Merge lp:~stewart/percona-server/5.6.8 into lp:percona-server/5.6

Proposed by Stewart Smith
Status: Merged
Approved by: Laurynas Biveinis
Approved revision: 309
Merged at revision: 310
Proposed branch: lp:~stewart/percona-server/5.6.8
Merge into: lp:percona-server/5.6
Diff against target: 184964 lines (+129336/-15035)
660 files modified
Makefile (+2/-2)
Percona-Server/CMakeLists.txt (+3/-1)
Percona-Server/SPECIFIC-ULN/CMakeLists.txt (+38/-0)
Percona-Server/SPECIFIC-ULN/README-ULN (+15/-0)
Percona-Server/SPECIFIC-ULN/README.mysql-docs (+4/-0)
Percona-Server/SPECIFIC-ULN/filter-requires-mysql.sh (+3/-0)
Percona-Server/SPECIFIC-ULN/generate-tarball.sh (+15/-0)
Percona-Server/SPECIFIC-ULN/my.cnf (+10/-0)
Percona-Server/SPECIFIC-ULN/my_config.h (+29/-0)
Percona-Server/SPECIFIC-ULN/mysql-5.5-errno.patch (+21/-0)
Percona-Server/SPECIFIC-ULN/mysql-5.5-fix-tests.patch (+34/-0)
Percona-Server/SPECIFIC-ULN/mysql-5.5-libdir.patch (+28/-0)
Percona-Server/SPECIFIC-ULN/mysql-5.5-mtr1.patch (+25/-0)
Percona-Server/SPECIFIC-ULN/mysql-5.5-stack-guard.patch (+140/-0)
Percona-Server/SPECIFIC-ULN/mysql-5.5-testing.patch (+23/-0)
Percona-Server/SPECIFIC-ULN/mysql-chain-certs.patch (+41/-0)
Percona-Server/SPECIFIC-ULN/mysql-embedded-check.c (+26/-0)
Percona-Server/SPECIFIC-ULN/mysql-expired-certs.patch (+555/-0)
Percona-Server/SPECIFIC-ULN/mysql-install-test.patch (+33/-0)
Percona-Server/SPECIFIC-ULN/mysql-strmov.patch (+32/-0)
Percona-Server/SPECIFIC-ULN/mysql.init (+209/-0)
Percona-Server/SPECIFIC-ULN/mysql.spec.sh (+1959/-0)
Percona-Server/SPECIFIC-ULN/scriptstub.c (+32/-0)
Percona-Server/VERSION (+1/-1)
Percona-Server/client/CMakeLists.txt (+5/-0)
Percona-Server/client/client_priv.h (+1/-0)
Percona-Server/client/mysql.cc (+224/-7)
Percona-Server/client/mysql_plugin.c (+36/-3)
Percona-Server/client/mysqladmin.cc (+68/-23)
Percona-Server/client/mysqltest.cc (+17/-7)
Percona-Server/cmake/configure.pl (+10/-0)
Percona-Server/cmake/create_initial_db.cmake.in (+9/-3)
Percona-Server/cmake/info_macros.cmake.in (+5/-3)
Percona-Server/cmake/install_layout.cmake (+6/-1)
Percona-Server/cmake/os/Darwin.cmake (+6/-2)
Percona-Server/cmake/os/SunOS.cmake (+6/-1)
Percona-Server/cmake/ssl.cmake (+57/-0)
Percona-Server/dbug/dbug.c (+20/-1)
Percona-Server/extra/CMakeLists.txt (+9/-0)
Percona-Server/include/my_dbug.h (+1/-0)
Percona-Server/libmysql/CMakeLists.txt (+13/-1)
Percona-Server/mysql-test/collections/default.daily (+3/-5)
Percona-Server/mysql-test/collections/default.experimental (+0/-18)
Percona-Server/mysql-test/collections/default.weekly (+18/-50)
Percona-Server/mysql-test/collections/mysql-5.6.release (+0/-6)
Percona-Server/mysql-test/collections/mysql-trunk-bug27480.push (+0/-4)
Percona-Server/mysql-test/collections/mysql-trunk-stage.push (+0/-6)
Percona-Server/mysql-test/collections/mysql-trunk-wl3584-gtid-ON.push (+0/-20)
Percona-Server/mysql-test/collections/mysql-trunk-wl3584.push (+0/-16)
Percona-Server/mysql-test/collections/mysql-trunk-wl5223.push (+0/-2)
Percona-Server/mysql-test/collections/mysql-trunk.release (+0/-6)
Percona-Server/mysql-test/include/Load_data.inc (+14/-0)
Percona-Server/mysql-test/include/create_table.inc (+8/-0)
Percona-Server/mysql-test/include/have_partition_open_file_limit.inc (+5/-0)
Percona-Server/mysql-test/include/ib_logfile_size_check.inc (+14/-0)
Percona-Server/mysql-test/include/innodb-util.inc (+54/-21)
Percona-Server/mysql-test/include/mtr_warnings.sql (+3/-0)
Percona-Server/mysql-test/include/mysqld--help.inc (+1/-1)
Percona-Server/mysql-test/include/rpl_start_server.inc (+11/-5)
Percona-Server/mysql-test/include/subquery_sj.inc (+11/-0)
Percona-Server/mysql-test/include/vardir_size_check.inc (+26/-0)
Percona-Server/mysql-test/mysql-test-run.pl (+17/-6)
Percona-Server/mysql-test/r/alter_table.result (+10/-10)
Percona-Server/mysql-test/r/contributors.result (+0/-5)
Percona-Server/mysql-test/r/ctype_ucs.result (+26/-0)
Percona-Server/mysql-test/r/gis-debug.result (+3/-3)
Percona-Server/mysql-test/r/gis-precise.result (+3/-3)
Percona-Server/mysql-test/r/gis.result (+1/-1)
Percona-Server/mysql-test/r/implicit_commit.result (+0/-16)
Percona-Server/mysql-test/r/innodb_log_file_size_functionality.result (+73/-0)
Percona-Server/mysql-test/r/innodb_mysql_sync.result (+1/-1)
Percona-Server/mysql-test/r/loaddata.result (+0/-29)
Percona-Server/mysql-test/r/lowercase_table_qcache.result (+1/-1)
Percona-Server/mysql-test/r/merge.result (+3/-0)
Percona-Server/mysql-test/r/mysql_plugin.result (+3/-0)
Percona-Server/mysql-test/r/mysqlbinlog.result (+16/-16)
Percona-Server/mysql-test/r/mysqlbinlog_row.result (+201/-201)
Percona-Server/mysql-test/r/mysqlbinlog_row_innodb.result (+1425/-1425)
Percona-Server/mysql-test/r/mysqlbinlog_row_myisam.result (+1445/-1445)
Percona-Server/mysql-test/r/mysqlbinlog_row_trans.result (+29/-29)
Percona-Server/mysql-test/r/mysqlbinlog_start_stop.result (+49/-49)
Percona-Server/mysql-test/r/mysqld--help-notwin.result (+8/-7)
Percona-Server/mysql-test/r/mysqld--help-win.result (+8/-7)
Percona-Server/mysql-test/r/partition_innodb_plugin.result (+1/-1)
Percona-Server/mysql-test/r/partition_innodb_tablespace.result (+2/-2)
Percona-Server/mysql-test/r/plugin_auth.result (+12/-9)
Percona-Server/mysql-test/r/query_cache.result (+1/-1)
Percona-Server/mysql-test/r/query_cache_debug.result (+0/-1)
Percona-Server/mysql-test/r/query_cache_disabled.result (+1/-1)
Percona-Server/mysql-test/r/query_cache_merge.result (+1/-1)
Percona-Server/mysql-test/r/query_cache_notembedded.result (+0/-1)
Percona-Server/mysql-test/r/query_cache_size_functionality.result (+226/-0)
Percona-Server/mysql-test/r/query_cache_type_functionality.result (+250/-0)
Percona-Server/mysql-test/r/show_check.result (+9/-3)
Percona-Server/mysql-test/r/show_profile.result (+6/-1)
Percona-Server/mysql-test/r/sort_buffer_size_functionality.result (+184/-0)
Percona-Server/mysql-test/r/sp-error.result (+0/-7)
Percona-Server/mysql-test/r/subquery_all.result (+4/-4)
Percona-Server/mysql-test/r/subquery_all_bka.result (+4/-4)
Percona-Server/mysql-test/r/subquery_all_bka_nixbnl.result (+4/-4)
Percona-Server/mysql-test/r/subquery_nomat_nosj.result (+5/-5)
Percona-Server/mysql-test/r/subquery_nomat_nosj_bka.result (+5/-5)
Percona-Server/mysql-test/r/subquery_nomat_nosj_bka_nixbnl.result (+5/-5)
Percona-Server/mysql-test/r/subquery_none.result (+5/-5)
Percona-Server/mysql-test/r/subquery_none_bka.result (+5/-5)
Percona-Server/mysql-test/r/subquery_none_bka_nixbnl.result (+5/-5)
Percona-Server/mysql-test/r/subquery_sj_all.result (+8/-0)
Percona-Server/mysql-test/r/subquery_sj_all_bka.result (+8/-0)
Percona-Server/mysql-test/r/subquery_sj_all_bka_nixbnl.result (+8/-0)
Percona-Server/mysql-test/r/subquery_sj_all_bkaunique.result (+8/-0)
Percona-Server/mysql-test/r/subquery_sj_dupsweed.result (+8/-0)
Percona-Server/mysql-test/r/subquery_sj_dupsweed_bka.result (+8/-0)
Percona-Server/mysql-test/r/subquery_sj_dupsweed_bka_nixbnl.result (+8/-0)
Percona-Server/mysql-test/r/subquery_sj_dupsweed_bkaunique.result (+8/-0)
Percona-Server/mysql-test/r/subquery_sj_firstmatch.result (+8/-0)
Percona-Server/mysql-test/r/subquery_sj_firstmatch_bka.result (+8/-0)
Percona-Server/mysql-test/r/subquery_sj_firstmatch_bka_nixbnl.result (+8/-0)
Percona-Server/mysql-test/r/subquery_sj_firstmatch_bkaunique.result (+8/-0)
Percona-Server/mysql-test/r/subquery_sj_loosescan.result (+8/-0)
Percona-Server/mysql-test/r/subquery_sj_loosescan_bka.result (+8/-0)
Percona-Server/mysql-test/r/subquery_sj_loosescan_bka_nixbnl.result (+8/-0)
Percona-Server/mysql-test/r/subquery_sj_loosescan_bkaunique.result (+8/-0)
Percona-Server/mysql-test/r/subquery_sj_mat.result (+8/-0)
Percona-Server/mysql-test/r/subquery_sj_mat_bka.result (+8/-0)
Percona-Server/mysql-test/r/subquery_sj_mat_bka_nixbnl.result (+8/-0)
Percona-Server/mysql-test/r/subquery_sj_mat_bkaunique.result (+8/-0)
Percona-Server/mysql-test/r/subquery_sj_mat_nosj.result (+8/-0)
Percona-Server/mysql-test/r/subquery_sj_none.result (+8/-0)
Percona-Server/mysql-test/r/subquery_sj_none_bka.result (+8/-0)
Percona-Server/mysql-test/r/subquery_sj_none_bka_nixbnl.result (+8/-0)
Percona-Server/mysql-test/r/subquery_sj_none_bkaunique.result (+8/-0)
Percona-Server/mysql-test/r/table_open_cache_functionality.result (+260/-0)
Percona-Server/mysql-test/r/thread_cache_size_functionality.result (+158/-0)
Percona-Server/mysql-test/r/user_var-binlog.result (+1/-1)
Percona-Server/mysql-test/r/variables.result (+2/-0)
Percona-Server/mysql-test/r/wl6443_deprecation.result (+36/-0)
Percona-Server/mysql-test/suite/binlog/r/binlog_base64_flag.result (+1/-1)
Percona-Server/mysql-test/suite/binlog/r/binlog_hexdump.result (+1/-1)
Percona-Server/mysql-test/suite/binlog/r/binlog_row_mysqlbinlog_verbose.result (+28/-28)
Percona-Server/mysql-test/suite/binlog/r/binlog_stm_ctype_ucs.result (+1/-1)
Percona-Server/mysql-test/suite/funcs_1/t/innodb_trig_1011ext-master.opt (+1/-0)
Percona-Server/mysql-test/suite/funcs_1/t/memory_trig_1011ext-master.opt (+1/-0)
Percona-Server/mysql-test/suite/funcs_1/t/myisam_trig_1011ext-master.opt (+1/-0)
Percona-Server/mysql-test/suite/funcs_1/t/myisam_views-big.test (+2/-1)
Percona-Server/mysql-test/suite/innodb/r/innodb-alter.result (+40/-4)
Percona-Server/mysql-test/suite/innodb/r/innodb-blob.result (+1/-0)
Percona-Server/mysql-test/suite/innodb/r/innodb-bug-14068765.result (+1/-1)
Percona-Server/mysql-test/suite/innodb/r/innodb-bug-14084530.result (+1/-1)
Percona-Server/mysql-test/suite/innodb/r/innodb-create-options.result (+22/-22)
Percona-Server/mysql-test/suite/innodb/r/innodb-index-online-fk.result (+37/-380)
Percona-Server/mysql-test/suite/innodb/r/innodb-index-online.result (+1/-5)
Percona-Server/mysql-test/suite/innodb/r/innodb-log-file-size-1.result (+178/-0)
Percona-Server/mysql-test/suite/innodb/r/innodb-log-file-size.result (+36/-0)
Percona-Server/mysql-test/suite/innodb/r/innodb-table-online.result (+2/-2)
Percona-Server/mysql-test/suite/innodb/r/innodb-tablespace.result (+6/-6)
Percona-Server/mysql-test/suite/innodb/r/innodb-wl5522-1.result (+15/-15)
Percona-Server/mysql-test/suite/innodb/r/innodb-wl5522-debug-zip.result (+24/-402)
Percona-Server/mysql-test/suite/innodb/r/innodb-wl5522-debug.result (+50/-40)
Percona-Server/mysql-test/suite/innodb/r/innodb-wl5522-zip.result (+10/-10)
Percona-Server/mysql-test/suite/innodb/r/innodb-wl5522.result (+21/-21)
Percona-Server/mysql-test/suite/innodb/r/innodb-wl5980-alter.result (+192/-0)
Percona-Server/mysql-test/suite/innodb/r/innodb-wl6445-1.result (+1338/-0)
Percona-Server/mysql-test/suite/innodb/r/innodb-wl6445-2.result (+127/-0)
Percona-Server/mysql-test/suite/innodb/r/innodb-wl6445.result (+54/-0)
Percona-Server/mysql-test/suite/innodb/r/innodb-zip.result (+34/-34)
Percona-Server/mysql-test/suite/innodb/r/innodb_16k.result (+8/-8)
Percona-Server/mysql-test/suite/innodb/r/innodb_4k.result (+12/-12)
Percona-Server/mysql-test/suite/innodb/r/innodb_8k.result (+10/-10)
Percona-Server/mysql-test/suite/innodb/r/innodb_bug14006907.result (+6/-0)
Percona-Server/mysql-test/suite/innodb/r/innodb_i_s_innodb_locks.result (+114/-0)
Percona-Server/mysql-test/suite/innodb/r/innodb_i_s_innodb_trx.result (+81/-0)
Percona-Server/mysql-test/suite/innodb/r/innodb_information_schema.result (+0/-54)
Percona-Server/mysql-test/suite/innodb/t/innodb-alter.test (+44/-6)
Percona-Server/mysql-test/suite/innodb/t/innodb-blob.test (+2/-0)
Percona-Server/mysql-test/suite/innodb/t/innodb-create-options.test (+11/-11)
Percona-Server/mysql-test/suite/innodb/t/innodb-index-online-fk.test (+25/-5)
Percona-Server/mysql-test/suite/innodb/t/innodb-index-online.test (+0/-6)
Percona-Server/mysql-test/suite/innodb/t/innodb-log-file-size-1.test (+298/-0)
Percona-Server/mysql-test/suite/innodb/t/innodb-log-file-size.test (+212/-0)
Percona-Server/mysql-test/suite/innodb/t/innodb-multiple-tablespaces.test (+15/-8)
Percona-Server/mysql-test/suite/innodb/t/innodb-table-online.test (+2/-2)
Percona-Server/mysql-test/suite/innodb/t/innodb-tablespace.test (+3/-3)
Percona-Server/mysql-test/suite/innodb/t/innodb-wl5522-debug-zip.test (+2/-720)
Percona-Server/mysql-test/suite/innodb/t/innodb-wl5522-debug.test (+68/-24)
Percona-Server/mysql-test/suite/innodb/t/innodb-wl5980-alter.test (+64/-1)
Percona-Server/mysql-test/suite/innodb/t/innodb-wl5980-discard.test (+2/-1)
Percona-Server/mysql-test/suite/innodb/t/innodb-wl5980-linux.test (+6/-5)
Percona-Server/mysql-test/suite/innodb/t/innodb-wl6445-1.test (+755/-0)
Percona-Server/mysql-test/suite/innodb/t/innodb-wl6445-2.test (+242/-0)
Percona-Server/mysql-test/suite/innodb/t/innodb-wl6445.test (+100/-0)
Percona-Server/mysql-test/suite/innodb/t/innodb-zip.test (+17/-17)
Percona-Server/mysql-test/suite/innodb/t/innodb_16k.test (+4/-4)
Percona-Server/mysql-test/suite/innodb/t/innodb_4k.test (+6/-6)
Percona-Server/mysql-test/suite/innodb/t/innodb_8k.test (+5/-5)
Percona-Server/mysql-test/suite/innodb/t/innodb_bug14006907.test (+8/-1)
Percona-Server/mysql-test/suite/innodb/t/innodb_i_s_innodb_locks.test (+174/-0)
Percona-Server/mysql-test/suite/innodb/t/innodb_i_s_innodb_trx.test (+100/-0)
Percona-Server/mysql-test/suite/innodb/t/innodb_information_schema.test (+0/-285)
Percona-Server/mysql-test/suite/innodb/t/innodb_mysql-master.opt (+1/-0)
Percona-Server/mysql-test/suite/innodb/t/innodb_page_size_func.test (+2/-6)
Percona-Server/mysql-test/suite/innodb/t/innodb_stats_drop_locked.test (+4/-0)
Percona-Server/mysql-test/suite/innodb_fts/r/fulltext.result (+0/-1)
Percona-Server/mysql-test/suite/innodb_fts/r/innodb_fts_misc.result (+31/-1)
Percona-Server/mysql-test/suite/innodb_fts/r/innodb_fts_misc_debug.result (+96/-0)
Percona-Server/mysql-test/suite/innodb_fts/t/innodb_fts_misc.test (+23/-1)
Percona-Server/mysql-test/suite/innodb_fts/t/innodb_fts_misc_debug.test (+209/-0)
Percona-Server/mysql-test/suite/opt_trace/r/general2_no_prot.result (+31/-0)
Percona-Server/mysql-test/suite/opt_trace/r/general2_ps_prot.result (+31/-0)
Percona-Server/mysql-test/suite/parts/inc/partition_max_parts_hash.inc (+52/-0)
Percona-Server/mysql-test/suite/parts/inc/partition_max_parts_inv.inc (+125/-0)
Percona-Server/mysql-test/suite/parts/inc/partition_max_parts_key.inc (+52/-0)
Percona-Server/mysql-test/suite/parts/inc/partition_max_parts_list.inc (+83/-0)
Percona-Server/mysql-test/suite/parts/inc/partition_max_parts_range.inc (+83/-0)
Percona-Server/mysql-test/suite/parts/inc/partition_max_sub_parts_key_list.inc (+83/-0)
Percona-Server/mysql-test/suite/parts/inc/partition_max_sub_parts_key_range.inc (+85/-0)
Percona-Server/mysql-test/suite/parts/inc/partition_max_sub_parts_list.inc (+83/-0)
Percona-Server/mysql-test/suite/parts/inc/partition_max_sub_parts_range.inc (+85/-0)
Percona-Server/mysql-test/suite/parts/r/partition_basic_symlink_innodb.result (+2/-2)
Percona-Server/mysql-test/suite/parts/r/partition_debug.result (+1/-0)
Percona-Server/mysql-test/suite/parts/r/partition_max_parts_hash_innodb.result (+125/-0)
Percona-Server/mysql-test/suite/parts/r/partition_max_parts_hash_myisam.result (+125/-0)
Percona-Server/mysql-test/suite/parts/r/partition_max_parts_inv_innodb.result (+16430/-0)
Percona-Server/mysql-test/suite/parts/r/partition_max_parts_inv_myisam.result (+16430/-0)
Percona-Server/mysql-test/suite/parts/r/partition_max_parts_key_innodb.result (+113/-0)
Percona-Server/mysql-test/suite/parts/r/partition_max_parts_key_myisam.result (+113/-0)
Percona-Server/mysql-test/suite/parts/r/partition_max_parts_list_innodb.result (+8282/-0)
Percona-Server/mysql-test/suite/parts/r/partition_max_parts_list_myisam.result (+8282/-0)
Percona-Server/mysql-test/suite/parts/r/partition_max_parts_range_innodb.result (+8310/-0)
Percona-Server/mysql-test/suite/parts/r/partition_max_parts_range_myisam.result (+8310/-0)
Percona-Server/mysql-test/suite/parts/r/partition_max_sub_parts_key_list_innodb.result (+4180/-0)
Percona-Server/mysql-test/suite/parts/r/partition_max_sub_parts_key_list_myisam.result (+4180/-0)
Percona-Server/mysql-test/suite/parts/r/partition_max_sub_parts_key_range_innodb.result (+4205/-0)
Percona-Server/mysql-test/suite/parts/r/partition_max_sub_parts_key_range_myisam.result (+4205/-0)
Percona-Server/mysql-test/suite/parts/r/partition_max_sub_parts_list_innodb.result (+4180/-0)
Percona-Server/mysql-test/suite/parts/r/partition_max_sub_parts_list_myisam.result (+4180/-0)
Percona-Server/mysql-test/suite/parts/r/partition_max_sub_parts_range_innodb.result (+4205/-0)
Percona-Server/mysql-test/suite/parts/r/partition_max_sub_parts_range_myisam.result (+4205/-0)
Percona-Server/mysql-test/suite/parts/t/part_supported_sql_func_innodb.test (+2/-0)
Percona-Server/mysql-test/suite/parts/t/partition_alter1_1_2_innodb.test (+2/-0)
Percona-Server/mysql-test/suite/parts/t/partition_alter1_2_innodb.test (+3/-0)
Percona-Server/mysql-test/suite/parts/t/partition_alter2_1_1_innodb.test (+2/-0)
Percona-Server/mysql-test/suite/parts/t/partition_alter2_1_2_innodb.test (+2/-0)
Percona-Server/mysql-test/suite/parts/t/partition_alter2_2_1_innodb.test (+4/-2)
Percona-Server/mysql-test/suite/parts/t/partition_alter2_2_2_innodb.test (+2/-0)
Percona-Server/mysql-test/suite/parts/t/partition_alter4_innodb.test (+2/-0)
Percona-Server/mysql-test/suite/parts/t/partition_basic_innodb.test (+2/-0)
Percona-Server/mysql-test/suite/parts/t/partition_basic_symlink_innodb.test (+1/-1)
Percona-Server/mysql-test/suite/parts/t/partition_debug.test (+1/-0)
Percona-Server/mysql-test/suite/parts/t/partition_max_parts_hash_innodb.test (+24/-0)
Percona-Server/mysql-test/suite/parts/t/partition_max_parts_hash_myisam.test (+23/-0)
Percona-Server/mysql-test/suite/parts/t/partition_max_parts_inv_innodb.test (+24/-0)
Percona-Server/mysql-test/suite/parts/t/partition_max_parts_inv_myisam.test (+23/-0)
Percona-Server/mysql-test/suite/parts/t/partition_max_parts_key_innodb.test (+25/-0)
Percona-Server/mysql-test/suite/parts/t/partition_max_parts_key_myisam.test (+24/-0)
Percona-Server/mysql-test/suite/parts/t/partition_max_parts_list_innodb.test (+24/-0)
Percona-Server/mysql-test/suite/parts/t/partition_max_parts_list_myisam.test (+23/-0)
Percona-Server/mysql-test/suite/parts/t/partition_max_parts_range_innodb.test (+24/-0)
Percona-Server/mysql-test/suite/parts/t/partition_max_parts_range_myisam.test (+23/-0)
Percona-Server/mysql-test/suite/parts/t/partition_max_sub_parts_key_list_innodb.test (+26/-0)
Percona-Server/mysql-test/suite/parts/t/partition_max_sub_parts_key_list_myisam.test (+25/-0)
Percona-Server/mysql-test/suite/parts/t/partition_max_sub_parts_key_range_innodb.test (+25/-0)
Percona-Server/mysql-test/suite/parts/t/partition_max_sub_parts_key_range_myisam.test (+24/-0)
Percona-Server/mysql-test/suite/parts/t/partition_max_sub_parts_list_innodb.test (+30/-0)
Percona-Server/mysql-test/suite/parts/t/partition_max_sub_parts_list_myisam.test (+24/-0)
Percona-Server/mysql-test/suite/parts/t/partition_max_sub_parts_range_innodb.test (+29/-0)
Percona-Server/mysql-test/suite/parts/t/partition_max_sub_parts_range_myisam.test (+23/-0)
Percona-Server/mysql-test/suite/perfschema/include/event_aggregate_load.inc (+24/-0)
Percona-Server/mysql-test/suite/perfschema/include/event_aggregate_setup.inc (+2/-1)
Percona-Server/mysql-test/suite/perfschema/r/digest_table_full.result (+1/-1)
Percona-Server/mysql-test/suite/perfschema/r/func_file_io.result (+26/-0)
Percona-Server/mysql-test/suite/perfschema/r/func_mutex.result (+34/-0)
Percona-Server/mysql-test/suite/perfschema/r/multi_table_io.result (+2/-11)
Percona-Server/mysql-test/suite/perfschema/r/ortho_iter.result (+1/-1)
Percona-Server/mysql-test/suite/perfschema/r/privilege_table_io.result (+1/-1)
Percona-Server/mysql-test/suite/perfschema/r/relaylog.result (+4/-0)
Percona-Server/mysql-test/suite/perfschema/r/sizing_default.result (+16/-16)
Percona-Server/mysql-test/suite/perfschema/r/sizing_high.result (+16/-16)
Percona-Server/mysql-test/suite/perfschema/r/sizing_low.result (+16/-16)
Percona-Server/mysql-test/suite/perfschema/r/sizing_med.result (+16/-16)
Percona-Server/mysql-test/suite/perfschema/r/sizing_off.result (+1/-1)
Percona-Server/mysql-test/suite/perfschema/r/start_server_disable_idle.result (+1/-1)
Percona-Server/mysql-test/suite/perfschema/r/start_server_disable_stages.result (+1/-1)
Percona-Server/mysql-test/suite/perfschema/r/start_server_disable_statements.result (+1/-1)
Percona-Server/mysql-test/suite/perfschema/r/start_server_disable_waits.result (+1/-1)
Percona-Server/mysql-test/suite/perfschema/r/start_server_innodb.result (+1/-1)
Percona-Server/mysql-test/suite/perfschema/r/start_server_no_account.result (+1/-1)
Percona-Server/mysql-test/suite/perfschema/r/start_server_no_cond_class.result (+1/-1)
Percona-Server/mysql-test/suite/perfschema/r/start_server_no_cond_inst.result (+1/-1)
Percona-Server/mysql-test/suite/perfschema/r/start_server_no_file_class.result (+1/-1)
Percona-Server/mysql-test/suite/perfschema/r/start_server_no_file_inst.result (+1/-1)
Percona-Server/mysql-test/suite/perfschema/r/start_server_no_host.result (+1/-1)
Percona-Server/mysql-test/suite/perfschema/r/start_server_no_mutex_class.result (+1/-1)
Percona-Server/mysql-test/suite/perfschema/r/start_server_no_mutex_inst.result (+1/-1)
Percona-Server/mysql-test/suite/perfschema/r/start_server_no_rwlock_class.result (+1/-1)
Percona-Server/mysql-test/suite/perfschema/r/start_server_no_rwlock_inst.result (+1/-1)
Percona-Server/mysql-test/suite/perfschema/r/start_server_no_setup_actors.result (+1/-1)
Percona-Server/mysql-test/suite/perfschema/r/start_server_no_setup_objects.result (+1/-1)
Percona-Server/mysql-test/suite/perfschema/r/start_server_no_socket_class.result (+1/-1)
Percona-Server/mysql-test/suite/perfschema/r/start_server_no_socket_inst.result (+1/-1)
Percona-Server/mysql-test/suite/perfschema/r/start_server_no_stage_class.result (+1/-1)
Percona-Server/mysql-test/suite/perfschema/r/start_server_no_stages_history.result (+1/-1)
Percona-Server/mysql-test/suite/perfschema/r/start_server_no_stages_history_long.result (+1/-1)
Percona-Server/mysql-test/suite/perfschema/r/start_server_no_statements_history.result (+1/-1)
Percona-Server/mysql-test/suite/perfschema/r/start_server_no_statements_history_long.result (+1/-1)
Percona-Server/mysql-test/suite/perfschema/r/start_server_no_table_hdl.result (+1/-1)
Percona-Server/mysql-test/suite/perfschema/r/start_server_no_table_inst.result (+1/-1)
Percona-Server/mysql-test/suite/perfschema/r/start_server_no_thread_class.result (+1/-1)
Percona-Server/mysql-test/suite/perfschema/r/start_server_no_thread_inst.result (+1/-1)
Percona-Server/mysql-test/suite/perfschema/r/start_server_no_user.result (+1/-1)
Percona-Server/mysql-test/suite/perfschema/r/start_server_no_waits_history.result (+1/-1)
Percona-Server/mysql-test/suite/perfschema/r/start_server_no_waits_history_long.result (+1/-1)
Percona-Server/mysql-test/suite/perfschema/r/start_server_off.result (+1/-1)
Percona-Server/mysql-test/suite/perfschema/r/start_server_on.result (+1/-1)
Percona-Server/mysql-test/suite/perfschema/r/statement_digest.result (+37/-37)
Percona-Server/mysql-test/suite/perfschema/r/statement_digest_consumers.result (+37/-37)
Percona-Server/mysql-test/suite/perfschema/r/statement_digest_long_query.result (+2/-2)
Percona-Server/mysql-test/suite/perfschema/r/table_aggregate_global_2u_2t.result (+73/-73)
Percona-Server/mysql-test/suite/perfschema/r/table_aggregate_global_2u_3t.result (+73/-73)
Percona-Server/mysql-test/suite/perfschema/r/table_aggregate_global_4u_2t.result (+73/-73)
Percona-Server/mysql-test/suite/perfschema/r/table_aggregate_global_4u_3t.result (+73/-73)
Percona-Server/mysql-test/suite/perfschema/r/table_aggregate_hist_2u_2t.result (+150/-150)
Percona-Server/mysql-test/suite/perfschema/r/table_aggregate_hist_2u_3t.result (+150/-150)
Percona-Server/mysql-test/suite/perfschema/r/table_aggregate_hist_4u_2t.result (+150/-150)
Percona-Server/mysql-test/suite/perfschema/r/table_aggregate_hist_4u_3t.result (+150/-150)
Percona-Server/mysql-test/suite/perfschema/r/table_aggregate_off.result (+1/-1)
Percona-Server/mysql-test/suite/perfschema/r/table_aggregate_thread_2u_2t.result (+131/-131)
Percona-Server/mysql-test/suite/perfschema/r/table_aggregate_thread_2u_3t.result (+131/-131)
Percona-Server/mysql-test/suite/perfschema/r/table_aggregate_thread_4u_2t.result (+131/-131)
Percona-Server/mysql-test/suite/perfschema/r/table_aggregate_thread_4u_3t.result (+131/-131)
Percona-Server/mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_2t.result (+73/-73)
Percona-Server/mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_3t.result (+73/-73)
Percona-Server/mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_2t.result (+73/-73)
Percona-Server/mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_3t.result (+73/-73)
Percona-Server/mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_2t.result (+150/-150)
Percona-Server/mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_3t.result (+150/-150)
Percona-Server/mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_2t.result (+150/-150)
Percona-Server/mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_3t.result (+150/-150)
Percona-Server/mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_2t.result (+131/-131)
Percona-Server/mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_3t.result (+131/-131)
Percona-Server/mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_2t.result (+131/-131)
Percona-Server/mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_3t.result (+131/-131)
Percona-Server/mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_2t.result (+1/-1)
Percona-Server/mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_3t.result (+1/-1)
Percona-Server/mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_2t.result (+1/-1)
Percona-Server/mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_3t.result (+1/-1)
Percona-Server/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_2t.result (+1/-1)
Percona-Server/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_3t.result (+1/-1)
Percona-Server/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_2t.result (+1/-1)
Percona-Server/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_3t.result (+1/-1)
Percona-Server/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_2t.result (+1/-1)
Percona-Server/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_3t.result (+1/-1)
Percona-Server/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_2t.result (+1/-1)
Percona-Server/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_3t.result (+1/-1)
Percona-Server/mysql-test/suite/perfschema/r/trigger_table_io.result (+0/-5)
Percona-Server/mysql-test/suite/perfschema/t/disabled.def (+3/-0)
Percona-Server/mysql-test/suite/perfschema/t/func_file_io.test (+7/-0)
Percona-Server/mysql-test/suite/perfschema/t/func_mutex.test (+12/-0)
Percona-Server/mysql-test/suite/perfschema/t/query_cache-master.opt (+1/-0)
Percona-Server/mysql-test/suite/perfschema/t/stage_mdl_global-master.opt (+1/-0)
Percona-Server/mysql-test/suite/perfschema/t/threads_mysql-master.opt (+1/-0)
Percona-Server/mysql-test/suite/rpl/r/rpl_do_grant.result (+17/-1)
Percona-Server/mysql-test/suite/rpl/r/rpl_grant.result (+35/-15)
Percona-Server/mysql-test/suite/rpl/r/rpl_master_pos_wait.result (+0/-18)
Percona-Server/mysql-test/suite/rpl/r/rpl_row_basic_11bugs.result (+1/-1)
Percona-Server/mysql-test/suite/rpl/r/rpl_row_ignorable_event.result (+133/-133)
Percona-Server/mysql-test/suite/rpl/r/rpl_row_mysqlbinlog.result (+4/-4)
Percona-Server/mysql-test/suite/rpl/r/rpl_seconds_behind_master.result (+4/-0)
Percona-Server/mysql-test/suite/rpl/r/rpl_sp.result (+6/-6)
Percona-Server/mysql-test/suite/rpl/t/rpl_binlog_index.test (+1/-1)
Percona-Server/mysql-test/suite/rpl/t/rpl_do_grant.test (+24/-4)
Percona-Server/mysql-test/suite/rpl/t/rpl_grant.test (+46/-49)
Percona-Server/mysql-test/suite/rpl/t/rpl_master_pos_wait.test (+1/-29)
Percona-Server/mysql-test/suite/rpl/t/rpl_mix_found_rows-master.opt (+1/-0)
Percona-Server/mysql-test/suite/rpl/t/rpl_row_basic_11bugs.test (+1/-1)
Percona-Server/mysql-test/suite/rpl/t/rpl_row_sp011-master.opt (+1/-0)
Percona-Server/mysql-test/suite/rpl/t/rpl_seconds_behind_master.test (+31/-33)
Percona-Server/mysql-test/suite/sys_vars/inc/query_cache_size_basic.inc (+1/-1)
Percona-Server/mysql-test/suite/sys_vars/r/have_profiling_basic.result (+2/-0)
Percona-Server/mysql-test/suite/sys_vars/r/innodb_change_buffering_debug_basic.result (+0/-3)
Percona-Server/mysql-test/suite/sys_vars/r/innodb_force_recovery_crash_basic.result (+33/-0)
Percona-Server/mysql-test/suite/sys_vars/r/innodb_read_only_basic.result (+22/-0)
Percona-Server/mysql-test/suite/sys_vars/r/metadata_locks_hash_instances_basic.result (+51/-0)
Percona-Server/mysql-test/suite/sys_vars/r/profiling_basic.result (+26/-0)
Percona-Server/mysql-test/suite/sys_vars/r/profiling_h_size_basic.result (+25/-0)
Percona-Server/mysql-test/suite/sys_vars/r/query_cache_size_basic_32.result (+1/-1)
Percona-Server/mysql-test/suite/sys_vars/r/query_cache_size_basic_64.result (+1/-1)
Percona-Server/mysql-test/suite/sys_vars/r/query_cache_type_basic.result (+2/-2)
Percona-Server/mysql-test/suite/sys_vars/r/table_definition_cache_basic.result (+5/-5)
Percona-Server/mysql-test/suite/sys_vars/r/table_open_cache_basic.result (+5/-5)
Percona-Server/mysql-test/suite/sys_vars/r/thread_cache_size_basic.result (+7/-7)
Percona-Server/mysql-test/suite/sys_vars/t/innodb_change_buffering_debug_basic.test (+3/-1)
Percona-Server/mysql-test/suite/sys_vars/t/innodb_force_recovery_crash_basic.test (+28/-0)
Percona-Server/mysql-test/suite/sys_vars/t/innodb_read_only_basic.test (+20/-0)
Percona-Server/mysql-test/suite/sys_vars/t/max_sp_recursion_depth_func-master.opt (+1/-0)
Percona-Server/mysql-test/suite/sys_vars/t/metadata_locks_hash_instances_basic.test (+60/-0)
Percona-Server/mysql-test/suite/sys_vars/t/query_cache_limit_func-master.opt (+1/-0)
Percona-Server/mysql-test/suite/sys_vars/t/query_cache_type_basic-master.opt (+1/-0)
Percona-Server/mysql-test/suite/sys_vars/t/query_cache_type_basic.test (+1/-1)
Percona-Server/mysql-test/suite/sys_vars/t/query_cache_type_func-master.opt (+1/-0)
Percona-Server/mysql-test/suite/sys_vars/t/query_cache_wlock_invalidate_func-master.opt (+1/-0)
Percona-Server/mysql-test/suite/sys_vars/t/slow_launch_time_func-master.opt (+1/-0)
Percona-Server/mysql-test/suite/sys_vars/t/table_definition_cache_basic.test (+2/-2)
Percona-Server/mysql-test/suite/sys_vars/t/table_open_cache_basic.test (+2/-2)
Percona-Server/mysql-test/suite/sys_vars/t/thread_cache_size_func-master.opt (+1/-0)
Percona-Server/mysql-test/t/alter_table.test (+5/-4)
Percona-Server/mysql-test/t/bug33509-master.opt (+1/-0)
Percona-Server/mysql-test/t/cache_innodb-master.opt (+1/-0)
Percona-Server/mysql-test/t/contributors.test (+0/-1)
Percona-Server/mysql-test/t/ctype_ucs.test (+32/-0)
Percona-Server/mysql-test/t/disabled.def (+3/-1)
Percona-Server/mysql-test/t/func_misc-master.opt (+1/-0)
Percona-Server/mysql-test/t/grant_cache-master.opt (+1/-0)
Percona-Server/mysql-test/t/implicit_commit.test (+0/-16)
Percona-Server/mysql-test/t/index_merge_innodb.test (+2/-2)
Percona-Server/mysql-test/t/innodb_log_file_size_functionality.test (+124/-0)
Percona-Server/mysql-test/t/innodb_mysql_sync.test (+1/-1)
Percona-Server/mysql-test/t/loaddata.test (+34/-30)
Percona-Server/mysql-test/t/lowercase_table_qcache-master.opt (+1/-0)
Percona-Server/mysql-test/t/lowercase_table_qcache.test (+1/-1)
Percona-Server/mysql-test/t/main.lowercase_table_qcache-master.opt (+1/-0)
Percona-Server/mysql-test/t/merge.test (+3/-0)
Percona-Server/mysql-test/t/mix2_myisam-master.opt (+1/-0)
Percona-Server/mysql-test/t/mysql_client_test-master.opt (+1/-0)
Percona-Server/mysql-test/t/mysql_plugin.test (+4/-0)
Percona-Server/mysql-test/t/partition_cache-master.opt (+1/-0)
Percona-Server/mysql-test/t/partition_innodb_plugin.test (+1/-1)
Percona-Server/mysql-test/t/partition_innodb_tablespace.test (+1/-1)
Percona-Server/mysql-test/t/plugin_auth.test (+23/-9)
Percona-Server/mysql-test/t/profiling.test (+45/-1)
Percona-Server/mysql-test/t/query_cache-master.opt (+1/-0)
Percona-Server/mysql-test/t/query_cache.test (+1/-1)
Percona-Server/mysql-test/t/query_cache_28249-master.opt (+1/-0)
Percona-Server/mysql-test/t/query_cache_debug-master.opt (+1/-0)
Percona-Server/mysql-test/t/query_cache_debug.test (+0/-1)
Percona-Server/mysql-test/t/query_cache_disabled.test (+1/-2)
Percona-Server/mysql-test/t/query_cache_merge-master.opt (+1/-0)
Percona-Server/mysql-test/t/query_cache_merge.test (+1/-1)
Percona-Server/mysql-test/t/query_cache_notembedded-master.opt (+1/-0)
Percona-Server/mysql-test/t/query_cache_notembedded.test (+0/-1)
Percona-Server/mysql-test/t/query_cache_ps_no_prot-master.opt (+1/-0)
Percona-Server/mysql-test/t/query_cache_ps_ps_prot-master.opt (+1/-0)
Percona-Server/mysql-test/t/query_cache_size_functionality.test (+258/-0)
Percona-Server/mysql-test/t/query_cache_type_functionality.test (+265/-0)
Percona-Server/mysql-test/t/query_cache_with_views-master.opt (+1/-0)
Percona-Server/mysql-test/t/show_check.test (+13/-5)
Percona-Server/mysql-test/t/signal_demo3-master.opt (+1/-0)
Percona-Server/mysql-test/t/sp-error.test (+0/-16)
Percona-Server/mysql-test/t/sp-fib-master.opt (+1/-0)
Percona-Server/mysql-test/t/sp-lock-master.opt (+1/-0)
Percona-Server/mysql-test/t/sp-master.opt (+2/-0)
Percona-Server/mysql-test/t/sp-prelocking-master.opt (+1/-0)
Percona-Server/mysql-test/t/sp_notembedded-master.opt (+1/-0)
Percona-Server/mysql-test/t/ssl-big.test (+2/-0)
Percona-Server/mysql-test/t/table_open_cache_functionality.test (+298/-0)
Percona-Server/mysql-test/t/udf-master.opt (+1/-0)
Percona-Server/mysql-test/t/variables-master.opt (+1/-0)
Percona-Server/mysql-test/t/variables.test (+2/-0)
Percona-Server/mysql-test/t/wl6443_deprecation.test (+8/-0)
Percona-Server/mysys/stacktrace.c (+0/-11)
Percona-Server/plugin/innodb_memcached/innodb_memcache/src/innodb_config.c (+9/-3)
Percona-Server/scripts/CMakeLists.txt (+18/-9)
Percona-Server/scripts/mysql_install_db.pl.in (+360/-24)
Percona-Server/scripts/mysql_secure_installation.pl.in (+12/-5)
Percona-Server/scripts/mysql_secure_installation.sh (+15/-5)
Percona-Server/scripts/mysql_security_commands.sql (+36/-0)
Percona-Server/sql-common/client_authentication.cc (+1/-1)
Percona-Server/sql/CMakeLists.txt (+12/-3)
Percona-Server/sql/abstract_query_plan.cc (+7/-5)
Percona-Server/sql/authors.h (+0/-163)
Percona-Server/sql/binlog.cc (+25/-5)
Percona-Server/sql/binlog.h (+4/-0)
Percona-Server/sql/contributors.h (+0/-45)
Percona-Server/sql/event_db_repository.cc (+4/-2)
Percona-Server/sql/filesort.cc (+6/-2)
Percona-Server/sql/gcalc_slicescan.cc (+5/-1)
Percona-Server/sql/gcalc_tools.cc (+15/-12)
Percona-Server/sql/ha_ndbcluster_binlog.cc (+28/-7)
Percona-Server/sql/ha_partition.cc (+175/-49)
Percona-Server/sql/ha_partition.h (+4/-0)
Percona-Server/sql/handler.cc (+8/-6)
Percona-Server/sql/handler.h (+13/-2)
Percona-Server/sql/item.cc (+13/-3)
Percona-Server/sql/item.h (+7/-4)
Percona-Server/sql/item_func.cc (+21/-9)
Percona-Server/sql/item_func.h (+19/-4)
Percona-Server/sql/item_geofunc.cc (+7/-2)
Percona-Server/sql/item_subselect.cc (+12/-16)
Percona-Server/sql/lex.h (+0/-2)
Percona-Server/sql/log_event.cc (+188/-54)
Percona-Server/sql/log_event.h (+18/-3)
Percona-Server/sql/log_event_old.cc (+3/-3)
Percona-Server/sql/mdl.cc (+151/-55)
Percona-Server/sql/mdl.h (+8/-0)
Percona-Server/sql/mysqld.cc (+143/-74)
Percona-Server/sql/mysqld.h (+6/-1)
Percona-Server/sql/opt_range.cc (+185/-77)
Percona-Server/sql/opt_sum.cc (+1/-1)
Percona-Server/sql/partition_info.cc (+3/-0)
Percona-Server/sql/password.c (+15/-6)
Percona-Server/sql/protocol.cc (+1/-1)
Percona-Server/sql/records.cc (+1/-1)
Percona-Server/sql/rpl_gtid.h (+130/-24)
Percona-Server/sql/rpl_gtid_execution.cc (+1/-8)
Percona-Server/sql/rpl_gtid_owned.cc (+18/-0)
Percona-Server/sql/rpl_gtid_state.cc (+63/-8)
Percona-Server/sql/rpl_rli.cc (+20/-4)
Percona-Server/sql/rpl_rli_pdb.cc (+12/-9)
Percona-Server/sql/rpl_slave.cc (+2/-1)
Percona-Server/sql/set_var.h (+2/-0)
Percona-Server/sql/share/CMakeLists.txt (+22/-10)
Percona-Server/sql/share/errmsg-utf8.txt (+3/-0)
Percona-Server/sql/sp.cc (+3/-4)
Percona-Server/sql/sp_instr.h (+12/-0)
Percona-Server/sql/sp_rcontext.cc (+9/-10)
Percona-Server/sql/sp_rcontext.h (+8/-9)
Percona-Server/sql/sql_acl.cc (+229/-160)
Percona-Server/sql/sql_base.cc (+15/-19)
Percona-Server/sql/sql_cache.cc (+48/-10)
Percona-Server/sql/sql_class.cc (+19/-39)
Percona-Server/sql/sql_class.h (+0/-29)
Percona-Server/sql/sql_cmd.h (+1/-2)
Percona-Server/sql/sql_const.h (+1/-1)
Percona-Server/sql/sql_db.cc (+22/-10)
Percona-Server/sql/sql_delete.cc (+1/-1)
Percona-Server/sql/sql_executor.cc (+57/-47)
Percona-Server/sql/sql_executor.h (+32/-1)
Percona-Server/sql/sql_help.cc (+5/-8)
Percona-Server/sql/sql_lex.cc (+23/-2)
Percona-Server/sql/sql_lex.h (+20/-3)
Percona-Server/sql/sql_load.cc (+12/-19)
Percona-Server/sql/sql_optimizer.cc (+65/-47)
Percona-Server/sql/sql_parse.cc (+13/-9)
Percona-Server/sql/sql_prepare.cc (+9/-0)
Percona-Server/sql/sql_select.cc (+51/-31)
Percona-Server/sql/sql_show.cc (+5/-73)
Percona-Server/sql/sql_show.h (+1/-2)
Percona-Server/sql/sql_table.cc (+11/-10)
Percona-Server/sql/sql_truncate.cc (+19/-15)
Percona-Server/sql/sql_update.cc (+0/-78)
Percona-Server/sql/sql_yacc.yy (+47/-19)
Percona-Server/sql/sys_vars.cc (+19/-8)
Percona-Server/sql/table.cc (+5/-2)
Percona-Server/sql/table.h (+0/-2)
Percona-Server/storage/innobase/api/api0api.cc (+48/-14)
Percona-Server/storage/innobase/btr/btr0btr.cc (+20/-18)
Percona-Server/storage/innobase/btr/btr0cur.cc (+14/-12)
Percona-Server/storage/innobase/buf/buf0buf.cc (+11/-16)
Percona-Server/storage/innobase/buf/buf0dblwr.cc (+32/-40)
Percona-Server/storage/innobase/buf/buf0dump.cc (+2/-0)
Percona-Server/storage/innobase/buf/buf0flu.cc (+3/-2)
Percona-Server/storage/innobase/buf/buf0lru.cc (+3/-1)
Percona-Server/storage/innobase/dict/dict0boot.cc (+32/-13)
Percona-Server/storage/innobase/dict/dict0crea.cc (+51/-11)
Percona-Server/storage/innobase/dict/dict0dict.cc (+172/-39)
Percona-Server/storage/innobase/dict/dict0load.cc (+138/-35)
Percona-Server/storage/innobase/dict/dict0mem.cc (+28/-0)
Percona-Server/storage/innobase/dict/dict0stats.cc (+123/-120)
Percona-Server/storage/innobase/dict/dict0stats_bg.cc (+25/-18)
Percona-Server/storage/innobase/fil/fil0fil.cc (+374/-186)
Percona-Server/storage/innobase/fsp/fsp0fsp.cc (+39/-107)
Percona-Server/storage/innobase/fts/fts0ast.cc (+14/-2)
Percona-Server/storage/innobase/fts/fts0fts.cc (+205/-119)
Percona-Server/storage/innobase/fts/fts0opt.cc (+35/-7)
Percona-Server/storage/innobase/fts/fts0que.cc (+32/-21)
Percona-Server/storage/innobase/handler/ha_innodb.cc (+241/-128)
Percona-Server/storage/innobase/handler/ha_innodb.h (+5/-4)
Percona-Server/storage/innobase/handler/handler0alter.cc (+318/-110)
Percona-Server/storage/innobase/ibuf/ibuf0ibuf.cc (+34/-4)
Percona-Server/storage/innobase/include/btr0cur.h (+5/-2)
Percona-Server/storage/innobase/include/buf0flu.ic (+2/-2)
Percona-Server/storage/innobase/include/dict0boot.h (+20/-6)
Percona-Server/storage/innobase/include/dict0boot.ic (+13/-1)
Percona-Server/storage/innobase/include/dict0dict.h (+26/-0)
Percona-Server/storage/innobase/include/dict0dict.ic (+1/-1)
Percona-Server/storage/innobase/include/dict0mem.h (+25/-1)
Percona-Server/storage/innobase/include/fil0fil.h (+36/-6)
Percona-Server/storage/innobase/include/fsp0fsp.h (+36/-2)
Percona-Server/storage/innobase/include/fsp0fsp.ic (+89/-0)
Percona-Server/storage/innobase/include/fts0fts.h (+3/-2)
Percona-Server/storage/innobase/include/fts0priv.h (+2/-0)
Percona-Server/storage/innobase/include/fts0priv.ic (+1/-7)
Percona-Server/storage/innobase/include/lock0lock.h (+27/-2)
Percona-Server/storage/innobase/include/log0log.h (+9/-3)
Percona-Server/storage/innobase/include/log0recv.h (+8/-8)
Percona-Server/storage/innobase/include/mach0data.h (+10/-0)
Percona-Server/storage/innobase/include/mach0data.ic (+23/-0)
Percona-Server/storage/innobase/include/page0zip.h (+5/-3)
Percona-Server/storage/innobase/include/row0ins.h (+2/-0)
Percona-Server/storage/innobase/include/row0merge.h (+1/-0)
Percona-Server/storage/innobase/include/row0mysql.h (+13/-1)
Percona-Server/storage/innobase/include/row0undo.h (+0/-7)
Percona-Server/storage/innobase/include/row0upd.ic (+3/-0)
Percona-Server/storage/innobase/include/srv0srv.h (+23/-7)
Percona-Server/storage/innobase/include/trx0rec.h (+3/-2)
Percona-Server/storage/innobase/include/trx0rec.ic (+1/-1)
Percona-Server/storage/innobase/include/trx0sys.h (+8/-0)
Percona-Server/storage/innobase/include/trx0trx.h (+16/-2)
Percona-Server/storage/innobase/include/trx0trx.ic (+1/-0)
Percona-Server/storage/innobase/include/univ.i (+12/-0)
Percona-Server/storage/innobase/include/ut0crc32.h (+3/-0)
Percona-Server/storage/innobase/lock/lock0lock.cc (+120/-24)
Percona-Server/storage/innobase/lock/lock0wait.cc (+5/-1)
Percona-Server/storage/innobase/log/log0log.cc (+110/-83)
Percona-Server/storage/innobase/log/log0recv.cc (+148/-137)
Percona-Server/storage/innobase/mtr/mtr0mtr.cc (+9/-12)
Percona-Server/storage/innobase/os/os0file.cc (+915/-689)
Percona-Server/storage/innobase/page/page0cur.cc (+3/-3)
Percona-Server/storage/innobase/page/page0page.cc (+24/-8)
Percona-Server/storage/innobase/page/page0zip.cc (+114/-49)
Percona-Server/storage/innobase/pars/pars0pars.cc (+16/-4)
Percona-Server/storage/innobase/row/row0ftsort.cc (+4/-4)
Percona-Server/storage/innobase/row/row0import.cc (+750/-172)
Percona-Server/storage/innobase/row/row0ins.cc (+339/-88)
Percona-Server/storage/innobase/row/row0log.cc (+79/-39)
Percona-Server/storage/innobase/row/row0merge.cc (+26/-11)
Percona-Server/storage/innobase/row/row0mysql.cc (+153/-57)
Percona-Server/storage/innobase/row/row0purge.cc (+17/-25)
Percona-Server/storage/innobase/row/row0quiesce.cc (+54/-1)
Percona-Server/storage/innobase/row/row0sel.cc (+18/-0)
Percona-Server/storage/innobase/row/row0umod.cc (+0/-55)
Percona-Server/storage/innobase/row/row0undo.cc (+0/-19)
Percona-Server/storage/innobase/row/row0upd.cc (+31/-11)
Percona-Server/storage/innobase/row/row0vers.cc (+1/-1)
Percona-Server/storage/innobase/srv/srv0srv.cc (+120/-58)
Percona-Server/storage/innobase/srv/srv0start.cc (+867/-648)
Percona-Server/storage/innobase/trx/trx0rec.cc (+3/-1)
Percona-Server/storage/innobase/trx/trx0roll.cc (+2/-0)
Percona-Server/storage/innobase/trx/trx0sys.cc (+23/-23)
Percona-Server/storage/innobase/trx/trx0trx.cc (+54/-17)
Percona-Server/storage/innobase/trx/trx0undo.cc (+8/-2)
Percona-Server/storage/innobase/ut/ut0crc32.cc (+2/-6)
Percona-Server/storage/myisam/mi_check.c (+6/-0)
Percona-Server/storage/perfschema/pfs.cc (+4/-4)
Percona-Server/storage/perfschema/pfs_engine_table.cc (+6/-4)
Percona-Server/storage/perfschema/pfs_instr.cc (+3/-0)
Percona-Server/storage/perfschema/pfs_instr.h (+2/-0)
Percona-Server/storage/perfschema/pfs_lock.h (+70/-37)
Percona-Server/storage/perfschema/table_threads.cc (+19/-0)
Percona-Server/storage/perfschema/unittest/CMakeLists.txt (+3/-0)
Percona-Server/support-files/CMakeLists.txt (+8/-7)
Percona-Server/support-files/my-default.cnf.sh (+31/-0)
Percona-Server/support-files/my-huge.cnf.sh (+0/-149)
Percona-Server/support-files/my-innodb-heavy-4G.cnf.sh (+0/-479)
Percona-Server/support-files/my-large.cnf.sh (+0/-149)
Percona-Server/support-files/my-medium.cnf.sh (+0/-147)
Percona-Server/support-files/my-small.cnf.sh (+0/-92)
Percona-Server/support-files/mysql.spec.sh (+44/-16)
Percona-Server/tests/mysql_client_fw.c (+2/-2)
Percona-Server/tests/mysql_client_test.c (+2/-2)
Percona-Server/unittest/gunit/CMakeLists.txt (+5/-1)
Percona-Server/unittest/gunit/dbug-t.cc (+43/-1)
Percona-Server/unittest/gunit/fake_table.h (+8/-0)
Percona-Server/unittest/gunit/handler-t.cc (+64/-0)
Percona-Server/unittest/gunit/handler-t.h (+86/-0)
Percona-Server/unittest/gunit/item-t.cc (+1/-1)
Percona-Server/unittest/gunit/make_sortkey-t.cc (+8/-8)
Percona-Server/unittest/gunit/mdl-t.cc (+1/-0)
Percona-Server/unittest/gunit/mdl_mytap-t.cc (+1/-0)
Percona-Server/unittest/gunit/test_utils.cc (+17/-1)
Percona-Server/unittest/gunit/test_utils.h (+1/-0)
To merge this branch: bzr merge lp:~stewart/percona-server/5.6.8
Reviewer Review Type Date Requested Status
Laurynas Biveinis (community) Approve
Review via email: mp+140134@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Laurynas Biveinis (laurynas-biveinis) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile'
2--- Makefile 2012-08-21 07:35:48 +0000
3+++ Makefile 2012-12-17 04:11:35 +0000
4@@ -1,5 +1,5 @@
5-MYSQL_VERSION=5.6.6
6-PERCONA_SERVER_VERSION=alpha60.1
7+MYSQL_VERSION=5.6.8
8+PERCONA_SERVER_VERSION=alpha60.2
9 PERCONA_SERVER ?=Percona-Server-$(MYSQL_VERSION)-$(PERCONA_SERVER_VERSION)
10 PERCONA_SERVER_SHORT_1 ?=Percona-Server-$(MYSQL_VERSION)
11 PERCONA_SERVER_SHORT_2 ?=Percona-Server
12
13=== modified file 'Percona-Server/CMakeLists.txt'
14--- Percona-Server/CMakeLists.txt 2012-10-16 06:21:51 +0000
15+++ Percona-Server/CMakeLists.txt 2012-12-17 04:11:35 +0000
16@@ -19,6 +19,7 @@
17 CMAKE_POLICY(VERSION 2.8)
18 endif()
19
20+MESSAGE(STATUS "Running cmake version ${CMAKE_VERSION}")
21
22 SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)
23
24@@ -108,7 +109,7 @@
25 ${CMAKE_SOURCE_DIR}/cmake/build_configurations/${BUILD_CONFIG}.cmake)
26 ENDIF()
27
28-#cmake on 64 bit windows doesn't set CMAKE_SYSTEM_PROCESSOR correctly
29+#cmake on 64bit windows/mac/solaris doesn't set CMAKE_SYSTEM_PROCESSOR correctly
30 SET(MYSQL_MACHINE_TYPE ${CMAKE_SYSTEM_PROCESSOR})
31
32
33@@ -401,6 +402,7 @@
34 IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt)
35 ADD_SUBDIRECTORY(internal)
36 ENDIF()
37+ ADD_SUBDIRECTORY(SPECIFIC-ULN)
38 ENDIF()
39
40 INCLUDE(cmake/abi_check.cmake)
41
42=== added directory 'Percona-Server/SPECIFIC-ULN'
43=== added file 'Percona-Server/SPECIFIC-ULN/CMakeLists.txt'
44--- Percona-Server/SPECIFIC-ULN/CMakeLists.txt 1970-01-01 00:00:00 +0000
45+++ Percona-Server/SPECIFIC-ULN/CMakeLists.txt 2012-12-17 04:11:35 +0000
46@@ -0,0 +1,38 @@
47+# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
48+#
49+# This program is free software; you can redistribute it and/or modify
50+# it under the terms of the GNU General Public License as published by
51+# the Free Software Foundation; version 2 of the License.
52+#
53+# This program is distributed in the hope that it will be useful,
54+# but WITHOUT ANY WARRANTY; without even the implied warranty of
55+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
56+# GNU General Public License for more details.
57+#
58+# You should have received a copy of the GNU General Public License
59+# along with this program; if not, write to the Free Software
60+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
61+
62+
63+IF(UNIX)
64+ SET(prefix ${CMAKE_INSTALL_PREFIX})
65+
66+ SET(SPECFILENAME "mysql.${VERSION}.spec")
67+ IF("${VERSION}" MATCHES "-ndb-")
68+ STRING(REGEX REPLACE "^.*-ndb-" "" NDBVERSION "${VERSION}")
69+ SET(SPECFILENAME "mysql-cluster-${NDBVERSION}.spec")
70+ ENDIF()
71+
72+ # Left in current directory, to be taken during build
73+ CONFIGURE_FILE(mysql.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/${SPECFILENAME} @ONLY)
74+
75+ FOREACH(ulnfile filter-requires-mysql.sh generate-tarball.sh my.cnf my_config.h
76+ mysql-5.5-errno.patch mysql-5.5-fix-tests.patch mysql-5.5-libdir.patch
77+ mysql-5.5-mtr1.patch mysql-5.5-stack-guard.patch mysql-5.5-testing.patch
78+ mysql-chain-certs.patch mysql-embedded-check.c mysql-expired-certs.patch
79+ mysql.init mysql-install-test.patch mysql-strmov.patch scriptstub.c
80+ README.mysql-docs)
81+ CONFIGURE_FILE(${ulnfile} ${CMAKE_CURRENT_BINARY_DIR}/${ulnfile} COPYONLY)
82+ ENDFOREACH()
83+ENDIF()
84+
85
86=== added file 'Percona-Server/SPECIFIC-ULN/README-ULN'
87--- Percona-Server/SPECIFIC-ULN/README-ULN 1970-01-01 00:00:00 +0000
88+++ Percona-Server/SPECIFIC-ULN/README-ULN 2012-12-17 04:11:35 +0000
89@@ -0,0 +1,15 @@
90+In order to have RPMs of MySQL which are distributed via ULN for Oracle Linux
91+to be as closely compatible to such RPMs built and distributed by RedHat,
92+this directory contains additional files which originated at RedHat
93+and are used only for such RPMs intended for distribution via ULN.
94+
95+Especially, this directory contains the spec file used to build these RPMs,
96+named "mysql.spec". Please regard the following note:
97+
98+ You are receiving a copy of the Red Hat spec file.
99+ The terms of the Oracle license do NOT apply to the Red Hat spec file;
100+ it is licensed under the
101+ GNU GENERAL PUBLIC LICENSE Version 2, June 1991
102+ separately from the Oracle programs you receive.
103+
104+
105
106=== added file 'Percona-Server/SPECIFIC-ULN/README.mysql-docs'
107--- Percona-Server/SPECIFIC-ULN/README.mysql-docs 1970-01-01 00:00:00 +0000
108+++ Percona-Server/SPECIFIC-ULN/README.mysql-docs 2012-12-17 04:11:35 +0000
109@@ -0,0 +1,4 @@
110+The official MySQL documentation is not freely redistributable, so we cannot
111+include it in RHEL or Fedora. You can find it on-line at
112+
113+http://dev.mysql.com/doc/
114
115=== added file 'Percona-Server/SPECIFIC-ULN/filter-requires-mysql.sh'
116--- Percona-Server/SPECIFIC-ULN/filter-requires-mysql.sh 1970-01-01 00:00:00 +0000
117+++ Percona-Server/SPECIFIC-ULN/filter-requires-mysql.sh 2012-12-17 04:11:35 +0000
118@@ -0,0 +1,3 @@
119+#!/bin/sh
120+
121+/usr/lib/rpm/perl.req $* | grep -v -e "perl(th" -e "perl(lib::mtr" -e "perl(mtr"
122
123=== added file 'Percona-Server/SPECIFIC-ULN/generate-tarball.sh'
124--- Percona-Server/SPECIFIC-ULN/generate-tarball.sh 1970-01-01 00:00:00 +0000
125+++ Percona-Server/SPECIFIC-ULN/generate-tarball.sh 2012-12-17 04:11:35 +0000
126@@ -0,0 +1,15 @@
127+#!/bin/sh
128+
129+VERSION=$1
130+
131+rm -rf mysql-$VERSION
132+
133+tar xfz mysql-$VERSION.tar.gz || exit 1
134+
135+rm mysql-$VERSION/Docs/mysql.info
136+
137+tar cfz mysql-$VERSION-nodocs.tar.gz mysql-$VERSION || exit 1
138+
139+rm -rf mysql-$VERSION
140+
141+exit 0
142
143=== added file 'Percona-Server/SPECIFIC-ULN/my.cnf'
144--- Percona-Server/SPECIFIC-ULN/my.cnf 1970-01-01 00:00:00 +0000
145+++ Percona-Server/SPECIFIC-ULN/my.cnf 2012-12-17 04:11:35 +0000
146@@ -0,0 +1,10 @@
147+[mysqld]
148+datadir=/var/lib/mysql
149+socket=/var/lib/mysql/mysql.sock
150+user=mysql
151+# Disabling symbolic-links is recommended to prevent assorted security risks
152+symbolic-links=0
153+
154+[mysqld_safe]
155+log-error=/var/log/mysqld.log
156+pid-file=/var/run/mysqld/mysqld.pid
157
158=== added file 'Percona-Server/SPECIFIC-ULN/my_config.h'
159--- Percona-Server/SPECIFIC-ULN/my_config.h 1970-01-01 00:00:00 +0000
160+++ Percona-Server/SPECIFIC-ULN/my_config.h 2012-12-17 04:11:35 +0000
161@@ -0,0 +1,29 @@
162+/*
163+ * Kluge to support multilib installation of both 32- and 64-bit RPMS:
164+ * we need to arrange that header files that appear in both RPMs are
165+ * identical. Hence, this file is architecture-independent and calls
166+ * in an arch-dependent file that will appear in just one RPM.
167+ *
168+ * To avoid breaking arches not explicitly supported by Red Hat, we
169+ * use this indirection file *only* on known multilib arches.
170+ *
171+ * Note: this may well fail if user tries to use gcc's -I- option.
172+ * But that option is deprecated anyway.
173+ */
174+#if defined(__x86_64__)
175+#include "my_config_x86_64.h"
176+#elif defined(__i386__)
177+#include "my_config_i386.h"
178+#elif defined(__ppc64__) || defined(__powerpc64__)
179+#include "my_config_ppc64.h"
180+#elif defined(__ppc__) || defined(__powerpc__)
181+#include "my_config_ppc.h"
182+#elif defined(__s390x__)
183+#include "my_config_s390x.h"
184+#elif defined(__s390__)
185+#include "my_config_s390.h"
186+#elif defined(__sparc__) && defined(__arch64__)
187+#include "my_config_sparc64.h"
188+#elif defined(__sparc__)
189+#include "my_config_sparc.h"
190+#endif
191
192=== added file 'Percona-Server/SPECIFIC-ULN/mysql-5.5-errno.patch'
193--- Percona-Server/SPECIFIC-ULN/mysql-5.5-errno.patch 1970-01-01 00:00:00 +0000
194+++ Percona-Server/SPECIFIC-ULN/mysql-5.5-errno.patch 2012-12-17 04:11:35 +0000
195@@ -0,0 +1,21 @@
196+"extern int errno" is just a really bad idea.
197+
198+
199+diff -Naur mysql-5.1.32.orig/include/my_sys.h mysql-5.1.32/include/my_sys.h
200+--- mysql-5.1.32.orig/include/my_sys.h 2009-02-13 19:52:19.000000000 -0500
201++++ mysql-5.1.32/include/my_sys.h 2009-03-04 18:08:40.000000000 -0500
202+@@ -199,13 +199,8 @@
203+ #define my_afree(PTR) my_free(PTR)
204+ #endif /* HAVE_ALLOCA */
205+
206+-#ifndef errno /* did we already get it? */
207+-#ifdef HAVE_ERRNO_AS_DEFINE
208+ #include <errno.h> /* errno is a define */
209+-#else
210+-extern int errno; /* declare errno */
211+-#endif
212+-#endif /* #ifndef errno */
213++
214+ extern char *home_dir; /* Home directory for user */
215+ extern const char *my_progname; /* program-name (printed in errors) */
216+ extern char curr_dir[]; /* Current directory for user */
217
218=== added file 'Percona-Server/SPECIFIC-ULN/mysql-5.5-fix-tests.patch'
219--- Percona-Server/SPECIFIC-ULN/mysql-5.5-fix-tests.patch 1970-01-01 00:00:00 +0000
220+++ Percona-Server/SPECIFIC-ULN/mysql-5.5-fix-tests.patch 2012-12-17 04:11:35 +0000
221@@ -0,0 +1,34 @@
222+Adapt tests (where needed) to RedHat conventions.
223+
224+1) The RedHat convention uses the package name "mysql*" whereas upstream uses "MySQL*".
225+ Test "file_contents" constructs path names and needs to be adapted.
226+
227+=== modified file 'mysql-test/t/file_contents.test'
228+--- mysql-5.5.17-orig/mysql-test/t/file_contents.test 2011-10-10 12:03:29 +0000
229++++ mysql-5.5.17/mysql-test/t/file_contents.test 2011-11-16 18:07:55 +0000
230+@@ -17,20 +17,20 @@ if ($dir_bin =~ m|/usr/|) {
231+ $dir_docs =~ s|/lib|/share/doc|;
232+ if(-d "$dir_docs/packages") {
233+ # SuSE: "packages/" in the documentation path
234+- $dir_docs = glob "$dir_docs/packages/MySQL-server*";
235++ $dir_docs = glob "$dir_docs/packages/mysql-server*";
236+ } else {
237+ # RedHat: version number in directory name
238+- $dir_docs = glob "$dir_docs/MySQL-server*";
239++ $dir_docs = glob "$dir_docs/mysql-server*";
240+ }
241+ } elsif ($dir_bin =~ m|/usr$|) {
242+ # RPM build during development
243+ $dir_docs = "$dir_bin/share/doc";
244+ if(-d "$dir_docs/packages") {
245+ # SuSE: "packages/" in the documentation path
246+- $dir_docs = glob "$dir_docs/packages/MySQL-server*";
247++ $dir_docs = glob "$dir_docs/packages/mysql-server*";
248+ } else {
249+ # RedHat: version number in directory name
250+- $dir_docs = glob "$dir_docs/MySQL-server*";
251++ $dir_docs = glob "$dir_docs/mysql-server*";
252+ }
253+ } else {
254+ # tar.gz package, Windows, or developer work (in BZR)
255+
256
257=== added file 'Percona-Server/SPECIFIC-ULN/mysql-5.5-libdir.patch'
258--- Percona-Server/SPECIFIC-ULN/mysql-5.5-libdir.patch 1970-01-01 00:00:00 +0000
259+++ Percona-Server/SPECIFIC-ULN/mysql-5.5-libdir.patch 2012-12-17 04:11:35 +0000
260@@ -0,0 +1,28 @@
261+The RPMs built by MySQL AB (-> Sun -> Oracle) put the libraries into "/usr/lib".
262+Those built by RedHat put them into "/usr/lib/mysql".
263+This patch is to modify the cmake files to follow the RedHat convention.
264+Similar, the server is now in "/usr/libexec" (formerly "/usr/sbin").
265+
266+
267+diff -Naur mysql-5.5.17.orig/cmake/install_layout.cmake mysql-5.5.17/cmake/install_layout.cmake
268+--- mysql-5.5.17.orig/cmake/install_layout.cmake 2011-06-30 15:46:53 +0000
269++++ mysql-5.5.17/cmake/install_layout.cmake 2011-10-27 16:40:10 +0000
270+@@ -140,14 +140,14 @@ SET(INSTALL_SBINDIR_RPM
271+ # be applied at build time via "rpmbuild".
272+ #
273+ SET(INSTALL_BINDIR_RPM "bin")
274+-SET(INSTALL_SBINDIR_RPM "sbin")
275++SET(INSTALL_SBINDIR_RPM "libexec")
276+ SET(INSTALL_SCRIPTDIR_RPM "bin")
277+ #
278+ IF(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64")
279+- SET(INSTALL_LIBDIR_RPM "lib64")
280++ SET(INSTALL_LIBDIR_RPM "lib64/mysql")
281+ SET(INSTALL_PLUGINDIR_RPM "lib64/mysql/plugin")
282+ ELSE()
283+- SET(INSTALL_LIBDIR_RPM "lib")
284++ SET(INSTALL_LIBDIR_RPM "lib/mysql")
285+ SET(INSTALL_PLUGINDIR_RPM "lib/mysql/plugin")
286+ ENDIF()
287+ #
288+
289
290=== added file 'Percona-Server/SPECIFIC-ULN/mysql-5.5-mtr1.patch'
291--- Percona-Server/SPECIFIC-ULN/mysql-5.5-mtr1.patch 1970-01-01 00:00:00 +0000
292+++ Percona-Server/SPECIFIC-ULN/mysql-5.5-mtr1.patch 2012-12-17 04:11:35 +0000
293@@ -0,0 +1,25 @@
294+Drop support for version 1 of "mysql-test-run.pl" from the RPMs:
295+
296+1) The auto-generation of Perl dependencies will mishandle that code,
297+ probably because its run directory differs from its storage location.
298+2) It does not provide several variables which are used in tests of MySQL 5.5
299+
300+If you really need it, take it from the source tarball.
301+
302+=== modified file 'mysql-test/mysql-test-run.pl'
303+--- mysql-5.5.17-orig/mysql-test/mysql-test-run.pl 2011-10-03 11:16:40 +0000
304++++ mysql-5.5.17/mysql-test/mysql-test-run.pl 2011-11-16 19:06:38 +0000
305+@@ -58,10 +58,9 @@ BEGIN {
306+ if ( $version == 1 )
307+ {
308+ print "=======================================================\n";
309+- print " WARNING: Using mysql-test-run.pl version 1! \n";
310++ print " ERROR: Support for version 1 is dropped in this distribution! \n";
311+ print "=======================================================\n";
312+- # Should use exec() here on *nix but this appears not to work on Windows
313+- exit(system($^X, "lib/v1/mysql-test-run.pl", @ARGV) >> 8);
314++ exit(1);
315+ }
316+ elsif ( $version == 2 )
317+ {
318+
319
320=== added file 'Percona-Server/SPECIFIC-ULN/mysql-5.5-stack-guard.patch'
321--- Percona-Server/SPECIFIC-ULN/mysql-5.5-stack-guard.patch 1970-01-01 00:00:00 +0000
322+++ Percona-Server/SPECIFIC-ULN/mysql-5.5-stack-guard.patch 2012-12-17 04:11:35 +0000
323@@ -0,0 +1,140 @@
324+mysql is not accounting for the "guard page" when setting thread stack size
325+requests. This is fatal on PPC systems, which may use guard pages as large
326+as 64K. This patch also documents the IA64 situation a bit better.
327+
328+Note: there are quite a few other setstacksize calls besides the two in
329+mysqld.cc; is it important to fix any of the others?
330+
331+Filed upstream at http://bugs.mysql.com/bug.php?id=35019
332+
333+
334+diff -Naur mysql-5.1.30.orig/sql/mysqld.cc mysql-5.1.30/sql/mysqld.cc
335+--- mysql-5.1.30.orig/sql/mysqld.cc 2008-11-14 11:37:13.000000000 -0500
336++++ mysql-5.1.30/sql/mysqld.cc 2009-01-13 12:08:35.000000000 -0500
337+@@ -2653,6 +2653,70 @@
338+ }
339+
340+
341++/* pthread_attr_setstacksize without so much platform-dependency */
342++/* returns the actual stack size if possible */
343++static size_t my_setstacksize(pthread_attr_t *attr, size_t stacksize)
344++{
345++ size_t guard_size = 0;
346++
347++#if defined(__ia64__) || defined(__ia64)
348++ /*
349++ On IA64, half of the requested stack size is used for "normal stack"
350++ and half for "register stack". The space measured by check_stack_overrun
351++ is the "normal stack", so double the request to make sure we have the
352++ caller-expected amount of normal stack.
353++
354++ NOTE: there is no guarantee that the register stack can't grow faster
355++ than normal stack, so it's very unclear that we won't dump core due to
356++ stack overrun despite check_stack_overrun's efforts. Experimentation
357++ shows that in the execution_constants test, the register stack grows
358++ less than half as fast as normal stack, but perhaps other scenarios are
359++ less forgiving. If it turns out that more space is needed for the
360++ register stack, that could be forced (rather inefficiently) by using a
361++ multiplier higher than 2 here.
362++ */
363++ stacksize *= 2;
364++#endif
365++
366++ /*
367++ On many machines, the "guard space" is subtracted from the requested
368++ stack size, and that space is quite large on some platforms. So add
369++ it to our request, if we can find out what it is.
370++
371++ FIXME: autoconfiscate use of pthread_attr_getguardsize
372++ */
373++ if (pthread_attr_getguardsize(attr, &guard_size))
374++ guard_size = 0; /* if can't find it out, treat as 0 */
375++
376++ pthread_attr_setstacksize(attr, stacksize + guard_size);
377++
378++ /* Retrieve actual stack size if possible */
379++#ifdef HAVE_PTHREAD_ATTR_GETSTACKSIZE
380++ {
381++ size_t real_stack_size= 0;
382++ /* We must ignore real_stack_size = 0 as Solaris 2.9 can return 0 here */
383++ if (pthread_attr_getstacksize(attr, &real_stack_size) == 0 &&
384++ real_stack_size > guard_size)
385++ {
386++ real_stack_size -= guard_size;
387++ if (real_stack_size < stacksize)
388++ {
389++ if (global_system_variables.log_warnings)
390++ sql_print_warning("Asked for %ld thread stack, but got %ld",
391++ (long) stacksize, (long) real_stack_size);
392++ stacksize= real_stack_size;
393++ }
394++ }
395++ }
396++#endif
397++
398++#if defined(__ia64__) || defined(__ia64)
399++ stacksize /= 2;
400++#endif
401++ return stacksize;
402++}
403++
404++
405+ static void start_signal_handler(void)
406+ {
407+ int error;
408+@@ -2663,15 +2727,7 @@
409+ #if !defined(HAVE_DEC_3_2_THREADS)
410+ pthread_attr_setscope(&thr_attr,PTHREAD_SCOPE_SYSTEM);
411+ (void) pthread_attr_setdetachstate(&thr_attr,PTHREAD_CREATE_DETACHED);
412+-#if defined(__ia64__) || defined(__ia64)
413+- /*
414+- Peculiar things with ia64 platforms - it seems we only have half the
415+- stack size in reality, so we have to double it here
416+- */
417+- pthread_attr_setstacksize(&thr_attr,my_thread_stack_size*2);
418+-#else
419+- pthread_attr_setstacksize(&thr_attr,my_thread_stack_size);
420+-#endif
421++ (void) my_setstacksize(&thr_attr,my_thread_stack_size);
422+ #endif
423+
424+ mysql_mutex_lock(&LOCK_thread_count);
425+@@ -4445,37 +4501,7 @@
426+ unireg_abort(1); // Will do exit
427+
428+ init_signals();
429+-#if defined(__ia64__) || defined(__ia64)
430+- /*
431+- Peculiar things with ia64 platforms - it seems we only have half the
432+- stack size in reality, so we have to double it here
433+- */
434+- pthread_attr_setstacksize(&connection_attrib,my_thread_stack_size*2);
435+-#else
436+- pthread_attr_setstacksize(&connection_attrib,my_thread_stack_size);
437+-#endif
438+-#ifdef HAVE_PTHREAD_ATTR_GETSTACKSIZE
439+- {
440+- /* Retrieve used stack size; Needed for checking stack overflows */
441+- size_t stack_size= 0;
442+- pthread_attr_getstacksize(&connection_attrib, &stack_size);
443+-#if defined(__ia64__) || defined(__ia64)
444+- stack_size/= 2;
445+-#endif
446+- /* We must check if stack_size = 0 as Solaris 2.9 can return 0 here */
447+- if (stack_size && stack_size < my_thread_stack_size)
448+- {
449+- if (global_system_variables.log_warnings)
450+- sql_print_warning("Asked for %lu thread stack, but got %ld",
451+- my_thread_stack_size, (long) stack_size);
452+-#if defined(__ia64__) || defined(__ia64)
453+- my_thread_stack_size= stack_size*2;
454+-#else
455+- my_thread_stack_size= stack_size;
456+-#endif
457+- }
458+- }
459+-#endif
460++ my_thread_stack_size = my_setstacksize(&connection_attrib,my_thread_stack_size);
461+
462+ (void) thr_setconcurrency(concurrency); // 10 by default
463+
464
465=== added file 'Percona-Server/SPECIFIC-ULN/mysql-5.5-testing.patch'
466--- Percona-Server/SPECIFIC-ULN/mysql-5.5-testing.patch 1970-01-01 00:00:00 +0000
467+++ Percona-Server/SPECIFIC-ULN/mysql-5.5-testing.patch 2012-12-17 04:11:35 +0000
468@@ -0,0 +1,23 @@
469+Hack the top-level Makefile to enable the openssl regression tests.
470+(Why doesn't this happen automatically given the configure option??)
471+
472+Also, increase the overall timeout for the regression tests to 12 hours,
473+because on a slow or heavily-loaded build machine sometimes the default of
474+5 hours isn't enough. (This has been demonstrated to fail in mass-rebuild
475+scenarios, which aren't that uncommon for Fedora.) Similarly increase the
476+per-testcase timeout to 30 minutes, since the default of 15 hasn't got a
477+great deal of headroom either.
478+
479+
480+diff -Naur mysql-5.1.32.orig/Makefile.am mysql-5.1.32/Makefile.am
481+--- mysql-5.1.32.orig/Makefile.am 2009-02-13 19:51:56.000000000 -0500
482++++ mysql-5.1.32/Makefile.am 2009-03-04 18:12:36.000000000 -0500
483+@@ -98,7 +98,7 @@
484+
485+ test-ns:
486+ cd mysql-test ; \
487+- @PERL@ ./mysql-test-run.pl $(force) $(mem) --mysqld=--binlog-format=mixed
488++ @PERL@ ./mysql-test-run.pl $(force) $(mem) --ssl --mysqld=--binlog-format=mixed --suite-timeout=720 --testcase-timeout=30
489+
490+ test-binlog-statement:
491+ cd mysql-test ; \
492
493=== added file 'Percona-Server/SPECIFIC-ULN/mysql-chain-certs.patch'
494--- Percona-Server/SPECIFIC-ULN/mysql-chain-certs.patch 1970-01-01 00:00:00 +0000
495+++ Percona-Server/SPECIFIC-ULN/mysql-chain-certs.patch 2012-12-17 04:11:35 +0000
496@@ -0,0 +1,41 @@
497+Fix things so that chains of certificates work in the server and client
498+certificate files.
499+
500+This only really works for OpenSSL-based builds, as yassl is unable to read
501+multiple certificates from a file. The patch below to yassl/src/ssl.cpp
502+doesn't fix that, but just arranges that the viosslfactories.c patch won't
503+have any ill effects in a yassl build. Since we don't use yassl in Red Hat/
504+Fedora builds, I'm not feeling motivated to try to fix yassl for this.
505+
506+See RH bug #598656. Filed upstream at http://bugs.mysql.com/bug.php?id=54158
507+
508+
509+diff -Naur mysql-5.1.47.orig/vio/viosslfactories.c mysql-5.1.47/vio/viosslfactories.c
510+--- mysql-5.1.47.orig/vio/viosslfactories.c 2010-05-06 11:28:07.000000000 -0400
511++++ mysql-5.1.47/vio/viosslfactories.c 2010-05-26 23:23:46.000000000 -0400
512+@@ -100,7 +100,7 @@
513+ (long) ctx, cert_file, key_file));
514+ if (cert_file)
515+ {
516+- if (SSL_CTX_use_certificate_file(ctx, cert_file, SSL_FILETYPE_PEM) <= 0)
517++ if (SSL_CTX_use_certificate_chain_file(ctx, cert_file) <= 0)
518+ {
519+ *error= SSL_INITERR_CERT;
520+ DBUG_PRINT("error",("%s from file '%s'", sslGetErrString(*error), cert_file));
521+diff -Naur mysql-5.1.47.orig/extra/yassl/src/ssl.cpp mysql-5.1.47/extra/yassl/src/ssl.cpp
522+--- mysql-5.1.47.orig/extra/yassl/src/ssl.cpp 2010-05-06 11:24:26.000000000 -0400
523++++ mysql-5.1.47/extra/yassl/src/ssl.cpp 2010-05-26 23:29:13.000000000 -0400
524+@@ -1606,10 +1606,10 @@
525+ }
526+
527+
528+- int SSL_CTX_use_certificate_chain_file(SSL_CTX*, const char*)
529++ int SSL_CTX_use_certificate_chain_file(SSL_CTX* ctx, const char* file)
530+ {
531+- // TDOD:
532+- return SSL_SUCCESS;
533++ // For the moment, treat like use_certificate_file
534++ return read_file(ctx, file, SSL_FILETYPE_PEM, Cert);
535+ }
536+
537+
538
539=== added file 'Percona-Server/SPECIFIC-ULN/mysql-embedded-check.c'
540--- Percona-Server/SPECIFIC-ULN/mysql-embedded-check.c 1970-01-01 00:00:00 +0000
541+++ Percona-Server/SPECIFIC-ULN/mysql-embedded-check.c 2012-12-17 04:11:35 +0000
542@@ -0,0 +1,26 @@
543+/* simple test program to see if we can link the embedded server library */
544+
545+#include <stdio.h>
546+#include <stdlib.h>
547+#include <stdarg.h>
548+
549+#include "mysql.h"
550+
551+MYSQL *mysql;
552+
553+static char *server_options[] = \
554+ { "mysql_test", "--defaults-file=my.cnf", NULL };
555+int num_elements = (sizeof(server_options) / sizeof(char *)) - 1;
556+
557+static char *server_groups[] = { "libmysqld_server",
558+ "libmysqld_client", NULL };
559+
560+int main(int argc, char **argv)
561+{
562+ mysql_library_init(num_elements, server_options, server_groups);
563+ mysql = mysql_init(NULL);
564+ mysql_close(mysql);
565+ mysql_library_end();
566+
567+ return 0;
568+}
569
570=== added file 'Percona-Server/SPECIFIC-ULN/mysql-expired-certs.patch'
571--- Percona-Server/SPECIFIC-ULN/mysql-expired-certs.patch 1970-01-01 00:00:00 +0000
572+++ Percona-Server/SPECIFIC-ULN/mysql-expired-certs.patch 2012-12-17 04:11:35 +0000
573@@ -0,0 +1,555 @@
574+Upstream insists on generating SSL testing certificates with relatively short
575+lifespan, which has repeatedly caused problems (ie, one day the regression
576+tests suddenly stop working). Replace them with certificates with 20-year
577+lifespan. We should periodically regenerate these, too, but at least not
578+very often.
579+
580+
581+diff -Naur mysql-5.1.50.orig/mysql-test/std_data/cacert.pem mysql-5.1.50/mysql-test/std_data/cacert.pem
582+--- mysql-5.1.50.orig/mysql-test/std_data/cacert.pem 2010-08-03 13:55:04.000000000 -0400
583++++ mysql-5.1.50/mysql-test/std_data/cacert.pem 2010-08-27 23:42:05.751428144 -0400
584+@@ -1,17 +1,22 @@
585+ -----BEGIN CERTIFICATE-----
586+-MIICrTCCAhagAwIBAgIJAMI7xZKjhrDbMA0GCSqGSIb3DQEBBAUAMEQxCzAJBgNV
587++MIIDsjCCApqgAwIBAgIJAL5YrUwfPSWVMA0GCSqGSIb3DQEBBQUAMEQxCzAJBgNV
588+ BAYTAlNFMRAwDgYDVQQIEwdVcHBzYWxhMRAwDgYDVQQHEwdVcHBzYWxhMREwDwYD
589+-VQQKEwhNeVNRTCBBQjAeFw0xMDAxMjkxMTQ3MTBaFw0xNTAxMjgxMTQ3MTBaMEQx
590++VQQKEwhNeVNRTCBBQjAeFw0xMDAxMjkwNTU5NTNaFw0xNTAxMjgwNTU5NTNaMEQx
591+ CzAJBgNVBAYTAlNFMRAwDgYDVQQIEwdVcHBzYWxhMRAwDgYDVQQHEwdVcHBzYWxh
592+-MREwDwYDVQQKEwhNeVNRTCBBQjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
593+-wQYsOEfrN4ESP3FjsI8cghE+tZVuyK2gck61lwieVxjgFMtBd65mI5a1y9pmlOI1
594+-yM4SB2Ppqcuw7/e1CdV1y7lvHrGNt5yqEHbN4QX1gvsN8TQauP/2WILturk4R4Hq
595+-rKg0ZySu7f1Xhl0ed9a48LpaEHD17IcxWEGMMJwAxF0CAwEAAaOBpjCBozAMBgNV
596+-HRMEBTADAQH/MB0GA1UdDgQWBBSvktYQ0ahLnyxyVKqty+WpBbBrDTB0BgNVHSME
597+-bTBrgBSvktYQ0ahLnyxyVKqty+WpBbBrDaFIpEYwRDELMAkGA1UEBhMCU0UxEDAO
598+-BgNVBAgTB1VwcHNhbGExEDAOBgNVBAcTB1VwcHNhbGExETAPBgNVBAoTCE15U1FM
599+-IEFCggkAwjvFkqOGsNswDQYJKoZIhvcNAQEEBQADgYEAdKN1PjwMHAKG2Ww1145g
600+-JQGBnKxSFOUaoSvkBi/4ntTM+ysnViWh7WvxyWjR9zU9arfr7aqsDeQxm0XDOqzj
601+-AQ/cQIla2/Li8tXyfc06bisH/IHRaSc2zWqioTKbEwMdVOdrvq4a8V8ic3xYyIWn
602+-7F4WeS07J8LKardSvM0+hOA=
603++MREwDwYDVQQKEwhNeVNRTCBBQjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
604++ggEBAL6kNN4peX7uhK9rb06W/QbPEpVuejmdWdl2PqMshP/eSuXXw7kwVgfpxx9R
605++vC000CKQQSG9MCoZjtqPnFRsetmWLZgApRpEalGXTXJqq9sEbCfoFizg94U8G7d2
606++u5XJjLVmcG34ru36KoBgVx1zeH1puBAf8dOzrE4L7Y+ZQBFzFohjh8C2LqWC4nM5
607++qsLmOkDWMipGqYU5DvkKjIbTbwTyRNRgZHWSPfVDDPUIUOsY4BGUp2DpgeGY9aEv
608++lIs57Ev9JqlIUCV65lOhhDkG+xwmkHKHA+ECEU9cALI8+uXbh48MB9XpMOuk408X
609++/lX89aZwD0/G9kmObVGnE2G+H5UCAwEAAaOBpjCBozAdBgNVHQ4EFgQUsft+d7VA
610++jWgRftkR5cPG2k2sUbAwdAYDVR0jBG0wa4AUsft+d7VAjWgRftkR5cPG2k2sUbCh
611++SKRGMEQxCzAJBgNVBAYTAlNFMRAwDgYDVQQIEwdVcHBzYWxhMRAwDgYDVQQHEwdV
612++cHBzYWxhMREwDwYDVQQKEwhNeVNRTCBBQoIJAL5YrUwfPSWVMAwGA1UdEwQFMAMB
613++Af8wDQYJKoZIhvcNAQEFBQADggEBALRUOAmdL8R8sl1y8kiEiFgDatdXK5RDqWai
614++8yZChfmwTIToHhmQsOEshJe2e8hky3huUj+33VyXjINoMbebIwMuXPwEkbJal8RZ
615++nSJmF0jN1Qz7J/jFffwK9xmejWZJx49Kt2+Qwrwp6kDeq9TLFqQOoVczgyJPYsTL
616++NAOib5WqTud3XWvCwxrhqmWu7JZq6sp1fomP/uunprb8y2miWfLESZN2mKAhm44Q
617++Lws867LT8v2lskEjq2dT1LutD5+R66XcdjgSr0uDziDs64jZwCD6ea94hVFM7ej0
618++ZOXYeSEZJ56FjUxu632e9fY8NyMh30yKjjmQf1mM9PuGJvdvsWU=
619+ -----END CERTIFICATE-----
620+diff -Naur mysql-5.1.50.orig/mysql-test/std_data/client-cert.pem mysql-5.1.50/mysql-test/std_data/client-cert.pem
621+--- mysql-5.1.50.orig/mysql-test/std_data/client-cert.pem 2010-08-03 13:55:04.000000000 -0400
622++++ mysql-5.1.50/mysql-test/std_data/client-cert.pem 2010-08-27 23:42:05.752428395 -0400
623+@@ -1,46 +1,69 @@
624+ Certificate:
625+ Data:
626+- Version: 1 (0x0)
627+- Serial Number: 1048577 (0x100001)
628+- Signature Algorithm: md5WithRSAEncryption
629++ Version: 3 (0x2)
630++ Serial Number: 6 (0x6)
631++ Signature Algorithm: sha1WithRSAEncryption
632+ Issuer: C=SE, ST=Uppsala, L=Uppsala, O=MySQL AB
633+ Validity
634+- Not Before: Jan 29 11:50:22 2010 GMT
635+- Not After : Jan 28 11:50:22 2015 GMT
636++ Not Before: Feb 20 03:03:26 2010 GMT
637++ Not After : Sep 3 03:03:26 2030 GMT
638+ Subject: C=SE, ST=Uppsala, O=MySQL AB
639+ Subject Public Key Info:
640+ Public Key Algorithm: rsaEncryption
641+- Public-Key: (1024 bit)
642+- Modulus:
643+- 00:cc:9a:37:49:13:66:dc:cf:e3:0b:13:a1:23:ed:
644+- 78:db:4e:bd:11:f6:8c:0d:76:f9:a3:32:56:9a:f8:
645+- a1:21:6a:55:4e:4d:3f:e6:67:9d:26:99:b2:cd:a4:
646+- 9a:d2:2b:59:5c:d7:8a:d3:60:68:f8:18:bd:c5:be:
647+- 15:e1:2a:3c:a3:d4:61:cb:f5:11:94:17:81:81:f7:
648+- 87:8c:f6:6a:d2:ee:d8:e6:77:f6:62:66:4d:2e:16:
649+- 8d:08:81:4a:c9:c6:4b:31:e5:b9:c7:8a:84:96:48:
650+- a7:47:8c:0d:26:90:56:4e:e6:a5:6e:8c:b3:f2:9f:
651+- fc:3d:78:9b:49:6e:86:83:77
652++ RSA Public Key: (1024 bit)
653++ Modulus (1024 bit):
654++ 00:c2:e7:20:cf:89:59:2f:67:cb:4c:9f:e8:11:f2:
655++ 23:e5:f1:b1:ee:3f:66:5f:c3:f5:fd:1e:31:ee:8f:
656++ 4c:2a:bd:c0:4a:a5:9f:c8:44:d5:77:8f:15:1b:4d:
657++ 78:6e:b2:a2:48:a5:24:33:05:40:02:b3:c1:87:8d:
658++ 59:3c:1a:07:aa:86:f0:04:e1:9c:20:4b:22:32:c4:
659++ 51:9e:40:e4:31:c3:57:f5:98:bf:2e:b1:fd:2c:56:
660++ bf:49:d9:9b:e7:17:cc:95:5f:b5:08:19:5e:9d:df:
661++ 65:22:39:2c:48:fb:69:96:31:7a:35:4d:de:60:b4:
662++ c1:60:19:5f:96:56:7e:55:19
663+ Exponent: 65537 (0x10001)
664+- Signature Algorithm: md5WithRSAEncryption
665+- 5e:1f:a3:53:5f:24:13:1c:f8:28:32:b0:7f:69:69:f3:0e:c0:
666+- 34:87:10:03:7d:da:15:8b:bd:19:b8:1a:56:31:e7:85:49:81:
667+- c9:7f:45:20:74:3e:89:c0:e0:26:84:51:cc:04:16:ce:69:99:
668+- 01:e1:26:99:b3:e3:f5:bd:ec:5f:a0:84:e4:38:da:75:78:7b:
669+- 89:9c:d2:cd:60:95:20:ba:8e:e3:7c:e6:df:76:3a:7c:89:77:
670+- 02:94:86:11:3a:c4:61:7d:6f:71:83:21:8a:17:fb:17:e2:ee:
671+- 02:6b:61:c1:b4:52:63:d7:d8:46:b2:c5:9c:6f:38:91:8a:35:
672+- 32:0b
673++ X509v3 extensions:
674++ X509v3 Basic Constraints:
675++ CA:FALSE
676++ X509v3 Subject Key Identifier:
677++ 8D:10:67:91:33:76:9C:02:E5:78:5D:D8:C5:EF:25:96:B2:D7:FA:1F
678++ X509v3 Authority Key Identifier:
679++ keyid:B1:FB:7E:77:B5:40:8D:68:11:7E:D9:11:E5:C3:C6:DA:4D:AC:51:B0
680++ DirName:/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB
681++ serial:BE:58:AD:4C:1F:3D:25:95
682++
683++ Signature Algorithm: sha1WithRSAEncryption
684++ a9:88:10:3e:5d:2a:47:29:c8:03:27:7a:31:5a:8e:10:03:bc:
685++ b5:4e:37:1d:12:7b:eb:5f:50:71:70:b1:a3:8e:93:0e:77:17:
686++ 6c:47:b6:c9:a4:4d:2a:c4:38:f0:61:55:b2:7f:28:ba:06:79:
687++ ee:67:11:7d:d4:c9:7f:0a:18:c8:c1:cb:d0:2c:f9:63:0f:bb:
688++ 45:ca:de:ea:bb:ac:00:01:52:48:36:2b:07:2b:c8:46:c7:b1:
689++ 21:81:bd:77:39:e7:4c:39:aa:bd:ac:60:d8:a7:bf:cf:14:98:
690++ 4a:0b:a1:40:55:06:8d:6f:35:a9:39:a0:71:a9:97:ba:7c:73:
691++ 3c:41:ba:c5:1c:11:4b:2b:43:1d:2d:ba:7b:5f:14:b5:3d:64:
692++ 62:15:36:b4:16:bd:78:c8:43:8d:f9:1c:a5:d2:ac:a1:58:74:
693++ e1:99:de:ad:04:19:43:a8:bd:0a:fd:19:9b:50:44:46:6d:18:
694++ 55:4d:bf:b4:5b:a4:93:62:c7:64:91:6c:54:34:d1:f8:f3:ff:
695++ 12:6d:5f:85:e7:35:9e:5c:42:81:5e:fb:c8:bb:44:51:98:b2:
696++ ef:1b:9f:5a:22:77:28:7d:da:fb:08:c2:94:9a:0f:42:08:93:
697++ 54:10:1e:ad:f2:4f:fc:62:98:51:e9:9b:b9:3a:93:d9:e4:1f:
698++ 1d:c4:76:d0
699+ -----BEGIN CERTIFICATE-----
700+-MIIB5zCCAVACAxAAATANBgkqhkiG9w0BAQQFADBEMQswCQYDVQQGEwJTRTEQMA4G
701+-A1UECBMHVXBwc2FsYTEQMA4GA1UEBxMHVXBwc2FsYTERMA8GA1UEChMITXlTUUwg
702+-QUIwHhcNMTAwMTI5MTE1MDIyWhcNMTUwMTI4MTE1MDIyWjAyMQswCQYDVQQGEwJT
703+-RTEQMA4GA1UECBMHVXBwc2FsYTERMA8GA1UEChMITXlTUUwgQUIwgZ8wDQYJKoZI
704+-hvcNAQEBBQADgY0AMIGJAoGBAMyaN0kTZtzP4wsToSPteNtOvRH2jA12+aMyVpr4
705+-oSFqVU5NP+ZnnSaZss2kmtIrWVzXitNgaPgYvcW+FeEqPKPUYcv1EZQXgYH3h4z2
706+-atLu2OZ39mJmTS4WjQiBSsnGSzHluceKhJZIp0eMDSaQVk7mpW6Ms/Kf/D14m0lu
707+-hoN3AgMBAAEwDQYJKoZIhvcNAQEEBQADgYEAXh+jU18kExz4KDKwf2lp8w7ANIcQ
708+-A33aFYu9GbgaVjHnhUmByX9FIHQ+icDgJoRRzAQWzmmZAeEmmbPj9b3sX6CE5Dja
709+-dXh7iZzSzWCVILqO43zm33Y6fIl3ApSGETrEYX1vcYMhihf7F+LuAmthwbRSY9fY
710+-RrLFnG84kYo1Mgs=
711++MIIDETCCAfmgAwIBAgIBBjANBgkqhkiG9w0BAQUFADBEMQswCQYDVQQGEwJTRTEQ
712++MA4GA1UECBMHVXBwc2FsYTEQMA4GA1UEBxMHVXBwc2FsYTERMA8GA1UEChMITXlT
713++UUwgQUIwHhcNMTAwMjIwMDMwMzI2WhcNMzAwOTAzMDMwMzI2WjAyMQswCQYDVQQG
714++EwJTRTEQMA4GA1UECBMHVXBwc2FsYTERMA8GA1UEChMITXlTUUwgQUIwgZ8wDQYJ
715++KoZIhvcNAQEBBQADgY0AMIGJAoGBAMLnIM+JWS9ny0yf6BHyI+Xxse4/Zl/D9f0e
716++Me6PTCq9wEqln8hE1XePFRtNeG6yokilJDMFQAKzwYeNWTwaB6qG8AThnCBLIjLE
717++UZ5A5DHDV/WYvy6x/SxWv0nZm+cXzJVftQgZXp3fZSI5LEj7aZYxejVN3mC0wWAZ
718++X5ZWflUZAgMBAAGjgaMwgaAwCQYDVR0TBAIwADAdBgNVHQ4EFgQUjRBnkTN2nALl
719++eF3Yxe8llrLX+h8wdAYDVR0jBG0wa4AUsft+d7VAjWgRftkR5cPG2k2sUbChSKRG
720++MEQxCzAJBgNVBAYTAlNFMRAwDgYDVQQIEwdVcHBzYWxhMRAwDgYDVQQHEwdVcHBz
721++YWxhMREwDwYDVQQKEwhNeVNRTCBBQoIJAL5YrUwfPSWVMA0GCSqGSIb3DQEBBQUA
722++A4IBAQCpiBA+XSpHKcgDJ3oxWo4QA7y1TjcdEnvrX1BxcLGjjpMOdxdsR7bJpE0q
723++xDjwYVWyfyi6BnnuZxF91Ml/ChjIwcvQLPljD7tFyt7qu6wAAVJINisHK8hGx7Eh
724++gb13OedMOaq9rGDYp7/PFJhKC6FAVQaNbzWpOaBxqZe6fHM8QbrFHBFLK0MdLbp7
725++XxS1PWRiFTa0Fr14yEON+Ryl0qyhWHThmd6tBBlDqL0K/RmbUERGbRhVTb+0W6ST
726++YsdkkWxUNNH48/8SbV+F5zWeXEKBXvvIu0RRmLLvG59aIncofdr7CMKUmg9CCJNU
727++EB6t8k/8YphR6Zu5OpPZ5B8dxHbQ
728+ -----END CERTIFICATE-----
729+diff -Naur mysql-5.1.50.orig/mysql-test/std_data/client-key.pem mysql-5.1.50/mysql-test/std_data/client-key.pem
730+--- mysql-5.1.50.orig/mysql-test/std_data/client-key.pem 2010-08-03 13:55:05.000000000 -0400
731++++ mysql-5.1.50/mysql-test/std_data/client-key.pem 2010-08-27 23:42:05.752428395 -0400
732+@@ -1,15 +1,15 @@
733+ -----BEGIN RSA PRIVATE KEY-----
734+-MIICXQIBAAKBgQDMmjdJE2bcz+MLE6Ej7XjbTr0R9owNdvmjMlaa+KEhalVOTT/m
735+-Z50mmbLNpJrSK1lc14rTYGj4GL3FvhXhKjyj1GHL9RGUF4GB94eM9mrS7tjmd/Zi
736+-Zk0uFo0IgUrJxksx5bnHioSWSKdHjA0mkFZO5qVujLPyn/w9eJtJboaDdwIDAQAB
737+-AoGASqk/4We2En+93y3jkIO4pXafIe3w/3zZ7caRue1ehx4RUQh5d+95djuB9u7J
738+-HEZ7TpjM7QNyao5EueL6gvbxt0LXFvqAMni7yM9tt/HUYtHHPqYiRtUny9bKYFTm
739+-l8szCCMal/wD9GZU9ByHDNHm7tHUMyMhARNTYSgx+SERFmECQQD/6jJocC4SXf6f
740+-T3LqimWR02lbJ7qCoDgRglsUXh0zjrG+IIiAyE+QOCCx1GMe3Uw6bsIuYwdHT6as
741+-WcdPs04xAkEAzKulvEvLVvN5zfa/DTYRTV7jh6aDleOxjsD5oN/oJXoACnPzVuUL
742+-qQQMNtuAXm6Q1QItrRxpQsSKbY0UQka6JwJBAOSgoNoG5lIIYTKIMvzwGV+XBLeo
743+-HYsXgh+6Wo4uql3mLErUG78ZtWL9kc/tE4R+ZdyKGLaCR/1gXmH5bwN4B/ECQEBb
744+-uUH8k3REG4kojesZlVc+/00ojzgS4UKCa/yqa9VdB6ZBz8MDQydinnShkTwgiGpy
745+-xOoqhO753o2UT0qH8wECQQC99IEJWUnwvExVMkLaZH5NjAFJkb22sjkmuT11tAgU
746+-RQgOMoDOm6driojnOnDWOkx1r1Gy9NgMLooduja4v6cx
747++MIICWwIBAAKBgQDC5yDPiVkvZ8tMn+gR8iPl8bHuP2Zfw/X9HjHuj0wqvcBKpZ/I
748++RNV3jxUbTXhusqJIpSQzBUACs8GHjVk8GgeqhvAE4ZwgSyIyxFGeQOQxw1f1mL8u
749++sf0sVr9J2ZvnF8yVX7UIGV6d32UiOSxI+2mWMXo1Td5gtMFgGV+WVn5VGQIDAQAB
750++AoGARXcXLKDpVooJ3W+IyQyiWsw//IhANpWjUOm4JiyQmxMyO+i4ACr4Yjpu7WI5
751++MEseqAGj20NdwxjKO0PXsCIe5LmrGZ+SI8+CSERFOWXWRtCWz7y7SG30i1k6suvM
752++mwqWom0tJLwn93uA1lm/WSwKQwUrJRahRQd3EaZqrl7DP5kCQQD/8gbuYAT5pxQe
753++ULLGM0RvEsXxDYbEDxNbY5wrBazfklBwpumxZpFl6jEAT++7Kh2Ns3A7kB1oUNlA
754++FPYr+dYPAkEAwvHEwRtoyUr8jqoqVVJWI76CDmBjEOzVeMKW97ztqbs2LxZW8dYI
755++iOh/myFGpdoUwgu0U8w9MmXcj3ZeZCYKVwJALyQ+AJPw9qa+fuLwOq9gsHCtwrty
756++EhSQxSlwrz/pWniRll439vPkXfgntF4E0t1r+hiN2Hqv3/HcQgBaYzkuIwJAG023
757++bACFxaOuCeFFepvEms8E8jSHy4gQQhCnCl24v8wLw76SQN7kZSCDNtwLRBFuVNtE
758++z3PMonFn2eQPRmGZkwJAP1c1BHprMQx/ruafdscROILv3JrH40C1bR6KVVBKt1dK
759++Qpnpgi7hK5rUQjDF8k3bn9ugTt06jyeHe/QhAml0kg==
760+ -----END RSA PRIVATE KEY-----
761+diff -Naur mysql-5.1.50.orig/mysql-test/std_data/server-cert.pem mysql-5.1.50/mysql-test/std_data/server-cert.pem
762+--- mysql-5.1.50.orig/mysql-test/std_data/server-cert.pem 2010-08-03 13:55:08.000000000 -0400
763++++ mysql-5.1.50/mysql-test/std_data/server-cert.pem 2010-08-27 23:42:05.753428361 -0400
764+@@ -1,41 +1,69 @@
765+ Certificate:
766+ Data:
767+- Version: 1 (0x0)
768+- Serial Number: 1048578 (0x100002)
769+- Signature Algorithm: md5WithRSAEncryption
770++ Version: 3 (0x2)
771++ Serial Number: 4 (0x4)
772++ Signature Algorithm: sha1WithRSAEncryption
773+ Issuer: C=SE, ST=Uppsala, L=Uppsala, O=MySQL AB
774+ Validity
775+- Not Before: Jan 29 11:56:49 2010 GMT
776+- Not After : Jan 28 11:56:49 2015 GMT
777++ Not Before: Feb 20 02:55:06 2010 GMT
778++ Not After : Sep 3 02:55:06 2030 GMT
779+ Subject: C=SE, ST=Uppsala, O=MySQL AB, CN=localhost
780+ Subject Public Key Info:
781+ Public Key Algorithm: rsaEncryption
782+- Public-Key: (512 bit)
783+- Modulus:
784+- 00:cd:e4:87:51:9d:72:11:a0:d1:fa:f3:92:8b:13:
785+- 1c:eb:f7:e2:9a:2f:72:a8:d6:65:48:d1:69:af:1b:
786+- c0:4c:13:e5:60:60:51:41:e9:ab:a6:bc:13:bb:0c:
787+- 5e:32:7c:d9:6c:9e:cd:05:24:84:78:db:80:91:2e:
788+- d8:88:2b:c2:ed
789++ RSA Public Key: (1024 bit)
790++ Modulus (1024 bit):
791++ 00:e3:7d:4f:c2:23:77:a9:3a:2c:d2:69:59:a0:2f:
792++ 4e:d1:51:4c:ae:8d:f5:17:cc:ce:58:9c:83:4f:0b:
793++ a3:bb:29:a2:b8:1d:3e:1b:04:f9:a9:3e:e2:61:d0:
794++ e6:7b:b9:7c:12:d8:1f:86:c9:53:b5:04:dd:df:26:
795++ e9:c0:2b:de:4a:96:2e:f3:23:6f:79:6d:a9:d2:4e:
796++ 17:af:2f:de:8b:68:44:ae:de:a3:e2:c4:37:1c:04:
797++ ad:73:4b:85:f9:83:ac:fe:b7:c1:54:47:2e:96:d4:
798++ 31:96:85:94:69:d6:5a:63:24:04:99:89:19:1d:56:
799++ 8a:d1:77:aa:87:fb:38:cd:b7
800+ Exponent: 65537 (0x10001)
801+- Signature Algorithm: md5WithRSAEncryption
802+- 73:ce:9c:6e:39:46:b4:14:be:da:3f:f3:1b:ba:90:bc:23:43:
803+- d7:82:2a:70:4e:a6:d9:5a:65:5c:b7:df:71:df:75:77:c5:80:
804+- a4:af:fa:d2:59:e2:fd:c9:9c:f0:98:95:8e:69:a9:8c:7c:d8:
805+- 6f:48:d2:e3:36:e0:cd:ff:3f:d1:a5:e6:ab:75:09:c4:50:10:
806+- c4:96:dd:bf:3b:de:32:46:da:ca:4a:f1:d6:52:8a:33:2f:ab:
807+- f5:2e:70:3f:d4:9c:be:00:c8:03:f9:39:8a:df:5b:70:3c:40:
808+- ef:03:be:7c:3d:1d:32:32:f3:51:81:e2:83:30:6e:3d:38:9b:
809+- fb:3c
810++ X509v3 extensions:
811++ X509v3 Basic Constraints:
812++ CA:FALSE
813++ X509v3 Subject Key Identifier:
814++ CC:8C:71:40:D0:0F:BF:D1:99:79:3F:1B:E9:10:76:19:67:36:0F:A3
815++ X509v3 Authority Key Identifier:
816++ keyid:B1:FB:7E:77:B5:40:8D:68:11:7E:D9:11:E5:C3:C6:DA:4D:AC:51:B0
817++ DirName:/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB
818++ serial:BE:58:AD:4C:1F:3D:25:95
819++
820++ Signature Algorithm: sha1WithRSAEncryption
821++ 6f:ad:5e:59:fa:84:3a:be:e2:72:b1:e8:66:2a:4e:f8:73:19:
822++ 11:06:11:92:78:56:3e:d6:e8:68:29:90:8b:59:d2:fe:aa:ae:
823++ 25:59:c7:e9:99:bb:4a:06:43:dd:40:bd:cb:f4:ae:79:95:7d:
824++ 8e:90:ef:58:d2:a8:fc:bf:07:f3:37:b2:9b:bd:da:e6:8c:56:
825++ dd:5e:c6:4a:70:7c:3e:3d:a1:e8:35:06:b8:a7:7b:ac:26:85:
826++ 54:5d:09:a2:7b:77:b4:17:7f:72:31:cb:ff:cc:67:6d:e6:3e:
827++ c6:dc:96:eb:4a:0a:ae:e9:48:ae:8a:e0:d6:73:57:6e:32:4c:
828++ 00:dc:28:da:55:b3:9f:9f:d8:98:cc:d9:f1:b6:b3:14:67:2e:
829++ a1:47:1e:51:11:cf:70:9f:31:8f:ba:59:29:f2:d0:88:0b:e2:
830++ 51:6b:f8:31:ed:6d:ac:00:5e:d3:78:4c:95:97:02:cc:74:2b:
831++ 3b:c6:28:e6:2a:c3:30:99:35:b4:4d:31:46:d4:90:f2:47:ed:
832++ 64:85:1a:75:2a:72:0a:2f:c6:3a:2f:d2:ac:6b:31:cc:e5:a8:
833++ 07:c2:d6:22:f3:c6:0f:bf:67:d9:d6:b2:79:cd:48:b5:c3:e0:
834++ e3:18:7f:b5:74:c9:43:19:fb:c4:93:29:ca:cc:90:2b:1b:6f:
835++ 45:f6:25:f9
836+ -----BEGIN CERTIFICATE-----
837+-MIIBtzCCASACAxAAAjANBgkqhkiG9w0BAQQFADBEMQswCQYDVQQGEwJTRTEQMA4G
838+-A1UECBMHVXBwc2FsYTEQMA4GA1UEBxMHVXBwc2FsYTERMA8GA1UEChMITXlTUUwg
839+-QUIwHhcNMTAwMTI5MTE1NjQ5WhcNMTUwMTI4MTE1NjQ5WjBGMQswCQYDVQQGEwJT
840+-RTEQMA4GA1UECBMHVXBwc2FsYTERMA8GA1UEChMITXlTUUwgQUIxEjAQBgNVBAMT
841+-CWxvY2FsaG9zdDBcMA0GCSqGSIb3DQEBAQUAA0sAMEgCQQDN5IdRnXIRoNH685KL
842+-Exzr9+KaL3Ko1mVI0WmvG8BME+VgYFFB6aumvBO7DF4yfNlsns0FJIR424CRLtiI
843+-K8LtAgMBAAEwDQYJKoZIhvcNAQEEBQADgYEAc86cbjlGtBS+2j/zG7qQvCND14Iq
844+-cE6m2VplXLffcd91d8WApK/60lni/cmc8JiVjmmpjHzYb0jS4zbgzf8/0aXmq3UJ
845+-xFAQxJbdvzveMkbaykrx1lKKMy+r9S5wP9ScvgDIA/k5it9bcDxA7wO+fD0dMjLz
846+-UYHigzBuPTib+zw=
847++MIIDJTCCAg2gAwIBAgIBBDANBgkqhkiG9w0BAQUFADBEMQswCQYDVQQGEwJTRTEQ
848++MA4GA1UECBMHVXBwc2FsYTEQMA4GA1UEBxMHVXBwc2FsYTERMA8GA1UEChMITXlT
849++UUwgQUIwHhcNMTAwMjIwMDI1NTA2WhcNMzAwOTAzMDI1NTA2WjBGMQswCQYDVQQG
850++EwJTRTEQMA4GA1UECBMHVXBwc2FsYTERMA8GA1UEChMITXlTUUwgQUIxEjAQBgNV
851++BAMTCWxvY2FsaG9zdDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA431PwiN3
852++qTos0mlZoC9O0VFMro31F8zOWJyDTwujuymiuB0+GwT5qT7iYdDme7l8EtgfhslT
853++tQTd3ybpwCveSpYu8yNveW2p0k4Xry/ei2hErt6j4sQ3HAStc0uF+YOs/rfBVEcu
854++ltQxloWUadZaYyQEmYkZHVaK0Xeqh/s4zbcCAwEAAaOBozCBoDAJBgNVHRMEAjAA
855++MB0GA1UdDgQWBBTMjHFA0A+/0Zl5PxvpEHYZZzYPozB0BgNVHSMEbTBrgBSx+353
856++tUCNaBF+2RHlw8baTaxRsKFIpEYwRDELMAkGA1UEBhMCU0UxEDAOBgNVBAgTB1Vw
857++cHNhbGExEDAOBgNVBAcTB1VwcHNhbGExETAPBgNVBAoTCE15U1FMIEFCggkAvlit
858++TB89JZUwDQYJKoZIhvcNAQEFBQADggEBAG+tXln6hDq+4nKx6GYqTvhzGREGEZJ4
859++Vj7W6GgpkItZ0v6qriVZx+mZu0oGQ91Avcv0rnmVfY6Q71jSqPy/B/M3spu92uaM
860++Vt1exkpwfD49oeg1Brine6wmhVRdCaJ7d7QXf3Ixy//MZ23mPsbclutKCq7pSK6K
861++4NZzV24yTADcKNpVs5+f2JjM2fG2sxRnLqFHHlERz3CfMY+6WSny0IgL4lFr+DHt
862++bawAXtN4TJWXAsx0KzvGKOYqwzCZNbRNMUbUkPJH7WSFGnUqcgovxjov0qxrMczl
863++qAfC1iLzxg+/Z9nWsnnNSLXD4OMYf7V0yUMZ+8STKcrMkCsbb0X2Jfk=
864+ -----END CERTIFICATE-----
865+diff -Naur mysql-5.1.50.orig/mysql-test/std_data/server-key.pem mysql-5.1.50/mysql-test/std_data/server-key.pem
866+--- mysql-5.1.50.orig/mysql-test/std_data/server-key.pem 2010-08-03 13:55:08.000000000 -0400
867++++ mysql-5.1.50/mysql-test/std_data/server-key.pem 2010-08-27 23:42:05.754428433 -0400
868+@@ -1,9 +1,15 @@
869+ -----BEGIN RSA PRIVATE KEY-----
870+-MIIBOwIBAAJBAM3kh1GdchGg0frzkosTHOv34povcqjWZUjRaa8bwEwT5WBgUUHp
871+-q6a8E7sMXjJ82WyezQUkhHjbgJEu2Igrwu0CAwEAAQJBAJuwhFbF3NzRpBbEmnqJ
872+-4GPa1UJMQMLFJF+04tqj/HxJcAIVhOJhGmmtYNw1yjz/ZsPnfJCMz4eFOtdjvGtf
873+-peECIQDmFFg2WLvYo+2m9w9V7z4ZIkg7ixYkI/ObUUctfZkPOQIhAOUWnrvjFrAX
874+-bIvYT/YR50+3ZDLEc51XxNgJnWqWYl1VAiEAnTOFWgyivFC1DgF8PvDp8u5TgCt2
875+-A1d1GMgd490O+TECIC/WMl0/hTxOF9930vKqOGf//o9PUGkZq8QE9fcM4gtlAiAE
876+-iOcFpnLjtWj57jrhuw214ucnB5rklkQQe+AtcARNkg==
877++MIICXgIBAAKBgQDjfU/CI3epOizSaVmgL07RUUyujfUXzM5YnINPC6O7KaK4HT4b
878++BPmpPuJh0OZ7uXwS2B+GyVO1BN3fJunAK95Kli7zI295banSThevL96LaESu3qPi
879++xDccBK1zS4X5g6z+t8FURy6W1DGWhZRp1lpjJASZiRkdVorRd6qH+zjNtwIDAQAB
880++AoGAUb0o91y/FjMs/72S0pes/lDz+JRRSGfyjKxQEgrgndNsADOhqRu0iTdrKDJj
881++XnlbN3ooecnFJfnFrvTQcJhSmlS30j6VrBw6LXpCBK3dvjYgJ9LOne7WK+dF1+vS
882++FMQtsP04C56Sxy6HJDpMyWJ6oS3Bu169ygG2AxKo+Fk+E6ECQQD38w/MzmrARz2Z
883++AGeEPDUnVZPYgtmXkmks95S0/2jSoLhmgpvJimzxwpYwVG/BG8dSDVuTDu5kp05D
884++3bZIp3EzAkEA6uAwJsCZPtHXlWU3wYZJsA697rUNjPaCQOIaZ/lnh5RUHTmUiw1h
885++Oj/VORqKB0kXqcDfawwLjZEvh1Xli+H5bQJBANTmhw2TvEPnp/OFTl1UGUvyBmXl
886++TRMB639qAu07VfVtfYi/4ya1zn/0VmOfTOoigQ5qW9Q1AOu6YNCTQl62L9MCQQDc
887++YfEsW2kvNYxYJHoVfuBjbuGuOnn1e1Oqd70ZND59S6NFLMMBWlORaVWzWACNZ3rp
888++kAzSj6HDeqgjD2jsQONdAkEAt7S1YHUn8F760bRn4AnAto2TVOYdArtTP/wYjd4o
889++9rJREO/d8AYkYJ96APLvF0SZ4n3t1pLwQRsKKN8ZGTmzLA==
890+ -----END RSA PRIVATE KEY-----
891+diff -Naur mysql-5.1.50.orig/mysql-test/std_data/server8k-cert.pem mysql-5.1.50/mysql-test/std_data/server8k-cert.pem
892+--- mysql-5.1.50.orig/mysql-test/std_data/server8k-cert.pem 2010-08-03 13:55:08.000000000 -0400
893++++ mysql-5.1.50/mysql-test/std_data/server8k-cert.pem 2010-08-27 23:43:00.005366270 -0400
894+@@ -1,51 +1,69 @@
895++Certificate:
896++ Data:
897++ Version: 3 (0x2)
898++ Serial Number: 5 (0x5)
899++ Signature Algorithm: sha1WithRSAEncryption
900++ Issuer: C=SE, ST=Uppsala, L=Uppsala, O=MySQL AB
901++ Validity
902++ Not Before: Feb 20 03:00:54 2010 GMT
903++ Not After : Sep 3 03:00:54 2030 GMT
904++ Subject: C=SE, ST=Uppsala, O=MySQL AB, CN=server
905++ Subject Public Key Info:
906++ Public Key Algorithm: rsaEncryption
907++ RSA Public Key: (1024 bit)
908++ Modulus (1024 bit):
909++ 00:c5:da:44:95:06:77:16:21:af:a0:c4:3c:e9:f8:
910++ 1d:2d:95:f9:63:90:8c:3f:86:ba:77:76:4a:52:4b:
911++ 6b:af:29:f5:1c:aa:d4:3f:3e:42:9f:6d:46:ba:86:
912++ 90:b1:2d:cc:db:c6:33:15:a3:f4:af:53:33:4f:a1:
913++ 56:d1:aa:3b:26:10:f7:64:b5:f9:bf:1b:b1:47:8e:
914++ cc:a6:d6:0d:aa:4a:77:e3:a3:63:9d:2a:dc:65:f4:
915++ 7f:91:17:38:2d:d6:cd:4e:8d:53:52:97:6e:87:fc:
916++ 64:60:a6:a1:00:ac:96:6c:e4:42:94:75:17:46:6f:
917++ 91:b5:dd:06:47:ed:05:e3:db
918++ Exponent: 65537 (0x10001)
919++ X509v3 extensions:
920++ X509v3 Basic Constraints:
921++ CA:FALSE
922++ X509v3 Subject Key Identifier:
923++ 6E:60:3F:29:13:60:99:ED:0C:F7:15:B5:DB:7B:1C:FB:6F:60:19:ED
924++ X509v3 Authority Key Identifier:
925++ keyid:B1:FB:7E:77:B5:40:8D:68:11:7E:D9:11:E5:C3:C6:DA:4D:AC:51:B0
926++ DirName:/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB
927++ serial:BE:58:AD:4C:1F:3D:25:95
928++
929++ Signature Algorithm: sha1WithRSAEncryption
930++ 63:2e:0f:07:14:06:cf:74:90:3d:37:42:f2:48:70:60:21:bc:
931++ 34:52:31:f1:87:70:d2:b2:fb:ff:13:38:dc:f0:5e:43:d7:ee:
932++ a7:c7:1f:ac:aa:d2:8c:4f:fa:3c:4c:73:f6:b6:c2:0c:a0:ea:
933++ a2:c9:e2:73:61:c3:2e:78:40:0f:2a:d3:63:50:9b:b8:f9:89:
934++ 40:ed:98:08:97:c3:07:24:17:34:b5:78:89:0a:bb:83:4c:e2:
935++ 5c:2e:13:d6:21:30:ad:30:48:b5:70:12:ff:4a:6f:42:f0:f8:
936++ 9f:b1:4b:bd:89:2b:f0:9d:e2:49:2b:35:69:18:1f:76:40:b4:
937++ 76:bd:cb:dd:27:2f:c0:c1:e2:33:3e:6e:df:68:54:19:92:8a:
938++ bb:13:9c:cf:d6:17:56:da:bf:0d:64:70:3a:45:b7:aa:5f:e3:
939++ f5:96:ae:34:f2:17:37:27:d0:4b:e8:30:4a:c0:02:42:e2:d2:
940++ 30:eb:eb:c7:d7:ec:d8:df:5c:43:58:e2:6f:b7:58:54:0d:c4:
941++ 01:71:2d:59:8f:44:c7:a1:6c:0b:41:28:fa:b7:63:a7:68:d3:
942++ 4f:c3:0f:17:9e:b2:32:50:e6:0b:87:3d:e2:39:47:c0:d8:0a:
943++ 3b:f6:af:50:68:0f:9d:ef:6e:34:0d:3a:07:94:f8:a4:d7:24:
944++ 86:32:d3:b4
945+ -----BEGIN CERTIFICATE-----
946+-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
994+-/w8pMRr8gEuRqpL2WdJiKGG6lhMHLVFo
995++MIIDIjCCAgqgAwIBAgIBBTANBgkqhkiG9w0BAQUFADBEMQswCQYDVQQGEwJTRTEQ
996++MA4GA1UECBMHVXBwc2FsYTEQMA4GA1UEBxMHVXBwc2FsYTERMA8GA1UEChMITXlT
997++UUwgQUIwHhcNMTAwMjIwMDMwMDU0WhcNMzAwOTAzMDMwMDU0WjBDMQswCQYDVQQG
998++EwJTRTEQMA4GA1UECBMHVXBwc2FsYTERMA8GA1UEChMITXlTUUwgQUIxDzANBgNV
999++BAMTBnNlcnZlcjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAxdpElQZ3FiGv
1000++oMQ86fgdLZX5Y5CMP4a6d3ZKUktrryn1HKrUPz5Cn21GuoaQsS3M28YzFaP0r1Mz
1001++T6FW0ao7JhD3ZLX5vxuxR47MptYNqkp346NjnSrcZfR/kRc4LdbNTo1TUpduh/xk
1002++YKahAKyWbORClHUXRm+Rtd0GR+0F49sCAwEAAaOBozCBoDAJBgNVHRMEAjAAMB0G
1003++A1UdDgQWBBRuYD8pE2CZ7Qz3FbXbexz7b2AZ7TB0BgNVHSMEbTBrgBSx+353tUCN
1004++aBF+2RHlw8baTaxRsKFIpEYwRDELMAkGA1UEBhMCU0UxEDAOBgNVBAgTB1VwcHNh
1005++bGExEDAOBgNVBAcTB1VwcHNhbGExETAPBgNVBAoTCE15U1FMIEFCggkAvlitTB89
1006++JZUwDQYJKoZIhvcNAQEFBQADggEBAGMuDwcUBs90kD03QvJIcGAhvDRSMfGHcNKy
1007+++/8TONzwXkPX7qfHH6yq0oxP+jxMc/a2wgyg6qLJ4nNhwy54QA8q02NQm7j5iUDt
1008++mAiXwwckFzS1eIkKu4NM4lwuE9YhMK0wSLVwEv9Kb0Lw+J+xS72JK/Cd4kkrNWkY
1009++H3ZAtHa9y90nL8DB4jM+bt9oVBmSirsTnM/WF1bavw1kcDpFt6pf4/WWrjTyFzcn
1010++0EvoMErAAkLi0jDr68fX7NjfXENY4m+3WFQNxAFxLVmPRMehbAtBKPq3Y6do00/D
1011++DxeesjJQ5guHPeI5R8DYCjv2r1BoD53vbjQNOgeU+KTXJIYy07Q=
1012+ -----END CERTIFICATE-----
1013+diff -Naur mysql-5.1.50.orig/mysql-test/std_data/server8k-key.pem mysql-5.1.50/mysql-test/std_data/server8k-key.pem
1014+--- mysql-5.1.50.orig/mysql-test/std_data/server8k-key.pem 2010-08-03 13:55:08.000000000 -0400
1015++++ mysql-5.1.50/mysql-test/std_data/server8k-key.pem 2010-08-27 23:43:10.165365998 -0400
1016+@@ -1,99 +1,15 @@
1017+ -----BEGIN RSA PRIVATE KEY-----
1018+-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
1128+ -----END RSA PRIVATE KEY-----
1129
1130=== added file 'Percona-Server/SPECIFIC-ULN/mysql-install-test.patch'
1131--- Percona-Server/SPECIFIC-ULN/mysql-install-test.patch 1970-01-01 00:00:00 +0000
1132+++ Percona-Server/SPECIFIC-ULN/mysql-install-test.patch 2012-12-17 04:11:35 +0000
1133@@ -0,0 +1,33 @@
1134+Improve the documentation that will be installed in the mysql-test RPM.
1135+
1136+
1137+diff -Naur mysql-5.1.43.orig/mysql-test/README mysql-5.1.43/mysql-test/README
1138+--- mysql-5.1.43.orig/mysql-test/README 2010-01-15 12:14:43.000000000 -0500
1139++++ mysql-5.1.43/mysql-test/README 2010-02-13 21:18:06.000000000 -0500
1140+@@ -6,6 +6,16 @@
1141+ actually have a co-existing MySQL installation. The tests will not
1142+ conflict with it.
1143+
1144++For use in Red Hat distributions, you should run the script as user mysql,
1145++so the best bet is something like
1146++ cd /usr/share/mysql-test
1147++ sudo -u mysql ./mysql-test-run
1148++This will use the installed mysql executables, but will run a private copy
1149++of the server process (using data files within /usr/share/mysql-test),
1150++so you need not start the mysqld service beforehand.
1151++To clean up afterwards, remove the created "var" subdirectory, eg
1152++ sudo -u mysql rm -rf /usr/share/mysql-test/var
1153++
1154+ All tests must pass. If one or more of them fail on your system, please
1155+ read the following manual section for instructions on how to report the
1156+ problem:
1157+@@ -25,7 +35,8 @@
1158+
1159+ With no test cases named on the command line, mysql-test-run falls back
1160+ to the normal "non-extern" behavior. The reason for this is that some
1161+-tests cannot run with an external server.
1162++tests cannot run with an external server (because they need to control the
1163++options with which the server is started).
1164+
1165+
1166+ You can create your own test cases. To create a test case, create a new
1167
1168=== added file 'Percona-Server/SPECIFIC-ULN/mysql-strmov.patch'
1169--- Percona-Server/SPECIFIC-ULN/mysql-strmov.patch 1970-01-01 00:00:00 +0000
1170+++ Percona-Server/SPECIFIC-ULN/mysql-strmov.patch 2012-12-17 04:11:35 +0000
1171@@ -0,0 +1,32 @@
1172+Remove overly optimistic definition of strmov() as stpcpy().
1173+
1174+mysql uses this macro with overlapping source and destination strings,
1175+which is verboten per spec, and fails on some Red Hat platforms.
1176+Deleting the definition is sufficient to make it fall back to a
1177+byte-at-a-time copy loop, which should consistently give the
1178+expected behavior.
1179+
1180+Note: the particular case that prompted this patch is reported and fixed
1181+at http://bugs.mysql.com/bug.php?id=48864. However, my faith in upstream's
1182+ability to detect this type of error is low, and I also see little evidence
1183+of any real performance gain from optimizing these calls. So I'm keeping
1184+this patch.
1185+
1186+
1187+diff -Naur mysql-5.1.37.orig/include/m_string.h mysql-5.1.37/include/m_string.h
1188+--- mysql-5.1.37.orig/include/m_string.h 2009-07-13 19:08:50.000000000 -0400
1189++++ mysql-5.1.37/include/m_string.h 2009-08-31 21:49:49.000000000 -0400
1190+@@ -81,13 +81,6 @@
1191+ extern void *(*my_str_malloc)(size_t);
1192+ extern void (*my_str_free)(void *);
1193+
1194+-#if defined(HAVE_STPCPY)
1195+-#define strmov(A,B) stpcpy((A),(B))
1196+-#ifndef stpcpy
1197+-extern char *stpcpy(char *, const char *); /* For AIX with gcc 2.95.3 */
1198+-#endif
1199+-#endif
1200+-
1201+ /* Declared in int2str() */
1202+ extern char NEAR _dig_vec_upper[];
1203+ extern char NEAR _dig_vec_lower[];
1204
1205=== added file 'Percona-Server/SPECIFIC-ULN/mysql.init'
1206--- Percona-Server/SPECIFIC-ULN/mysql.init 1970-01-01 00:00:00 +0000
1207+++ Percona-Server/SPECIFIC-ULN/mysql.init 2012-12-17 04:11:35 +0000
1208@@ -0,0 +1,209 @@
1209+#!/bin/sh
1210+#
1211+# mysqld This shell script takes care of starting and stopping
1212+# the MySQL subsystem (mysqld).
1213+#
1214+# chkconfig: - 64 36
1215+# description: MySQL database server.
1216+# processname: mysqld
1217+# config: /etc/my.cnf
1218+# pidfile: /var/run/mysqld/mysqld.pid
1219+
1220+# Source function library.
1221+. /etc/rc.d/init.d/functions
1222+
1223+# Source networking configuration.
1224+. /etc/sysconfig/network
1225+
1226+
1227+exec="/usr/bin/mysqld_safe"
1228+prog="mysqld"
1229+
1230+# Set timeouts here so they can be overridden from /etc/sysconfig/mysqld
1231+STARTTIMEOUT=120
1232+STOPTIMEOUT=60
1233+
1234+[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
1235+
1236+lockfile=/var/lock/subsys/$prog
1237+
1238+
1239+# extract value of a MySQL option from config files
1240+# Usage: get_mysql_option SECTION VARNAME DEFAULT
1241+# result is returned in $result
1242+# We use my_print_defaults which prints all options from multiple files,
1243+# with the more specific ones later; hence take the last match.
1244+get_mysql_option(){
1245+ result=`/usr/bin/my_print_defaults "$1" | sed -n "s/^--$2=//p" | tail -n 1`
1246+ if [ -z "$result" ]; then
1247+ # not found, use default
1248+ result="$3"
1249+ fi
1250+}
1251+
1252+get_mysql_option mysqld datadir "/var/lib/mysql"
1253+datadir="$result"
1254+get_mysql_option mysqld socket "$datadir/mysql.sock"
1255+socketfile="$result"
1256+get_mysql_option mysqld_safe log-error "/var/log/mysqld.log"
1257+errlogfile="$result"
1258+get_mysql_option mysqld_safe pid-file "/var/run/mysqld/mysqld.pid"
1259+mypidfile="$result"
1260+
1261+
1262+start(){
1263+ [ -x $exec ] || exit 5
1264+ # check to see if it's already running
1265+ RESPONSE=`/usr/bin/mysqladmin --socket="$socketfile" --user=UNKNOWN_MYSQL_USER ping 2>&1`
1266+ if [ $? = 0 ]; then
1267+ # already running, do nothing
1268+ action $"Starting $prog: " /bin/true
1269+ ret=0
1270+ elif echo "$RESPONSE" | grep -q "Access denied for user"
1271+ then
1272+ # already running, do nothing
1273+ action $"Starting $prog: " /bin/true
1274+ ret=0
1275+ else
1276+ # prepare for start
1277+ touch "$errlogfile"
1278+ chown mysql:mysql "$errlogfile"
1279+ chmod 0640 "$errlogfile"
1280+ [ -x /sbin/restorecon ] && /sbin/restorecon "$errlogfile"
1281+ if [ ! -d "$datadir/mysql" ] ; then
1282+ # First, make sure $datadir is there with correct permissions
1283+ if [ ! -e "$datadir" -a ! -h "$datadir" ]
1284+ then
1285+ mkdir -p "$datadir" || exit 1
1286+ fi
1287+ chown mysql:mysql "$datadir"
1288+ chmod 0755 "$datadir"
1289+ [ -x /sbin/restorecon ] && /sbin/restorecon "$datadir"
1290+ # Now create the database
1291+ action $"Initializing MySQL database: " /usr/bin/mysql_install_db --datadir="$datadir" --user=mysql
1292+ ret=$?
1293+ chown -R mysql:mysql "$datadir"
1294+ if [ $ret -ne 0 ] ; then
1295+ return $ret
1296+ fi
1297+ fi
1298+ chown mysql:mysql "$datadir"
1299+ chmod 0755 "$datadir"
1300+ # Pass all the options determined above, to ensure consistent behavior.
1301+ # In many cases mysqld_safe would arrive at the same conclusions anyway
1302+ # but we need to be sure. (An exception is that we don't force the
1303+ # log-error setting, since this script doesn't really depend on that,
1304+ # and some users might prefer to configure logging to syslog.)
1305+ # Note: set --basedir to prevent probes that might trigger SELinux
1306+ # alarms, per bug #547485
1307+ $exec --datadir="$datadir" --socket="$socketfile" \
1308+ --pid-file="$mypidfile" \
1309+ --basedir=/usr --user=mysql >/dev/null 2>&1 &
1310+ safe_pid=$!
1311+ # Spin for a maximum of N seconds waiting for the server to come up;
1312+ # exit the loop immediately if mysqld_safe process disappears.
1313+ # Rather than assuming we know a valid username, accept an "access
1314+ # denied" response as meaning the server is functioning.
1315+ ret=0
1316+ TIMEOUT="$STARTTIMEOUT"
1317+ while [ $TIMEOUT -gt 0 ]; do
1318+ RESPONSE=`/usr/bin/mysqladmin --socket="$socketfile" --user=UNKNOWN_MYSQL_USER ping 2>&1` && break
1319+ echo "$RESPONSE" | grep -q "Access denied for user" && break
1320+ if ! /bin/kill -0 $safe_pid 2>/dev/null; then
1321+ echo "MySQL Daemon failed to start."
1322+ ret=1
1323+ break
1324+ fi
1325+ sleep 1
1326+ let TIMEOUT=${TIMEOUT}-1
1327+ done
1328+ if [ $TIMEOUT -eq 0 ]; then
1329+ echo "Timeout error occurred trying to start MySQL Daemon."
1330+ ret=1
1331+ fi
1332+ if [ $ret -eq 0 ]; then
1333+ action $"Starting $prog: " /bin/true
1334+ touch $lockfile
1335+ else
1336+ action $"Starting $prog: " /bin/false
1337+ fi
1338+ fi
1339+ return $ret
1340+}
1341+
1342+stop(){
1343+ if [ ! -f "$mypidfile" ]; then
1344+ # not running; per LSB standards this is "ok"
1345+ action $"Stopping $prog: " /bin/true
1346+ return 0
1347+ fi
1348+ MYSQLPID=`cat "$mypidfile"`
1349+ if [ -n "$MYSQLPID" ]; then
1350+ /bin/kill "$MYSQLPID" >/dev/null 2>&1
1351+ ret=$?
1352+ if [ $ret -eq 0 ]; then
1353+ TIMEOUT="$STOPTIMEOUT"
1354+ while [ $TIMEOUT -gt 0 ]; do
1355+ /bin/kill -0 "$MYSQLPID" >/dev/null 2>&1 || break
1356+ sleep 1
1357+ let TIMEOUT=${TIMEOUT}-1
1358+ done
1359+ if [ $TIMEOUT -eq 0 ]; then
1360+ echo "Timeout error occurred trying to stop MySQL Daemon."
1361+ ret=1
1362+ action $"Stopping $prog: " /bin/false
1363+ else
1364+ rm -f $lockfile
1365+ rm -f "$socketfile"
1366+ action $"Stopping $prog: " /bin/true
1367+ fi
1368+ else
1369+ action $"Stopping $prog: " /bin/false
1370+ fi
1371+ else
1372+ # failed to read pidfile, probably insufficient permissions
1373+ action $"Stopping $prog: " /bin/false
1374+ ret=4
1375+ fi
1376+ return $ret
1377+}
1378+
1379+restart(){
1380+ stop
1381+ start
1382+}
1383+
1384+condrestart(){
1385+ [ -e $lockfile ] && restart || :
1386+}
1387+
1388+
1389+# See how we were called.
1390+case "$1" in
1391+ start)
1392+ start
1393+ ;;
1394+ stop)
1395+ stop
1396+ ;;
1397+ status)
1398+ status -p "$mypidfile" $prog
1399+ ;;
1400+ restart)
1401+ restart
1402+ ;;
1403+ condrestart|try-restart)
1404+ condrestart
1405+ ;;
1406+ reload)
1407+ exit 3
1408+ ;;
1409+ force-reload)
1410+ restart
1411+ ;;
1412+ *)
1413+ echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
1414+ exit 2
1415+esac
1416+
1417+exit $?
1418
1419=== added file 'Percona-Server/SPECIFIC-ULN/mysql.spec.sh'
1420--- Percona-Server/SPECIFIC-ULN/mysql.spec.sh 1970-01-01 00:00:00 +0000
1421+++ Percona-Server/SPECIFIC-ULN/mysql.spec.sh 2012-12-17 04:11:35 +0000
1422@@ -0,0 +1,1959 @@
1423+#
1424+# This file was modified by Oracle in 2011 and later.
1425+# Details of the modifications are described in the "changelog" section.
1426+#
1427+# Modifications copyright (c) 2011, 2012, Oracle and/or its
1428+# affiliates. All rights reserved.
1429+#
1430+# This program is free software; you can redistribute it and/or modify
1431+# it under the terms of the GNU General Public License as published by
1432+# the Free Software Foundation; version 2 of the License.
1433+#
1434+# This program is distributed in the hope that it will be useful,
1435+# but WITHOUT ANY WARRANTY; without even the implied warranty of
1436+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1437+# GNU General Public License for more details.
1438+#
1439+# You should have received a copy of the GNU General Public License
1440+# along with this program; see the file COPYING. If not, write to the
1441+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston
1442+# MA 02110-1301 USA.
1443+
1444+##############################################################################
1445+# Some common macro definitions
1446+##############################################################################
1447+
1448+# NOTE: "vendor" is used in upgrade/downgrade check, so you can't
1449+# change these, has to be exactly as is.
1450+# %define mysql_old_vendor MySQL AB # Applies to traditional MySQL RPMs only.
1451+# %define mysql_vendor_2 Sun Microsystems, Inc.
1452+%define mysql_vendor Oracle and/or its affiliates
1453+
1454+%define mysql_version @VERSION@
1455+
1456+%define mysqldatadir /var/lib/mysql
1457+
1458+%define release 1
1459+
1460+##############################################################################
1461+# Command line handling
1462+##############################################################################
1463+#
1464+# To set options:
1465+#
1466+# $ rpmbuild --define="option <x>" ...
1467+#
1468+
1469+# ----------------------------------------------------------------------------
1470+# Commercial builds
1471+# ----------------------------------------------------------------------------
1472+%if %{undefined commercial}
1473+%define commercial 0
1474+%endif
1475+
1476+# ----------------------------------------------------------------------------
1477+# Source name
1478+# ----------------------------------------------------------------------------
1479+%if %{undefined src_base}
1480+%define src_base mysql
1481+%endif
1482+%define src_dir %{src_base}-%{mysql_version}
1483+
1484+# ----------------------------------------------------------------------------
1485+# Feature set (storage engines, options). Default to community (everything)
1486+# ----------------------------------------------------------------------------
1487+%if %{undefined feature_set}
1488+%define feature_set community
1489+%endif
1490+
1491+# ----------------------------------------------------------------------------
1492+# Server comment strings
1493+# ----------------------------------------------------------------------------
1494+%if %{undefined compilation_comment_debug}
1495+%define compilation_comment_debug MySQL Community Server - Debug (GPL)
1496+%endif
1497+%if %{undefined compilation_comment_release}
1498+%define compilation_comment_release MySQL Community Server (GPL)
1499+%endif
1500+
1501+# ----------------------------------------------------------------------------
1502+# Product and server suffixes
1503+# ----------------------------------------------------------------------------
1504+%if %{undefined product_suffix}
1505+ %if %{defined short_product_tag}
1506+ %define product_suffix -%{short_product_tag}
1507+ %else
1508+ %define product_suffix %{nil}
1509+ %endif
1510+%endif
1511+
1512+%if %{undefined server_suffix}
1513+%define server_suffix %{nil}
1514+%endif
1515+
1516+# ----------------------------------------------------------------------------
1517+# Distribution support
1518+# ----------------------------------------------------------------------------
1519+%if %{undefined distro_specific}
1520+%define distro_specific 0
1521+%endif
1522+%if %{distro_specific}
1523+ %if %(test -f /etc/oracle-release && echo 1 || echo 0)
1524+ %define elver %(rpm -qf --qf '%%{version}\\n' /etc/oracle-release | sed -e 's/^\\([0-9]*\\).*/\\1/g')
1525+ %if "%elver" == "6"
1526+ %define distro_description Oracle Linux 6
1527+ %define distro_releasetag el6
1528+ %define distro_buildreq gcc-c++ ncurses-devel perl readline-devel time zlib-devel
1529+ %define distro_requires chkconfig coreutils grep procps shadow-utils net-tools
1530+ %else
1531+ %{error:Oracle Linux %{elver} is unsupported}
1532+ %endif
1533+ %else
1534+ %if %(test -f /etc/redhat-release && echo 1 || echo 0)
1535+ %define rhelver %(rpm -qf --qf '%%{version}\\n' /etc/redhat-release | sed -e 's/^\\([0-9]*\\).*/\\1/g')
1536+ %if "%rhelver" == "5"
1537+ %define distro_description Red Hat Enterprise Linux 5
1538+ %define distro_releasetag rhel5
1539+ %define distro_buildreq gcc-c++ gperf ncurses-devel perl readline-devel time zlib-devel
1540+ %define distro_requires chkconfig coreutils grep procps shadow-utils net-tools
1541+ %else
1542+ %if "%rhelver" == "6"
1543+ %define distro_description Red Hat Enterprise Linux 6
1544+ %define distro_releasetag rhel6
1545+ %define distro_buildreq gcc-c++ ncurses-devel perl readline-devel time zlib-devel
1546+ %define distro_requires chkconfig coreutils grep procps shadow-utils net-tools
1547+ %else
1548+ %{error:Red Hat Enterprise Linux %{rhelver} is unsupported}
1549+ %endif
1550+ %endif
1551+ %else
1552+ %if %(test -f /etc/SuSE-release && echo 1 || echo 0)
1553+ %define susever %(rpm -qf --qf '%%{version}\\n' /etc/SuSE-release | cut -d. -f1)
1554+ %if "%susever" == "10"
1555+ %define distro_description SUSE Linux Enterprise Server 10
1556+ %define distro_releasetag sles10
1557+ %define distro_buildreq gcc-c++ gdbm-devel gperf ncurses-devel openldap2-client readline-devel zlib-devel
1558+ %define distro_requires aaa_base coreutils grep procps pwdutils
1559+ %else
1560+ %if "%susever" == "11"
1561+ %define distro_description SUSE Linux Enterprise Server 11
1562+ %define distro_releasetag sles11
1563+ %define distro_buildreq gcc-c++ gdbm-devel gperf ncurses-devel openldap2-client procps pwdutils readline-devel zlib-devel
1564+ %define distro_requires aaa_base coreutils grep procps pwdutils
1565+ %else
1566+ %{error:SuSE %{susever} is unsupported}
1567+ %endif
1568+ %endif
1569+ %else
1570+ %{error:Unsupported distribution}
1571+ %endif
1572+ %endif
1573+ %endif
1574+%else
1575+ %define generic_kernel %(uname -r | cut -d. -f1-2)
1576+ %define distro_description Generic Linux (kernel %{generic_kernel})
1577+ %define distro_releasetag linux%{generic_kernel}
1578+ %define distro_buildreq gcc-c++ gperf ncurses-devel perl readline-devel time zlib-devel
1579+ %define distro_requires coreutils grep procps /sbin/chkconfig /usr/sbin/useradd /usr/sbin/groupadd
1580+%endif
1581+
1582+# Avoid debuginfo RPMs, leaves binaries unstripped
1583+%define debug_package %{nil}
1584+
1585+# Hack to work around bug in RHEL5 __os_install_post macro, wrong inverted
1586+# test for __debug_package
1587+%define __strip /bin/true
1588+
1589+# ----------------------------------------------------------------------------
1590+# Support optional "tcmalloc" library (experimental)
1591+# ----------------------------------------------------------------------------
1592+%if %{defined malloc_lib_target}
1593+%define WITH_TCMALLOC 1
1594+%else
1595+%define WITH_TCMALLOC 0
1596+%endif
1597+
1598+##############################################################################
1599+# Configuration based upon above user input, not to be set directly
1600+##############################################################################
1601+
1602+%if %{commercial}
1603+%define license_files_server %{src_dir}/LICENSE.mysql
1604+%define license_type Commercial
1605+%else
1606+%define license_files_server %{src_dir}/COPYING %{src_dir}/README
1607+%define license_type GPL
1608+%endif
1609+
1610+##############################################################################
1611+# Main spec file section
1612+##############################################################################
1613+
1614+Name: mysql%{product_suffix}
1615+Summary: MySQL client programs and shared libraries
1616+Group: Applications/Databases
1617+Version: @MYSQL_RPM_VERSION@
1618+Release: %{release}%{?distro_releasetag:.%{distro_releasetag}}
1619+# exceptions allow client libraries to be linked with most open source SW,
1620+# not only GPL code.
1621+License: Copyright (c) 2000, @MYSQL_COPYRIGHT_YEAR@, %{mysql_vendor}. All rights reserved. Under %{license_type} license as shown in the Description field.
1622+URL: http://www.mysql.com/
1623+Packager: MySQL Release Engineering <mysql-build@oss.oracle.com>
1624+Vendor: %{mysql_vendor}
1625+
1626+# Regression tests may take a long time, override the default to skip them
1627+%{!?runselftest:%global runselftest 1}
1628+
1629+# Upstream has a mirror redirector for downloads, so the URL is hard to
1630+# represent statically. You can get the tarball by following a link from
1631+# http://dev.mysql.com/downloads/mysql/
1632+Source0: %{src_dir}.tar.gz
1633+# The upstream tarball includes non-free documentation that only the
1634+# copyright holder (MySQL -> Sun -> Oracle) may ship.
1635+# To remove the non-free documentation, run this script after downloading
1636+# the tarball into the current directory:
1637+# ./generate-tarball.sh $VERSION
1638+# Then, source name changes:
1639+# Source0: mysql-%{version}-nodocs.tar.gz
1640+%if %{commercial}
1641+NoSource: 0
1642+%endif
1643+Source1: generate-tarball.sh
1644+Source2: mysql.init
1645+Source3: my.cnf
1646+Source4: scriptstub.c
1647+Source5: my_config.h
1648+# The below is only needed for packages built outside MySQL -> Sun -> Oracle:
1649+Source6: README.mysql-docs
1650+Source9: mysql-embedded-check.c
1651+# Working around perl dependency checking bug in rpm FTTB. Remove later.
1652+Source999: filter-requires-mysql.sh
1653+
1654+# Patch1: mysql-ssl-multilib.patch Not needed by MySQL (yaSSL), will not work in 5.5 (cmake)
1655+Patch2: mysql-5.5-errno.patch
1656+Patch4: mysql-5.5-testing.patch
1657+Patch5: mysql-install-test.patch
1658+Patch6: mysql-5.5-stack-guard.patch
1659+# Patch7: mysql-disable-test.patch Already fixed in current 5.1
1660+# Patch8: mysql-setschedparam.patch Will not work in 5.5 (cmake)
1661+# Patch9: mysql-no-docs.patch Will not work in 5.5 (cmake)
1662+Patch10: mysql-strmov.patch
1663+ # Not used by MySQL
1664+# Patch12: mysql-cve-2008-7247.patch Already fixed in 5.5
1665+Patch13: mysql-expired-certs.patch
1666+ # Will not be used by MySQL
1667+# Patch14: mysql-missing-string-code.patch Undecided, will not work in 5.5 (cmake)
1668+# Patch15: mysql-lowercase-bug.patch Fixed in MySQL 5.1.54 and 5.5.9
1669+Patch16: mysql-chain-certs.patch
1670+Patch17: mysql-5.5-libdir.patch
1671+Patch18: mysql-5.5-fix-tests.patch
1672+Patch19: mysql-5.5-mtr1.patch
1673+
1674+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
1675+BuildRequires: %{distro_buildreq}
1676+BuildRequires: gawk
1677+# make test requires time and ps
1678+BuildRequires: procps
1679+# Socket and Time::HiRes are needed to run regression tests
1680+BuildRequires: perl(Socket), perl(Time::HiRes)
1681+
1682+Requires: %{distro_requires}
1683+Requires: fileutils
1684+Requires: mysql-libs%{product_suffix} = %{version}-%{release}
1685+Requires: bash
1686+
1687+# If %%{product_suffix} is non-empty, the auto-generated capability is insufficient:
1688+# We want all dependency handling to use the generic name only.
1689+# Similar in other sub-packages
1690+Provides: mysql
1691+
1692+# MySQL (with caps) is upstream's spelling of their own RPMs for mysql
1693+Conflicts: MySQL
1694+# mysql-cluster used to be built from this SRPM, but no more
1695+Obsoletes: mysql-cluster < 5.1.44
1696+# We need cross-product "Obsoletes:" to allow cross-product upgrades:
1697+Obsoletes: mysql mysql-advanced
1698+
1699+# Working around perl dependency checking bug in rpm FTTB. Remove later.
1700+%global __perl_requires %{SOURCE999}
1701+
1702+%description -n mysql%{product_suffix}
1703+MySQL is a multi-user, multi-threaded SQL database server. MySQL is a
1704+client/server implementation consisting of a server daemon (mysqld)
1705+and many different client programs and libraries. The base package
1706+contains the standard MySQL client programs and generic MySQL files.
1707+
1708+The MySQL software has Dual Licensing, which means you can use the MySQL
1709+software free of charge under the GNU General Public License
1710+(http://www.gnu.org/licenses/). You can also purchase commercial MySQL
1711+licenses from %{mysql_vendor} if you do not wish to be bound by the terms of
1712+the GPL. See the chapter "Licensing and Support" in the manual for
1713+further info.
1714+
1715+%package -n mysql-libs%{product_suffix}
1716+
1717+Summary: The shared libraries required for MySQL clients
1718+Group: Applications/Databases
1719+Requires: /sbin/ldconfig
1720+Provides: mysql-libs
1721+Obsoletes: mysql-libs mysql-libs-advanced
1722+
1723+%description -n mysql-libs%{product_suffix}
1724+The mysql-libs package provides the essential shared libraries for any
1725+MySQL client program or interface. You will need to install this package
1726+to use any other MySQL package or any clients that need to connect to a
1727+MySQL server.
1728+
1729+%package -n mysql-server%{product_suffix}
1730+
1731+Summary: The MySQL server and related files
1732+Group: Applications/Databases
1733+Requires: mysql%{product_suffix} = %{version}-%{release}
1734+Requires: sh-utils
1735+Requires(pre): /usr/sbin/useradd
1736+Requires(post): chkconfig
1737+Requires(preun): chkconfig
1738+# This is for /sbin/service
1739+Requires(preun): initscripts
1740+Requires(postun): initscripts
1741+# mysqlhotcopy needs DBI/DBD support
1742+Requires: perl-DBI, perl-DBD-MySQL
1743+Provides: mysql-server
1744+Conflicts: MySQL-server
1745+Obsoletes: mysql-server mysql-server-advanced
1746+
1747+%description -n mysql-server%{product_suffix}
1748+MySQL is a multi-user, multi-threaded SQL database server. MySQL is a
1749+client/server implementation consisting of a server daemon (mysqld)
1750+and many different client programs and libraries. This package contains
1751+the MySQL server and some accompanying files and directories.
1752+
1753+%package -n mysql-devel%{product_suffix}
1754+
1755+Summary: Files for development of MySQL applications
1756+Group: Applications/Databases
1757+Requires: mysql%{product_suffix} = %{version}-%{release}
1758+Requires: openssl-devel
1759+Provides: mysql-devel
1760+Conflicts: MySQL-devel
1761+Obsoletes: mysql-devel mysql-devel-advanced
1762+
1763+%description -n mysql-devel%{product_suffix}
1764+MySQL is a multi-user, multi-threaded SQL database server. This
1765+package contains the libraries and header files that are needed for
1766+developing MySQL client applications.
1767+
1768+%package -n mysql-embedded%{product_suffix}
1769+
1770+Summary: MySQL as an embeddable library
1771+Group: Applications/Databases
1772+Provides: mysql-embedded
1773+Obsoletes: mysql-embedded mysql-embedded-advanced
1774+
1775+%description -n mysql-embedded%{product_suffix}
1776+MySQL is a multi-user, multi-threaded SQL database server. This
1777+package contains a version of the MySQL server that can be embedded
1778+into a client application instead of running as a separate process,
1779+as well as a command line client with such an embedded server.
1780+
1781+%package -n mysql-embedded-devel%{product_suffix}
1782+
1783+Summary: Development files for MySQL as an embeddable library
1784+Group: Applications/Databases
1785+Requires: mysql-embedded%{product_suffix} = %{version}-%{release}
1786+Requires: mysql-devel%{product_suffix} = %{version}-%{release}
1787+Provides: mysql-embedded-devel
1788+Obsoletes: mysql-embedded-devel mysql-embedded-devel-advanced
1789+
1790+%description -n mysql-embedded-devel%{product_suffix}
1791+MySQL is a multi-user, multi-threaded SQL database server. This
1792+package contains files needed for developing and testing with
1793+the embedded version of the MySQL server.
1794+
1795+%package -n mysql-test%{product_suffix}
1796+
1797+Summary: The test suite distributed with MySQL
1798+Group: Applications/Databases
1799+Requires: mysql%{product_suffix} = %{version}-%{release}
1800+Requires: mysql-server%{product_suffix} = %{version}-%{release}
1801+Provides: mysql-test
1802+Conflicts: MySQL-test
1803+Obsoletes: mysql-test mysql-test-advanced
1804+
1805+%description -n mysql-test%{product_suffix}
1806+MySQL is a multi-user, multi-threaded SQL database server. This
1807+package contains the regression test suite distributed with
1808+the MySQL sources.
1809+
1810+%prep
1811+%setup -T -a 0 -c -n %{src_dir}
1812+
1813+cd %{src_dir} # read about "%setup -n"
1814+# %patch1 -p1
1815+%patch2 -p1
1816+# %patch4 -p1 TODO / FIXME: if wanted, needs to be adapted to new mysql-test-run setup
1817+%patch5 -p1
1818+%patch6 -p1
1819+# %patch8 -p1
1820+# %patch9 -p1
1821+# %patch10 -p1
1822+# %patch13 -p1
1823+# %patch14 -p1
1824+%patch16 -p1
1825+%patch17 -p1
1826+%patch18 -p1
1827+%patch19 -p1
1828+
1829+# workaround for upstream bug #56342
1830+rm -f mysql-test/t/ssl_8k_key-master.opt
1831+
1832+%build
1833+
1834+# Fail quickly and obviously if user tries to build as root
1835+%if %runselftest
1836+ if [ x"`id -u`" = x0 ]; then
1837+ echo "The MySQL regression tests may fail if run as root."
1838+ echo "If you really need to build the RPM as root, use"
1839+ echo "--define='runselftest 0' to skip the regression tests."
1840+ exit 1
1841+ fi
1842+%endif
1843+
1844+# Be strict about variables, bail at earliest opportunity, etc.
1845+set -eu
1846+
1847+# Optional package files
1848+touch optional-files-devel
1849+
1850+#
1851+# Set environment in order of preference, MYSQL_BUILD_* first, then variable
1852+# name, finally a default. RPM_OPT_FLAGS is assumed to be a part of the
1853+# default RPM build environment.
1854+#
1855+# We set CXX=gcc by default to support so-called 'generic' binaries, where we
1856+# do not have a dependancy on libgcc/libstdc++. This only works while we do
1857+# not require C++ features such as exceptions, and may need to be removed at
1858+# a later date.
1859+#
1860+
1861+# This is a hack, $RPM_OPT_FLAGS on ia64 hosts contains flags which break
1862+# the compile in cmd-line-utils/readline - needs investigation, but for now
1863+# we simply unset it and use those specified directly in cmake.
1864+%if "%{_arch}" == "ia64"
1865+RPM_OPT_FLAGS=
1866+%endif
1867+
1868+# This goes in sync with Patch19. "rm" is faster than "patch" for this.
1869+rm -rf %{src_dir}/mysql-test/lib/v1
1870+
1871+export PATH=${MYSQL_BUILD_PATH:-$PATH}
1872+export CC=${MYSQL_BUILD_CC:-${CC:-gcc}}
1873+export CXX=${MYSQL_BUILD_CXX:-${CXX:-gcc}}
1874+export CFLAGS=${MYSQL_BUILD_CFLAGS:-${CFLAGS:-$RPM_OPT_FLAGS}}
1875+# Following "%ifarch" developed by RedHat, MySQL/Oracle does not support/maintain Linux/Sparc:
1876+# gcc seems to have some bugs on sparc as of 4.4.1, back off optimization
1877+# submitted as bz #529298
1878+%ifarch sparc sparcv9 sparc64
1879+CFLAGS=`echo $CFLAGS| sed -e "s|-O2|-O1|g" `
1880+%endif
1881+export CXXFLAGS=${MYSQL_BUILD_CXXFLAGS:-${CXXFLAGS:-$RPM_OPT_FLAGS -felide-constructors -fno-exceptions -fno-rtti}}
1882+export LDFLAGS=${MYSQL_BUILD_LDFLAGS:-${LDFLAGS:-}}
1883+export CMAKE=${MYSQL_BUILD_CMAKE:-${CMAKE:-cmake}}
1884+export MAKE_JFLAG=${MYSQL_BUILD_MAKE_JFLAG:-%{?_smp_mflags}}
1885+
1886+# Build debug mysqld and libmysqld.a
1887+mkdir debug
1888+(
1889+ cd debug
1890+ # Attempt to remove any optimisation flags from the debug build
1891+ CFLAGS=`echo " ${CFLAGS} " | \
1892+ sed -e 's/ -O[0-9]* / /' \
1893+ -e 's/ -unroll2 / /' \
1894+ -e 's/ -ip / /' \
1895+ -e 's/^ //' \
1896+ -e 's/ $//'`
1897+ CXXFLAGS=`echo " ${CXXFLAGS} " | \
1898+ sed -e 's/ -O[0-9]* / /' \
1899+ -e 's/ -unroll2 / /' \
1900+ -e 's/ -ip / /' \
1901+ -e 's/^ //' \
1902+ -e 's/ $//'`
1903+ # XXX: MYSQL_UNIX_ADDR should be in cmake/* but mysql_version is included before
1904+ # XXX: install_layout so we can't just set it based on INSTALL_LAYOUT=RPM
1905+ ${CMAKE} ../%{src_dir} -DBUILD_CONFIG=mysql_release -DINSTALL_LAYOUT=RPM \
1906+ -DCMAKE_BUILD_TYPE=Debug \
1907+ -DMYSQL_UNIX_ADDR="%{mysqldatadir}/mysql.sock" \
1908+ -DFEATURE_SET="%{feature_set}" \
1909+ -DCOMPILATION_COMMENT="%{compilation_comment_debug}" \
1910+ -DMYSQL_SERVER_SUFFIX="%{server_suffix}"
1911+ echo BEGIN_DEBUG_CONFIG ; egrep '^#define' include/config.h ; echo END_DEBUG_CONFIG
1912+ make ${MAKE_JFLAG} VERBOSE=1
1913+)
1914+# Build full release
1915+mkdir release
1916+(
1917+ cd release
1918+ # XXX: MYSQL_UNIX_ADDR should be in cmake/* but mysql_version is included before
1919+ # XXX: install_layout so we can't just set it based on INSTALL_LAYOUT=RPM
1920+ ${CMAKE} ../%{src_dir} -DBUILD_CONFIG=mysql_release -DINSTALL_LAYOUT=RPM \
1921+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
1922+ -DMYSQL_UNIX_ADDR="%{mysqldatadir}/mysql.sock" \
1923+ -DFEATURE_SET="%{feature_set}" \
1924+ -DCOMPILATION_COMMENT="%{compilation_comment_release}" \
1925+ -DMYSQL_SERVER_SUFFIX="%{server_suffix}"
1926+ echo BEGIN_NORMAL_CONFIG ; egrep '^#define' include/config.h ; echo END_NORMAL_CONFIG
1927+ make ${MAKE_JFLAG} VERBOSE=1
1928+)
1929+
1930+# TODO / FIXME: Do we need "scriptstub"?
1931+gcc $CFLAGS $LDFLAGS -o scriptstub "-DLIBDIR=\"%{_libdir}/mysql\"" %{SOURCE4}
1932+
1933+# TODO / FIXME: "libmysqld.so" should have been produced above - WORK in PROGRESS
1934+# regular build will make libmysqld.a but not libmysqld.so :-(
1935+cd release
1936+mkdir libmysqld/work
1937+cd libmysqld/work
1938+ar -x ../libmysqld.a
1939+rm rpl_utility.cc.o sql_binlog.cc.o # Try-and-Error: These modules cause unresolved references
1940+gcc $CFLAGS $LDFLAGS -shared -Wl,-soname,libmysqld.so.0 -o libmysqld.so.0.0.1 \
1941+ *.o \
1942+ -lpthread -lcrypt -laio -lnsl -lssl -lcrypto -lz -lrt -lstdc++ -lm -lc
1943+# this is to check that we built a complete library
1944+cp %{SOURCE9} .
1945+ln -s libmysqld.so.0.0.1 libmysqld.so.0
1946+gcc -I../../include -I../../../%{src_dir}/include $CFLAGS mysql-embedded-check.c libmysqld.so.0
1947+LD_LIBRARY_PATH=. ldd ./a.out
1948+cd ../..
1949+cd ..
1950+
1951+# TODO / FIXME: autotools only?
1952+# make check
1953+
1954+# TODO / FIXME: Test suite is run elsewhere in release builds -
1955+# do we need this for users who want to build from source?
1956+# Also, check whether MTR_BUILD_THREAD=auto would solve all issues
1957+%if %runselftest
1958+ # hack to let 32- and 64-bit tests run concurrently on same build machine
1959+ case `uname -m` in
1960+ ppc64 | s390x | x86_64 | sparc64 )
1961+ MTR_BUILD_THREAD=7
1962+ ;;
1963+ *)
1964+ MTR_BUILD_THREAD=11
1965+ ;;
1966+ esac
1967+ export MTR_BUILD_THREAD
1968+
1969+ # if you want to change which tests are run, look at mysql-5.5-testing.patch too.
1970+ (cd release && make test-bt-fast )
1971+%endif
1972+
1973+%install
1974+RBR=$RPM_BUILD_ROOT
1975+MBD=$RPM_BUILD_DIR/%{src_dir}
1976+[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
1977+
1978+# Ensure that needed directories exists
1979+# TODO / FIXME: needed ? install -d $RBR%{mysqldatadir}/mysql
1980+# TODO / FIXME: needed ? install -d $RBR%{_datadir}/mysql-test
1981+# TODO / FIXME: needed ? install -d $RBR%{_datadir}/mysql/SELinux/RHEL4
1982+# TODO / FIXME: needed ? install -d $RBR%{_includedir}
1983+# TODO / FIXME: needed ? install -d $RBR%{_libdir}
1984+# TODO / FIXME: needed ? install -d $RBR%{_mandir}
1985+# TODO / FIXME: needed ? install -d $RBR%{_sbindir}
1986+
1987+# Install all binaries
1988+(
1989+ cd $MBD/release
1990+ make DESTDIR=$RBR install
1991+)
1992+
1993+# For gcc builds, include libgcc.a in the devel subpackage (BUG 4921). Do
1994+# this in a sub-shell to ensure we don't pollute the install environment
1995+# with compiler bits.
1996+(
1997+ PATH=${MYSQL_BUILD_PATH:-$PATH}
1998+ CC=${MYSQL_BUILD_CC:-${CC:-gcc}}
1999+ CFLAGS=${MYSQL_BUILD_CFLAGS:-${CFLAGS:-$RPM_OPT_FLAGS}}
2000+ if "${CC}" -v 2>&1 | grep '^gcc.version' >/dev/null 2>&1; then
2001+ libgcc=`${CC} ${CFLAGS} --print-libgcc-file`
2002+ if [ -f ${libgcc} ]; then
2003+ mkdir -p $RBR%{_libdir}/mysql
2004+ install -m 644 ${libgcc} $RBR%{_libdir}/mysql/libmygcc.a
2005+ echo "%{_libdir}/mysql/libmygcc.a" >>optional-files-devel
2006+ fi
2007+ fi
2008+)
2009+
2010+# multilib header hacks
2011+# we only apply this to known Red Hat multilib arches, per bug #181335
2012+case `uname -i` in
2013+ i386 | x86_64 | ppc | ppc64 | s390 | s390x | sparc | sparc64 )
2014+ mv $RPM_BUILD_ROOT/usr/include/mysql/my_config.h $RPM_BUILD_ROOT/usr/include/mysql/my_config_`uname -i`.h
2015+ install -m 644 %{SOURCE5} $RPM_BUILD_ROOT/usr/include/mysql/
2016+ ;;
2017+ *)
2018+ ;;
2019+esac
2020+
2021+mkdir -p $RPM_BUILD_ROOT/var/log
2022+touch $RPM_BUILD_ROOT/var/log/mysqld.log
2023+
2024+# List the installed tree for RPM package maintenance purposes.
2025+find $RPM_BUILD_ROOT -print | sed "s|^$RPM_BUILD_ROOT||" | sort > ROOTFILES
2026+
2027+mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d
2028+mkdir -p $RPM_BUILD_ROOT/var/run/mysqld
2029+install -m 0755 -d $RPM_BUILD_ROOT/var/lib/mysql
2030+install -m 0755 %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/mysqld
2031+install -m 0644 %{SOURCE3} $RPM_BUILD_ROOT/etc/my.cnf
2032+# obsolete: mv $RPM_BUILD_ROOT/usr/sql-bench $RPM_BUILD_ROOT%{_datadir}/sql-bench # 'sql-bench' is dropped
2033+# obsolete: mv $RPM_BUILD_ROOT/usr/mysql-test $RPM_BUILD_ROOT%{_datadir}/mysql-test # 'mysql-test' is there already
2034+# 5.1.32 forgets to install the mysql-test README file
2035+# obsolete: install -m 0644 mysql-test/README $RPM_BUILD_ROOT%{_datadir}/mysql-test/README # 'README' is there already
2036+
2037+mv ${RPM_BUILD_ROOT}%{_bindir}/mysqlbug ${RPM_BUILD_ROOT}%{_libdir}/mysql/mysqlbug
2038+install -m 0755 scriptstub ${RPM_BUILD_ROOT}%{_bindir}/mysqlbug
2039+mv ${RPM_BUILD_ROOT}%{_bindir}/mysql_config ${RPM_BUILD_ROOT}%{_libdir}/mysql/mysql_config
2040+install -m 0755 scriptstub ${RPM_BUILD_ROOT}%{_bindir}/mysql_config
2041+
2042+rm -f ${RPM_BUILD_ROOT}%{_libdir}/mysql/libmysqld.a
2043+install -m 0755 release/libmysqld/work/libmysqld.so.0.0.1 ${RPM_BUILD_ROOT}%{_libdir}/mysql/libmysqld.so.0.0.1
2044+ln -s libmysqld.so.0.0.1 ${RPM_BUILD_ROOT}%{_libdir}/mysql/libmysqld.so.0
2045+ln -s libmysqld.so.0 ${RPM_BUILD_ROOT}%{_libdir}/mysql/libmysqld.so
2046+
2047+rm -f ${RPM_BUILD_ROOT}%{_bindir}/comp_err
2048+rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/comp_err.1*
2049+rm -f ${RPM_BUILD_ROOT}%{_bindir}/make_win_binary_distribution
2050+rm -f ${RPM_BUILD_ROOT}%{_bindir}/make_win_src_distribution
2051+rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/make_win_bin_dist.1*
2052+rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/make_win_src_distribution.1*
2053+rm -f ${RPM_BUILD_ROOT}%{_libdir}/mysql/libmysqlclient*.la
2054+rm -f ${RPM_BUILD_ROOT}%{_libdir}/mysql/*.a
2055+rm -f ${RPM_BUILD_ROOT}%{_libdir}/mysql/plugin/*.la
2056+rm -f ${RPM_BUILD_ROOT}%{_libdir}/mysql/plugin/*.a
2057+rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/binary-configure
2058+rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/make_binary_distribution
2059+rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/make_sharedlib_distribution
2060+rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/mi_test_all*
2061+rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/ndb-config-2-node.ini
2062+rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/mysql.server
2063+rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/mysqld_multi.server
2064+rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/MySQL-shared-compat.spec
2065+rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/*.plist
2066+rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/preinstall
2067+rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/postinstall
2068+rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/mysql-*.spec
2069+rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/mysql-log-rotate
2070+rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/ChangeLog
2071+rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/mysql-stress-test.pl.1*
2072+rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/mysql-test-run.pl.1*
2073+
2074+mkdir -p $RPM_BUILD_ROOT/etc/ld.so.conf.d
2075+echo "%{_libdir}/mysql" > $RPM_BUILD_ROOT/etc/ld.so.conf.d/%{name}-%{_arch}.conf
2076+
2077+# The below *only* applies to builds not done by MySQL / Sun / Oracle:
2078+# copy additional docs into build tree so %%doc will find them
2079+# cp %{SOURCE6} README.mysql-docs
2080+
2081+%clean
2082+[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
2083+
2084+%pre -n mysql-server%{product_suffix}
2085+
2086+# Check if we can safely upgrade. An upgrade is only safe if it's from one
2087+# of our RPMs in the same version family.
2088+
2089+# Handle both ways of spelling the capability.
2090+installed=`rpm -q --whatprovides mysql-server 2> /dev/null`
2091+if [ $? -ne 0 -o -z "$installed" ]; then
2092+ installed=`rpm -q --whatprovides MySQL-server 2> /dev/null`
2093+fi
2094+if [ $? -eq 0 -a -n "$installed" ]; then
2095+ installed=`echo $installed | sed 's/\([^ ]*\) .*/\1/'` # Tests have shown duplicated package names
2096+ vendor=`rpm -q --queryformat='%{VENDOR}' "$installed" 2>&1`
2097+ version=`rpm -q --queryformat='%{VERSION}' "$installed" 2>&1`
2098+ myvendor='%{mysql_vendor}'
2099+ myversion='%{mysql_version}'
2100+
2101+ old_family=`echo $version \
2102+ | sed -n -e 's,^\([1-9][0-9]*\.[0-9][0-9]*\)\..*$,\1,p'`
2103+ new_family=`echo $myversion \
2104+ | sed -n -e 's,^\([1-9][0-9]*\.[0-9][0-9]*\)\..*$,\1,p'`
2105+
2106+ [ -z "$vendor" ] && vendor='<unknown>'
2107+ [ -z "$old_family" ] && old_family="<unrecognized version $version>"
2108+ [ -z "$new_family" ] && new_family="<bad package specification: version $myversion>"
2109+
2110+ error_text=
2111+ if [ "$vendor" != "$myvendor" ]; then
2112+ error_text="$error_text
2113+The current MySQL server package is provided by a different
2114+vendor ($vendor) than $myvendor.
2115+Some files may be installed to different locations, including log
2116+files and the service startup script in %{_sysconfdir}/init.d/.
2117+"
2118+ fi
2119+
2120+ if [ "$old_family" != "$new_family" ]; then
2121+ error_text="$error_text
2122+Upgrading directly from MySQL $old_family to MySQL $new_family may not
2123+be safe in all cases. A manual dump and restore using mysqldump is
2124+recommended. It is important to review the MySQL manual's Upgrading
2125+section for version-specific incompatibilities.
2126+"
2127+ fi
2128+
2129+ if [ -n "$error_text" ]; then
2130+ cat <<HERE >&2
2131+
2132+******************************************************************
2133+A MySQL server package ($installed) is installed.
2134+$error_text
2135+A manual upgrade is required.
2136+
2137+- Ensure that you have a complete, working backup of your data and my.cnf
2138+ files
2139+- Shut down the MySQL server cleanly
2140+- Remove the existing MySQL packages. Usually this command will
2141+ list the packages you should remove:
2142+ rpm -qa | grep -i '^mysql-'
2143+
2144+ You may choose to use 'rpm --nodeps -ev <package-name>' to remove
2145+ the package which contains the mysqlclient shared library. The
2146+ library will be reinstalled by the MySQL-shared-compat package.
2147+- Install the new MySQL packages supplied by $myvendor
2148+- Ensure that the MySQL server is started
2149+- Run the 'mysql_upgrade' program
2150+
2151+This is a brief description of the upgrade process. Important details
2152+can be found in the MySQL manual, in the Upgrading section.
2153+******************************************************************
2154+HERE
2155+ exit 1
2156+ fi
2157+fi
2158+
2159+/usr/sbin/groupadd -g 27 -o -r mysql >/dev/null 2>&1 || :
2160+/usr/sbin/useradd -M -N -g mysql -o -r -d /var/lib/mysql -s /bin/bash \
2161+ -c "MySQL Server" -u 27 mysql >/dev/null 2>&1 || :
2162+
2163+%post -n mysql-libs%{product_suffix}
2164+/sbin/ldconfig
2165+
2166+%post -n mysql-server%{product_suffix}
2167+if [ $1 = 1 ]; then
2168+ /sbin/chkconfig --add mysqld
2169+fi
2170+/bin/chmod 0755 /var/lib/mysql
2171+/bin/touch /var/log/mysqld.log
2172+
2173+%preun -n mysql-server%{product_suffix}
2174+if [ $1 = 0 ]; then
2175+ /sbin/service mysqld stop >/dev/null 2>&1
2176+ /sbin/chkconfig --del mysqld
2177+fi
2178+
2179+%postun -n mysql-libs%{product_suffix}
2180+if [ $1 = 0 ] ; then
2181+ /sbin/ldconfig
2182+fi
2183+
2184+%postun -n mysql-server%{product_suffix}
2185+if [ $1 -ge 1 ]; then
2186+ /sbin/service mysqld condrestart >/dev/null 2>&1 || :
2187+fi
2188+
2189+
2190+%files -n mysql%{product_suffix}
2191+%defattr(-,root,root)
2192+%doc %{license_files_server}
2193+
2194+# The below file *only* applies to builds not done by MySQL / Sun / Oracle:
2195+# %doc README.mysql-docs
2196+
2197+%{_bindir}/msql2mysql
2198+%{_bindir}/mysql
2199+%{_bindir}/mysql_config
2200+%{_bindir}/mysql_find_rows
2201+%{_bindir}/mysql_waitpid
2202+%{_bindir}/mysqlaccess
2203+%{_bindir}/mysqlaccess.conf
2204+%{_bindir}/mysqladmin
2205+%{_bindir}/mysqlbinlog
2206+%{_bindir}/mysqlcheck
2207+%{_bindir}/mysqldump
2208+%{_bindir}/mysqlimport
2209+%{_bindir}/mysqlshow
2210+%{_bindir}/mysqlslap
2211+%{_bindir}/my_print_defaults
2212+
2213+%{_mandir}/man1/mysql.1*
2214+%{_mandir}/man1/mysql_config.1*
2215+%{_mandir}/man1/mysql_find_rows.1*
2216+%{_mandir}/man1/mysql_waitpid.1*
2217+%{_mandir}/man1/mysqlaccess.1*
2218+%{_mandir}/man1/mysqladmin.1*
2219+%{_mandir}/man1/mysqldump.1*
2220+%{_mandir}/man1/mysqlshow.1*
2221+%{_mandir}/man1/mysqlslap.1*
2222+%{_mandir}/man1/my_print_defaults.1*
2223+
2224+%{_libdir}/mysql/mysqlbug
2225+%{_libdir}/mysql/mysql_config
2226+
2227+%files -n mysql-libs%{product_suffix}
2228+%defattr(-,root,root)
2229+%doc %{license_files_server}
2230+# although the default my.cnf contains only server settings, we put it in the
2231+# libs package because it can be used for client settings too.
2232+%config(noreplace) /etc/my.cnf
2233+%dir %{_libdir}/mysql
2234+%{_libdir}/mysql/libmysqlclient*.so.*
2235+/etc/ld.so.conf.d/*
2236+
2237+%dir %{_datadir}/mysql
2238+%{_datadir}/mysql/english
2239+%lang(cs) %{_datadir}/mysql/czech
2240+%lang(da) %{_datadir}/mysql/danish
2241+%lang(nl) %{_datadir}/mysql/dutch
2242+%lang(et) %{_datadir}/mysql/estonian
2243+%lang(fr) %{_datadir}/mysql/french
2244+%lang(de) %{_datadir}/mysql/german
2245+%lang(el) %{_datadir}/mysql/greek
2246+%lang(hu) %{_datadir}/mysql/hungarian
2247+%lang(it) %{_datadir}/mysql/italian
2248+%lang(ja) %{_datadir}/mysql/japanese
2249+%lang(ko) %{_datadir}/mysql/korean
2250+%lang(no) %{_datadir}/mysql/norwegian
2251+%lang(no) %{_datadir}/mysql/norwegian-ny
2252+%lang(pl) %{_datadir}/mysql/polish
2253+%lang(pt) %{_datadir}/mysql/portuguese
2254+%lang(ro) %{_datadir}/mysql/romanian
2255+%lang(ru) %{_datadir}/mysql/russian
2256+%lang(sr) %{_datadir}/mysql/serbian
2257+%lang(sk) %{_datadir}/mysql/slovak
2258+%lang(es) %{_datadir}/mysql/spanish
2259+%lang(sv) %{_datadir}/mysql/swedish
2260+%lang(uk) %{_datadir}/mysql/ukrainian
2261+%{_datadir}/mysql/charsets
2262+
2263+%files -n mysql-server%{product_suffix} -f release/support-files/plugins.files
2264+%defattr(-,root,root)
2265+%doc release/support-files/*.cnf
2266+%doc %{_datadir}/info/mysql.info*
2267+%doc %{src_dir}/Docs/ChangeLog
2268+%doc %{src_dir}/Docs/INFO_SRC*
2269+%doc release/Docs/INFO_BIN*
2270+
2271+%{_bindir}/myisamchk
2272+%{_bindir}/myisam_ftdump
2273+%{_bindir}/myisamlog
2274+%{_bindir}/myisampack
2275+%{_bindir}/mysql_convert_table_format
2276+%{_bindir}/mysql_fix_extensions
2277+%{_bindir}/mysql_install_db
2278+%{_bindir}/mysql_plugin
2279+%{_bindir}/mysql_secure_installation
2280+%if %{commercial}
2281+%else
2282+%{_bindir}/mysql_setpermission
2283+%endif
2284+%{_bindir}/mysql_tzinfo_to_sql
2285+%{_bindir}/mysql_upgrade
2286+%{_bindir}/mysql_zap
2287+%{_bindir}/mysqlbug
2288+%{_bindir}/mysqldumpslow
2289+%{_bindir}/mysqld_multi
2290+%{_bindir}/mysqld_safe
2291+%{_bindir}/mysqlhotcopy
2292+%{_bindir}/mysqltest
2293+%{_bindir}/innochecksum
2294+%{_bindir}/perror
2295+%{_bindir}/replace
2296+%{_bindir}/resolve_stack_dump
2297+%{_bindir}/resolveip
2298+
2299+/usr/libexec/mysqld
2300+/usr/libexec/mysqld-debug
2301+%{_libdir}/mysql/plugin/daemon_example.ini
2302+
2303+%if %{WITH_TCMALLOC}
2304+%{_libdir}/mysql/%{malloc_lib_target}
2305+%endif
2306+
2307+# obsolete by "-f release/support-files/plugins.files" above
2308+# %{_libdir}/mysql/plugin
2309+
2310+%{_mandir}/man1/msql2mysql.1*
2311+%{_mandir}/man1/myisamchk.1*
2312+%{_mandir}/man1/myisamlog.1*
2313+%{_mandir}/man1/myisampack.1*
2314+%{_mandir}/man1/mysql_convert_table_format.1*
2315+%{_mandir}/man1/myisam_ftdump.1*
2316+%{_mandir}/man1/mysql.server.1*
2317+%{_mandir}/man1/mysql_fix_extensions.1*
2318+%{_mandir}/man1/mysql_install_db.1*
2319+%{_mandir}/man1/mysql_plugin.1*
2320+%{_mandir}/man1/mysql_secure_installation.1*
2321+%{_mandir}/man1/mysql_upgrade.1*
2322+%{_mandir}/man1/mysql_zap.1*
2323+%{_mandir}/man1/mysqlbug.1*
2324+%{_mandir}/man1/mysqldumpslow.1*
2325+%{_mandir}/man1/mysqlbinlog.1*
2326+%{_mandir}/man1/mysqlcheck.1*
2327+%{_mandir}/man1/mysqld_multi.1*
2328+%{_mandir}/man1/mysqld_safe.1*
2329+%{_mandir}/man1/mysqlhotcopy.1*
2330+%{_mandir}/man1/mysqlimport.1*
2331+%{_mandir}/man1/mysqlman.1*
2332+%if %{commercial}
2333+%else
2334+%{_mandir}/man1/mysql_setpermission.1*
2335+%endif
2336+%{_mandir}/man1/mysqltest.1*
2337+%{_mandir}/man1/innochecksum.1*
2338+%{_mandir}/man1/perror.1*
2339+%{_mandir}/man1/replace.1*
2340+%{_mandir}/man1/resolve_stack_dump.1*
2341+%{_mandir}/man1/resolveip.1*
2342+%{_mandir}/man1/mysql_tzinfo_to_sql.1*
2343+%{_mandir}/man8/mysqld.8*
2344+
2345+%{_datadir}/mysql/errmsg-utf8.txt
2346+%{_datadir}/mysql/fill_help_tables.sql
2347+%{_datadir}/mysql/magic
2348+%{_datadir}/mysql/mysql_system_tables.sql
2349+%{_datadir}/mysql/mysql_system_tables_data.sql
2350+%{_datadir}/mysql/mysql_test_data_timezone.sql
2351+%{_datadir}/mysql/my-*.cnf
2352+%{_datadir}/mysql/config.*.ini
2353+
2354+/etc/rc.d/init.d/mysqld
2355+%attr(0755,mysql,mysql) %dir /var/run/mysqld
2356+%attr(0755,mysql,mysql) %dir /var/lib/mysql
2357+%attr(0640,mysql,mysql) %config(noreplace) %verify(not md5 size mtime) /var/log/mysqld.log
2358+
2359+# TODO / FIXME: Do we need "libmygcc.a"? If yes, append "-f optional-files-devel"
2360+# and fix the "rm -f" list in the "install" section.
2361+%files -n mysql-devel%{product_suffix}
2362+%defattr(-,root,root)
2363+/usr/include/mysql
2364+/usr/share/aclocal/mysql.m4
2365+%{_libdir}/mysql/libmysqlclient*.so
2366+
2367+%files -n mysql-embedded%{product_suffix}
2368+%defattr(-,root,root)
2369+%doc %{license_files_server}
2370+%{_libdir}/mysql/libmysqld.so.*
2371+%{_bindir}/mysql_embedded
2372+
2373+%files -n mysql-embedded-devel%{product_suffix}
2374+%defattr(-,root,root)
2375+%{_libdir}/mysql/libmysqld.so
2376+%{_bindir}/mysql_client_test_embedded
2377+%{_bindir}/mysqltest_embedded
2378+%{_mandir}/man1/mysql_client_test_embedded.1*
2379+%{_mandir}/man1/mysqltest_embedded.1*
2380+
2381+%files -n mysql-test%{product_suffix}
2382+%defattr(-,root,root)
2383+%{_bindir}/mysql_client_test
2384+%attr(-,mysql,mysql) %{_datadir}/mysql-test
2385+
2386+%{_mandir}/man1/mysql_client_test.1*
2387+
2388+%changelog
2389+* Tue Sep 18 2012 Joerg Bruehe <joerg.bruehe@oracle.com>
2390+- Restrict the vendor check to Oracle: There is no history here
2391+ which we have to allow for.
2392+
2393+* Thu Jul 26 2012 Joerg Bruehe <joerg.bruehe@oracle.com>
2394+- Add the vendor and release series checks from the traditional MySQL RPM
2395+ spec file, to protect against errors happening during upgrades.
2396+- Do some code alignment with the traditional MySQL RPM spec file,
2397+ to make synchronous maintenance (and possibly even integration?) easier.
2398+
2399+* Mon Feb 13 2012 Joerg Bruehe <joerg.bruehe@oracle.com>
2400+- Add "Provides:" lines for the generic names of the subpackages,
2401+ independent of "product_suffix".
2402+
2403+* Tue Feb 7 2012 Joerg Bruehe <joerg.bruehe@oracle.com>
2404+- Make "mysql_setpermission" and its man page appear in GPL builds only.
2405+
2406+* Thu Nov 24 2011 Joerg Bruehe <joerg.bruehe@oracle.com>
2407+- Add two patches (#18 + #19) regarding the test suite;
2408+ version 1 of "mysql-test-run.pl" had to go because the auto-detection
2409+ of Perl dependencies does not handle differences between run directory
2410+ and delivery location.
2411+
2412+* Thu Nov 3 2011 Joerg Bruehe <joerg.bruehe@oracle.com>
2413+- Adapt from MySQL 5.1 to 5.5, tested using 5.5.17:
2414+ - Done by the MySQL Build Team at Oracle:
2415+ set as packager, set copyright owner and related info;
2416+ - handle command line options, allowing different configurations, platforms, ...
2417+ - configurations will show up in the file name as "product_suffix",
2418+ - use "-n" for all subpackage specifications,
2419+ - license may be GPL or commercial, mention that in the description,
2420+ the license output and the included license files will vary,
2421+ - commercial is "nosource",
2422+ - improve "requires" listings for different platforms,
2423+ - explicitly use "product_suffix" in the "requires" entries;
2424+ - adapt to 5.5 changes in features and function:
2425+ - remove "mysql-bench" package (files are outdated, not maintained),
2426+ - no InnoDB plugin,
2427+ - the set of plugins will vary by configuration, to control the "server"
2428+ package contents use "-f release/support-files/plugins.files" in the
2429+ "files" section,
2430+ - remove "mysqlmanager", "mysql_fix_privilege_tables",
2431+ - add "mysql_embedded", "mysql-plugin", "mysqlaccess.conf", "magic",
2432+ - "errmsg.txt" is now in UTF8: "errmsg-utf8.txt",
2433+ - adapt patches to changed code where needed, rename these to include "5.5",
2434+ - stop using patches which are not applicable to 5.5;
2435+ - 5.5 uses a different way of building:
2436+ - autotools are replaced by cmake,
2437+ - both a "release" and a "debug" server are built in separate subtrees
2438+ ("out of source"!), this also affects path names in further handling,
2439+ - the debug server is added to the "server" subpackage,
2440+ - add "mysql-5.5-libdir.patch" to handle file placement at user site.
2441+
2442+* Mon Dec 20 2010 Tom Lane <tgl@redhat.com> 5.1.52-1.1
2443+- Update to MySQL 5.1.52, for various fixes described at
2444+ http://dev.mysql.com/doc/refman/5.1/en/news-5-1-52.html
2445+ including numerous small security issues
2446+Resolves: #652553
2447+- Sync with current Fedora package; this includes:
2448+- Duplicate COPYING and EXCEPTIONS-CLIENT in -libs and -embedded subpackages,
2449+ to ensure they are available when any subset of mysql RPMs are installed,
2450+ per revised packaging guidelines
2451+- Allow init script's STARTTIMEOUT/STOPTIMEOUT to be overridden from sysconfig
2452+
2453+* Thu Jul 15 2010 Tom Lane <tgl@redhat.com> 5.1.47-4
2454+- Add backported patch for CVE-2010-2008 (upstream bug 53804)
2455+Resolves: #614215
2456+- Add BuildRequires perl(Time::HiRes) ... seems to no longer be installed
2457+ by just pulling in perl.
2458+
2459+* Mon Jun 28 2010 Tom Lane <tgl@redhat.com> 5.1.47-3
2460+- Add -p "$mypidfile" to initscript's status call to improve corner cases.
2461+ (Note: can't be fixed in Fedora until 595597 is fixed there.)
2462+Resolves: #596008
2463+
2464+* Mon Jun 7 2010 Tom Lane <tgl@redhat.com> 5.1.47-2
2465+- Add back "partition" storage engine
2466+Resolves: #598585
2467+- Fix broken "federated" storage engine plugin
2468+Resolves: #587170
2469+- Read all certificates in SSL certificate files, to support chained certs
2470+Resolves: #598656
2471+
2472+* Mon May 24 2010 Tom Lane <tgl@redhat.com> 5.1.47-1
2473+- Update to MySQL 5.1.47, for various fixes described at
2474+ http://dev.mysql.com/doc/refman/5.1/en/news-5-1-47.html
2475+ http://dev.mysql.com/doc/refman/5.1/en/news-5-1-46.html
2476+ http://dev.mysql.com/doc/refman/5.1/en/news-5-1-45.html
2477+ including fixes for CVE-2010-1621, CVE-2010-1626,
2478+ CVE-2010-1848, CVE-2010-1849, CVE-2010-1850
2479+Resolves: #590598
2480+- Create mysql group explicitly in pre-server script, to ensure correct GID
2481+
2482+* Mon Mar 8 2010 Tom Lane <tgl@redhat.com> 5.1.44-2
2483+- Update to MySQL 5.1.44, for various fixes described at
2484+ http://dev.mysql.com/doc/refman/5.1/en/news-5-1-44.html
2485+Resolves: #565554
2486+- Remove mysql.info, which is not freely redistributable
2487+Related: #560181
2488+- Revert broken upstream fix for their bug 45058
2489+Related: #566547
2490+- Bring init script into some modicum of compliance with Fedora/LSB standards
2491+Resolves: #557711
2492+Resolves: #562749
2493+
2494+* Mon Feb 15 2010 Tom Lane <tgl@redhat.com> 5.1.43-2
2495+- Update to MySQL 5.1.43, for various fixes described at
2496+ http://dev.mysql.com/doc/refman/5.1/en/news-5-1-43.html
2497+Resolves: #565554
2498+- Remove mysql-cluster, which is no longer supported by upstream in this
2499+ source distribution. If we want it we'll need a separate SRPM for it.
2500+Resolves: #565210
2501+
2502+* Fri Jan 29 2010 Tom Lane <tgl@redhat.com> 5.1.42-7
2503+- Add backported patch for CVE-2008-7247 (upstream bug 39277)
2504+Resolves: #549329
2505+- Use non-expired certificates for SSL testing (upstream bug 50702)
2506+
2507+* Tue Jan 26 2010 Tom Lane <tgl@redhat.com> 5.1.42-6
2508+- Emit explicit error message if user tries to build RPM as root
2509+Resolves: #558915
2510+
2511+* Wed Jan 20 2010 Tom Lane <tgl@redhat.com> 5.1.42-5
2512+- Correct Source0: tag and comment to reflect how to get the tarball
2513+
2514+* Fri Jan 8 2010 Tom Lane <tgl@redhat.com> 5.1.42-4
2515+- Sync with current Fedora build, including:
2516+- Update to MySQL 5.1.42, for various fixes described at
2517+ http://dev.mysql.com/doc/refman/5.1/en/news-5-1-42.html
2518+- Disable symbolic links by default in /etc/my.cnf
2519+Resolves: #553653
2520+- Remove static libraries (.a files) from package, per packaging guidelines
2521+- Change %%define to %%global, per packaging guidelines
2522+- Disable building the innodb plugin; it tickles assorted gcc bugs and
2523+ doesn't seem entirely ready for prime time anyway.
2524+Resolves: #553632
2525+- Start mysqld_safe with --basedir=/usr, to avoid unwanted SELinux messages
2526+ (see 547485)
2527+- Stop waiting during "service mysqld start" if mysqld_safe exits
2528+Resolves: #544095
2529+
2530+* Mon Nov 23 2009 Tom Lane <tgl@redhat.com> 5.1.41-1
2531+- Update to MySQL 5.1.41, for various fixes described at
2532+ http://dev.mysql.com/doc/refman/5.1/en/news-5-1-41.html
2533+ including fixes for CVE-2009-4019
2534+Resolves: #549327
2535+- Don't set old_passwords=1; we aren't being bug-compatible with 3.23 anymore
2536+Resolves: #540735
2537+
2538+* Tue Nov 10 2009 Tom Lane <tgl@redhat.com> 5.1.40-1
2539+- Update to MySQL 5.1.40, for various fixes described at
2540+ http://dev.mysql.com/doc/refman/5.1/en/news-5-1-40.html
2541+- Do not force the --log-error setting in mysqld init script
2542+Resolves: #533736
2543+
2544+* Sat Oct 17 2009 Tom Lane <tgl@redhat.com> 5.1.39-4
2545+- Replace kluge fix for ndbd sparc crash with a real fix (mysql bug 48132)
2546+
2547+* Thu Oct 15 2009 Tom Lane <tgl@redhat.com> 5.1.39-3
2548+- Work around two different compiler bugs on sparc, one by backing off
2549+ optimization from -O2 to -O1, and the other with a klugy patch
2550+Related: #529298, #529299
2551+- Clean up bogosity in multilib stub header support: ia64 should not be
2552+ listed (it's not multilib), sparc and sparc64 should be
2553+
2554+* Wed Sep 23 2009 Tom Lane <tgl@redhat.com> 5.1.39-2
2555+- Work around upstream bug 46895 by disabling outfile_loaddata test
2556+
2557+* Tue Sep 22 2009 Tom Lane <tgl@redhat.com> 5.1.39-1
2558+- Update to MySQL 5.1.39, for various fixes described at
2559+ http://dev.mysql.com/doc/refman/5.1/en/news-5-1-39.html
2560+
2561+* Mon Aug 31 2009 Tom Lane <tgl@redhat.com> 5.1.37-5
2562+- Work around unportable assumptions about stpcpy(); re-enable main.mysql test
2563+- Clean up some obsolete parameters to the configure script
2564+
2565+* Sat Aug 29 2009 Tom Lane <tgl@redhat.com> 5.1.37-4
2566+- Remove one misguided patch; turns out I was chasing a glibc bug
2567+- Temporarily disable "main.mysql" test; there's something broken there too,
2568+ but we need to get mysql built in rawhide for dependency reasons
2569+
2570+* Fri Aug 21 2009 Tomas Mraz <tmraz@redhat.com> - 5.1.37-3
2571+- rebuilt with new openssl
2572+
2573+* Fri Aug 14 2009 Tom Lane <tgl@redhat.com> 5.1.37-2
2574+- Add a couple of patches to improve the probability of the regression tests
2575+ completing in koji builds
2576+
2577+* Sun Aug 2 2009 Tom Lane <tgl@redhat.com> 5.1.37-1
2578+- Update to MySQL 5.1.37, for various fixes described at
2579+ http://dev.mysql.com/doc/refman/5.1/en/news-5-1-37.html
2580+
2581+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.1.36-2
2582+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
2583+
2584+* Fri Jul 10 2009 Tom Lane <tgl@redhat.com> 5.1.36-1
2585+- Update to MySQL 5.1.36, for various fixes described at
2586+ http://dev.mysql.com/doc/refman/5.1/en/news-5-1-36.html
2587+
2588+* Sat Jun 6 2009 Tom Lane <tgl@redhat.com> 5.1.35-1
2589+- Update to MySQL 5.1.35, for various fixes described at
2590+ http://dev.mysql.com/doc/refman/5.1/en/news-5-1-35.html
2591+- Ensure that /var/lib/mysql is created with the right SELinux context
2592+Resolves: #502966
2593+
2594+* Fri May 15 2009 Tom Lane <tgl@redhat.com> 5.1.34-1
2595+- Update to MySQL 5.1.34, for various fixes described at
2596+ http://dev.mysql.com/doc/refman/5.1/en/news-5-1-34.html
2597+- Increase startup timeout per bug #472222
2598+
2599+* Wed Apr 15 2009 Tom Lane <tgl@redhat.com> 5.1.33-2
2600+- Increase stack size of ndbd threads for safety's sake.
2601+Related: #494631
2602+
2603+* Tue Apr 7 2009 Tom Lane <tgl@redhat.com> 5.1.33-1
2604+- Update to MySQL 5.1.33.
2605+- Disable use of pthread_setschedparam; doesn't work the way code expects.
2606+Related: #477624
2607+
2608+* Wed Mar 4 2009 Tom Lane <tgl@redhat.com> 5.1.32-1
2609+- Update to MySQL 5.1.32.
2610+
2611+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.1.31-2
2612+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
2613+
2614+* Fri Feb 13 2009 Tom Lane <tgl@redhat.com> 5.1.31-1
2615+- Update to MySQL 5.1.31.
2616+
2617+* Thu Jan 22 2009 Tom Lane <tgl@redhat.com> 5.1.30-2
2618+- hm, apparently --with-innodb and --with-ndbcluster are still needed
2619+ even though no longer documented ...
2620+
2621+* Thu Jan 22 2009 Tom Lane <tgl@redhat.com> 5.1.30-1
2622+- Update to MySQL 5.1.30. Note that this includes an ABI break for
2623+ libmysqlclient (it's now got .so major version 16).
2624+- This also updates mysql for new openssl build
2625+
2626+* Wed Oct 1 2008 Tom Lane <tgl@redhat.com> 5.0.67-2
2627+- Build the "embedded server" library, and package it in a new sub-RPM
2628+ mysql-embedded, along with mysql-embedded-devel for devel support files.
2629+Resolves: #149829
2630+
2631+* Sat Aug 23 2008 Tom Lane <tgl@redhat.com> 5.0.67-1
2632+- Update to mysql version 5.0.67
2633+- Move mysql_config's man page to base package, again (apparently I synced
2634+ that change the wrong way while importing specfile changes for ndbcluster)
2635+
2636+* Sun Jul 27 2008 Tom Lane <tgl@redhat.com> 5.0.51a-2
2637+- Enable ndbcluster support
2638+Resolves: #163758
2639+- Suppress odd crash messages during package build, caused by trying to
2640+ build dbug manual (which we don't install anyway) with dbug disabled
2641+Resolves: #437053
2642+- Improve mysql.init to pass configured datadir to mysql_install_db,
2643+ and to force user=mysql for both mysql_install_db and mysqld_safe.
2644+Related: #450178
2645+
2646+* Mon Mar 3 2008 Tom Lane <tgl@redhat.com> 5.0.51a-1
2647+- Update to mysql version 5.0.51a
2648+
2649+* Mon Mar 3 2008 Tom Lane <tgl@redhat.com> 5.0.45-11
2650+- Fix mysql-stack-guard patch to work correctly on IA64
2651+- Fix mysql.init to wait correctly when socket is not in default place
2652+Related: #435494
2653+
2654+* Mon Mar 03 2008 Dennis Gilmore <dennis@ausil.us> 5.0.45-10
2655+- add sparc64 to 64 bit arches for test suite checking
2656+- add sparc, sparcv9 and sparc64 to multilib handling
2657+
2658+* Thu Feb 28 2008 Tom Lane <tgl@redhat.com> 5.0.45-9
2659+- Fix the stack overflow problem encountered in January. It seems the real
2660+issue is that the buildfarm machines were moved to RHEL5, which uses 64K not
2661+4K pages on PPC, and because RHEL5 takes the guard area out of the requested
2662+thread stack size we no longer had enough headroom.
2663+Related: #435337
2664+
2665+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 5.0.45-8
2666+- Autorebuild for GCC 4.3
2667+
2668+* Tue Jan 8 2008 Tom Lane <tgl@redhat.com> 5.0.45-7
2669+- Unbelievable ... upstream still thinks that it's a good idea to have a
2670+ regression test that is guaranteed to begin failing come January 1.
2671+- ... and it seems we need to raise STACK_MIN_SIZE again too.
2672+
2673+* Thu Dec 13 2007 Tom Lane <tgl@redhat.com> 5.0.45-6
2674+- Back-port upstream fixes for CVE-2007-5925, CVE-2007-5969, CVE-2007-6303.
2675+Related: #422211
2676+
2677+* Wed Dec 5 2007 Tom Lane <tgl@redhat.com> 5.0.45-5
2678+- Rebuild for new openssl
2679+
2680+* Sat Aug 25 2007 Tom Lane <tgl@redhat.com> 5.0.45-4
2681+- Seems we need explicit BuildRequires on gawk and procps now
2682+- Rebuild to fix Fedora toolchain issues
2683+
2684+* Sun Aug 12 2007 Tom Lane <tgl@redhat.com> 5.0.45-3
2685+- Recent perl changes in rawhide mean we need a more specific BuildRequires
2686+
2687+* Thu Aug 2 2007 Tom Lane <tgl@redhat.com> 5.0.45-2
2688+- Update License tag to match code.
2689+- Work around recent Fedora change that makes "open" a macro name.
2690+
2691+* Sun Jul 22 2007 Tom Lane <tgl@redhat.com> 5.0.45-1
2692+- Update to MySQL 5.0.45
2693+Resolves: #246535
2694+- Move mysql_config's man page to base package
2695+Resolves: #245770
2696+- move my_print_defaults to base RPM, for consistency with Stacks packaging
2697+- mysql user is no longer deleted at RPM uninstall
2698+Resolves: #241912
2699+
2700+* Thu Mar 29 2007 Tom Lane <tgl@redhat.com> 5.0.37-2
2701+- Use a less hacky method of getting default values in initscript
2702+Related: #233771, #194596
2703+- Improve packaging of mysql-libs per suggestions from Remi Collet
2704+Resolves: #233731
2705+- Update default /etc/my.cnf ([mysql.server] has been bogus for a long time)
2706+
2707+* Mon Mar 12 2007 Tom Lane <tgl@redhat.com> 5.0.37-1
2708+- Update to MySQL 5.0.37
2709+Resolves: #231838
2710+- Put client library into a separate mysql-libs RPM to reduce dependencies
2711+Resolves: #205630
2712+
2713+* Fri Feb 9 2007 Tom Lane <tgl@redhat.com> 5.0.33-1
2714+- Update to MySQL 5.0.33
2715+- Install band-aid fix for "view" regression test designed to fail after 2006
2716+- Don't chmod -R the entire database directory tree on every startup
2717+Related: #221085
2718+- Fix unsafe use of install-info
2719+Resolves: #223713
2720+- Cope with new automake in F7
2721+Resolves: #224171
2722+
2723+* Thu Nov 9 2006 Tom Lane <tgl@redhat.com> 5.0.27-1
2724+- Update to MySQL 5.0.27 (see CVE-2006-4031, CVE-2006-4226, CVE-2006-4227)
2725+Resolves: #202247, #202675, #203427, #203428, #203432, #203434, #208641
2726+- Fix init script to return status 1 on server start timeout
2727+Resolves: #203910
2728+- Move mysqldumpslow from base package to mysql-server
2729+Resolves: #193559
2730+- Adjust link options for BDB module
2731+Resolves: #199368
2732+
2733+* Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 5.0.22-2.1
2734+- rebuild
2735+
2736+* Sat Jun 10 2006 Tom Lane <tgl@redhat.com> 5.0.22-2
2737+- Work around brew's tendency not to clean up failed builds completely,
2738+ by adding code in mysql-testing.patch to kill leftover mysql daemons.
2739+
2740+* Thu Jun 8 2006 Tom Lane <tgl@redhat.com> 5.0.22-1
2741+- Update to MySQL 5.0.22 (fixes CVE-2006-2753)
2742+- Install temporary workaround for gcc bug on s390x (bz #193912)
2743+
2744+* Tue May 2 2006 Tom Lane <tgl@redhat.com> 5.0.21-2
2745+- Fix bogus perl Requires for mysql-test
2746+
2747+* Mon May 1 2006 Tom Lane <tgl@redhat.com> 5.0.21-1
2748+- Update to MySQL 5.0.21
2749+
2750+* Mon Mar 27 2006 Tom Lane <tgl@redhat.com> 5.0.18-4
2751+- Modify multilib header hack to not break non-RH arches, per bug #181335
2752+- Remove logrotate script, per bug #180639.
2753+- Add a new mysql-test RPM to carry the regression test files;
2754+ hack up test scripts as needed to make them run in /usr/share/mysql-test.
2755+
2756+* Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 5.0.18-2.1
2757+- bump again for double-long bug on ppc(64)
2758+
2759+* Thu Feb 9 2006 Tom Lane <tgl@redhat.com> 5.0.18-2
2760+- err-log option has been renamed to log-error, fix my.cnf and initscript
2761+
2762+* Tue Feb 07 2006 Jesse Keating <jkeating@redhat.com> - 5.0.18-1.1
2763+- rebuilt for new gcc4.1 snapshot and glibc changes
2764+
2765+* Thu Jan 5 2006 Tom Lane <tgl@redhat.com> 5.0.18-1
2766+- Update to MySQL 5.0.18
2767+
2768+* Thu Dec 15 2005 Tom Lane <tgl@redhat.com> 5.0.16-4
2769+- fix my_config.h for ppc platforms
2770+
2771+* Thu Dec 15 2005 Tom Lane <tgl@redhat.com> 5.0.16-3
2772+- my_config.h needs to guard against 64-bit platforms that also define the
2773+ 32-bit symbol
2774+
2775+* Wed Dec 14 2005 Tom Lane <tgl@redhat.com> 5.0.16-2
2776+- oops, looks like we want uname -i not uname -m
2777+
2778+* Mon Dec 12 2005 Tom Lane <tgl@redhat.com> 5.0.16-1
2779+- Update to MySQL 5.0.16
2780+- Add EXCEPTIONS-CLIENT license info to the shipped documentation
2781+- Make my_config.h architecture-independent for multilib installs;
2782+ put the original my_config.h into my_config_$ARCH.h
2783+- Add -fwrapv to CFLAGS so that gcc 4.1 doesn't break it
2784+
2785+* Fri Dec 09 2005 Jesse Keating <jkeating@redhat.com>
2786+- rebuilt
2787+
2788+* Mon Nov 14 2005 Tom Lane <tgl@redhat.com> 5.0.15-3
2789+- Make stop script wait for daemon process to disappear (bz#172426)
2790+
2791+* Wed Nov 9 2005 Tom Lane <tgl@redhat.com> 5.0.15-2
2792+- Rebuild due to openssl library update.
2793+
2794+* Thu Nov 3 2005 Tom Lane <tgl@redhat.com> 5.0.15-1
2795+- Update to MySQL 5.0.15 (scratch build for now)
2796+
2797+* Wed Oct 5 2005 Tom Lane <tgl@redhat.com> 4.1.14-1
2798+- Update to MySQL 4.1.14
2799+
2800+* Tue Aug 23 2005 Tom Lane <tgl@redhat.com> 4.1.12-3
2801+- Use politically correct patch name.
2802+
2803+* Tue Jul 12 2005 Tom Lane <tgl@redhat.com> 4.1.12-2
2804+- Fix buffer overflow newly exposed in isam code; it's the same issue
2805+ previously found in myisam, and not very exciting, but I'm tired of
2806+ seeing build warnings.
2807+
2808+* Mon Jul 11 2005 Tom Lane <tgl@redhat.com> 4.1.12-1
2809+- Update to MySQL 4.1.12 (includes a fix for bz#158688, bz#158689)
2810+- Extend mysql-test-ssl.patch to solve rpl_openssl test failure (bz#155850)
2811+- Update mysql-lock-ssl.patch to match the upstream committed version
2812+- Add --with-isam to re-enable the old ISAM table type, per bz#159262
2813+- Add dependency on openssl-devel per bz#159569
2814+- Remove manual.txt, as upstream decided not to ship it anymore;
2815+ it was redundant with the mysql.info file anyway.
2816+
2817+* Mon May 9 2005 Tom Lane <tgl@redhat.com> 4.1.11-4
2818+- Include proper locking for OpenSSL in the server, per bz#155850
2819+
2820+* Mon Apr 25 2005 Tom Lane <tgl@redhat.com> 4.1.11-3
2821+- Enable openssl tests during build, per bz#155850
2822+- Might as well turn on --disable-dependency-tracking
2823+
2824+* Fri Apr 8 2005 Tom Lane <tgl@redhat.com> 4.1.11-2
2825+- Avoid dependency on <asm/atomic.h>, cause it won't build anymore on ia64.
2826+ This is probably a cleaner solution for bz#143537, too.
2827+
2828+* Thu Apr 7 2005 Tom Lane <tgl@redhat.com> 4.1.11-1
2829+- Update to MySQL 4.1.11 to fix bz#152911 as well as other issues
2830+- Move perl-DBI, perl-DBD-MySQL dependencies to server package (bz#154123)
2831+- Override configure thread library test to suppress HAVE_LINUXTHREADS check
2832+- Fix BDB failure on s390x (bz#143537)
2833+- At last we can enable "make test" on all arches
2834+
2835+* Fri Mar 11 2005 Tom Lane <tgl@redhat.com> 4.1.10a-1
2836+- Update to MySQL 4.1.10a to fix security vulnerabilities (bz#150868,
2837+ for CAN-2005-0711, and bz#150871 for CAN-2005-0709, CAN-2005-0710).
2838+
2839+* Sun Mar 6 2005 Tom Lane <tgl@redhat.com> 4.1.10-3
2840+- Fix package Requires: interdependencies.
2841+
2842+* Sat Mar 5 2005 Tom Lane <tgl@redhat.com> 4.1.10-2
2843+- Need -fno-strict-aliasing in at least one place, probably more.
2844+- Work around some C spec violations in mysql.
2845+
2846+* Fri Feb 18 2005 Tom Lane <tgl@redhat.com> 4.1.10-1
2847+- Update to MySQL 4.1.10.
2848+
2849+* Sat Jan 15 2005 Tom Lane <tgl@redhat.com> 4.1.9-1
2850+- Update to MySQL 4.1.9.
2851+
2852+* Wed Jan 12 2005 Tom Lane <tgl@redhat.com> 4.1.7-10
2853+- Don't assume /etc/my.cnf will specify pid-file (bz#143724)
2854+
2855+* Wed Jan 12 2005 Tim Waugh <twaugh@redhat.com> 4.1.7-9
2856+- Rebuilt for new readline.
2857+
2858+* Tue Dec 21 2004 Tom Lane <tgl@redhat.com> 4.1.7-8
2859+- Run make test on all archs except s390x (which seems to have a bdb issue)
2860+
2861+* Mon Dec 13 2004 Tom Lane <tgl@redhat.com> 4.1.7-7
2862+- Suppress someone's silly idea that libtool overhead can be skipped
2863+
2864+* Sun Dec 12 2004 Tom Lane <tgl@redhat.com> 4.1.7-6
2865+- Fix init script to not need a valid username for startup check (bz#142328)
2866+- Fix init script to honor settings appearing in /etc/my.cnf (bz#76051)
2867+- Enable SSL (bz#142032)
2868+
2869+* Thu Dec 2 2004 Tom Lane <tgl@redhat.com> 4.1.7-5
2870+- Add a restorecon to keep the mysql.log file in the right context (bz#143887)
2871+
2872+* Tue Nov 23 2004 Tom Lane <tgl@redhat.com> 4.1.7-4
2873+- Turn off old_passwords in default /etc/my.cnf file, for better compatibility
2874+ with mysql 3.x clients (per suggestion from Joe Orton).
2875+
2876+* Fri Oct 29 2004 Tom Lane <tgl@redhat.com> 4.1.7-3
2877+- Handle ldconfig more cleanly (put a file in /etc/ld.so.conf.d/).
2878+
2879+* Thu Oct 28 2004 Tom Lane <tgl@redhat.com> 4.1.7-2
2880+- rebuild in devel branch
2881+
2882+* Wed Oct 27 2004 Tom Lane <tgl@redhat.com> 4.1.7-1
2883+- Update to MySQL 4.1.x.
2884+
2885+* Tue Oct 12 2004 Tom Lane <tgl@redhat.com> 3.23.58-13
2886+- fix security issues CAN-2004-0835, CAN-2004-0836, CAN-2004-0837
2887+ (bugs #135372, 135375, 135387)
2888+- fix privilege escalation on GRANT ALL ON `Foo\_Bar` (CAN-2004-0957)
2889+
2890+* Wed Oct 06 2004 Tom Lane <tgl@redhat.com> 3.23.58-12
2891+- fix multilib problem with mysqlbug and mysql_config
2892+- adjust chkconfig priority per bug #128852
2893+- remove bogus quoting per bug #129409 (MySQL 4.0 has done likewise)
2894+- add sleep to mysql.init restart(); may or may not fix bug #133993
2895+
2896+* Tue Oct 05 2004 Tom Lane <tgl@redhat.com> 3.23.58-11
2897+- fix low-priority security issues CAN-2004-0388, CAN-2004-0381, CAN-2004-0457
2898+ (bugs #119442, 125991, 130347, 130348)
2899+- fix bug with dropping databases under recent kernels (bug #124352)
2900+
2901+* Tue Jun 15 2004 Elliot Lee <sopwith@redhat.com> 3.23.58-10
2902+- rebuilt
2903+
2904+* Sat Apr 17 2004 Warren Togami <wtogami@redhat.com> 3.23.58-9
2905+- remove redundant INSTALL-SOURCE, manual.*
2906+- compress manual.txt.bz2
2907+- BR time
2908+
2909+* Tue Mar 16 2004 Tom Lane <tgl@redhat.com> 3.23.58-8
2910+- repair logfile attributes in %%files, per bug #102190
2911+- repair quoting problem in mysqlhotcopy, per bug #112693
2912+- repair missing flush in mysql_setpermission, per bug #113960
2913+- repair broken error message printf, per bug #115165
2914+- delete mysql user during uninstall, per bug #117017
2915+- rebuilt
2916+
2917+* Tue Mar 02 2004 Elliot Lee <sopwith@redhat.com>
2918+- rebuilt
2919+
2920+* Tue Feb 24 2004 Tom Lane <tgl@redhat.com>
2921+- fix chown syntax in mysql.init
2922+- rebuild
2923+
2924+* Fri Feb 13 2004 Elliot Lee <sopwith@redhat.com>
2925+- rebuilt
2926+
2927+* Tue Nov 18 2003 Kim Ho <kho@redhat.com> 3.23.58-5
2928+- update mysql.init to use anonymous user (UNKNOWN_MYSQL_USER) for
2929+ pinging mysql server (#108779)
2930+
2931+* Mon Oct 27 2003 Kim Ho <kho@redhat.com> 3.23.58-4
2932+- update mysql.init to wait (max 10 seconds) for mysql server to
2933+ start (#58732)
2934+
2935+* Mon Oct 27 2003 Patrick Macdonald <patrickm@redhat.com> 3.23.58-3
2936+- re-enable Berkeley DB support (#106832)
2937+- re-enable ia64 testing
2938+
2939+* Fri Sep 19 2003 Patrick Macdonald <patrickm@redhat.com> 3.23.58-2
2940+- rebuilt
2941+
2942+* Mon Sep 15 2003 Patrick Macdonald <patrickm@redhat.com> 3.23.58-1
2943+- upgrade to 3.23.58 for security fix
2944+
2945+* Tue Aug 26 2003 Patrick Macdonald <patrickm@redhat.com> 3.23.57-2
2946+- rebuilt
2947+
2948+* Wed Jul 02 2003 Patrick Macdonald <patrickm@redhat.com> 3.23.57-1
2949+- revert to prior version of MySQL due to license incompatibilities
2950+ with packages that link against the client. The MySQL folks are
2951+ looking into the issue.
2952+
2953+* Wed Jun 18 2003 Patrick Macdonald <patrickm@redhat.com> 4.0.13-4
2954+- restrict test on ia64 (temporary)
2955+
2956+* Wed Jun 04 2003 Elliot Lee <sopwith@redhat.com> 4.0.13-3
2957+- rebuilt
2958+
2959+* Thu May 29 2003 Patrick Macdonald <patrickm@redhat.com> 4.0.13-2
2960+- fix filter-requires-mysql.sh with less restrictive for mysql-bench
2961+
2962+* Wed May 28 2003 Patrick Macdonald <patrickm@redhat.com> 4.0.13-1
2963+- update for MySQL 4.0
2964+- back-level shared libraries available in mysqlclient10 package
2965+
2966+* Fri May 09 2003 Patrick Macdonald <patrickm@redhat.com> 3.23.56-2
2967+- add sql-bench package (#90110)
2968+
2969+* Wed Mar 19 2003 Patrick Macdonald <patrickm@redhat.com> 3.23.56-1
2970+- upgrade to 3.23.56 for security fixes
2971+- remove patch for double-free (included in 3.23.56)
2972+
2973+* Tue Feb 18 2003 Patrick Macdonald <patrickm@redhat.com> 3.23.54a-11
2974+- enable thread safe client
2975+- add patch for double free fix
2976+
2977+* Wed Jan 22 2003 Tim Powers <timp@redhat.com>
2978+- rebuilt
2979+
2980+* Mon Jan 13 2003 Karsten Hopp <karsten@redhat.de> 3.23.54a-9
2981+- disable checks on s390x
2982+
2983+* Sat Jan 4 2003 Jeff Johnson <jbj@redhat.com> 3.23.54a-8
2984+- use internal dep generator.
2985+
2986+* Wed Jan 1 2003 Bill Nottingham <notting@redhat.com> 3.23.54a-7
2987+- fix mysql_config on hammer
2988+
2989+* Sun Dec 22 2002 Tim Powers <timp@redhat.com> 3.23.54a-6
2990+- don't use rpms internal dep generator
2991+
2992+* Tue Dec 17 2002 Elliot Lee <sopwith@redhat.com> 3.23.54a-5
2993+- Push it into the build system
2994+
2995+* Mon Dec 16 2002 Joe Orton <jorton@redhat.com> 3.23.54a-4
2996+- upgrade to 3.23.54a for safe_mysqld fix
2997+
2998+* Thu Dec 12 2002 Joe Orton <jorton@redhat.com> 3.23.54-3
2999+- upgrade to 3.23.54 for latest security fixes
3000+
3001+* Tue Nov 19 2002 Jakub Jelinek <jakub@redhat.com> 3.23.52-5
3002+- Always include <errno.h> for errno
3003+- Remove unpackaged files
3004+
3005+* Tue Nov 12 2002 Florian La Roche <Florian.LaRoche@redhat.de>
3006+- do not prereq userdel, not used at all
3007+
3008+* Mon Sep 9 2002 Trond Eivind Glomsrd <teg@redhat.com> 3.23.52-4
3009+- Use %%{_libdir}
3010+- Add patch for x86-64
3011+
3012+* Wed Sep 4 2002 Jakub Jelinek <jakub@redhat.com> 3.23.52-3
3013+- rebuilt with gcc-3.2-7
3014+
3015+* Thu Aug 29 2002 Trond Eivind Glomsrd <teg@redhat.com> 3.23.52-2
3016+- Add --enable-local-infile to configure - a new option
3017+ which doesn't default to the old behaviour (#72885)
3018+
3019+* Fri Aug 23 2002 Trond Eivind Glomsrd <teg@redhat.com> 3.23.52-1
3020+- 3.23.52. Fixes a minor security problem, various bugfixes.
3021+
3022+* Sat Aug 10 2002 Elliot Lee <sopwith@redhat.com> 3.23.51-5
3023+- rebuilt with gcc-3.2 (we hope)
3024+
3025+* Mon Jul 22 2002 Trond Eivind Glomsrd <teg@redhat.com> 3.23.51-4
3026+- rebuild
3027+
3028+* Thu Jul 18 2002 Trond Eivind Glomsrd <teg@redhat.com> 3.23.51-3
3029+- Fix #63543 and #63542
3030+
3031+* Thu Jul 11 2002 Trond Eivind Glomsrd <teg@redhat.com> 3.23.51-2
3032+- Turn off bdb on PPC(#68591)
3033+- Turn off the assembly optimizations, for safety.
3034+
3035+* Wed Jun 26 2002 Trond Eivind Glomsrd <teg@redhat.com> 3.23.51-1
3036+- Work around annoying auto* thinking this is a crosscompile
3037+- 3.23.51
3038+
3039+* Fri Jun 21 2002 Tim Powers <timp@redhat.com>
3040+- automated rebuild
3041+
3042+* Mon Jun 10 2002 Trond Eivind Glomsrd <teg@redhat.com> 3.23.50-2
3043+- Add dependency on perl-DBI and perl-DBD-MySQL (#66349)
3044+
3045+* Thu May 30 2002 Trond Eivind Glomsrd <teg@redhat.com> 3.23.50-1
3046+- 3.23.50
3047+
3048+* Thu May 23 2002 Tim Powers <timp@redhat.com>
3049+- automated rebuild
3050+
3051+* Mon May 13 2002 Trond Eivind Glomsrd <teg@redhat.com> 3.23.49-4
3052+- Rebuild
3053+- Don't set CXX to gcc, it doesn't work anymore
3054+- Exclude Alpha
3055+
3056+* Mon Apr 8 2002 Trond Eivind Glomsrd <teg@redhat.com> 3.23.49-3
3057+- Add the various .cnf examples as doc files to mysql-server (#60349)
3058+- Don't include manual.ps, it's just 200 bytes with a URL inside (#60349)
3059+- Don't include random files in /usr/share/mysql (#60349)
3060+- langify (#60349)
3061+
3062+* Thu Feb 21 2002 Trond Eivind Glomsrd <teg@redhat.com> 3.23.49-2
3063+- Rebuild
3064+
3065+* Sun Feb 17 2002 Trond Eivind Glomsrd <teg@redhat.com> 3.23.49-1
3066+- 3.23.49
3067+
3068+* Thu Feb 14 2002 Trond Eivind Glomsrd <teg@redhat.com> 3.23.48-2
3069+- work around perl dependency bug.
3070+
3071+* Mon Feb 11 2002 Trond Eivind Glomsrd <teg@redhat.com> 3.23.48-1
3072+- 3.23.48
3073+
3074+* Thu Jan 17 2002 Trond Eivind Glomsrd <teg@redhat.com> 3.23.47-4
3075+- Use kill, not mysqladmin, to flush logs and shut down. Thus,
3076+ an admin password can be set with no problems.
3077+- Remove reload from init script
3078+
3079+* Wed Jan 16 2002 Trond Eivind Glomsrd <teg@redhat.com> 3.23.47-3
3080+- remove db3-devel from buildrequires,
3081+ MySQL has had its own bundled copy since the mid thirties
3082+
3083+* Sun Jan 6 2002 Trond Eivind Glomsrd <teg@redhat.com> 3.23.47-1
3084+- 3.23.47
3085+- Don't build for alpha, toolchain immature.
3086+
3087+* Mon Dec 3 2001 Trond Eivind Glomsrd <teg@redhat.com> 3.23.46-1
3088+- 3.23.46
3089+- use -fno-rtti and -fno-exceptions, and set CXX to increase stability.
3090+ Recommended by mysql developers.
3091+
3092+* Sun Nov 25 2001 Trond Eivind Glomsrd <teg@redhat.com> 3.23.45-1
3093+- 3.23.45
3094+
3095+* Wed Nov 14 2001 Trond Eivind Glomsrd <teg@redhat.com> 3.23.44-2
3096+- centralize definition of datadir in the initscript (#55873)
3097+
3098+* Fri Nov 2 2001 Trond Eivind Glomsrd <teg@redhat.com> 3.23.44-1
3099+- 3.23.44
3100+
3101+* Thu Oct 4 2001 Trond Eivind Glomsrd <teg@redhat.com> 3.23.43-1
3102+- 3.23.43
3103+
3104+* Mon Sep 10 2001 Trond Eivind Glomsrd <teg@redhat.com> 3.23.42-1
3105+- 3.23.42
3106+- reenable innodb
3107+
3108+* Tue Aug 14 2001 Trond Eivind Glomsrd <teg@redhat.com> 3.23.41-1
3109+- 3.23.41 bugfix release
3110+- disable innodb, to avoid the broken updates
3111+- Use "mysqladmin flush_logs" instead of kill -HUP in logrotate
3112+ script (#51711)
3113+
3114+* Sat Jul 21 2001 Trond Eivind Glomsrd <teg@redhat.com>
3115+- 3.23.40, bugfix release
3116+- Add zlib-devel to buildrequires:
3117+
3118+* Fri Jul 20 2001 Trond Eivind Glomsrd <teg@redhat.com>
3119+- BuildRequires-tweaking
3120+
3121+* Thu Jun 28 2001 Trond Eivind Glomsrd <teg@redhat.com>
3122+- Reenable test, but don't run them for s390, s390x or ia64
3123+- Make /etc/my.cnf config(noplace). Same for /etc/logrotate.d/mysqld
3124+
3125+* Thu Jun 14 2001 Trond Eivind Glomsrd <teg@redhat.com>
3126+- 3.23.29
3127+- enable innodb
3128+- enable assembly again
3129+- disable tests for now...
3130+
3131+* Tue May 15 2001 Trond Eivind Glomsrd <teg@redhat.com>
3132+- 3.23.38
3133+- Don't use BDB on Alpha - no fast mutexes
3134+
3135+* Tue Apr 24 2001 Trond Eivind Glomsrd <teg@redhat.com>
3136+- 3.23.37
3137+- Add _GNU_SOURCE to the compile flags
3138+
3139+* Wed Mar 28 2001 Trond Eivind Glomsrd <teg@redhat.com>
3140+- Make it obsolete our 6.2 PowerTools packages
3141+- 3.23.36 bugfix release - fixes some security issues
3142+ which didn't apply to our standard configuration
3143+- Make "make test" part of the build process, except on IA64
3144+ (it fails there)
3145+
3146+* Tue Mar 20 2001 Trond Eivind Glomsrd <teg@redhat.com>
3147+- 3.23.35 bugfix release
3148+- Don't delete the mysql user on uninstall
3149+
3150+* Tue Mar 13 2001 Trond Eivind Glomsrd <teg@redhat.com>
3151+- 3.23.34a bugfix release
3152+
3153+* Wed Feb 7 2001 Trond Eivind Glomsrd <teg@redhat.com>
3154+- added readline-devel to BuildRequires:
3155+
3156+* Tue Feb 6 2001 Trond Eivind Glomsrd <teg@redhat.com>
3157+- small i18n-fixes to initscript (action needs $)
3158+
3159+* Tue Jan 30 2001 Trond Eivind Glomsrd <teg@redhat.com>
3160+- make it shut down and rotate logs without using mysqladmin
3161+ (from #24909)
3162+
3163+* Mon Jan 29 2001 Trond Eivind Glomsrd <teg@redhat.com>
3164+- conflict with "MySQL"
3165+
3166+* Tue Jan 23 2001 Trond Eivind Glomsrd <teg@redhat.com>
3167+- improve gettextizing
3168+
3169+* Mon Jan 22 2001 Trond Eivind Glomsrd <teg@redhat.com>
3170+- 3.23.32
3171+- fix logrotate script (#24589)
3172+
3173+* Wed Jan 17 2001 Trond Eivind Glomsrd <teg@redhat.com>
3174+- gettextize
3175+- move the items in Requires(post): to Requires: in preparation
3176+ for an errata for 7.0 when 3.23.31 is released
3177+- 3.23.31
3178+
3179+* Tue Jan 16 2001 Trond Eivind Glomsrd <teg@redhat.com>
3180+- add the log file to the rpm database, and make it 0640
3181+ (#24116)
3182+- as above in logrotate script
3183+- changes to the init sequence - put most of the data
3184+ in /etc/my.cnf instead of hardcoding in the init script
3185+- use /var/run/mysqld/mysqld.pid instead of
3186+ /var/run/mysqld/pid
3187+- use standard safe_mysqld
3188+- shut down cleaner
3189+
3190+* Mon Jan 08 2001 Trond Eivind Glomsrd <teg@redhat.com>
3191+- 3.23.30
3192+- do an explicit chmod on /var/lib/mysql in post, to avoid
3193+ any problems with broken permissons. There is a report
3194+ of rm not changing this on its own (#22989)
3195+
3196+* Mon Jan 01 2001 Trond Eivind Glomsrd <teg@redhat.com>
3197+- bzipped source
3198+- changed from 85 to 78 in startup, so it starts before
3199+ apache (which can use modules requiring mysql)
3200+
3201+* Wed Dec 27 2000 Trond Eivind Glomsrd <teg@redhat.com>
3202+- 3.23.29a
3203+
3204+* Tue Dec 19 2000 Trond Eivind Glomsrd <teg@redhat.com>
3205+- add requirement for new libstdc++, build for errata
3206+
3207+* Mon Dec 18 2000 Trond Eivind Glomsrd <teg@redhat.com>
3208+- 3.23.29
3209+
3210+* Mon Nov 27 2000 Trond Eivind Glomsrd <teg@redhat.com>
3211+- 3.23.28 (gamma)
3212+- remove old patches, as they are now upstreamed
3213+
3214+* Thu Nov 14 2000 Trond Eivind Glomsrd <teg@redhat.com>
3215+- Add a requirement for a new glibc (#20735)
3216+- build on IA64
3217+
3218+* Wed Nov 1 2000 Trond Eivind Glomsrd <teg@redhat.com>
3219+- disable more assembly
3220+
3221+* Wed Nov 1 2000 Jakub Jelinek <jakub@redhat.com>
3222+- fix mysql on SPARC (#20124)
3223+
3224+* Tue Oct 31 2000 Trond Eivind Glomsrd <teg@redhat.com>
3225+- 3.23.27
3226+
3227+* Wed Oct 25 2000 Trond Eivind Glomsrd <teg@redhat.com>
3228+- add patch for fixing bogus aliasing in mysql from Jakub,
3229+ which should fix #18905 and #18620
3230+
3231+* Mon Oct 23 2000 Trond Eivind Glomsrd <teg@redhat.com>
3232+- check for negative niceness values, and negate it
3233+ if present (#17899)
3234+- redefine optflags on IA32 FTTB
3235+
3236+* Wed Oct 18 2000 Trond Eivind Glomsrd <teg@redhat.com>
3237+- 3.23.26, which among other fixes now uses mkstemp()
3238+ instead of tempnam().
3239+- revert changes made yesterday, the problem is now
3240+ isolated
3241+
3242+* Tue Oct 17 2000 Trond Eivind Glomsrd <teg@redhat.com>
3243+- use the compat C++ compiler FTTB. Argh.
3244+- add requirement of ncurses4 (see above)
3245+
3246+* Sun Oct 01 2000 Trond Eivind Glomsrd <teg@redhat.com>
3247+- 3.23.25
3248+- fix shutdown problem (#17956)
3249+
3250+* Tue Sep 26 2000 Trond Eivind Glomsrd <teg@redhat.com>
3251+- Don't try to include no-longer-existing PUBLIC file
3252+ as doc (#17532)
3253+
3254+* Thu Sep 12 2000 Trond Eivind Glomsrd <teg@redhat.com>
3255+- rename config file to /etc/my.cnf, which is what
3256+ mysqld wants... doh. (#17432)
3257+- include a changed safe_mysqld, so the pid file option
3258+ works.
3259+- make mysql dir world readable to they can access the
3260+ mysql socket. (#17432)
3261+- 3.23.24
3262+
3263+* Wed Sep 06 2000 Trond Eivind Glomsrd <teg@redhat.com>
3264+- 3.23.23
3265+
3266+* Sun Aug 27 2000 Trond Eivind Glomsrd <teg@redhat.com>
3267+- Add "|| :" to condrestart to avoid non-zero exit code
3268+
3269+* Thu Aug 24 2000 Trond Eivind Glomsrd <teg@redhat.com>
3270+- it's mysql.com, not mysql.org and use correct path to
3271+ source (#16830)
3272+
3273+* Wed Aug 16 2000 Trond Eivind Glomsrd <teg@redhat.com>
3274+- source file from /etc/rc.d, not /etc/rd.d. Doh.
3275+
3276+* Sun Aug 13 2000 Trond Eivind Glomsrd <teg@redhat.com>
3277+- don't run ldconfig -n, it doesn't update ld.so.cache
3278+ (#16034)
3279+- include some missing binaries
3280+- use safe_mysqld to start the server (request from
3281+ mysql developers)
3282+
3283+* Sat Aug 05 2000 Bill Nottingham <notting@redhat.com>
3284+- condrestart fixes
3285+
3286+* Mon Aug 01 2000 Trond Eivind Glomsrd <teg@redhat.com>
3287+- 3.23.22. Disable the old patches, they're now in.
3288+
3289+* Thu Jul 27 2000 Trond Eivind Glomsrd <teg@redhat.com>
3290+- bugfixes in the initscript
3291+- move the .so link to the devel package
3292+
3293+* Wed Jul 19 2000 Trond Eivind Glomsrd <teg@redhat.com>
3294+- rebuild due to glibc changes
3295+
3296+* Tue Jul 18 2000 Trond Eivind Glomsrd <teg@redhat.com>
3297+- disable compiler patch
3298+- don't include info directory file
3299+
3300+* Mon Jul 17 2000 Trond Eivind Glomsrd <teg@redhat.com>
3301+- move back to /etc/rc.d/init.d
3302+
3303+* Fri Jul 14 2000 Trond Eivind Glomsrd <teg@redhat.com>
3304+- more cleanups in initscript
3305+
3306+* Thu Jul 13 2000 Trond Eivind Glomsrd <teg@redhat.com>
3307+- add a patch to work around compiler bug
3308+ (from monty@mysql.com)
3309+
3310+* Wed Jul 12 2000 Trond Eivind Glomsrd <teg@redhat.com>
3311+- don't build the SQL daemon statically (glibc problems)
3312+- fix the logrotate script - only flush log if mysql
3313+ is running
3314+- change the reloading procedure
3315+- remove icon - glint is obsolete a long time ago
3316+
3317+* Wed Jul 12 2000 Prospector <bugzilla@redhat.com>
3318+- automatic rebuild
3319+
3320+* Mon Jul 10 2000 Trond Eivind Glomsrd <teg@redhat.com>
3321+- try the new compiler again
3322+- build the SQL daemon statically
3323+- add compile time support for complex charsets
3324+- enable assembler
3325+- more cleanups in initscript
3326+
3327+* Sun Jul 09 2000 Trond Eivind Glomsrd <teg@redhat.com>
3328+- use old C++ compiler
3329+- Exclusivearch x86
3330+
3331+* Sat Jul 08 2000 Trond Eivind Glomsrd <teg@redhat.com>
3332+- move .so files to devel package
3333+- more cleanups
3334+- exclude sparc for now
3335+
3336+* Wed Jul 05 2000 Trond Eivind Glomsrd <teg@redhat.com>
3337+- 3.23.21
3338+- remove file from /etc/sysconfig
3339+- Fix initscript a bit - initialization of databases doesn't
3340+ work yet
3341+- specify the correct licenses
3342+- include a /etc/my.conf (empty, FTTB)
3343+- add conditional restart to spec file
3344+
3345+* Tue Jul 2 2000 Jakub Jelinek <jakub@redhat.com>
3346+- Rebuild with new C++
3347+
3348+* Fri Jun 30 2000 Trond Eivind Glomsrd <teg@redhat.com>
3349+- update to 3.23.20
3350+- use %%configure, %%makeinstall, %%{_tmppath}, %%{_mandir},
3351+ %%{_infodir}, /etc/init.d
3352+- remove the bench package
3353+- change some of the descriptions a little bit
3354+- fix the init script
3355+- some compile fixes
3356+- specify mysql user
3357+- use mysql uid 27 (postgresql is 26)
3358+- don't build on ia64
3359+
3360+* Sat Feb 26 2000 Jos Vos <jos@xos.nl>
3361+- Version 3.22.32 release XOS.1 for LinuX/OS 1.8.0
3362+- Upgrade from version 3.22.27 to 3.22.32.
3363+- Do "make install" instead of "make install-strip", because "install -s"
3364+ now appears to fail on various scripts. Afterwards, strip manually.
3365+- Reorganize subpackages, according to common Red Hat packages: the client
3366+ program and shared library become the base package and the server and
3367+ some accompanying files are now in a separate server package. The
3368+ server package implicitly requires the base package (shared library),
3369+ but we have added a manual require tag anyway (because of the shared
3370+ config file, and more).
3371+- Rename the mysql-benchmark subpackage to mysql-bench.
3372+
3373+* Mon Jan 31 2000 Jos Vos <jos@xos.nl>
3374+- Version 3.22.27 release XOS.2 for LinuX/OS 1.7.1
3375+- Add post(un)install scripts for updating ld.so.conf (client subpackage).
3376+
3377+* Sun Nov 21 1999 Jos Vos <jos@xos.nl>
3378+- Version 3.22.27 release XOS.1 for LinuX/OS 1.7.0
3379+- Initial version.
3380+- Some ideas borrowed from Red Hat Powertools 6.1, although this spec
3381+ file is a full rewrite from scratch.
3382
3383=== added file 'Percona-Server/SPECIFIC-ULN/scriptstub.c'
3384--- Percona-Server/SPECIFIC-ULN/scriptstub.c 1970-01-01 00:00:00 +0000
3385+++ Percona-Server/SPECIFIC-ULN/scriptstub.c 2012-12-17 04:11:35 +0000
3386@@ -0,0 +1,32 @@
3387+#include <stdio.h>
3388+#include <stdlib.h>
3389+#include <string.h>
3390+#include <unistd.h>
3391+
3392+/* Translate call of myself into call of same-named script in LIBDIR */
3393+/* The macro LIBDIR must be defined as a double-quoted string */
3394+
3395+int main (int argc, char **argv)
3396+{
3397+ char *basename;
3398+ char *fullname;
3399+ char **newargs;
3400+ int i;
3401+
3402+ basename = strrchr(argv[0], '/');
3403+ if (basename)
3404+ basename++;
3405+ else
3406+ basename = argv[0];
3407+ fullname = malloc(strlen(LIBDIR) + strlen(basename) + 2);
3408+ sprintf(fullname, "%s/%s", LIBDIR, basename);
3409+ newargs = malloc((argc+1) * sizeof(char *));
3410+ newargs[0] = fullname;
3411+ for (i = 1; i < argc; i++)
3412+ newargs[i] = argv[i];
3413+ newargs[argc] = NULL;
3414+
3415+ execvp(fullname, newargs);
3416+
3417+ return 1;
3418+}
3419
3420=== modified file 'Percona-Server/VERSION'
3421--- Percona-Server/VERSION 2012-10-16 06:21:51 +0000
3422+++ Percona-Server/VERSION 2012-12-17 04:11:35 +0000
3423@@ -1,4 +1,4 @@
3424 MYSQL_VERSION_MAJOR=5
3425 MYSQL_VERSION_MINOR=6
3426-MYSQL_VERSION_PATCH=7
3427+MYSQL_VERSION_PATCH=8
3428 MYSQL_VERSION_EXTRA=-rc
3429
3430=== modified file 'Percona-Server/client/CMakeLists.txt'
3431--- Percona-Server/client/CMakeLists.txt 2012-08-22 01:40:20 +0000
3432+++ Percona-Server/client/CMakeLists.txt 2012-12-17 04:11:35 +0000
3433@@ -26,6 +26,11 @@
3434 ${CMAKE_CURRENT_BINARY_DIR}
3435 )
3436
3437+
3438+## We will need libeay32.dll and ssleay32.dll when running client executables.
3439+COPY_OPENSSL_DLLS(copy_openssl_client)
3440+
3441+
3442 ADD_DEFINITIONS(${READLINE_DEFINES})
3443 ADD_DEFINITIONS(${SSL_DEFINES})
3444 MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc sql_string.cc)
3445
3446=== modified file 'Percona-Server/client/client_priv.h'
3447--- Percona-Server/client/client_priv.h 2012-10-16 06:21:51 +0000
3448+++ Percona-Server/client/client_priv.h 2012-12-17 04:11:35 +0000
3449@@ -90,6 +90,7 @@
3450 OPT_DEFAULT_PLUGIN,
3451 OPT_RAW_OUTPUT, OPT_WAIT_SERVER_ID, OPT_STOP_NEVER,
3452 OPT_BINLOG_ROWS_EVENT_MAX_SIZE,
3453+ OPT_HISTIGNORE,
3454 OPT_BINARY_MODE,
3455 OPT_SSL_CRL, OPT_SSL_CRLPATH,
3456 OPT_MYSQLBINLOG_SKIP_GTIDS,
3457
3458=== modified file 'Percona-Server/client/mysql.cc'
3459--- Percona-Server/client/mysql.cc 2012-10-16 06:21:51 +0000
3460+++ Percona-Server/client/mysql.cc 2012-12-17 04:11:35 +0000
3461@@ -167,6 +167,8 @@
3462 *opt_init_command= 0;
3463 static char *histfile;
3464 static char *histfile_tmp;
3465+static char *opt_histignore= NULL;
3466+DYNAMIC_STRING histignore_buffer;
3467 static String glob_buffer,old_buffer;
3468 static String processed_prompt;
3469 static char *full_username=0,*part_username=0,*default_prompt=0;
3470@@ -290,6 +292,17 @@
3471 static void add_int_to_prompt(int toadd);
3472 static int get_result_width(MYSQL_RES *res);
3473 static int get_field_disp_length(MYSQL_FIELD * field);
3474+static int normalize_dbname(const char *line, char *buff, uint buff_size);
3475+static int get_quote_count(const char *line);
3476+
3477+#if defined(HAVE_READLINE)
3478+static void add_filtered_history(const char *string);
3479+static my_bool check_histignore(const char *string);
3480+static my_bool parse_histignore();
3481+static my_bool init_hist_patterns();
3482+static void free_hist_patterns();
3483+DYNAMIC_ARRAY histignore_patterns;
3484+#endif /* HAVE_READLINE */
3485
3486 /* A structure which contains information on the commands this program
3487 can understand. */
3488@@ -1309,6 +1322,29 @@
3489 initialize_readline((char*) my_progname);
3490 if (!status.batch && !quick && !opt_html && !opt_xml)
3491 {
3492+ init_dynamic_string(&histignore_buffer, "*IDENTIFIED*:*PASSWORD*",
3493+ 1024, 1024);
3494+
3495+ /*
3496+ More history-ignore patterns can be supplied using either --histignore
3497+ option or MYSQL_HISTIGNORE environment variable. If supplied, it will
3498+ get appended to the default pattern (*IDENTIFIED*:*PASSWORD*). In case
3499+ both are specified, pattern(s) supplied using --histignore option will
3500+ be used.
3501+ */
3502+ if (opt_histignore)
3503+ {
3504+ dynstr_append(&histignore_buffer, ":");
3505+ dynstr_append(&histignore_buffer, opt_histignore);
3506+ }
3507+ else if (getenv("MYSQL_HISTIGNORE"))
3508+ {
3509+ dynstr_append(&histignore_buffer, ":");
3510+ dynstr_append(&histignore_buffer, getenv("MYSQL_HISTIGNORE"));
3511+ }
3512+
3513+ parse_histignore();
3514+
3515 /* read-history from file, default ~/.mysql_history*/
3516 if (getenv("MYSQL_HISTFILE"))
3517 histfile=my_strdup(getenv("MYSQL_HISTFILE"),MYF(MY_WME));
3518@@ -1379,6 +1415,11 @@
3519 completion_hash_free(&ht);
3520 free_root(&hash_mem_root,MYF(0));
3521
3522+ my_free(opt_histignore);
3523+ my_free(histfile);
3524+ my_free(histfile_tmp);
3525+ dynstr_free(&histignore_buffer);
3526+ free_hist_patterns();
3527 #endif
3528 if (sig >= 0)
3529 put_info(sig ? "Aborted" : "Bye", INFO_RESULT);
3530@@ -1388,8 +1429,6 @@
3531 my_free(server_version);
3532 my_free(opt_password);
3533 my_free(opt_mysql_unix_port);
3534- my_free(histfile);
3535- my_free(histfile_tmp);
3536 my_free(current_db);
3537 my_free(current_host);
3538 my_free(current_user);
3539@@ -1710,6 +1749,10 @@
3540 "Default authentication client-side plugin to use.",
3541 &opt_default_auth, &opt_default_auth, 0,
3542 GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
3543+ {"histignore", OPT_HISTIGNORE, "A colon-separated list of patterns "
3544+ "to keep statements from getting logged into mysql history.",
3545+ &opt_histignore, &opt_histignore, 0, GET_STR_ALLOC, REQUIRED_ARG,
3546+ 0, 0, 0, 0, 0, 0},
3547 {"binary-mode", OPT_BINARY_MODE,
3548 "By default, ASCII '\\0' is disallowed and '\\r\\n' is translated to '\\n'. "
3549 "This switch turns off both features, and also turns off parsing of all client"
3550@@ -2113,7 +2156,7 @@
3551 in_string=0;
3552 #ifdef HAVE_READLINE
3553 if (interactive && status.add_to_history && not_in_history(line))
3554- add_history(line);
3555+ add_filtered_history(line);
3556 #endif
3557 continue;
3558 }
3559@@ -2275,7 +2318,7 @@
3560 DBUG_RETURN(0);
3561 #ifdef HAVE_READLINE
3562 if (status.add_to_history && line[0] && not_in_history(line))
3563- add_history(line);
3564+ add_filtered_history(line);
3565 #endif
3566 char *end_of_line= line + line_length;
3567
3568@@ -2611,7 +2654,7 @@
3569 ptr++;
3570 }
3571 if (total_lines > 1)
3572- add_history(fixed_buffer.ptr());
3573+ add_filtered_history(fixed_buffer.ptr());
3574 }
3575
3576 /*
3577@@ -2913,6 +2956,95 @@
3578 }
3579 }
3580 #endif
3581+
3582+/* Add the given line to mysql history. */
3583+static void add_filtered_history(const char *string)
3584+{
3585+ if (!check_histignore(string))
3586+ add_history(string);
3587+}
3588+
3589+
3590+/**
3591+ Perform a check on the given string if it contains
3592+ any of the histignore patterns.
3593+
3594+ @param string [IN] String that needs to be checked.
3595+
3596+ @return Operation status
3597+ @retval 0 No match found
3598+ @retval 1 Match found
3599+*/
3600+
3601+static
3602+my_bool check_histignore(const char *string)
3603+{
3604+ uint i;
3605+ int rc;
3606+
3607+ LEX_STRING *tmp;
3608+
3609+ DBUG_ENTER("check_histignore");
3610+
3611+ for (i= 0; i < histignore_patterns.elements; i++)
3612+ {
3613+ tmp= dynamic_element(&histignore_patterns, i, LEX_STRING *);
3614+ if ((rc= charset_info->coll->wildcmp(&my_charset_latin1,
3615+ string, string + strlen(string),
3616+ tmp->str, tmp->str + tmp->length,
3617+ wild_prefix, wild_one,
3618+ wild_many)) == 0)
3619+ DBUG_RETURN(1);
3620+ }
3621+ DBUG_RETURN(0);
3622+}
3623+
3624+
3625+/**
3626+ Parse the histignore list into pattern tokens.
3627+
3628+ @return Operation status
3629+ @retval 0 Success
3630+ @retval 1 Failure
3631+*/
3632+
3633+static
3634+my_bool parse_histignore()
3635+{
3636+ LEX_STRING pattern;
3637+
3638+ char *token;
3639+ const char *search= ":";
3640+
3641+ DBUG_ENTER("parse_histignore");
3642+
3643+ if (init_hist_patterns())
3644+ DBUG_RETURN(1);
3645+
3646+ token= strtok(histignore_buffer.str, search);
3647+
3648+ while(token != NULL)
3649+ {
3650+ pattern.str= token;
3651+ pattern.length= strlen(pattern.str);
3652+ insert_dynamic(&histignore_patterns, &pattern);
3653+ token= strtok(NULL, search);
3654+ }
3655+ DBUG_RETURN(0);
3656+}
3657+
3658+static
3659+my_bool init_hist_patterns()
3660+{
3661+ return my_init_dynamic_array(&histignore_patterns,
3662+ sizeof(LEX_STRING), 50, 50);
3663+}
3664+
3665+static
3666+void free_hist_patterns()
3667+{
3668+ delete_dynamic(&histignore_patterns);
3669+}
3670 #endif /* HAVE_READLINE */
3671
3672
3673@@ -4309,8 +4441,23 @@
3674 int select_db;
3675
3676 memset(buff, 0, sizeof(buff));
3677- strmake(buff, line, sizeof(buff) - 1);
3678- tmp= get_arg(buff, 0);
3679+
3680+ /*
3681+ In case number of quotes exceed 2, we try to get
3682+ the normalized db name.
3683+ */
3684+ if (get_quote_count(line) > 2)
3685+ {
3686+ if (normalize_dbname(line, buff, sizeof(buff)))
3687+ return put_error(&mysql);
3688+ tmp= buff;
3689+ }
3690+ else
3691+ {
3692+ strmake(buff, line, sizeof(buff) - 1);
3693+ tmp= get_arg(buff, 0);
3694+ }
3695+
3696 if (!tmp || !*tmp)
3697 {
3698 put_info("USE must be followed by a database name", INFO_ERROR);
3699@@ -4376,6 +4523,62 @@
3700 return 0;
3701 }
3702
3703+/**
3704+ Normalize database name.
3705+
3706+ @param line [IN] The command.
3707+ @param buff [OUT] Normalized db name.
3708+ @param buff_size [IN] Buffer size.
3709+
3710+ @return Operation status
3711+ @retval 0 Success
3712+ @retval 1 Failure
3713+
3714+ @note Sometimes server normilizes the database names
3715+ & APIs like mysql_select_db() expect normalized
3716+ database names. Since it is difficult to perform
3717+ the name conversion/normalization on the client
3718+ side, this function tries to get the normalized
3719+ dbname (indirectly) from the server.
3720+*/
3721+
3722+static int
3723+normalize_dbname(const char *line, char *buff, uint buff_size)
3724+{
3725+ MYSQL_RES *res= NULL;
3726+
3727+ /* Send the "USE db" commmand to the server. */
3728+ if (mysql_query(&mysql, line))
3729+ return 1;
3730+
3731+ /*
3732+ Now, get the normalized database name and store it
3733+ into the buff.
3734+ */
3735+ if (!mysql_query(&mysql, "SELECT DATABASE()") &&
3736+ (res= mysql_use_result(&mysql)))
3737+ {
3738+ MYSQL_ROW row= mysql_fetch_row(res);
3739+ if (row && row[0])
3740+ {
3741+ size_t len= strlen(row[0]);
3742+ /* Make sure there is enough room to store the dbname. */
3743+ if ((len > buff_size) || ! memcpy(buff, row[0], len))
3744+ {
3745+ mysql_free_result(res);
3746+ return 1;
3747+ }
3748+ }
3749+ mysql_free_result(res);
3750+ }
3751+
3752+ /* Restore the original database. */
3753+ if (current_db && mysql_select_db(&mysql, current_db))
3754+ return 1;
3755+
3756+ return 0;
3757+}
3758+
3759 static int
3760 com_warnings(String *buffer __attribute__((unused)),
3761 char *line __attribute__((unused)))
3762@@ -4455,6 +4658,20 @@
3763 return valid_arg ? start : NullS;
3764 }
3765
3766+/*
3767+ Number of quotes present in the command's argument.
3768+*/
3769+static int
3770+get_quote_count(const char *line)
3771+{
3772+ int quote_count;
3773+ const char *ptr= line;
3774+
3775+ for(quote_count= 0; ptr ++ && *ptr; ptr= strpbrk(ptr, "\"\'`"))
3776+ quote_count ++;
3777+
3778+ return quote_count;
3779+}
3780
3781 static int
3782 sql_real_connect(char *host,char *database,char *user,char *password,
3783
3784=== modified file 'Percona-Server/client/mysql_plugin.c'
3785--- Percona-Server/client/mysql_plugin.c 2012-02-28 09:11:34 +0000
3786+++ Percona-Server/client/mysql_plugin.c 2012-12-17 04:11:35 +0000
3787@@ -552,6 +552,11 @@
3788 {
3789 char new_path[FN_REFLEN];
3790 char source_path[FN_REFLEN];
3791+#if __WIN__
3792+ char win_abs_path[FN_REFLEN];
3793+ char self_name[FN_REFLEN];
3794+ const char *last_fn_libchar;
3795+#endif
3796
3797 strcpy(source_path, base_path);
3798 strcat(source_path, subdir);
3799@@ -560,7 +565,33 @@
3800 {
3801 strcpy(tool_path, new_path);
3802 return 1;
3803+ }
3804+
3805+#if __WIN__
3806+ /*
3807+ On Windows above code will not be able to find the file since
3808+ path names are not absolute and file_exists works only with
3809+ absolute path names. Try to get the absolute path of current
3810+ exe and see if the file exists relative to the path of exe.
3811+ */
3812+ if (GetModuleFileName(NULL, self_name, FN_REFLEN -1) == 0)
3813+ strncpy(self_name, my_progname, FN_REFLEN - 1);
3814+ self_name[FN_REFLEN - 1]= '\0';
3815+
3816+ last_fn_libchar= strrchr(self_name, FN_LIBCHAR);
3817+ if (NULL != last_fn_libchar)
3818+ {
3819+ strncpy(win_abs_path, self_name, last_fn_libchar - self_name + 1 );
3820+ win_abs_path[(last_fn_libchar - self_name + 1)]= 0;
3821+ strncat(win_abs_path, new_path,
3822+ sizeof(win_abs_path) - strlen(win_abs_path) - 1);
3823+ if (file_exists(win_abs_path))
3824+ {
3825+ strcpy(tool_path, win_abs_path);
3826+ return 1;
3827+ }
3828 }
3829+#endif
3830 return 0;
3831 }
3832
3833@@ -967,9 +998,11 @@
3834 int i= 0;
3835
3836 const char *paths[]= {
3837- opt_mysqld, opt_basedir, opt_my_print_defaults, "/usr",
3838- "/usr/local/mysql", "/usr/sbin", "/usr/share", "/extra", "/extra/debug",
3839- "/extra/release", "/bin", "/usr/bin", "/mysql/bin"
3840+ opt_mysqld, opt_basedir, opt_my_print_defaults, "",
3841+ "/usr", "/usr/local/mysql", "/usr/sbin", "/usr/share",
3842+ "/extra", "/extra/debug", "/../../extra/debug",
3843+ "/release/", "/extra/release", "/../../extra/release",
3844+ "/bin", "/usr/bin", "/mysql/bin"
3845 };
3846 for (i= 0; i < (int)array_elements(paths); i++)
3847 {
3848
3849=== modified file 'Percona-Server/client/mysqladmin.cc'
3850--- Percona-Server/client/mysqladmin.cc 2012-10-16 06:21:51 +0000
3851+++ Percona-Server/client/mysqladmin.cc 2012-12-17 04:11:35 +0000
3852@@ -25,6 +25,7 @@
3853 #include <mysql.h>
3854 #include <sql_common.h>
3855 #include <welcome_copyright_notice.h> /* ORACLE_WELCOME_COPYRIGHT_NOTICE */
3856+#include <mysqld_error.h> /* to check server error codes */
3857
3858 #define ADMIN_VERSION "8.42"
3859 #define MAX_MYSQL_VAR 512
3860@@ -625,7 +626,8 @@
3861
3862 for (; argc > 0 ; argv++,argc--)
3863 {
3864- switch (find_type(argv[0],&command_typelib, FIND_TYPE_BASIC)) {
3865+ int option;
3866+ switch (option= find_type(argv[0], &command_typelib, FIND_TYPE_BASIC)) {
3867 case ADMIN_CREATE:
3868 {
3869 char buff[FN_REFLEN+20];
3870@@ -939,6 +941,11 @@
3871 char buff[128],crypted_pw[64];
3872 time_t start_time;
3873 char *typed_password= NULL, *verified= NULL;
3874+ bool log_off= true, err= false;
3875+ int retry_count= 0; /* Attempts to SET PASSWORD */
3876+
3877+ bool old= (option == ADMIN_OLD_PASSWORD);
3878+
3879 /* Do initialization the same way as we do in mysqld */
3880 start_time=time((time_t*) 0);
3881 randominit(&rand_st,(ulong) start_time,(ulong) start_time/2);
3882@@ -956,7 +963,8 @@
3883 if (strcmp(typed_password, verified) != 0)
3884 {
3885 my_printf_error(0,"Passwords don't match",MYF(ME_BELL));
3886- return -1;
3887+ err= true;
3888+ goto error;
3889 }
3890 }
3891 else
3892@@ -964,8 +972,6 @@
3893
3894 if (typed_password[0])
3895 {
3896- bool old= (find_type(argv[0], &command_typelib, FIND_TYPE_BASIC) ==
3897- ADMIN_OLD_PASSWORD);
3898 #ifdef __WIN__
3899 size_t pw_len= strlen(typed_password);
3900 if (pw_len > 1 && typed_password[0] == '\'' &&
3901@@ -974,16 +980,23 @@
3902 " your command\nline client, as you might have expected.\n");
3903 #endif
3904 /*
3905- If we don't already know to use an old-style password, see what
3906- the server is using
3907+ If we don't already know to use an old-style password, see
3908+ (if possible) what the server is using.
3909 */
3910 if (!old)
3911 {
3912 if (mysql_query(mysql, "SHOW VARIABLES LIKE 'old_passwords'"))
3913 {
3914- my_printf_error(0, "Could not determine old_passwords setting from server; error: '%s'",
3915- error_flags, mysql_error(mysql));
3916- return -1;
3917+ bool fatal= (mysql_errno(mysql) != ER_MUST_CHANGE_PASSWORD);
3918+ if (fatal || opt_verbose)
3919+ my_printf_error(0, "Could not determine old_passwords setting "
3920+ "from server; error: '%s'.", error_flags,
3921+ mysql_error(mysql));
3922+ if (fatal)
3923+ {
3924+ err= true;
3925+ goto error;
3926+ }
3927 }
3928 else
3929 {
3930@@ -992,20 +1005,36 @@
3931 {
3932 my_printf_error(0,
3933 "Could not get old_passwords setting from "
3934- "server; error: '%s'",
3935- error_flags, mysql_error(mysql));
3936- return -1;
3937+ "server; error: '%s'.",
3938+ error_flags, mysql_error(mysql));
3939+ err= true;
3940+ goto error;
3941 }
3942 if (!mysql_num_rows(res))
3943 old= 1;
3944 else
3945 {
3946 MYSQL_ROW row= mysql_fetch_row(res);
3947- old= !strncmp(row[1], "ON", 2);
3948+ old= (!strncmp(row[1], "ON", 2) || !strncmp(row[1], "1", 1));
3949 }
3950 mysql_free_result(res);
3951 }
3952 }
3953+ /* turn logging off if we can */
3954+ if (mysql_query(mysql,"set sql_log_off=1"))
3955+ {
3956+ if (opt_verbose)
3957+ fprintf(stderr, "Note: Can't turn off logging; '%s'", mysql_error(mysql));
3958+ log_off= false;
3959+ }
3960+
3961+retry:
3962+ /*
3963+ In case the password_expired flag is set ('Y'), then there is no way
3964+ to determine the password format. So, we first try to set the
3965+ password using native format. If it fails with ER_PASSWORD_LENGTH,
3966+ we will give one more try with old format.
3967+ */
3968 if (old)
3969 make_scrambled_password_323(crypted_pw, typed_password);
3970 else
3971@@ -1013,21 +1042,27 @@
3972 }
3973 else
3974 crypted_pw[0]=0; /* No password */
3975- sprintf(buff,"set password='%s',sql_log_off=0",crypted_pw);
3976-
3977- if (mysql_query(mysql,"set sql_log_off=1"))
3978- {
3979- my_printf_error(0, "Can't turn off logging; error: '%s'",
3980- error_flags, mysql_error(mysql));
3981- return -1;
3982- }
3983+
3984+ sprintf(buff, "set password='%s'", crypted_pw);
3985+
3986 if (mysql_query(mysql,buff))
3987 {
3988+ if ((mysql_errno(mysql) == ER_PASSWD_LENGTH) &&
3989+ !(option == ADMIN_OLD_PASSWORD) && !retry_count)
3990+ {
3991+ /* Try to set the password using old format. */
3992+ memset(crypted_pw, 0, 64);
3993+ old= 0;
3994+ retry_count ++;
3995+ goto retry;
3996+ }
3997+
3998 if (mysql_errno(mysql)!=1290)
3999 {
4000 my_printf_error(0,"unable to change password; error: '%s'",
4001 error_flags, mysql_error(mysql));
4002- return -1;
4003+ err= true;
4004+ goto error;
4005 }
4006 else
4007 {
4008@@ -1041,15 +1076,25 @@
4009 " --skip-grant-tables).\n"
4010 "Use: \"mysqladmin flush-privileges password '*'\""
4011 " instead", error_flags);
4012- return -1;
4013+ err= true;
4014+ goto error;
4015 }
4016 }
4017+ if (log_off && mysql_query(mysql, "set sql_log_off=0"))
4018+ {
4019+ if (opt_verbose)
4020+ fprintf(stderr, "Note: Can't turn on logging; '%s'", mysql_error(mysql));
4021+ }
4022+error:
4023 /* free up memory from prompted password */
4024 if (typed_password != argv[1])
4025 {
4026 my_free(typed_password);
4027 my_free(verified);
4028 }
4029+ if (err)
4030+ return -1;
4031+
4032 argc--; argv++;
4033 break;
4034 }
4035
4036=== modified file 'Percona-Server/client/mysqltest.cc'
4037--- Percona-Server/client/mysqltest.cc 2012-10-16 06:21:51 +0000
4038+++ Percona-Server/client/mysqltest.cc 2012-12-17 04:11:35 +0000
4039@@ -1049,6 +1049,8 @@
4040 fprintf(stderr, "---- %d. ----\n", row_num);
4041 for(i= 0; i < num_fields; i++)
4042 {
4043+ /* looks ugly , but put here to convince parfait */
4044+ assert(lengths);
4045 fprintf(stderr, "%s\t%.*s\n",
4046 fields[i].name,
4047 (int)lengths[i], row[i] ? row[i] : "NULL");
4048@@ -1123,6 +1125,8 @@
4049
4050 for(i= 0; i < num_fields; i++)
4051 {
4052+ /* looks ugly , but put here to convince parfait */
4053+ assert(lengths);
4054 fprintf(stderr, "%.*s ", (int)lengths[i],
4055 row[i] ? row[i] : "NULL");
4056 }
4057@@ -7125,8 +7129,12 @@
4058 uint i;
4059 lengths = mysql_fetch_lengths(res);
4060 for (i = 0; i < num_fields; i++)
4061+ {
4062+ /* looks ugly , but put here to convince parfait */
4063+ assert(lengths);
4064 append_field(ds, i, &fields[i],
4065 row[i], lengths[i], !row[i]);
4066+ }
4067 if (!display_result_vertically)
4068 dynstr_append_mem(ds, "\n", 1);
4069 }
4070@@ -7849,6 +7857,14 @@
4071 }
4072 revert_properties();
4073
4074+ /*
4075+ We save the return code (mysql_stmt_errno(stmt)) from the last call sent
4076+ to the server into the mysqltest builtin variable $mysql_errno. This
4077+ variable then can be used from the test case itself.
4078+ */
4079+
4080+ var_set_errno(mysql_stmt_errno(stmt));
4081+
4082 /* Close the statement if - no reconnect, need new prepare */
4083 if (mysql->reconnect)
4084 {
4085@@ -7856,13 +7872,6 @@
4086 cur_con->stmt= NULL;
4087 }
4088
4089- /*
4090- We save the return code (mysql_stmt_errno(stmt)) from the last call sent
4091- to the server into the mysqltest builtin variable $mysql_errno. This
4092- variable then can be used from the test case itself.
4093- */
4094-
4095- var_set_errno(mysql_stmt_errno(stmt));
4096
4097 DBUG_VOID_RETURN;
4098 }
4099@@ -10133,6 +10142,7 @@
4100 else
4101 {
4102 new_set=make_new_set(&sets);
4103+ assert(new_set);
4104 set=sets.set+set_nr; /* if realloc */
4105 new_set->table_offset=set->table_offset;
4106 new_set->found_len=set->found_len;
4107
4108=== modified file 'Percona-Server/cmake/configure.pl'
4109--- Percona-Server/cmake/configure.pl 2012-08-22 01:40:20 +0000
4110+++ Percona-Server/cmake/configure.pl 2012-12-17 04:11:35 +0000
4111@@ -239,6 +239,16 @@
4112 $cmakeargs = $cmakeargs." -DENABLE_GCOV=ON";
4113 next;
4114 }
4115+ if ($option =~ /with-client-ldflags/)
4116+ {
4117+ print("configure.pl : ignoring $option\n");
4118+ next;
4119+ }
4120+ if ($option =~ /with-mysqld-ldflags=/)
4121+ {
4122+ print("configure.pl : ignoring $option\n");
4123+ next;
4124+ }
4125
4126 $option = uc($option);
4127 $option =~ s/-/_/g;
4128
4129=== modified file 'Percona-Server/cmake/create_initial_db.cmake.in'
4130--- Percona-Server/cmake/create_initial_db.cmake.in 2012-08-31 14:03:47 +0000
4131+++ Percona-Server/cmake/create_initial_db.cmake.in 2012-12-17 04:11:35 +0000
4132@@ -74,7 +74,7 @@
4133
4134 GET_FILENAME_COMPONENT(CWD . ABSOLUTE)
4135
4136-IF(WITH_SSL_PATH)
4137+IF(WITH_SSL_PATH AND HAVE_CRYPTO_DLL AND HAVE_OPENSSL_DLL)
4138 GET_FILENAME_COMPONENT(MYSQLD_DIR "${MYSQLD_EXECUTABLE}" PATH)
4139 GET_FILENAME_COMPONENT(CRYPTO_NAME "${CRYPTO_LIBRARY}" NAME_WE)
4140 GET_FILENAME_COMPONENT(OPENSSL_NAME "${OPENSSL_LIBRARY}" NAME_WE)
4141@@ -88,10 +88,13 @@
4142 COMMAND "@CMAKE_COMMAND@" -E echo Executing ${BOOTSTRAP_COMMAND}
4143 )
4144 EXECUTE_PROCESS (
4145- COMMAND "@CMAKE_COMMAND@" -E echo input file bootstrap.sql, current directory ${CWD}
4146+ COMMAND "@CMAKE_COMMAND@" -E
4147+ echo input file bootstrap.sql, current directory ${CWD}
4148 )
4149 EXECUTE_PROCESS (
4150- COMMAND ${BOOTSTRAP_COMMAND} INPUT_FILE bootstrap.sql OUTPUT_VARIABLE OUT
4151+ COMMAND ${BOOTSTRAP_COMMAND}
4152+ INPUT_FILE bootstrap.sql
4153+ OUTPUT_VARIABLE OUT
4154 ERROR_VARIABLE ERR
4155 RESULT_VARIABLE RESULT
4156 )
4157@@ -100,3 +103,6 @@
4158 MESSAGE(FATAL_ERROR "Could not create initial database \n ${OUT} \n ${ERR}")
4159 ENDIF()
4160
4161+EXECUTE_PROCESS (
4162+ COMMAND "@CMAKE_COMMAND@" -E touch ${CMAKE_CURRENT_BINARY_DIR}/initdb.dep
4163+)
4164
4165=== modified file 'Percona-Server/cmake/info_macros.cmake.in'
4166--- Percona-Server/cmake/info_macros.cmake.in 2012-07-11 05:06:58 +0000
4167+++ Percona-Server/cmake/info_macros.cmake.in 2012-12-17 04:11:35 +0000
4168@@ -1,4 +1,4 @@
4169-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
4170+# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
4171 #
4172 # This program is free software; you can redistribute it and/or modify
4173 # it under the terms of the GNU General Public License as published by
4174@@ -89,9 +89,11 @@
4175
4176 FILE(WRITE ${INFO_BIN} "===== Information about the build process: =====\n")
4177 IF (WIN32)
4178- EXECUTE_PROCESS(COMMAND cmd /c date /T OUTPUT_VARIABLE TMP_DATE)
4179+ EXECUTE_PROCESS(COMMAND cmd /c date /T
4180+ OUTPUT_VARIABLE TMP_DATE OUTPUT_STRIP_TRAILING_WHITESPACE)
4181 ELSEIF(UNIX)
4182- EXECUTE_PROCESS(COMMAND date "+%Y-%m-%d %H:%M:%S" OUTPUT_VARIABLE TMP_DATE OUTPUT_STRIP_TRAILING_WHITESPACE)
4183+ EXECUTE_PROCESS(COMMAND date "+%Y-%m-%d %H:%M:%S"
4184+ OUTPUT_VARIABLE TMP_DATE OUTPUT_STRIP_TRAILING_WHITESPACE)
4185 ELSE()
4186 SET(TMP_DATE "(no date command known for this platform)")
4187 ENDIF()
4188
4189=== modified file 'Percona-Server/cmake/install_layout.cmake'
4190--- Percona-Server/cmake/install_layout.cmake 2011-06-30 15:50:45 +0000
4191+++ Percona-Server/cmake/install_layout.cmake 2012-12-17 04:11:35 +0000
4192@@ -1,4 +1,4 @@
4193-# Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
4194+# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
4195 #
4196 # This program is free software; you can redistribute it and/or modify
4197 # it under the terms of the GNU General Public License as published by
4198@@ -24,6 +24,7 @@
4199 #
4200 # RPM
4201 # Build as per default RPM layout, with prefix=/usr
4202+# Note: The layout for ULN RPMs differs, see the "RPM" section.
4203 #
4204 # DEB
4205 # Build as per STANDALONE, prefix=/opt/mysql/server-$major.$minor
4206@@ -134,6 +135,10 @@
4207 #
4208 # RPM layout
4209 #
4210+# See "SPECIFIC-ULN/mysql-5.5-libdir.patch" for the differences
4211+# which apply to RPMs in ULN (Oracle Linux), that patch file will
4212+# be applied at build time via "rpmbuild".
4213+#
4214 SET(INSTALL_BINDIR_RPM "bin")
4215 SET(INSTALL_SBINDIR_RPM "sbin")
4216 SET(INSTALL_SCRIPTDIR_RPM "bin")
4217
4218=== modified file 'Percona-Server/cmake/os/Darwin.cmake'
4219--- Percona-Server/cmake/os/Darwin.cmake 2011-06-30 15:46:53 +0000
4220+++ Percona-Server/cmake/os/Darwin.cmake 2012-12-17 04:11:35 +0000
4221@@ -1,5 +1,4 @@
4222-# Copyright (c) 2010 Sun Microsystems, Inc.
4223-# Use is subject to license terms.
4224+# Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
4225 #
4226 # This program is free software; you can redistribute it and/or modify
4227 # it under the terms of the GNU General Public License as published by
4228@@ -33,3 +32,8 @@
4229 ADD_DEFINITIONS(-fno-common)
4230 ENDIF()
4231 ENDIF()
4232+
4233+# This is used for the version_compile_machine variable.
4234+IF(CMAKE_SIZEOF_VOID_P MATCHES 8)
4235+ SET(MYSQL_MACHINE_TYPE "x86_64")
4236+ENDIF()
4237
4238=== modified file 'Percona-Server/cmake/os/SunOS.cmake'
4239--- Percona-Server/cmake/os/SunOS.cmake 2011-06-30 15:46:53 +0000
4240+++ Percona-Server/cmake/os/SunOS.cmake 2012-12-17 04:11:35 +0000
4241@@ -1,4 +1,4 @@
4242-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
4243+# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
4244 #
4245 # This program is free software; you can redistribute it and/or modify
4246 # it under the terms of the GNU General Public License as published by
4247@@ -93,3 +93,8 @@
4248 ENDIF()
4249 ENDIF()
4250 ENDIF()
4251+
4252+# This is used for the version_compile_machine variable.
4253+IF(CMAKE_SIZEOF_VOID_P MATCHES 8 AND CMAKE_SYSTEM_PROCESSOR MATCHES "i386")
4254+ SET(MYSQL_MACHINE_TYPE "x86_64")
4255+ENDIF()
4256
4257=== modified file 'Percona-Server/cmake/ssl.cmake'
4258--- Percona-Server/cmake/ssl.cmake 2012-10-16 06:21:51 +0000
4259+++ Percona-Server/cmake/ssl.cmake 2012-12-17 04:11:35 +0000
4260@@ -88,6 +88,27 @@
4261
4262 IF(WITH_SSL STREQUAL "bundled")
4263 MYSQL_USE_BUNDLED_SSL()
4264+ # Reset some variables, in case we switch from /path/to/ssl to "bundled".
4265+ IF (WITH_SSL_PATH)
4266+ UNSET(WITH_SSL_PATH)
4267+ UNSET(WITH_SSL_PATH CACHE)
4268+ ENDIF()
4269+ IF (OPENSSL_ROOT_DIR)
4270+ UNSET(OPENSSL_ROOT_DIR)
4271+ UNSET(OPENSSL_ROOT_DIR CACHE)
4272+ ENDIF()
4273+ IF (OPENSSL_INCLUDE_DIR)
4274+ UNSET(OPENSSL_INCLUDE_DIR)
4275+ UNSET(OPENSSL_INCLUDE_DIR CACHE)
4276+ ENDIF()
4277+ IF (WIN32 AND OPENSSL_APPLINK_C)
4278+ UNSET(OPENSSL_APPLINK_C)
4279+ UNSET(OPENSSL_APPLINK_C CACHE)
4280+ ENDIF()
4281+ IF (OPENSSL_LIBRARIES)
4282+ UNSET(OPENSSL_LIBRARIES)
4283+ UNSET(OPENSSL_LIBRARIES CACHE)
4284+ ENDIF()
4285 ELSEIF(WITH_SSL STREQUAL "system" OR
4286 WITH_SSL STREQUAL "yes" OR
4287 WITH_SSL_PATH
4288@@ -108,6 +129,15 @@
4289 NAMES openssl/ssl.h
4290 HINTS ${OPENSSL_ROOT_DIR}/include
4291 )
4292+
4293+ IF (WIN32)
4294+ FIND_FILE(OPENSSL_APPLINK_C
4295+ NAMES openssl/applink.c
4296+ HINTS ${OPENSSL_ROOT_DIR}/include
4297+ )
4298+ MESSAGE(STATUS "OPENSSL_APPLINK_C ${OPENSSL_APPLINK_C}")
4299+ ENDIF()
4300+
4301 # On mac this list is <.dylib;.so;.a>
4302 # We prefer static libraries, so we revert it here.
4303 LIST(REVERSE CMAKE_FIND_LIBRARY_SUFFIXES)
4304@@ -175,3 +205,30 @@
4305 "Wrong option for WITH_SSL. Valid values are : "${WITH_SSL_DOC})
4306 ENDIF()
4307 ENDMACRO()
4308+
4309+
4310+# Many executables will depend on libeay32.dll and ssleay32.dll at runtime.
4311+# In order to ensure we find the right version(s), we copy them into
4312+# the same directory as the executables.
4313+# NOTE: Using dlls will likely crash in malloc/free,
4314+# see INSTALL.W32 which comes with the openssl sources.
4315+# So we should be linking static versions of the libraries.
4316+MACRO (COPY_OPENSSL_DLLS target_name)
4317+ IF (WIN32 AND WITH_SSL_PATH)
4318+ GET_FILENAME_COMPONENT(CRYPTO_NAME "${CRYPTO_LIBRARY}" NAME_WE)
4319+ GET_FILENAME_COMPONENT(OPENSSL_NAME "${OPENSSL_LIBRARIES}" NAME_WE)
4320+ FILE(GLOB HAVE_CRYPTO_DLL "${WITH_SSL_PATH}/bin/${CRYPTO_NAME}.dll")
4321+ FILE(GLOB HAVE_OPENSSL_DLL "${WITH_SSL_PATH}/bin/${OPENSSL_NAME}.dll")
4322+ IF (HAVE_CRYPTO_DLL AND HAVE_OPENSSL_DLL)
4323+ ADD_CUSTOM_COMMAND(OUTPUT ${target_name}
4324+ COMMAND ${CMAKE_COMMAND} -E copy_if_different
4325+ "${WITH_SSL_PATH}/bin/${CRYPTO_NAME}.dll"
4326+ "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${CRYPTO_NAME}.dll"
4327+ COMMAND ${CMAKE_COMMAND} -E copy_if_different
4328+ "${WITH_SSL_PATH}/bin/${OPENSSL_NAME}.dll"
4329+ "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${OPENSSL_NAME}.dll"
4330+ )
4331+ ADD_CUSTOM_TARGET(${target_name} ALL)
4332+ ENDIF()
4333+ ENDIF()
4334+ENDMACRO()
4335
4336=== modified file 'Percona-Server/dbug/dbug.c'
4337--- Percona-Server/dbug/dbug.c 2012-10-16 06:21:51 +0000
4338+++ Percona-Server/dbug/dbug.c 2012-12-17 04:11:35 +0000
4339@@ -356,6 +356,14 @@
4340
4341 #include <my_pthread.h>
4342 static pthread_mutex_t THR_LOCK_dbug;
4343+
4344+/**
4345+ A mutex protecting flushing of gcov data, see _db_flush_gcov_().
4346+ We don't re-use THR_LOCK_dbug, because that would disallow:
4347+ DBUG_LOCK_FILE; ..... DBUG_SUICIDE(); .... DBUG_UNLOCK_FILE;
4348+*/
4349+static pthread_mutex_t THR_LOCK_gcov;
4350+
4351 /**
4352 Lock, to protect @c init_settings.
4353 For performance reasons,
4354@@ -378,6 +386,7 @@
4355 {
4356 init_done=TRUE;
4357 pthread_mutex_init(&THR_LOCK_dbug, NULL);
4358+ pthread_mutex_init(&THR_LOCK_gcov, NULL);
4359 my_rwlock_init(&THR_LOCK_init_settings, NULL);
4360 memset(&init_settings, 0, sizeof(init_settings));
4361 init_settings.out_file=stderr;
4362@@ -2383,6 +2392,16 @@
4363 extern void __gcov_flush();
4364 #endif
4365
4366+void _db_flush_gcov_()
4367+{
4368+#ifdef HAVE_GCOV
4369+ // Gcov will assert() if we try to flush in parallel.
4370+ pthread_mutex_lock(&THR_LOCK_gcov);
4371+ __gcov_flush();
4372+ pthread_mutex_unlock(&THR_LOCK_gcov);
4373+#endif
4374+}
4375+
4376 void _db_suicide_()
4377 {
4378 int retval;
4379@@ -2392,7 +2411,7 @@
4380 #ifdef HAVE_GCOV
4381 fprintf(stderr, "Flushing gcov data\n");
4382 fflush(stderr);
4383- __gcov_flush();
4384+ _db_flush_gcov_();
4385 #endif
4386
4387 fprintf(stderr, "SIGKILL myself\n");
4388
4389=== modified file 'Percona-Server/extra/CMakeLists.txt'
4390--- Percona-Server/extra/CMakeLists.txt 2012-08-22 01:40:20 +0000
4391+++ Percona-Server/extra/CMakeLists.txt 2012-12-17 04:11:35 +0000
4392@@ -32,6 +32,7 @@
4393 SET_TARGET_PROPERTIES(comp_err PROPERTIES LINKER_LANGUAGE CXX)
4394 ENDIF()
4395
4396+
4397 ADD_CUSTOM_COMMAND(OUTPUT ${PROJECT_BINARY_DIR}/include/mysqld_error.h
4398 ${PROJECT_BINARY_DIR}/sql/share/english/errmsg.sys
4399 COMMAND comp_err
4400@@ -51,6 +52,14 @@
4401 ${PROJECT_BINARY_DIR}/sql/share/english/errmsg.sys
4402 ${PROJECT_SOURCE_DIR}/sql/share/errmsg-utf8.txt)
4403
4404+## Most executables depend on libeay32.dll (through mysys_ssl).
4405+## For 'comp_err' we need it to be available during build.
4406+COPY_OPENSSL_DLLS(copy_openssl_extra)
4407+IF (WIN32 AND WITH_SSL_PATH AND HAVE_CRYPTO_DLL)
4408+ ADD_DEPENDENCIES(GenError copy_openssl_extra)
4409+ENDIF()
4410+
4411+
4412 MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.c)
4413 TARGET_LINK_LIBRARIES(my_print_defaults mysys mysys_ssl)
4414 SET_TARGET_PROPERTIES(my_print_defaults PROPERTIES LINKER_LANGUAGE CXX)
4415
4416=== modified file 'Percona-Server/include/my_dbug.h'
4417--- Percona-Server/include/my_dbug.h 2011-09-20 09:20:12 +0000
4418+++ Percona-Server/include/my_dbug.h 2012-12-17 04:11:35 +0000
4419@@ -133,6 +133,7 @@
4420 #define DBUG_SUICIDE() DBUG_ABORT()
4421 #else
4422 extern void _db_suicide_();
4423+extern void _db_flush_gcov_();
4424 #define DBUG_SUICIDE() (_db_flush_(), _db_suicide_())
4425 #endif
4426
4427
4428=== modified file 'Percona-Server/libmysql/CMakeLists.txt'
4429--- Percona-Server/libmysql/CMakeLists.txt 2012-10-16 06:21:51 +0000
4430+++ Percona-Server/libmysql/CMakeLists.txt 2012-12-17 04:11:35 +0000
4431@@ -149,6 +149,13 @@
4432 ../sql/password.c
4433 )
4434
4435+IF (WIN32 AND OPENSSL_APPLINK_C)
4436+ SET_SOURCE_FILES_PROPERTIES(
4437+ ../sql-common/client_authentication.cc
4438+ PROPERTIES COMPILE_FLAGS "-DHAVE_OPENSSL_APPLINK_C"
4439+ )
4440+ENDIF()
4441+
4442 ADD_CONVENIENCE_LIBRARY(clientlib ${CLIENT_SOURCES})
4443 DTRACE_INSTRUMENT(clientlib)
4444 ADD_DEPENDENCIES(clientlib GenError)
4445@@ -205,13 +212,18 @@
4446 OUTPUT_NAME mysqlclient
4447 VERSION "${OS_SHARED_LIB_VERSION}"
4448 SOVERSION "${SHARED_LIB_MAJOR_VERSION}")
4449+ CONFIGURE_FILE(libmysql.ver.in ${CMAKE_CURRENT_BINARY_DIR}/libmysql.ver)
4450 IF(LINK_FLAG_NO_UNDEFINED)
4451 GET_TARGET_PROPERTY(libmysql_link_flags libmysql LINK_FLAGS)
4452 IF(NOT libmysql_link_flag)
4453 SET(libmysql_link_flags)
4454 ENDIF()
4455- SET_TARGET_PROPERTIES(libmysql PROPERTIES LINK_FLAGS
4456+ SET(libmysql_link_flags
4457 "${libmysql_link_flags} ${LINK_FLAG_NO_UNDEFINED}")
4458+ SET(libmysql_link_flags
4459+ "${libmysql_link_flags} -Wl,--version-script=libmysql.ver")
4460+ SET_TARGET_PROPERTIES(libmysql
4461+ PROPERTIES LINK_FLAGS "${libmysql_link_flags}")
4462 ENDIF()
4463 # clean direct output needs to be set several targets have the same name
4464 #(mysqlclient in this case)
4465
4466=== modified file 'Percona-Server/mysql-test/collections/default.daily'
4467--- Percona-Server/mysql-test/collections/default.daily 2012-10-16 06:21:51 +0000
4468+++ Percona-Server/mysql-test/collections/default.daily 2012-12-17 04:11:35 +0000
4469@@ -16,13 +16,11 @@
4470 perl mysql-test-run.pl --force --timer --debug-server --parallel=auto --experimental=collections/default.experimental --comment=rpl_crash_safe_master-debug --vardir=var-rpl_crash_safe_master-debug --suite=rpl --mysqld=--master-info-repository=TABLE --skip-test-list=collections/disabled-daily.list
4471
4472 # Additional modes for rpl. Multi-Threaded Slave
4473-perl mysql-test-run.pl --timer --force --parallel=auto --comment=rpl_binlog_n_mix_MTS --vardir=var-mts-rpl-binlog-n_mix --mysqld=--binlog-format=mixed --experimental=collections/default.experimental --skip-ndb --unit-tests --mysqld=--slave-parallel-workers=4 --mysqld=--slave-transaction-retries=0 --suite=rpl
4474-perl mysql-test-run.pl --timer --force --parallel=auto --comment=rpl_binlog_ps_row_MTS --vardir=var-mts-rpl-binlog-ps_row --ps-protocol --mysqld=--binlog-format=row --experimental=collections/default.experimental --skip-ndb --mysqld=--slave-parallel-workers=4 --mysqld=--slave-transaction-retries=0 --suite=rpl
4475-perl mysql-test-run.pl --timer --force --parallel=auto --comment=rpl_binlog_stmt_MTS --vardir=var-mts-rpl-binlog-stmt --mysqld=--binlog-format=statement --experimental=collections/default.experimental --skip-ndb --mysqld=--slave-parallel-workers=4 --mysqld=--slave-transaction-retries=0 --suite=rpl
4476+perl mysql-test-run.pl --timer --debug-server --force --parallel=auto --comment=rpl_MTS-debug --vardir=var-mts-rpl-debug --experimental=collections/default.experimental --skip-ndb --unit-tests --mysqld=--slave-parallel-workers=4 --mysqld=--slave-transaction-retries=0 --suite=rpl
4477
4478 # Additional runs for innodb-page-size=4k and 8k
4479-perl mysql-test-run.pl --timer --force --parallel=auto --comment=n_mix_4k_size --vardir=var-n_mix --mysqld=--binlog-format=mixed --experimental=collections/default.experimental --skip-ndb --skip-test-list=collections/disabled-per-push.list --mysqld=--innodb-page-size=4k --skip-test=innodb_ignore_builtin
4480-perl mysql-test-run.pl --timer --force --parallel=auto --comment=n_mix_8k_size --vardir=var-n_mix --mysqld=--binlog-format=mixed --experimental=collections/default.experimental --skip-ndb --skip-test-list=collections/disabled-per-push.list --mysqld=--innodb-page-size=8k --skip-test=innodb_ignore_builtin
4481+perl mysql-test-run.pl --timer --force --debug-server --parallel=auto --comment=n_mix_4k_size --vardir=var-n_mix --mysqld=--binlog-format=mixed --experimental=collections/default.experimental --skip-ndb --skip-test-list=collections/disabled-per-push.list --mysqld=--innodb-page-size=4k --skip-test=innodb_ignore_builtin
4482+perl mysql-test-run.pl --timer --force --debug-server --parallel=auto --comment=n_mix_8k_size --vardir=var-n_mix --mysqld=--binlog-format=mixed --experimental=collections/default.experimental --skip-ndb --skip-test-list=collections/disabled-per-push.list --mysqld=--innodb-page-size=8k --skip-test=innodb_ignore_builtin
4483
4484 #Engine independent tests
4485 perl mysql-test-run.pl --timer --force --debug-server --parallel=auto --comment=eits-rpl-binlog-row-tests-myisam-engine-debug --experimental=collections/default.experimental --vardir=var-binlog-row-eits-tests-myisam-engine-debug --suite=engines/iuds,engines/funcs --suite-timeout=500 --max-test-fail=0 --retry-failure=0 --mysqld=--default-storage-engine=myisam --do-test=rpl --mysqld=--binlog-format=row --skip-test-list=collections/disabled-daily.list
4486
4487=== modified file 'Percona-Server/mysql-test/collections/default.experimental'
4488--- Percona-Server/mysql-test/collections/default.experimental 2012-10-16 06:21:51 +0000
4489+++ Percona-Server/mysql-test/collections/default.experimental 2012-12-17 04:11:35 +0000
4490@@ -4,39 +4,21 @@
4491 binlog.binlog_multi_engine # joro : NDB tests marked as experimental as agreed with bochklin
4492
4493 funcs_1.charset_collation_1 # depends on compile-time decisions
4494-funcs_1.innodb_trig_1011ext @solaris # Bug#11753919 2012-05-22 Hemant Several test cases fail on Solaris with error Thread stack overrun
4495-funcs_1.myisam_trig_1011ext @solaris # Bug#11753919 2012-05-22 Hemant Several test cases fail on Solaris with error Thread stack overrun
4496-funcs_1.memory_trig_1011ext @solaris # Bug#11753919 2012-05-22 Hemant Several test cases fail on Solaris with error Thread stack overrun
4497
4498 main.func_math @freebsd # Bug#11751977 2010-05-04 alik main.func_math fails on FreeBSD in PB2
4499 main.mysqlslap @windows # Bug#11761520 2010-08-10 alik mysqlslap fails sporadically starting from Dahlia
4500-main.signal_demo3 @solaris # Bug#11753919 2010-01-20 alik Several test cases fail on Solaris with error Thread stack overrun
4501-main.sp @solaris # Bug#11753919 2010-01-20 alik Several test cases fail on Solaris with error Thread stack overrun
4502-
4503-main.bug33509 @solaris # Bug#11753919 2012-02-16 didrik Several test cases fail on Solaris with error Thread stack overrun
4504
4505 main.index_merge_innodb # BUG#11754168 2012-05-08 jorgen Doing an attempt at reenabling tests disabled by bug. EXPLAIN's row estimates varies for innodb so marked experimental for a while
4506 main.kill @freebsd # Bug#12619719 2011-08-04 Occasional failure in PB2
4507 main.kill @darwin # Bug#12619719 2012-07-12 Occasional failure in PB2
4508-main.mix2_myisam @solaris # Bug#11753919 2012-05-22 Hemant Several test cases fail on Solaris with error Thread stack overrun
4509-main.sp-lock @solaris # Bug#11753919 2012-05-22 Hemant Several test cases fail on Solaris with error Thread stack overrun
4510-main.sp-prelocking @solaris # Bug#11753919 2012-05-22 Hemant Several test cases fail on Solaris with error Thread stack overrun
4511-main.sp-fib @solaris # Bug#11753919 2012-05-22 Hemant Several test cases fail on Solaris with error Thread stack overrun
4512
4513 innodb.innodb_monitor # Bug#12320827 2011-08-04 Occasional failure in PB2
4514
4515 rpl.rpl_delayed_slave # BUG#11764654 rpl_delayed_slave fails sporadically in pb
4516 rpl.rpl_innodb_bug28430 # Bug#11754425
4517-rpl.rpl_row_sp011 @solaris # Bug#11753919 2010-01-20 alik Several test cases fail on Solaris with error Thread stack overrun
4518-rpl.rpl_seconds_behind_master # BUG#11765124 2010-11-24 luis fails sporadically on pb2
4519 rpl.rpl_show_slave_running # BUG#12346048 2011-04-11 sven fails sporadically on pb2
4520 rpl.rpl_parallel_switch_sequential # BUG#13626976 2012-02-07 dlenev Fails sporadically on pb2
4521-rpl.rpl_gtid_stress_failover # BUG#11938382,BUG#13779291 2012-03-26 Nuno Fails sporadically on pb2 (see also BUG#13813811)
4522 rpl.rpl_report_port # BUG#13812374 2012-05-10 Hemant Fails after the post fix for bug#13812374
4523-rpl.rpl_switch_stm_row_mixed @solaris # Bug#11753919 2012-05-22 Hemant Several test cases fail on Solaris with error Thread stack overrun
4524-rpl.rpl_mix_found_rows @solaris # Bug#11753919 2012-05-22 Hemant Several test cases fail on Solaris with error Thread stack overrun
4525-rpl.rpl_insert_id @solaris # Bug#11753919 2012-05-22 Hemant Several test cases fail on Solaris with error Thread stack overrun
4526-sys_vars.max_sp_recursion_depth_func @solaris # Bug#11753919 2010-01-20 alik Several test cases fail on Solaris with error Thread stack overrun
4527
4528 # BUG #59055 : All ndb tests should be removed from the repository
4529 # Leaving the sys_vars tests for now. sys_vars.all_vars.test fails on removing ndb tests
4530
4531=== modified file 'Percona-Server/mysql-test/collections/default.weekly'
4532--- Percona-Server/mysql-test/collections/default.weekly 2012-10-16 06:21:51 +0000
4533+++ Percona-Server/mysql-test/collections/default.weekly 2012-12-17 04:11:35 +0000
4534@@ -11,7 +11,7 @@
4535 # Repeat daily run
4536 # big-test option for normal runs
4537 # Default suites (in modes binlog format stmt/mixed/row, parts), embedded and ps-protocol
4538-perl mysql-test-run.pl --force --timer --big-test --testcase-timeout=90 --debug-server --parallel=auto --experimental=collections/default.experimental --comment=normal-debug-big --vardir=var-normal-debug-big --report-features --skip-test-list=collections/disabled-daily.list --unit-tests
4539+perl mysql-test-run.pl --force --timer --big-test --testcase-timeout=90 --debug-server --parallel=auto --experimental=collections/default.experimental --comment=normal-debug-big --vardir=var-normal-debug-big --report-features --skip-test-list=collections/disabled-daily.list --unit-tests --mysqld=--innodb_autoextend_increment=64
4540 perl mysql-test-run.pl --force --timer --big-test --testcase-timeout=60 --debug-server --parallel=auto --experimental=collections/default.experimental --comment=embedded-debug-big --vardir=var-embedded-debug-big --embedded
4541 perl mysql-test-run.pl --force --timer --big-test --testcase-timeout=90 --debug-server --parallel=auto --experimental=collections/default.experimental --comment=ps-debug-big --vardir=var-ps-debug-big --ps-protocol --skip-test-list=collections/disabled-daily.list
4542
4543@@ -39,60 +39,28 @@
4544 perl mysql-test-run.pl --timer --force --debug-server --parallel=auto --comment=eits-rpl-binlog-mixed-tests-innodb-engine-debug --experimental=collections/default.experimental --vardir=var-binlog-mixed-eits-tests-innodb-engine-debug --suite=engines/iuds,engines/funcs --suite-timeout=500 --max-test-fail=0 --retry-failure=0 --mysqld=--default-storage-engine=innodb --mysqld=--innodb --do-test=rpl --mysqld=--binlog-format=mixed --skip-test-list=collections/disabled-weekly.list
4545
4546 #Memcached tests
4547-perl mysql-test-run.pl --timer --force --debug-server --comment=memcached-debug --vardir=var-debug-memcached --experimental=collections/default.experimental --skip-ndb --parallel=1 --retry=0 --suite=memcached --mysqld=--innodb-page-size=4k --skip-test-list=collections/disabled-weekly.list
4548-
4549-# Non debug runs of all the tests
4550-
4551-# Repeat daily run
4552-# big-test option for normal runs
4553-# Default suites in modes normal(binlog format statement/mixed/row, parts), embedded and ps-protocol
4554-perl mysql-test-run.pl --force --timer --big-test --testcase-timeout=90 --parallel=auto --experimental=collections/default.experimental --comment=normal-big --vardir=var-normal-big --report-features --skip-test-list=collections/disabled-daily.list --unit-tests
4555-perl mysql-test-run.pl --force --timer --big-test --testcase-timeout=60 --parallel=auto --experimental=collections/default.experimental --comment=embedded-big --vardir=var-embedded-big --embedded
4556-perl mysql-test-run.pl --force --timer --big-test --testcase-timeout=90 --parallel=auto --experimental=collections/default.experimental --comment=ps-big --vardir=var-ps-big --ps-protocol --skip-test-list=collections/disabled-daily.list
4557-
4558-# Run the suites that are not part of the default - funcs_2, stress, jp, nist
4559-perl mysql-test-run.pl --force --timer --big-test --testcase-timeout=60 --parallel=auto --experimental=collections/default.experimental --comment=funcs2-big --vardir=var-funcs2-big --suite=funcs_2
4560-perl mysql-test-run.pl --force --timer --big-test --testcase-timeout=60 --parallel=auto --experimental=collections/default.experimental --comment=stress-big --vardir=var-stress-big --suite=stress
4561-perl mysql-test-run.pl --force --timer --big-test --testcase-timeout=60 --parallel=auto --experimental=collections/default.experimental --comment=jp-big --vardir=var-jp-big --suite=jp
4562-perl mysql-test-run.pl --force --timer --big-test --testcase-timeout=60 --parallel=auto --experimental=collections/default.experimental --comment=nist-big --vardir=var-nist-big --suite=nist
4563-perl mysql-test-run.pl --force --timer --testcase-timeout=60 --parallel=auto --experimental=collections/default.experimental --comment=nist+ps --vardir=var-ps_nist --suite=nist --ps-protocol
4564-
4565-
4566-# Additional replication configurations
4567-perl mysql-test-run.pl --timer --force --big-test --testcase-timeout=60 --parallel=auto --comment=all_binlog_checksum --experimental=collections/default.experimental --mysqld=--binlog-checksum=CRC32 --vardir=var-all_binlog_checksum --suite=main,binlog,innodb,federated,rpl,sys_vars,perfschema --skip-test-list=collections/disabled-weekly.list
4568-perl mysql-test-run.pl --force --timer --big-test --testcase-timeout=60 --parallel=auto --experimental=collections/default.experimental --comment=rpl_crash_safe_relay --vardir=var-rpl_crash_safe_relay --suite=rpl --mysqld=--relay-log-info-repository=TABLE --skip-test-list=collections/disabled-daily.list
4569-perl mysql-test-run.pl --force --timer --big-test --testcase-timeout=60 --parallel=auto --experimental=collections/default.experimental --comment=rpl_crash_safe_master --vardir=var-rpl_crash_safe_master --suite=rpl --mysqld=--master-info-repository=TABLE --skip-test-list=collections/disabled-daily.list
4570-
4571-#Engine independent tests
4572-perl mysql-test-run.pl --timer --force --big-test --testcase-timeout=60 --parallel=auto --comment=eits-tests-myisam-engine-big --experimental=collections/default.experimental --vardir=var-stmt-eits-tests-myisam-engine-big --suite=engines/iuds,engines/funcs --suite-timeout=500 --max-test-fail=0 --retry-failure=0 --mysqld=--default-storage-engine=myisam --skip-test-list=collections/disabled-weekly.list
4573-perl mysql-test-run.pl --timer --force --parallel=auto --comment=eits-rpl-binlog-row-tests-myisam-engine --experimental=collections/default.experimental --vardir=var-binlog-row-eits-tests-myisam-engine --suite=engines/iuds,engines/funcs --suite-timeout=500 --max-test-fail=0 --retry-failure=0 --mysqld=--default-storage-engine=myisam --do-test=rpl --mysqld=--binlog-format=row --skip-test-list=collections/disabled-weekly.list
4574-perl mysql-test-run.pl --timer --force --parallel=auto --comment=eits-rpl-binlog-mixed-tests-myisam-engine --experimental=collections/default.experimental --vardir=var-binlog-mixed-eits-tests-myisam-engine --suite=engines/iuds,engines/funcs --suite-timeout=500 --max-test-fail=0 --retry-failure=0 --mysqld=--default-storage-engine=myisam --do-test=rpl --mysqld=--binlog-format=mixed --skip-test-list=collections/disabled-weekly.list
4575-perl mysql-test-run.pl --timer --force --big-test --testcase-timeout=60 --parallel=auto --comment=eits-tests-innodb-engine-big --experimental=collections/default.experimental --vardir=var-stmt-eits-tests-innodb-engine-big --suite=engines/iuds,engines/funcs --suite-timeout=500 --max-test-fail=0 --retry-failure=0 --mysqld=--default-storage-engine=innodb --mysqld=--innodb --skip-test-list=collections/disabled-weekly.list
4576-perl mysql-test-run.pl --timer --force --parallel=auto --comment=eits-rpl-binlog-row-tests-innodb-engine --experimental=collections/default.experimental --vardir=var-binlog-row-eits-tests-innodb-engine --suite=engines/iuds,engines/funcs --suite-timeout=500 --max-test-fail=0 --retry-failure=0 --mysqld=--default-storage-engine=innodb --mysqld=--innodb --do-test=rpl --mysqld=--binlog-format=row --skip-test-list=collections/disabled-weekly.list
4577-perl mysql-test-run.pl --timer --force --parallel=auto --comment=eits-rpl-binlog-mixed-tests-innodb-engine --experimental=collections/default.experimental --vardir=var-binlog-mixed-eits-tests-innodb-engine --suite=engines/iuds,engines/funcs --suite-timeout=500 --max-test-fail=0 --retry-failure=0 --mysqld=--default-storage-engine=innodb --mysqld=--innodb --do-test=rpl --mysqld=--binlog-format=mixed --skip-test-list=collections/disabled-weekly.list
4578-
4579-#Memcached tests
4580-perl mysql-test-run.pl --timer --force --comment=memcached --vardir=var-memcached --experimental=collections/default.experimental --skip-ndb --parallel=1 --retry=0 --suite=memcached --mysqld=--innodb-page-size=4k --skip-test-list=collections/disabled-weekly.list
4581+perl mysql-test-run.pl --timer --force --debug-server --comment=memcached-debug --vardir=var-debug-memcached --experimental=collections/default.experimental --skip-ndb --parallel=1 --retry=0 --suite=memcached --skip-test-list=collections/disabled-weekly.list
4582+
4583+# Non debug runs of default suites in normal and embedded modes
4584+perl mysql-test-run.pl --force --debug-server --timer --parallel=auto --experimental=collections/default.experimental --comment=normal-non-debug --vardir=var-normal-non-debug --report-features --skip-test-list=collections/disabled-daily.list --unit-tests
4585+perl mysql-test-run.pl --force --debug-server --timer --parallel=auto --experimental=collections/default.experimental --comment=embedded-non-debug --vardir=var-embedded-non-debug --embedded
4586+
4587+
4588
4589 # Multi-Thread Slave
4590-perl mysql-test-run.pl --timer --force --big-test --testcase-timeout=60 --debug-server --parallel=auto --comment=n_mix-MTS-debug-big --vardir=var-n_mix-MTS-debug-big --suite=rpl --mysqld=--binlog-format=mixed --experimental=collections/default.experimental --skip-ndb --skip-test-list=collections/disabled-per-push.list --unit-tests --mysqld=--slave-parallel-workers=4 --mysqld=--slave-transaction-retries=0
4591+perl mysql-test-run.pl --timer --force --big-test --testcase-timeout=60 --debug-server --parallel=auto --comment=MTS-debug-big --vardir=var-MTS-debug-big --suite=rpl --experimental=collections/default.experimental --skip-ndb --skip-test-list=collections/disabled-per-push.list --unit-tests --mysqld=--slave-parallel-workers=4 --mysqld=--slave-transaction-retries=0
4592
4593 # Run with 4K page size
4594-perl mysql-test-run.pl --timer --force --parallel=auto --comment=n_mix_4k_size --vardir=var-n_mix_4k_size --mysqld=--binlog-format=mixed --experimental=collections/default.experimental --skip-ndb --skip-test-list=collections/disabled-per-push.list --unit-tests --mysqld=--innodb-page-size=4k --skip-test=innodb_ignore_builtin
4595-perl mysql-test-run.pl --timer --force --parallel=auto --comment=main_ps_row_4k_size --vardir=var-main-ps_row --suite=main --ps-protocol --mysqld=--binlog-format=row --experimental=collections/default.experimental --skip-ndb --skip-test-list=collections/disabled-per-push.list --mysqld=--innodb-page-size=4k --skip-test=innodb_ignore_builtin
4596-perl mysql-test-run.pl --timer --force --parallel=auto --comment=main_embedded_4k_size --vardir=var-main_emebbed --suite=main --embedded --experimental=collections/default.experimental --skip-ndb --mysqld=--innodb-page-size=4k --skip-test=innodb_ignore_builtin
4597+perl mysql-test-run.pl --debug-server --timer --force --parallel=auto --comment=n_mix_4k_size --vardir=var-n_mix_4k_size --mysqld=--binlog-format=mixed --experimental=collections/default.experimental --skip-ndb --skip-test-list=collections/disabled-per-push.list --unit-tests --mysqld=--innodb-page-size=4k --skip-test=innodb_ignore_builtin
4598+perl mysql-test-run.pl --debug-server --timer --force --parallel=auto --comment=main_ps_row_4k_size --vardir=var-main-ps_row --suite=main --ps-protocol --mysqld=--binlog-format=row --experimental=collections/default.experimental --skip-ndb --skip-test-list=collections/disabled-per-push.list --mysqld=--innodb-page-size=4k --skip-test=innodb_ignore_builtin
4599+perl mysql-test-run.pl --debug-server --timer --force --parallel=auto --comment=main_embedded_4k_size --vardir=var-main_emebbed --suite=main --embedded --experimental=collections/default.experimental --skip-ndb --mysqld=--innodb-page-size=4k --skip-test=innodb_ignore_builtin
4600
4601 # Run with 8K page size
4602-perl mysql-test-run.pl --timer --force --parallel=auto --comment=n_mix_8k_size --vardir=var-n_mix_8k_size --mysqld=--binlog-format=mixed --experimental=collections/default.experimental --skip-ndb --skip-test-list=collections/disabled-per-push.list --unit-tests --mysqld=--innodb-page-size=8k --skip-test=innodb_ignore_builtin
4603-perl mysql-test-run.pl --timer --force --parallel=auto --comment=main_ps_row_8k_size --vardir=var-main-ps_row --suite=main --ps-protocol --mysqld=--binlog-format=row --experimental=collections/default.experimental --skip-ndb --skip-test-list=collections/disabled-per-push.list --mysqld=--innodb-page-size=8k --skip-test=innodb_ignore_builtin
4604-perl mysql-test-run.pl --timer --force --parallel=auto --comment=main_embedded_8k_size --vardir=var-main_emebbed --suite=main --embedded --experimental=collections/default.experimental --skip-ndb --mysqld=--innodb-page-size=8k --skip-test=innodb_ignore_builtin
4605-
4606-# Run InnoDB with 4k page size
4607-perl mysql-test-run.pl --timer --force --parallel=auto --comment=innodb_4k_size --vardir=var-innodb-4k --experimental=collections/default.experimental --skip-ndb --suite=innodb --mysqld=--innodb-page-size=4k
4608-
4609-# Run InnoDB with 8k page size
4610-perl mysql-test-run.pl --timer --force --parallel=auto --comment=innodb_8k_size --vardir=var-innodb-8k --experimental=collections/default.experimental --skip-ndb --suite=innodb --mysqld=--innodb-page-size=8k
4611+perl mysql-test-run.pl --debug-server --timer --force --parallel=auto --comment=n_mix_8k_size --vardir=var-n_mix_8k_size --mysqld=--binlog-format=mixed --experimental=collections/default.experimental --skip-ndb --skip-test-list=collections/disabled-per-push.list --unit-tests --mysqld=--innodb-page-size=8k --skip-test=innodb_ignore_builtin
4612+perl mysql-test-run.pl --debug-server --timer --force --parallel=auto --comment=main_ps_row_8k_size --vardir=var-main-ps_row --suite=main --ps-protocol --mysqld=--binlog-format=row --experimental=collections/default.experimental --skip-ndb --skip-test-list=collections/disabled-per-push.list --mysqld=--innodb-page-size=8k --skip-test=innodb_ignore_builtin
4613+perl mysql-test-run.pl --debug-server --timer --force --parallel=auto --comment=main_embedded_8k_size --vardir=var-main_emebbed --suite=main --embedded --experimental=collections/default.experimental --skip-ndb --mysqld=--innodb-page-size=8k --skip-test=innodb_ignore_builtin
4614+
4615
4616 # Additional run to test rpl HASH_SCAN & INDEX_SCAN
4617-perl mysql-test-run.pl --force --timer --parallel=auto --experimental=collections/default.experimental --comment=binlog_rpl_row_hash_scan --vardir=var-binlog_rpl_row_hash_scan --mysqld=--binlog-format=row --suite=binlog,rpl --mysqld=--slave-rows-search-algorithms=HASH_SCAN,INDEX_SCAN --big-test --testcase-timeout=60
4618-perl mysql-test-run.pl --timer --force --parallel=auto --comment=rpl_binlog_row_hash_MTS --vardir=var-mts-rpl-binlog-hash-n_mix --mysqld=--binlog-format=row --experimental=collections/default.experimental --skip-ndb --unit-tests --mysqld=--slave-parallel-workers=4 --mysqld=--slave-transaction-retries=0 --suite=rpl,binlog -mysqld=--slave-rows-search-algorithms=HASH_SCAN,INDEX_SCAN
4619+perl mysql-test-run.pl --force --debug-server --timer --parallel=auto --experimental=collections/default.experimental --comment=binlog_rpl_row_hash_scan --vardir=var-binlog_rpl_row_hash_scan --mysqld=--binlog-format=row --suite=binlog,rpl --mysqld=--slave-rows-search-algorithms=HASH_SCAN,INDEX_SCAN --big-test --testcase-timeout=60
4620+perl mysql-test-run.pl --debug-server --timer --force --parallel=auto --comment=rpl_binlog_row_hash_MTS --vardir=var-mts-rpl-binlog-hash-n_mix --mysqld=--binlog-format=row --experimental=collections/default.experimental --skip-ndb --unit-tests --mysqld=--slave-parallel-workers=4 --mysqld=--slave-transaction-retries=0 --suite=rpl,binlog -mysqld=--slave-rows-search-algorithms=HASH_SCAN,INDEX_SCAN
4621
4622=== removed file 'Percona-Server/mysql-test/collections/mysql-5.6.release'
4623--- Percona-Server/mysql-test/collections/mysql-5.6.release 2012-09-06 13:52:50 +0000
4624+++ Percona-Server/mysql-test/collections/mysql-5.6.release 1970-01-01 00:00:00 +0000
4625@@ -1,6 +0,0 @@
4626-perl mysql-test-run.pl --timer --debug-server --force --parallel=auto --comment=n_mix-debug --vardir=var-n_mix --mysqld=--binlog-format=mixed --experimental=collections/default.experimental --skip-ndb --skip-test-list=collections/disabled-per-push.list --unit-tests
4627-perl mysql-test-run.pl --timer --debug-server --force --parallel=auto --comment=main_ps_row-debug --vardir=var-main-ps_row --suite=main --ps-protocol --mysqld=--binlog-format=row --experimental=collections/default.experimental --skip-ndb --skip-test-list=collections/disabled-per-push.list
4628-perl mysql-test-run.pl --timer --force --parallel=auto --comment=main_embedded-debug --vardir=var-main_emebbed --suite=main --embedded --experimental=collections/default.experimental --skip-ndb
4629-perl mysql-test-run.pl --timer --debug-server --force --parallel=auto --comment=innodb_4k_size-debug --vardir=var-innodb-4k --experimental=collections/default.experimental --skip-ndb --suite=innodb --mysqld=--innodb-page-size=4k
4630-perl mysql-test-run.pl --force --timer --debug-server --parallel=auto --experimental=collections/default.experimental --comment=partitions-debug --vardir=var-parts --suite=parts
4631-perl mysql-test-run.pl --timer --debug-server --force --parallel=auto --comment=rpl_binlog_n_mix_MTS-debug --vardir=var-mts-rpl-binlog-n_mix --mysqld=--binlog-format=mixed --experimental=collections/default.experimental --skip-ndb --unit-tests --mysqld=--slave-parallel-workers=4 --mysqld=--slave-transaction-retries=0 --suite=rpl
4632
4633=== removed file 'Percona-Server/mysql-test/collections/mysql-trunk-bug27480.push'
4634--- Percona-Server/mysql-test/collections/mysql-trunk-bug27480.push 2011-03-24 08:45:04 +0000
4635+++ Percona-Server/mysql-test/collections/mysql-trunk-bug27480.push 1970-01-01 00:00:00 +0000
4636@@ -1,4 +0,0 @@
4637-perl mysql-test-run.pl --timer --force --parallel=auto --comment=n_mix --vardir=var-n_mix --mysqld=--binlog-format=mixed --experimental=collections/default.experimental --skip-ndb --skip-test-list=collections/disabled-per-push.list
4638-perl mysql-test-run.pl --timer --force --parallel=auto --comment=main_ps_row --vardir=var-main-ps_row --suite=main --ps-protocol --mysqld=--binlog-format=row --experimental=collections/default.experimental --skip-ndb --skip-test-list=collections/disabled-per-push.list
4639-perl mysql-test-run.pl --timer --force --parallel=auto --comment=main_embedded --vardir=var-main_emebbed --suite=main --embedded --experimental=collections/default.experimental --skip-ndb
4640-perl mysql-test-run.pl --timer --force --parallel=auto --comment=funcs_1 --vardir=var-funcs_1 --suite=funcs_1 --experimental=collections/default.experimental --skip-ndb
4641
4642=== removed file 'Percona-Server/mysql-test/collections/mysql-trunk-stage.push'
4643--- Percona-Server/mysql-test/collections/mysql-trunk-stage.push 2012-05-31 11:06:04 +0000
4644+++ Percona-Server/mysql-test/collections/mysql-trunk-stage.push 1970-01-01 00:00:00 +0000
4645@@ -1,6 +0,0 @@
4646-perl mysql-test-run.pl --timer --debug-server --force --parallel=auto --comment=n_mix --vardir=var-n_mix --mysqld=--binlog-format=mixed --experimental=collections/default.experimental --skip-ndb --skip-test-list=collections/disabled-per-push.list --unit-tests
4647-perl mysql-test-run.pl --timer --debug-server --force --parallel=auto --comment=main_ps_row --vardir=var-main-ps_row --suite=main --ps-protocol --mysqld=--binlog-format=row --experimental=collections/default.experimental --skip-ndb --skip-test-list=collections/disabled-per-push.list
4648-perl mysql-test-run.pl --timer --debug-server --force --parallel=auto --comment=main_embedded --vardir=var-main_emebbed --suite=main --embedded --experimental=collections/default.experimental --skip-ndb
4649-perl mysql-test-run.pl --timer --debug-server --force --parallel=auto --comment=innodb_4k_size --vardir=var-innodb-4k --experimental=collections/default.experimental --skip-ndb --suite=innodb --mysqld=--innodb-page-size=4k
4650-perl mysql-test-run.pl --force --timer --debug-server --parallel=auto --experimental=collections/default.experimental --comment=partitions --vardir=var-parts --suite=parts
4651-perl mysql-test-run.pl --timer --debug-server --force --parallel=auto --comment=rpl_binlog_n_mix_MTS --vardir=var-mts-rpl-binlog-n_mix --mysqld=--binlog-format=mixed --experimental=collections/default.experimental --skip-ndb --unit-tests --mysqld=--slave-parallel-workers=4 --mysqld=--slave-transaction-retries=0 --suite=rpl
4652
4653=== removed file 'Percona-Server/mysql-test/collections/mysql-trunk-wl3584-gtid-ON.push'
4654--- Percona-Server/mysql-test/collections/mysql-trunk-wl3584-gtid-ON.push 2012-02-17 09:27:56 +0000
4655+++ Percona-Server/mysql-test/collections/mysql-trunk-wl3584-gtid-ON.push 1970-01-01 00:00:00 +0000
4656@@ -1,20 +0,0 @@
4657-# Additional modes for rpl. Multi-Threaded Slave
4658-perl mysql-test-run.pl --timer --force --retry=0 --max-test-fail=0 --parallel=auto --comment=rpl_binlog_n_mix_MTS --vardir=var-mts-rpl-binlog-n_mix --mysqld=--binlog-format=mixed --experimental=collections/default.experimental --skip-ndb --unit-tests --mysqld=--slave-parallel-workers=4 --mysqld=--slave-transaction-retries=0 --suite=rpl
4659-
4660-perl mysql-test-run.pl --timer --force --retry=0 --max-test-fail=0 --parallel=auto --comment=rpl_binlog_ps_row_MTS --vardir=var-mts-rpl-binlog-ps_row --ps-protocol --mysqld=--binlog-format=row --experimental=collections/default.experimental --skip-ndb --mysqld=--slave-parallel-workers=4 --mysqld=--slave-transaction-retries=0 --suite=rpl
4661-
4662-perl mysql-test-run.pl --timer --force --retry=0 --max-test-fail=0 --parallel=auto --comment=rpl_binlog_stmt_MTS --vardir=var-mts-rpl-binlog-stmt --mysqld=--binlog-format=statement --experimental=collections/default.experimental --skip-ndb --mysqld=--slave-parallel-workers=4 --mysqld=--slave-transaction-retries=0 --suite=rpl
4663-
4664-# Additional modes for rpl and binlog suites. Checksum and relay-log-info-repository
4665-perl mysql-test-run.pl --force --retry=0 --max-test-fail=0 --timer --debug-server --parallel=auto --experimental=collections/default.experimental --comment=rpl_binlog_checksum-debug --vardir=var-rpl_binlog_checksum-debug --suite=rpl,binlog --mysqld=--binlog-checksum=CRC32
4666-
4667-perl mysql-test-run.pl --force --retry=0 --max-test-fail=0 --timer --debug-server --parallel=auto --experimental=collections/default.experimental --comment=rpl_crash_safe_relay-debug --vardir=var-rpl_crash_safe_relay-debug --suite=rpl --mysqld=--relay-log-info-repository=TABLE
4668-
4669-perl mysql-test-run.pl --force --retry=0 --max-test-fail=0 --timer --debug-server --parallel=auto --experimental=collections/default.experimental --comment=rpl_crash_safe_master-debug --vardir=var-rpl_crash_safe_master-debug --suite=rpl --mysqld=--master-info-repository=TABLE
4670-
4671-# modes for gtid on
4672-#perl mysql-test-run.pl --debug-server --timer --skip-ndb --force --retry=0 --max-test-fail=0 --parallel=auto --comment=rpl_gtid_enabled --vardir=var-gtid-enabled --mysqld=--gtid-mode=ON --mysqld=--log-bin --mysqld=--log-slave-updates --mysqld=--disable-gtid-unsafe-statements --mysqld=--debug="+d,allow_gtid_unsafe_non_transactional_updates" --skip-test-list=collections/disabled-gtid-on.list --suite=rpl,binlog
4673-
4674-#perl mysql-test-run.pl --debug-server --timer --skip-ndb --force --retry=0 --max-test-fail=0 --parallel=auto --comment=rpl_mts_gtid_enabled --vardir=var-mts-gtid-enabled --mysqld=--gtid-mode=ON --mysqld=--log-bin --mysqld=--log-slave-updates --mysqld=--disable-gtid-unsafe-statements --mysqld=--debug="+d,allow_gtid_unsafe_non_transactional_updates" --mysqld=--slave-parallel-workers=4 --mysqld=--slave-transaction-retries=0 --skip-test-list=collections/disabled-gtid-on.list --suite=rpl
4675-
4676-#perl mysql-test-run.pl --debug-server --timer --skip-ndb --force --retry=0 --max-test-fail=0 --parallel=auto --comment=rpl_crc_gtid_enabled --vardir=var-crc-gtid-enabled --mysqld=--gtid-mode=ON --mysqld=--log-bin --mysqld=--log-slave-updates --mysqld=--disable-gtid-unsafe-statements --mysqld=--debug="+d,allow_gtid_unsafe_non_transactional_updates" --mysqld=--binlog-checksum=CRC32 --skip-test-list=collections/disabled-gtid-on.list --suite=rpl,binlog
4677
4678=== removed file 'Percona-Server/mysql-test/collections/mysql-trunk-wl3584.push'
4679--- Percona-Server/mysql-test/collections/mysql-trunk-wl3584.push 2012-02-17 09:27:56 +0000
4680+++ Percona-Server/mysql-test/collections/mysql-trunk-wl3584.push 1970-01-01 00:00:00 +0000
4681@@ -1,16 +0,0 @@
4682-# n_mix
4683-perl mysql-test-run.pl --timer --force --retry=0 --max-test-fail=0 --parallel=auto --comment=n_mix --vardir=var-n_mix --mysqld=--binlog-format=mixed --experimental=collections/default.experimental --skip-ndb --unit-tests
4684-
4685-# main_ps_row
4686-perl mysql-test-run.pl --timer --force --retry=0 --max-test-fail=0 --parallel=auto --comment=main_ps_row --vardir=var-main-ps_row --suite=main --ps-protocol --mysqld=--binlog-format=row --experimental=collections/default.experimental --skip-ndb
4687-
4688-# main_embedded
4689-perl mysql-test-run.pl --timer --force --parallel=auto --comment=main_embedded --vardir=var-main_emebbed --suite=main --embedded --experimental=collections/default.experimental --skip-ndb
4690-
4691-
4692-# Additional modes for gtid on
4693-#perl mysql-test-run.pl --debug-server --timer --skip-ndb --force --retry=0 --max-test-fail=0 --parallel=auto --comment=rpl_gtid_enabled --vardir=var-gtid-enabled --mysqld=--gtid-mode=ON --mysqld=--log-bin --mysqld=--log-slave-updates --mysqld=--disable-gtid-unsafe-statements --mysqld=--debug="+d,allow_gtid_unsafe_non_transactional_updates" --skip-test-list=collections/disabled-gtid-on.list --suite=rpl,binlog
4694-
4695-#perl mysql-test-run.pl --debug-server --timer --skip-ndb --force --retry=0 --max-test-fail=0 --parallel=auto --comment=rpl_mts_gtid_enabled --vardir=var-mts-gtid-enabled --mysqld=--gtid-mode=ON --mysqld=--log-bin --mysqld=--log-slave-updates --mysqld=--disable-gtid-unsafe-statements --mysqld=--debug="+d,allow_gtid_unsafe_non_transactional_updates" --mysqld=--slave-parallel-workers=4 --mysqld=--slave-transaction-retries=0 --skip-test-list=collections/disabled-gtid-on.list --suite=rpl
4696-
4697-#perl mysql-test-run.pl --debug-server --timer --skip-ndb --force --retry=0 --max-test-fail=0 --parallel=auto --comment=rpl_crc_gtid_enabled --vardir=var-crc-gtid-enabled --mysqld=--gtid-mode=ON --mysqld=--log-bin --mysqld=--log-slave-updates --mysqld=--disable-gtid-unsafe-statements --mysqld=--debug="+d,allow_gtid_unsafe_non_transactional_updates" --mysqld=--binlog-checksum=CRC32 --skip-test-list=collections/disabled-gtid-on.list --suite=rpl,binlog
4698
4699=== removed file 'Percona-Server/mysql-test/collections/mysql-trunk-wl5223.push'
4700--- Percona-Server/mysql-test/collections/mysql-trunk-wl5223.push 2012-05-08 20:03:33 +0000
4701+++ Percona-Server/mysql-test/collections/mysql-trunk-wl5223.push 1970-01-01 00:00:00 +0000
4702@@ -1,2 +0,0 @@
4703-perl mysql-test-run.pl --timer --force --parallel=auto --comment=n_all --vardir=var-n_all --experimental=collections/default.experimental --skip-ndb --unit-tests
4704-perl mysql-test-run.pl --timer --big-test --testcase-timeout=60 --force --parallel=auto --comment=n_big --vardir=var-n_big --big-test --suite=rpl,binlog --experimental=collections/default.experimental --skip-ndb
4705
4706=== removed file 'Percona-Server/mysql-test/collections/mysql-trunk.release'
4707--- Percona-Server/mysql-test/collections/mysql-trunk.release 2012-06-11 09:01:15 +0000
4708+++ Percona-Server/mysql-test/collections/mysql-trunk.release 1970-01-01 00:00:00 +0000
4709@@ -1,6 +0,0 @@
4710-perl mysql-test-run.pl --timer --debug-server --force --parallel=auto --comment=n_mix-debug --vardir=var-n_mix --mysqld=--binlog-format=mixed --experimental=collections/default.experimental --skip-ndb --skip-test-list=collections/disabled-per-push.list --unit-tests
4711-perl mysql-test-run.pl --timer --debug-server --force --parallel=auto --comment=main_ps_row-debug --vardir=var-main-ps_row --suite=main --ps-protocol --mysqld=--binlog-format=row --experimental=collections/default.experimental --skip-ndb --skip-test-list=collections/disabled-per-push.list
4712-perl mysql-test-run.pl --timer --debug-server --force --parallel=auto --comment=main_embedded-debug --vardir=var-main_emebbed --suite=main --embedded --experimental=collections/default.experimental --skip-ndb
4713-perl mysql-test-run.pl --timer --debug-server --force --parallel=auto --comment=innodb_4k_size-debug --vardir=var-innodb-4k --experimental=collections/default.experimental --skip-ndb --suite=innodb --mysqld=--innodb-page-size=4k
4714-perl mysql-test-run.pl --force --timer --debug-server --parallel=auto --experimental=collections/default.experimental --comment=partitions-debug --vardir=var-parts --suite=parts
4715-perl mysql-test-run.pl --timer --debug-server --force --parallel=auto --comment=rpl_binlog_n_mix_MTS-debug --vardir=var-mts-rpl-binlog-n_mix --mysqld=--binlog-format=mixed --experimental=collections/default.experimental --skip-ndb --unit-tests --mysqld=--slave-parallel-workers=4 --mysqld=--slave-transaction-retries=0 --suite=rpl
4716
4717=== added file 'Percona-Server/mysql-test/include/Load_data.inc'
4718--- Percona-Server/mysql-test/include/Load_data.inc 1970-01-01 00:00:00 +0000
4719+++ Percona-Server/mysql-test/include/Load_data.inc 2012-12-17 04:11:35 +0000
4720@@ -0,0 +1,14 @@
4721+--echo ===============
4722+--echo Load the data
4723+--echo ===============
4724+
4725+SET @col_1 = repeat('a', 10);
4726+
4727+while ($i) {
4728+
4729+eval INSERT INTO $table
4730+VALUES (@col_1);
4731+dec $i;
4732+}
4733+commit;
4734+
4735
4736=== added file 'Percona-Server/mysql-test/include/create_table.inc'
4737--- Percona-Server/mysql-test/include/create_table.inc 1970-01-01 00:00:00 +0000
4738+++ Percona-Server/mysql-test/include/create_table.inc 2012-12-17 04:11:35 +0000
4739@@ -0,0 +1,8 @@
4740+--echo ===============
4741+--echo create table & Index
4742+--echo ===============
4743+
4744+eval CREATE TABLE $table (col_1 text(10))
4745+ENGINE=INNODB ;
4746+
4747+
4748
4749=== added file 'Percona-Server/mysql-test/include/have_partition_open_file_limit.inc'
4750--- Percona-Server/mysql-test/include/have_partition_open_file_limit.inc 1970-01-01 00:00:00 +0000
4751+++ Percona-Server/mysql-test/include/have_partition_open_file_limit.inc 2012-12-17 04:11:35 +0000
4752@@ -0,0 +1,5 @@
4753+let $max_open_files_limit= `SELECT @@open_files_limit < 17000`;
4754+if ($max_open_files_limit)
4755+{
4756+ skip Need open_files_limit >= 16450 (see ulimit -n);
4757+}
4758
4759=== added file 'Percona-Server/mysql-test/include/ib_logfile_size_check.inc'
4760--- Percona-Server/mysql-test/include/ib_logfile_size_check.inc 1970-01-01 00:00:00 +0000
4761+++ Percona-Server/mysql-test/include/ib_logfile_size_check.inc 2012-12-17 04:11:35 +0000
4762@@ -0,0 +1,14 @@
4763+perl;
4764+ my $dir = $ENV{'MYSQLD_DATADIR'};
4765+ my $size;
4766+ opendir(DIR, $dir) or die $!;
4767+ while (my $file = readdir(DIR))
4768+ {
4769+
4770+ next unless ($file =~ m/\ib_logfile.$/);
4771+ $size = -s "$dir/$file";
4772+ print "The size of the ib_logfile(0/1): $size \n";
4773+ }
4774+ close(DIR);
4775+ exit(0)
4776+EOF
4777
4778=== modified file 'Percona-Server/mysql-test/include/innodb-util.inc'
4779--- Percona-Server/mysql-test/include/innodb-util.inc 2012-06-19 06:35:20 +0000
4780+++ Percona-Server/mysql-test/include/innodb-util.inc 2012-12-17 04:11:35 +0000
4781@@ -19,13 +19,13 @@
4782 my $ibd_file = sprintf("%s.ibd", $table);
4783 my $tmpd = $ENV{'MYSQLTEST_VARDIR'} . "/tmp";
4784
4785- my @args = (File::Spec->catfile("$datadir", "$db", "$ibd_file"),
4786- File::Spec->catfile("$tmpd", "$ibd_file"));
4787+ my @args = (File::Spec->catfile($datadir, $db, $ibd_file),
4788+ File::Spec->catfile($tmpd, $ibd_file));
4789
4790 copy(@args) or die "copy @args failed: $!";
4791
4792- my @args = (File::Spec->catfile("$datadir", "$db", "$cfg_file"),
4793- File::Spec->catfile("$tmpd", "$cfg_file"));
4794+ my @args = (File::Spec->catfile($datadir, $db, $cfg_file),
4795+ File::Spec->catfile($tmpd, $cfg_file));
4796
4797 copy(@args) or die "copy @args failed: $!";
4798 }
4799@@ -38,7 +38,7 @@
4800 print "unlink: $cfg_file\n";
4801
4802 # These may or may not exist
4803- unlink(File::Spec->catfile("$datadir", "$db", "$cfg_file"));
4804+ unlink(File::Spec->catfile($datadir, $db, $cfg_file));
4805 }
4806
4807 sub ib_unlink_tablespace {
4808@@ -48,7 +48,7 @@
4809
4810 print "unlink: $ibd_file\n";
4811 # This may or may not exist
4812- unlink(File::Spec->catfile("$datadir", "$db", "$ibd_file"));
4813+ unlink(File::Spec->catfile($datadir, $db, $ibd_file));
4814
4815 ib_cleanup($db, $table);
4816 }
4817@@ -57,8 +57,8 @@
4818 my ($db, @tables) = @_;
4819
4820 foreach my $table (@tables) {
4821- print "backup: $table\n";
4822- ib_backup_tablespace($db, $table);
4823+ print "backup: $table\n";
4824+ ib_backup_tablespace($db, $table);
4825 }
4826 }
4827
4828@@ -66,30 +66,63 @@
4829
4830 sub ib_discard_tablespaces { }
4831
4832+sub ib_restore_cfg_file {
4833+ my ($tmpd, $datadir, $db, $table) = @_;
4834+ my $cfg_file = sprintf("%s.cfg", $table);
4835+
4836+ my @args = (File::Spec->catfile($tmpd, $cfg_file),
4837+ File::Spec->catfile($datadir, "$db", $cfg_file));
4838+
4839+ copy(@args) or die "copy @args failed: $!";
4840+}
4841+
4842+sub ib_restore_ibd_file {
4843+ my ($tmpd, $datadir, $db, $table) = @_;
4844+ my $ibd_file = sprintf("%s.ibd", $table);
4845+
4846+ my @args = (File::Spec->catfile($tmpd, $ibd_file),
4847+ File::Spec->catfile($datadir, $db, $ibd_file));
4848+
4849+ copy(@args) or die "copy @args failed: $!";
4850+}
4851+
4852 sub ib_restore_tablespace {
4853 my ($db, $table) = @_;
4854 my $datadir = $ENV{'MYSQLD_DATADIR'};
4855- my $cfg_file = sprintf("%s.cfg", $table);
4856- my $ibd_file = sprintf("%s.ibd", $table);
4857 my $tmpd = $ENV{'MYSQLTEST_VARDIR'} . "/tmp";
4858
4859- my @args = (File::Spec->catfile("$tmpd", "$cfg_file"),
4860- File::Spec->catfile("$datadir", "$db", "$cfg_file"));
4861-
4862- copy(@args) or die "copy @args failed: $!";
4863-
4864- my @args = (File::Spec->catfile("$tmpd", "$ibd_file"),
4865- File::Spec->catfile("$datadir", "$db", "$ibd_file"));
4866-
4867- copy(@args) or die "copy @args failed: $!";
4868+ ib_restore_cfg_file($tmpd, $datadir, $db, $table);
4869+ ib_restore_ibd_file($tmpd, $datadir, $db, $table);
4870 }
4871
4872 sub ib_restore_tablespaces {
4873 my ($db, @tables) = @_;
4874
4875 foreach my $table (@tables) {
4876- print "restore: $table\n";
4877- ib_restore_tablespace($db, $table);
4878+ print "restore: $table .ibd and .cfg files\n";
4879+ ib_restore_tablespace($db, $table);
4880+ }
4881+}
4882+
4883+sub ib_restore_cfg_files {
4884+ my ($db, @tables) = @_;
4885+ my $datadir = $ENV{'MYSQLD_DATADIR'};
4886+ my $tmpd = $ENV{'MYSQLTEST_VARDIR'} . "/tmp";
4887+
4888+ foreach my $table (@tables) {
4889+ print "restore: $table .cfg file\n";
4890+ ib_restore_cfg_file($tmpd, $datadir, $db, $table);
4891+ }
4892+}
4893+
4894+sub ib_restore_ibd_files {
4895+ my ($db, @tables) = @_;
4896+ my $datadir = $ENV{'MYSQLD_DATADIR'};
4897+ my $tmpd = $ENV{'MYSQLTEST_VARDIR'} . "/tmp";
4898+
4899+ foreach my $table (@tables) {
4900+ print "restore: $table .ibd file\n";
4901+ ib_restore_ibd_file($tmpd, $datadir, $db, $table);
4902 }
4903 }
4904 EOF
4905
4906=== modified file 'Percona-Server/mysql-test/include/mtr_warnings.sql'
4907--- Percona-Server/mysql-test/include/mtr_warnings.sql 2012-08-22 01:40:20 +0000
4908+++ Percona-Server/mysql-test/include/mtr_warnings.sql 2012-12-17 04:11:35 +0000
4909@@ -239,6 +239,9 @@
4910 of events, this warning is emitted.
4911 */
4912 ("Slave SQL: Coordinator thread of multi-threaded slave is being stopped in the middle of assigning a group of events.*"),
4913+
4914+ ("Changed limits: max_open_files: * max_connections: * table_cache: *"),
4915+ ("Could not increase number of max_open_files to more than *"),
4916
4917 ("THE_LAST_SUPPRESSION")||
4918
4919
4920=== modified file 'Percona-Server/mysql-test/include/mysqld--help.inc'
4921--- Percona-Server/mysql-test/include/mysqld--help.inc 2012-08-22 01:40:20 +0000
4922+++ Percona-Server/mysql-test/include/mysqld--help.inc 2012-12-17 04:11:35 +0000
4923@@ -18,7 +18,7 @@
4924 # their paths may vary:
4925 @skipvars=qw/basedir open-files-limit general-log-file log plugin-dir
4926 log-slow-queries pid-file slow-query-log-file
4927- datadir slave-load-tmpdir tmpdir socket/;
4928+ datadir slave-load-tmpdir tmpdir socket table-definition-cache table-open-cache/;
4929
4930 # Plugins which may or may not be there:
4931 @plugins=qw/innodb ndb ndbinfo archive blackhole federated partition ndbcluster debug temp-pool ssl des-key-file
4932
4933=== modified file 'Percona-Server/mysql-test/include/rpl_start_server.inc'
4934--- Percona-Server/mysql-test/include/rpl_start_server.inc 2012-08-22 01:40:20 +0000
4935+++ Percona-Server/mysql-test/include/rpl_start_server.inc 2012-12-17 04:11:35 +0000
4936@@ -11,6 +11,7 @@
4937 # [--let $rpl_omit_print_server_parameters= 0]
4938 # [--let $rpl_debug_trace= 1]
4939 # [--let $rpl_debug= 1]
4940+# [--let $rpl_server_error= 0]
4941 # --source include/rpl_start_server.inc
4942 #
4943 # Parameters:
4944@@ -44,6 +45,9 @@
4945 # $rpl_debug
4946 # See include/rpl_init.inc
4947 #
4948+# $rpl_server_error
4949+# If set, failure of the server startup is expected.
4950+#
4951 # ==== See also ====
4952 #
4953 # rpl_stop_server.inc
4954@@ -112,8 +116,10 @@
4955
4956 #--exec echo "$_rpl_start_server_command" > $MYSQLTEST_VARDIR/tmp/mysqld.$rpl_server_number.expect
4957
4958---source include/rpl_reconnect.inc
4959-
4960-
4961---let $include_filename= rpl_start_server.inc [$_rpl_start_server_info]
4962---source include/end_include_file.inc
4963+if (!$rpl_server_error)
4964+{
4965+ --source include/rpl_reconnect.inc
4966+
4967+ --let $include_filename= rpl_start_server.inc [$_rpl_start_server_info]
4968+ --source include/end_include_file.inc
4969+}
4970
4971=== modified file 'Percona-Server/mysql-test/include/subquery_sj.inc'
4972--- Percona-Server/mysql-test/include/subquery_sj.inc 2012-10-16 06:21:51 +0000
4973+++ Percona-Server/mysql-test/include/subquery_sj.inc 2012-12-17 04:11:35 +0000
4974@@ -4318,12 +4318,23 @@
4975
4976 INSERT INTO t2 VALUES ('v'), ('y'), ('j'), ('c'), ('d'), ('r');
4977
4978+-- disable_query_log
4979+-- disable_result_log
4980+ANALYZE TABLE t1;
4981+ANALYZE TABLE t2;
4982+-- enable_result_log
4983+-- enable_query_log
4984+
4985+let $query=
4986 SELECT col_varchar_key
4987 FROM t1
4988 WHERE col_varchar_key IN (SELECT col_varchar_nokey
4989 FROM t2)
4990 ORDER BY col_datetime_key LIMIT 4;
4991
4992+eval explain $query;
4993+eval $query;
4994+
4995 DROP TABLE t1, t2;
4996
4997 --echo # End of test for bug#12818569.
4998
4999=== added file 'Percona-Server/mysql-test/include/vardir_size_check.inc'
5000--- Percona-Server/mysql-test/include/vardir_size_check.inc 1970-01-01 00:00:00 +0000
The diff has been truncated for viewing.

Subscribers

People subscribed via source and target branches