Percona Server moved to https://jira.percona.com/projects/PS

lp://staging/~laurynas-biveinis/percona-server/merge-5.5.38

Created by Laurynas Biveinis on 2014-06-03 and last modified on 2014-06-03

Only Laurynas Biveinis can upload to this branch. If you are Laurynas Biveinis please log in for upload directions.

Branch merges

No branches dependent on this one.

Merged into lp://staging/percona-server/5.5 at revision 671

Sergei Glushchenko (community): Approve (g2) on 2014-06-11

Diff: 4573 lines (+1830/-359)

103 files modified

CMakeLists.txt (+4/-3)
VERSION (+2/-2)
include/errmsg.h (+4/-2)
libmysql/errmsg.c (+3/-1)
libmysql/libmysql.c (+5/-1)
man/comp_err.1 (+2/-2)
man/innochecksum.1 (+2/-2)
man/msql2mysql.1 (+2/-2)
man/my_print_defaults.1 (+2/-2)
man/myisam_ftdump.1 (+2/-2)
man/myisamchk.1 (+96/-6)
man/myisamlog.1 (+2/-2)
man/myisampack.1 (+2/-2)
man/mysql-stress-test.pl.1 (+3/-3)
man/mysql-test-run.pl.1 (+4/-4)
man/mysql.1 (+102/-10)
man/mysql.server.1 (+2/-2)
man/mysql_client_test.1 (+3/-3)
man/mysql_config.1 (+2/-2)
man/mysql_convert_table_format.1 (+2/-2)
man/mysql_find_rows.1 (+2/-2)
man/mysql_fix_extensions.1 (+2/-2)
man/mysql_install_db.1 (+100/-16)
man/mysql_plugin.1 (+2/-2)
man/mysql_secure_installation.1 (+2/-2)
man/mysql_setpermission.1 (+2/-2)
man/mysql_tzinfo_to_sql.1 (+2/-2)
man/mysql_upgrade.1 (+100/-6)
man/mysql_waitpid.1 (+2/-2)
man/mysql_zap.1 (+2/-2)
man/mysqlaccess.1 (+2/-2)
man/mysqladmin.1 (+100/-6)
man/mysqlbinlog.1 (+100/-6)
man/mysqlbug.1 (+2/-2)
man/mysqlcheck.1 (+100/-6)
man/mysqld.8 (+2/-2)
man/mysqld_multi.1 (+2/-2)
man/mysqld_safe.1 (+2/-2)
man/mysqldump.1 (+102/-10)
man/mysqldumpslow.1 (+2/-2)
man/mysqlhotcopy.1 (+2/-2)
man/mysqlimport.1 (+100/-6)
man/mysqlshow.1 (+100/-6)
man/mysqlslap.1 (+115/-21)
man/mysqltest.1 (+4/-4)
man/ndb-common-options.1 (+2/-2)
man/ndb_blob_tool.1 (+3/-4)
man/ndb_config.1 (+4/-4)
man/ndb_cpcd.1 (+2/-2)
man/ndb_delete_all.1 (+3/-3)
man/ndb_desc.1 (+4/-5)
man/ndb_drop_index.1 (+4/-4)
man/ndb_drop_table.1 (+3/-3)
man/ndb_error_reporter.1 (+3/-3)
man/ndb_index_stat.1 (+4/-6)
man/ndb_mgm.1 (+2/-2)
man/ndb_mgmd.8 (+2/-2)
man/ndb_print_backup_file.1 (+4/-5)
man/ndb_print_schema_file.1 (+4/-5)
man/ndb_print_sys_file.1 (+4/-5)
man/ndb_restore.1 (+2/-2)
man/ndb_select_all.1 (+4/-5)
man/ndb_select_count.1 (+4/-4)
man/ndb_show_tables.1 (+3/-3)
man/ndb_size.pl.1 (+4/-4)
man/ndb_waiter.1 (+4/-4)
man/ndbd.8 (+2/-2)
man/ndbd_redo_log_reader.1 (+3/-3)
man/ndbinfo_select_all.1 (+2/-2)
man/ndbmtd.8 (+2/-2)
man/perror.1 (+2/-2)
man/replace.1 (+2/-2)
man/resolve_stack_dump.1 (+2/-2)
man/resolveip.1 (+2/-2)
mysql-test/collections/default.experimental (+0/-1)
mysql-test/r/have_cp1251.require (+1/-1)
mysql-test/r/have_cp866.require (+1/-1)
mysql-test/r/have_koi8r.require (+1/-1)
mysql-test/r/loaddata.result (+12/-0)
mysql-test/r/outfile_loaddata.result (+16/-8)
mysql-test/suite/binlog/r/binlog_truncate_kill.result (+33/-0)
mysql-test/suite/binlog/t/binlog_truncate_kill.test (+56/-0)
mysql-test/suite/rpl/r/rpl_row_create_select.result (+28/-0)
mysql-test/suite/rpl/t/rpl_heartbeat_basic.test (+1/-3)
mysql-test/suite/rpl/t/rpl_row_create_select.test (+28/-0)
mysql-test/t/loaddata.test (+21/-0)
mysql-test/t/outfile_loaddata.test (+4/-0)
mysys/my_thr_init.c (+3/-0)
packaging/rpm-oel/mysql.spec.in (+82/-7)
packaging/solaris/CMakeLists.txt (+5/-1)
sql-common/client.c (+16/-6)
sql/field.cc (+3/-6)
sql/item_func.cc (+6/-4)
sql/sql_load.cc (+40/-24)
sql/sql_select.cc (+5/-0)
sql/sql_show.cc (+58/-7)
sql/sql_string.cc (+36/-0)
sql/sql_string.h (+3/-0)
sql/sql_truncate.cc (+38/-13)
sql/sql_truncate.h (+8/-2)
sql/sql_union.cc (+29/-0)
storage/archive/ha_archive.cc (+3/-1)
storage/innobase/row/row0ins.c (+10/-7)