21164153 Upgrade the version of MySQL 5.5 to 5.5.43 on Solaris
authorMurthy Narkedimilli <murthy.narkedimilli@oracle.com>
Fri, 19 Jun 2015 09:04:36 -0700
changeset 4510 522eaa890fe6
parent 4507 76c2e35382f6
child 4511 dd483456146f
21164153 Upgrade the version of MySQL 5.5 to 5.5.43 on Solaris 21271010 problem in DATABASE/MYSQL 21271041 problem in DATABASE/MYSQL 21271071 problem in DATABASE/MYSQL
components/mysql-5-5/Makefile
components/mysql-5-5/mysql-55.p5m
components/mysql-5-5/mysql-55test.p5m
components/mysql-5-5/patches/mysql_config.patch
--- a/components/mysql-5-5/Makefile	Thu Jun 18 22:21:14 2015 -0700
+++ b/components/mysql-5-5/Makefile	Fri Jun 19 09:04:36 2015 -0700
@@ -26,11 +26,11 @@
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME        = mysql
-COMPONENT_VERSION     = 5.5.31
+COMPONENT_VERSION     = 5.5.43
 COMPONENT_SRC         = $(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE     = $(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH= \
-    sha256:9cdd650b47e3ea864ab40d4ab23fa4a9fdfabc7fd018bf5c9cce30722c0abcea
+    sha256:43d3df79e5c839a2749deb6e056a4589e49c903e09034c18653ec56e6e4774cd
 COMPONENT_ARCHIVE_URL = http://downloads.mysql.com/archives/mysql-5.5/$(COMPONENT_ARCHIVE)
 COMPONENT_PROJECT_URL = http://dev.mysql.com/ 
 COMPONENT_BUGDB       = database/mysql
--- a/components/mysql-5-5/mysql-55.p5m	Thu Jun 18 22:21:14 2015 -0700
+++ b/components/mysql-5-5/mysql-55.p5m	Fri Jun 19 09:04:36 2015 -0700
@@ -76,7 +76,6 @@
 file path=usr/mysql/5.5/docs/ChangeLog
 file path=usr/mysql/5.5/docs/INFO_BIN
 file path=usr/mysql/5.5/docs/INFO_SRC
-file path=usr/mysql/5.5/docs/mysql.info
 file path=usr/mysql/5.5/include/decimal.h
 file path=usr/mysql/5.5/include/errmsg.h
 file path=usr/mysql/5.5/include/keycache.h
@@ -252,6 +251,7 @@
 file path=usr/mysql/5.5/support-files/mysql.server
 file path=usr/mysql/5.5/support-files/mysqld_multi.server
 file path=usr/mysql/5.5/support-files/ndb-config-2-node.ini
+file path=usr/mysql/5.5/support-files/solaris/postinstall-solaris
 
 # added ownership of var/mysql/* to mysql user/ group
 dir  path=var/mysql owner=mysql group=mysql mode=0700
--- a/components/mysql-5-5/mysql-55test.p5m	Thu Jun 18 22:21:14 2015 -0700
+++ b/components/mysql-5-5/mysql-55test.p5m	Fri Jun 19 09:04:36 2015 -0700
@@ -276,6 +276,7 @@
 file path=usr/mysql/5.5/mysql-test/include/have_ssl.inc
 file path=usr/mysql/5.5/mysql-test/include/have_ssl_communication.inc
 file path=usr/mysql/5.5/mysql-test/include/have_ssl_crypto_functs.inc
+file path=usr/mysql/5.5/mysql-test/include/have_symlink.inc
 file path=usr/mysql/5.5/mysql-test/include/have_tis620.inc
 file path=usr/mysql/5.5/mysql-test/include/have_ucs2.inc
 file path=usr/mysql/5.5/mysql-test/include/have_udf.inc
@@ -284,6 +285,7 @@
 file path=usr/mysql/5.5/mysql-test/include/have_utf32.inc
 file path=usr/mysql/5.5/mysql-test/include/have_utf8.inc
 file path=usr/mysql/5.5/mysql-test/include/have_utf8mb4.inc
+file path=usr/mysql/5.5/mysql-test/include/have_valgrind.inc
 file path=usr/mysql/5.5/mysql-test/include/implicit_commit_helper.inc
 file path=usr/mysql/5.5/mysql-test/include/index_merge1.inc
 file path=usr/mysql/5.5/mysql-test/include/index_merge2.inc
@@ -293,6 +295,7 @@
 file path=usr/mysql/5.5/mysql-test/include/innodb-index.inc
 file path=usr/mysql/5.5/mysql-test/include/innodb_rollback_on_timeout.inc
 file path=usr/mysql/5.5/mysql-test/include/innodb_trx_weight.inc
+file path=usr/mysql/5.5/mysql-test/include/install_semisync.inc
 file path=usr/mysql/5.5/mysql-test/include/io_thd_fault_injection.inc
 file path=usr/mysql/5.5/mysql-test/include/ipv6.inc
 file path=usr/mysql/5.5/mysql-test/include/ipv6_clients.inc
@@ -340,6 +343,7 @@
 file path=usr/mysql/5.5/mysql-test/include/not_parallel.inc
 file path=usr/mysql/5.5/mysql-test/include/not_threadpool.inc
 file path=usr/mysql/5.5/mysql-test/include/not_valgrind.inc
+file path=usr/mysql/5.5/mysql-test/include/not_var_link.inc
 file path=usr/mysql/5.5/mysql-test/include/not_windows.inc
 file path=usr/mysql/5.5/mysql-test/include/not_windows_embedded.inc
 file path=usr/mysql/5.5/mysql-test/include/one_thread_per_connection.inc
@@ -393,6 +397,7 @@
 file path=usr/mysql/5.5/mysql-test/include/running_event_scheduler.inc
 file path=usr/mysql/5.5/mysql-test/include/safe_set_to_maybe_ro_var.inc
 file path=usr/mysql/5.5/mysql-test/include/save_master_pos.inc
+file path=usr/mysql/5.5/mysql-test/include/search_pattern_in_file.inc
 file path=usr/mysql/5.5/mysql-test/include/select_ndb_apply_status.inc
 file path=usr/mysql/5.5/mysql-test/include/set_binlog_format_mixed.sql
 file path=usr/mysql/5.5/mysql-test/include/set_binlog_format_row.sql
@@ -413,6 +418,7 @@
 file path=usr/mysql/5.5/mysql-test/include/show_slave_status.inc
 file path=usr/mysql/5.5/mysql-test/include/sp-vars.inc
 file path=usr/mysql/5.5/mysql-test/include/start_slave.inc
+file path=usr/mysql/5.5/mysql-test/include/stop_dump_threads.inc
 file path=usr/mysql/5.5/mysql-test/include/stop_slave.inc
 file path=usr/mysql/5.5/mysql-test/include/stop_slave_io.inc
 file path=usr/mysql/5.5/mysql-test/include/stop_slave_sql.inc
@@ -427,6 +433,7 @@
 file path=usr/mysql/5.5/mysql-test/include/tpcb.inc
 file path=usr/mysql/5.5/mysql-test/include/tpcb_disk_data.inc
 file path=usr/mysql/5.5/mysql-test/include/truncate_file.inc
+file path=usr/mysql/5.5/mysql-test/include/uninstall_semisync.inc
 file path=usr/mysql/5.5/mysql-test/include/unsafe_binlog.inc
 file path=usr/mysql/5.5/mysql-test/include/uses_vardir.inc
 file path=usr/mysql/5.5/mysql-test/include/varchar.inc
@@ -578,6 +585,7 @@
 file path=usr/mysql/5.5/mysql-test/r/ctype_collate.result
 file path=usr/mysql/5.5/mysql-test/r/ctype_cp1250_ch.result
 file path=usr/mysql/5.5/mysql-test/r/ctype_cp1251.result
+file path=usr/mysql/5.5/mysql-test/r/ctype_cp932.result
 file path=usr/mysql/5.5/mysql-test/r/ctype_cp932_binlog_row.result
 file path=usr/mysql/5.5/mysql-test/r/ctype_cp932_binlog_stm.result
 file path=usr/mysql/5.5/mysql-test/r/ctype_create.result
@@ -819,6 +827,7 @@
 file path=usr/mysql/5.5/mysql-test/r/lock_multi_bug38691.result
 file path=usr/mysql/5.5/mysql-test/r/lock_sync.result
 file path=usr/mysql/5.5/mysql-test/r/lock_tables_lost_commit.result
+file path=usr/mysql/5.5/mysql-test/r/log_errchk.result
 file path=usr/mysql/5.5/mysql-test/r/log_state.result
 file path=usr/mysql/5.5/mysql-test/r/log_state_bug33693.result
 file path=usr/mysql/5.5/mysql-test/r/log_tables-big.result
@@ -1022,6 +1031,7 @@
 file path=usr/mysql/5.5/mysql-test/r/server_id1.require
 file path=usr/mysql/5.5/mysql-test/r/shm.result
 file path=usr/mysql/5.5/mysql-test/r/show_check.result
+file path=usr/mysql/5.5/mysql-test/r/show_processlist.result
 file path=usr/mysql/5.5/mysql-test/r/show_profile.result
 file path=usr/mysql/5.5/mysql-test/r/signal.result
 file path=usr/mysql/5.5/mysql-test/r/signal_code.result
@@ -1359,6 +1369,7 @@
 file path=usr/mysql/5.5/mysql-test/suite/binlog/r/binlog_switch_inside_trans.result
 file path=usr/mysql/5.5/mysql-test/suite/binlog/r/binlog_tmp_table.result
 file path=usr/mysql/5.5/mysql-test/suite/binlog/r/binlog_truncate_innodb.result
+file path=usr/mysql/5.5/mysql-test/suite/binlog/r/binlog_truncate_kill.result
 file path=usr/mysql/5.5/mysql-test/suite/binlog/r/binlog_truncate_myisam.result
 file path=usr/mysql/5.5/mysql-test/suite/binlog/r/binlog_unsafe.result
 file path=usr/mysql/5.5/mysql-test/suite/binlog/r/binlog_write_error.result
@@ -1451,6 +1462,7 @@
 file path=usr/mysql/5.5/mysql-test/suite/binlog/t/binlog_tmp_table.test
 file path=usr/mysql/5.5/mysql-test/suite/binlog/t/binlog_truncate_innodb-master.opt
 file path=usr/mysql/5.5/mysql-test/suite/binlog/t/binlog_truncate_innodb.test
+file path=usr/mysql/5.5/mysql-test/suite/binlog/t/binlog_truncate_kill.test
 file path=usr/mysql/5.5/mysql-test/suite/binlog/t/binlog_truncate_myisam.test
 file path=usr/mysql/5.5/mysql-test/suite/binlog/t/binlog_unsafe-master.opt
 file path=usr/mysql/5.5/mysql-test/suite/binlog/t/binlog_unsafe.test
@@ -2741,6 +2753,10 @@
 file path=usr/mysql/5.5/mysql-test/suite/funcs_2/t/memory_charset.test
 file path=usr/mysql/5.5/mysql-test/suite/funcs_2/t/myisam_charset.test
 file path=usr/mysql/5.5/mysql-test/suite/funcs_2/t/suite.opt
+file path=usr/mysql/5.5/mysql-test/suite/innodb/r/blob-update-debug.result
+file path=usr/mysql/5.5/mysql-test/suite/innodb/r/create-index.result
+file path=usr/mysql/5.5/mysql-test/suite/innodb/r/foreign-keys.result
+file path=usr/mysql/5.5/mysql-test/suite/innodb/r/foreign-keys.result.moved
 file path=usr/mysql/5.5/mysql-test/suite/innodb/r/innodb-analyze.result
 file path=usr/mysql/5.5/mysql-test/suite/innodb/r/innodb-autoinc-18274.result
 file path=usr/mysql/5.5/mysql-test/suite/innodb/r/innodb-autoinc-44030.result
@@ -2748,8 +2764,9 @@
 file path=usr/mysql/5.5/mysql-test/suite/innodb/r/innodb-autoinc-optimize.result
 file path=usr/mysql/5.5/mysql-test/suite/innodb/r/innodb-autoinc.result
 file path=usr/mysql/5.5/mysql-test/suite/innodb/r/innodb-blob.result
+file path=usr/mysql/5.5/mysql-test/suite/innodb/r/innodb-change-buffer-recovery.result
 file path=usr/mysql/5.5/mysql-test/suite/innodb/r/innodb-consistent.result
-file path=usr/mysql/5.5/mysql-test/suite/innodb/r/innodb-create-options.result
+file path=usr/mysql/5.5/mysql-test/suite/innodb/r/innodb-fk.result
 file path=usr/mysql/5.5/mysql-test/suite/innodb/r/innodb-index.result
 file path=usr/mysql/5.5/mysql-test/suite/innodb/r/innodb-index_ucs2.result
 file path=usr/mysql/5.5/mysql-test/suite/innodb/r/innodb-lock.result
@@ -2758,8 +2775,8 @@
 file path=usr/mysql/5.5/mysql-test/suite/innodb/r/innodb-timeout.result
 file path=usr/mysql/5.5/mysql-test/suite/innodb/r/innodb-truncate.result
 file path=usr/mysql/5.5/mysql-test/suite/innodb/r/innodb-ucs2.result
+file path=usr/mysql/5.5/mysql-test/suite/innodb/r/innodb-update-insert.result
 file path=usr/mysql/5.5/mysql-test/suite/innodb/r/innodb-use-sys-malloc.result
-file path=usr/mysql/5.5/mysql-test/suite/innodb/r/innodb-zip.result
 file path=usr/mysql/5.5/mysql-test/suite/innodb/r/innodb.result
 file path=usr/mysql/5.5/mysql-test/suite/innodb/r/innodb_autoinc_lock_mode_zero.result
 file path=usr/mysql/5.5/mysql-test/suite/innodb/r/innodb_bug11754376.result
@@ -2779,8 +2796,6 @@
 file path=usr/mysql/5.5/mysql-test/suite/innodb/r/innodb_bug34053.result
 file path=usr/mysql/5.5/mysql-test/suite/innodb/r/innodb_bug34300.result
 file path=usr/mysql/5.5/mysql-test/suite/innodb/r/innodb_bug35220.result
-file path=usr/mysql/5.5/mysql-test/suite/innodb/r/innodb_bug36169.result
-file path=usr/mysql/5.5/mysql-test/suite/innodb/r/innodb_bug36172.result
 file path=usr/mysql/5.5/mysql-test/suite/innodb/r/innodb_bug38231.result
 file path=usr/mysql/5.5/mysql-test/suite/innodb/r/innodb_bug39438.result
 file path=usr/mysql/5.5/mysql-test/suite/innodb/r/innodb_bug40360.result
@@ -2805,16 +2820,13 @@
 file path=usr/mysql/5.5/mysql-test/suite/innodb/r/innodb_bug51920.result
 file path=usr/mysql/5.5/mysql-test/suite/innodb/r/innodb_bug52199.result
 file path=usr/mysql/5.5/mysql-test/suite/innodb/r/innodb_bug52663.result
-file path=usr/mysql/5.5/mysql-test/suite/innodb/r/innodb_bug52745.result
 file path=usr/mysql/5.5/mysql-test/suite/innodb/r/innodb_bug53046.result
 file path=usr/mysql/5.5/mysql-test/suite/innodb/r/innodb_bug53290.result
-file path=usr/mysql/5.5/mysql-test/suite/innodb/r/innodb_bug53591.result
 file path=usr/mysql/5.5/mysql-test/suite/innodb/r/innodb_bug53592.result
 file path=usr/mysql/5.5/mysql-test/suite/innodb/r/innodb_bug53674.result
 file path=usr/mysql/5.5/mysql-test/suite/innodb/r/innodb_bug53756.result
 file path=usr/mysql/5.5/mysql-test/suite/innodb/r/innodb_bug54044.result
 file path=usr/mysql/5.5/mysql-test/suite/innodb/r/innodb_bug56143.result
-file path=usr/mysql/5.5/mysql-test/suite/innodb/r/innodb_bug56680.result
 file path=usr/mysql/5.5/mysql-test/suite/innodb/r/innodb_bug56716.result
 file path=usr/mysql/5.5/mysql-test/suite/innodb/r/innodb_bug56947.result
 file path=usr/mysql/5.5/mysql-test/suite/innodb/r/innodb_bug57252.result
@@ -2827,11 +2839,9 @@
 file path=usr/mysql/5.5/mysql-test/suite/innodb/r/innodb_bug60049.result
 file path=usr/mysql/5.5/mysql-test/suite/innodb/r/innodb_bug60196.result
 file path=usr/mysql/5.5/mysql-test/suite/innodb/r/innodb_bug60229.result
-file path=usr/mysql/5.5/mysql-test/suite/innodb/r/innodb_cmp_drop_table.result
 file path=usr/mysql/5.5/mysql-test/suite/innodb/r/innodb_corrupt_bit.result
 file path=usr/mysql/5.5/mysql-test/suite/innodb/r/innodb_file_format.result
 file path=usr/mysql/5.5/mysql-test/suite/innodb/r/innodb_gis.result
-file path=usr/mysql/5.5/mysql-test/suite/innodb/r/innodb_index_large_prefix.result
 file path=usr/mysql/5.5/mysql-test/suite/innodb/r/innodb_information_schema.result
 file path=usr/mysql/5.5/mysql-test/suite/innodb/r/innodb_information_schema_buffer.result
 file path=usr/mysql/5.5/mysql-test/suite/innodb/r/innodb_lock_wait_timeout_1.result
@@ -2840,12 +2850,18 @@
 file path=usr/mysql/5.5/mysql-test/suite/innodb/r/innodb_mysql.result
 file path=usr/mysql/5.5/mysql-test/suite/innodb/r/innodb_mysql_rbk.result
 file path=usr/mysql/5.5/mysql-test/suite/innodb/r/innodb_notembedded.result
-file path=usr/mysql/5.5/mysql-test/suite/innodb/r/innodb_prefix_index_liftedlimit.result
 file path=usr/mysql/5.5/mysql-test/suite/innodb/r/innodb_prefix_index_restart_server.result
 file path=usr/mysql/5.5/mysql-test/suite/innodb/r/innodb_replace.result
 file path=usr/mysql/5.5/mysql-test/suite/innodb/r/innodb_timeout_rollback.result
 file path=usr/mysql/5.5/mysql-test/suite/innodb/r/innodb_trx_weight.result
+file path=usr/mysql/5.5/mysql-test/suite/innodb/r/insert_debug.result
+file path=usr/mysql/5.5/mysql-test/suite/innodb/r/sp_temp_table.result
+file path=usr/mysql/5.5/mysql-test/suite/innodb/r/strict_mode.result
+file path=usr/mysql/5.5/mysql-test/suite/innodb/t/blob-update-debug.test
+file path=usr/mysql/5.5/mysql-test/suite/innodb/t/create-index.test
 file path=usr/mysql/5.5/mysql-test/suite/innodb/t/disabled.def
+file path=usr/mysql/5.5/mysql-test/suite/innodb/t/foreign-keys.test
+file path=usr/mysql/5.5/mysql-test/suite/innodb/t/foreign-keys.test.moved
 file path=usr/mysql/5.5/mysql-test/suite/innodb/t/innodb-analyze.test
 file path=usr/mysql/5.5/mysql-test/suite/innodb/t/innodb-autoinc-18274.test
 file path=usr/mysql/5.5/mysql-test/suite/innodb/t/innodb-autoinc-44030-master.opt
@@ -2856,9 +2872,11 @@
 file path=usr/mysql/5.5/mysql-test/suite/innodb/t/innodb-autoinc-optimize.test
 file path=usr/mysql/5.5/mysql-test/suite/innodb/t/innodb-autoinc.test
 file path=usr/mysql/5.5/mysql-test/suite/innodb/t/innodb-blob.test
+file path=usr/mysql/5.5/mysql-test/suite/innodb/t/innodb-change-buffer-recovery-master.opt
+file path=usr/mysql/5.5/mysql-test/suite/innodb/t/innodb-change-buffer-recovery.test
 file path=usr/mysql/5.5/mysql-test/suite/innodb/t/innodb-consistent-master.opt
 file path=usr/mysql/5.5/mysql-test/suite/innodb/t/innodb-consistent.test
-file path=usr/mysql/5.5/mysql-test/suite/innodb/t/innodb-create-options.test
+file path=usr/mysql/5.5/mysql-test/suite/innodb/t/innodb-fk.test
 file path=usr/mysql/5.5/mysql-test/suite/innodb/t/innodb-index.test
 file path=usr/mysql/5.5/mysql-test/suite/innodb/t/innodb-index_ucs2.test
 file path=usr/mysql/5.5/mysql-test/suite/innodb/t/innodb-lock.test
@@ -2869,9 +2887,9 @@
 file path=usr/mysql/5.5/mysql-test/suite/innodb/t/innodb-timeout.test
 file path=usr/mysql/5.5/mysql-test/suite/innodb/t/innodb-truncate.test
 file path=usr/mysql/5.5/mysql-test/suite/innodb/t/innodb-ucs2.test
+file path=usr/mysql/5.5/mysql-test/suite/innodb/t/innodb-update-insert.test
 file path=usr/mysql/5.5/mysql-test/suite/innodb/t/innodb-use-sys-malloc-master.opt
 file path=usr/mysql/5.5/mysql-test/suite/innodb/t/innodb-use-sys-malloc.test
-file path=usr/mysql/5.5/mysql-test/suite/innodb/t/innodb-zip.test
 file path=usr/mysql/5.5/mysql-test/suite/innodb/t/innodb.test
 file path=usr/mysql/5.5/mysql-test/suite/innodb/t/innodb_autoinc_lock_mode_zero-master.opt
 file path=usr/mysql/5.5/mysql-test/suite/innodb/t/innodb_autoinc_lock_mode_zero.test
@@ -2896,8 +2914,6 @@
 file path=usr/mysql/5.5/mysql-test/suite/innodb/t/innodb_bug34053.test
 file path=usr/mysql/5.5/mysql-test/suite/innodb/t/innodb_bug34300.test
 file path=usr/mysql/5.5/mysql-test/suite/innodb/t/innodb_bug35220.test
-file path=usr/mysql/5.5/mysql-test/suite/innodb/t/innodb_bug36169.test
-file path=usr/mysql/5.5/mysql-test/suite/innodb/t/innodb_bug36172.test
 file path=usr/mysql/5.5/mysql-test/suite/innodb/t/innodb_bug38231.test
 file path=usr/mysql/5.5/mysql-test/suite/innodb/t/innodb_bug39438-master.opt
 file path=usr/mysql/5.5/mysql-test/suite/innodb/t/innodb_bug39438.test
@@ -2925,10 +2941,8 @@
 file path=usr/mysql/5.5/mysql-test/suite/innodb/t/innodb_bug51920.test
 file path=usr/mysql/5.5/mysql-test/suite/innodb/t/innodb_bug52199.test
 file path=usr/mysql/5.5/mysql-test/suite/innodb/t/innodb_bug52663.test
-file path=usr/mysql/5.5/mysql-test/suite/innodb/t/innodb_bug52745.test
 file path=usr/mysql/5.5/mysql-test/suite/innodb/t/innodb_bug53046.test
 file path=usr/mysql/5.5/mysql-test/suite/innodb/t/innodb_bug53290.test
-file path=usr/mysql/5.5/mysql-test/suite/innodb/t/innodb_bug53591.test
 file path=usr/mysql/5.5/mysql-test/suite/innodb/t/innodb_bug53592.test
 file path=usr/mysql/5.5/mysql-test/suite/innodb/t/innodb_bug53674-master.opt
 file path=usr/mysql/5.5/mysql-test/suite/innodb/t/innodb_bug53674.test
@@ -2936,7 +2950,6 @@
 file path=usr/mysql/5.5/mysql-test/suite/innodb/t/innodb_bug53756.test
 file path=usr/mysql/5.5/mysql-test/suite/innodb/t/innodb_bug54044.test
 file path=usr/mysql/5.5/mysql-test/suite/innodb/t/innodb_bug56143.test
-file path=usr/mysql/5.5/mysql-test/suite/innodb/t/innodb_bug56680.test
 file path=usr/mysql/5.5/mysql-test/suite/innodb/t/innodb_bug56716.test
 file path=usr/mysql/5.5/mysql-test/suite/innodb/t/innodb_bug56947.test
 file path=usr/mysql/5.5/mysql-test/suite/innodb/t/innodb_bug57252.test
@@ -2952,13 +2965,10 @@
 file path=usr/mysql/5.5/mysql-test/suite/innodb/t/innodb_bug60196.test
 file path=usr/mysql/5.5/mysql-test/suite/innodb/t/innodb_bug60229-master.opt
 file path=usr/mysql/5.5/mysql-test/suite/innodb/t/innodb_bug60229.test
-file path=usr/mysql/5.5/mysql-test/suite/innodb/t/innodb_cmp_drop_table-master.opt
-file path=usr/mysql/5.5/mysql-test/suite/innodb/t/innodb_cmp_drop_table.test
 file path=usr/mysql/5.5/mysql-test/suite/innodb/t/innodb_corrupt_bit.test
 file path=usr/mysql/5.5/mysql-test/suite/innodb/t/innodb_file_format-master.opt
 file path=usr/mysql/5.5/mysql-test/suite/innodb/t/innodb_file_format.test
 file path=usr/mysql/5.5/mysql-test/suite/innodb/t/innodb_gis.test
-file path=usr/mysql/5.5/mysql-test/suite/innodb/t/innodb_index_large_prefix.test
 file path=usr/mysql/5.5/mysql-test/suite/innodb/t/innodb_information_schema.test
 file path=usr/mysql/5.5/mysql-test/suite/innodb/t/innodb_information_schema_buffer.test
 file path=usr/mysql/5.5/mysql-test/suite/innodb/t/innodb_lock_wait_timeout_1-master.opt
@@ -2971,12 +2981,38 @@
 file path=usr/mysql/5.5/mysql-test/suite/innodb/t/innodb_mysql_rbk-master.opt
 file path=usr/mysql/5.5/mysql-test/suite/innodb/t/innodb_mysql_rbk.test
 file path=usr/mysql/5.5/mysql-test/suite/innodb/t/innodb_notembedded.test
-file path=usr/mysql/5.5/mysql-test/suite/innodb/t/innodb_prefix_index_liftedlimit.test
 file path=usr/mysql/5.5/mysql-test/suite/innodb/t/innodb_prefix_index_restart_server.test
 file path=usr/mysql/5.5/mysql-test/suite/innodb/t/innodb_replace.test
 file path=usr/mysql/5.5/mysql-test/suite/innodb/t/innodb_timeout_rollback-master.opt
 file path=usr/mysql/5.5/mysql-test/suite/innodb/t/innodb_timeout_rollback.test
 file path=usr/mysql/5.5/mysql-test/suite/innodb/t/innodb_trx_weight.test
+file path=usr/mysql/5.5/mysql-test/suite/innodb/t/insert_debug.test
+file path=usr/mysql/5.5/mysql-test/suite/innodb/t/sp_temp_table.test
+file path=usr/mysql/5.5/mysql-test/suite/innodb/t/strict_mode.test
+dir  path=usr/mysql/5.5/mysql-test/suite/innodb_zip
+dir  path=usr/mysql/5.5/mysql-test/suite/innodb_zip/r
+file path=usr/mysql/5.5/mysql-test/suite/innodb_zip/r/innodb-create-options.result
+file path=usr/mysql/5.5/mysql-test/suite/innodb_zip/r/innodb-zip.result
+file path=usr/mysql/5.5/mysql-test/suite/innodb_zip/r/innodb_bug36169.result
+file path=usr/mysql/5.5/mysql-test/suite/innodb_zip/r/innodb_bug36172.result
+file path=usr/mysql/5.5/mysql-test/suite/innodb_zip/r/innodb_bug52745.result
+file path=usr/mysql/5.5/mysql-test/suite/innodb_zip/r/innodb_bug53591.result
+file path=usr/mysql/5.5/mysql-test/suite/innodb_zip/r/innodb_bug56680.result
+file path=usr/mysql/5.5/mysql-test/suite/innodb_zip/r/innodb_cmp_drop_table.result
+file path=usr/mysql/5.5/mysql-test/suite/innodb_zip/r/innodb_index_large_prefix.result
+file path=usr/mysql/5.5/mysql-test/suite/innodb_zip/r/innodb_prefix_index_liftedlimit.result
+dir  path=usr/mysql/5.5/mysql-test/suite/innodb_zip/t
+file path=usr/mysql/5.5/mysql-test/suite/innodb_zip/t/innodb-create-options.test
+file path=usr/mysql/5.5/mysql-test/suite/innodb_zip/t/innodb-zip.test
+file path=usr/mysql/5.5/mysql-test/suite/innodb_zip/t/innodb_bug36169.test
+file path=usr/mysql/5.5/mysql-test/suite/innodb_zip/t/innodb_bug36172.test
+file path=usr/mysql/5.5/mysql-test/suite/innodb_zip/t/innodb_bug52745.test
+file path=usr/mysql/5.5/mysql-test/suite/innodb_zip/t/innodb_bug53591.test
+file path=usr/mysql/5.5/mysql-test/suite/innodb_zip/t/innodb_bug56680.test
+file path=usr/mysql/5.5/mysql-test/suite/innodb_zip/t/innodb_cmp_drop_table-master.opt
+file path=usr/mysql/5.5/mysql-test/suite/innodb_zip/t/innodb_cmp_drop_table.test
+file path=usr/mysql/5.5/mysql-test/suite/innodb_zip/t/innodb_index_large_prefix.test
+file path=usr/mysql/5.5/mysql-test/suite/innodb_zip/t/innodb_prefix_index_liftedlimit.test
 file path=usr/mysql/5.5/mysql-test/suite/jp/include/trim_sjis.inc
 file path=usr/mysql/5.5/mysql-test/suite/jp/r/jp_alter_sjis.result
 file path=usr/mysql/5.5/mysql-test/suite/jp/r/jp_alter_ucs2.result
@@ -3682,6 +3718,7 @@
 file path=usr/mysql/5.5/mysql-test/suite/rpl/r/rpl_000011.result
 file path=usr/mysql/5.5/mysql-test/suite/rpl/r/rpl_000013.result
 file path=usr/mysql/5.5/mysql-test/suite/rpl/r/rpl_000017.result
+file path=usr/mysql/5.5/mysql-test/suite/rpl/r/rpl_4threads_deadlock.result
 file path=usr/mysql/5.5/mysql-test/suite/rpl/r/rpl_EE_err.result
 file path=usr/mysql/5.5/mysql-test/suite/rpl/r/rpl_LD_INFILE.result
 file path=usr/mysql/5.5/mysql-test/suite/rpl/r/rpl_alter.result
@@ -3728,6 +3765,7 @@
 file path=usr/mysql/5.5/mysql-test/suite/rpl/r/rpl_do_grant.result
 file path=usr/mysql/5.5/mysql-test/suite/rpl/r/rpl_drop.result
 file path=usr/mysql/5.5/mysql-test/suite/rpl/r/rpl_drop_db.result
+file path=usr/mysql/5.5/mysql-test/suite/rpl/r/rpl_drop_db_fail.result
 file path=usr/mysql/5.5/mysql-test/suite/rpl/r/rpl_drop_temp.result
 file path=usr/mysql/5.5/mysql-test/suite/rpl/r/rpl_drop_view.result
 file path=usr/mysql/5.5/mysql-test/suite/rpl/r/rpl_dual_pos_advance.result
@@ -3786,6 +3824,7 @@
 file path=usr/mysql/5.5/mysql-test/suite/rpl/r/rpl_loadfile.result
 file path=usr/mysql/5.5/mysql-test/suite/rpl/r/rpl_locale.result
 file path=usr/mysql/5.5/mysql-test/suite/rpl/r/rpl_log_pos.result
+file path=usr/mysql/5.5/mysql-test/suite/rpl/r/rpl_lost_events_on_rotate.result
 file path=usr/mysql/5.5/mysql-test/suite/rpl/r/rpl_manual_change_index_file.result
 file path=usr/mysql/5.5/mysql-test/suite/rpl/r/rpl_many_optimize.result
 file path=usr/mysql/5.5/mysql-test/suite/rpl/r/rpl_master_pos_wait.result
@@ -3847,6 +3886,7 @@
 file path=usr/mysql/5.5/mysql-test/suite/rpl/r/rpl_row_colSize.result
 file path=usr/mysql/5.5/mysql-test/suite/rpl/r/rpl_row_conflicts.result
 file path=usr/mysql/5.5/mysql-test/suite/rpl/r/rpl_row_corruption.result
+file path=usr/mysql/5.5/mysql-test/suite/rpl/r/rpl_row_create_select.result
 file path=usr/mysql/5.5/mysql-test/suite/rpl/r/rpl_row_create_table.result
 file path=usr/mysql/5.5/mysql-test/suite/rpl/r/rpl_row_delayed_ins.result
 file path=usr/mysql/5.5/mysql-test/suite/rpl/r/rpl_row_drop.result
@@ -3903,6 +3943,7 @@
 file path=usr/mysql/5.5/mysql-test/suite/rpl/r/rpl_savepoint.result
 file path=usr/mysql/5.5/mysql-test/suite/rpl/r/rpl_semi_sync.result
 file path=usr/mysql/5.5/mysql-test/suite/rpl/r/rpl_semi_sync_event.result
+file path=usr/mysql/5.5/mysql-test/suite/rpl/r/rpl_semi_sync_uninstall_plugin.result
 file path=usr/mysql/5.5/mysql-test/suite/rpl/r/rpl_server_id1.result
 file path=usr/mysql/5.5/mysql-test/suite/rpl/r/rpl_server_id2.result
 file path=usr/mysql/5.5/mysql-test/suite/rpl/r/rpl_server_id_ignore.result
@@ -3924,6 +3965,7 @@
 file path=usr/mysql/5.5/mysql-test/suite/rpl/r/rpl_sp004.result
 file path=usr/mysql/5.5/mysql-test/suite/rpl/r/rpl_sp_effects.result
 file path=usr/mysql/5.5/mysql-test/suite/rpl/r/rpl_spec_variables.result
+file path=usr/mysql/5.5/mysql-test/suite/rpl/r/rpl_special_charset.result
 file path=usr/mysql/5.5/mysql-test/suite/rpl/r/rpl_sporadic_master.result
 file path=usr/mysql/5.5/mysql-test/suite/rpl/r/rpl_ssl.result
 file path=usr/mysql/5.5/mysql-test/suite/rpl/r/rpl_ssl1.result
@@ -3984,6 +4026,7 @@
 file path=usr/mysql/5.5/mysql-test/suite/rpl/t/rpl_000011.test
 file path=usr/mysql/5.5/mysql-test/suite/rpl/t/rpl_000013.test
 file path=usr/mysql/5.5/mysql-test/suite/rpl/t/rpl_000017.test
+file path=usr/mysql/5.5/mysql-test/suite/rpl/t/rpl_4threads_deadlock.test
 file path=usr/mysql/5.5/mysql-test/suite/rpl/t/rpl_EE_err.test
 file path=usr/mysql/5.5/mysql-test/suite/rpl/t/rpl_LD_INFILE.test
 file path=usr/mysql/5.5/mysql-test/suite/rpl/t/rpl_alter.test
@@ -4044,6 +4087,7 @@
 file path=usr/mysql/5.5/mysql-test/suite/rpl/t/rpl_do_grant.test
 file path=usr/mysql/5.5/mysql-test/suite/rpl/t/rpl_drop.test
 file path=usr/mysql/5.5/mysql-test/suite/rpl/t/rpl_drop_db.test
+file path=usr/mysql/5.5/mysql-test/suite/rpl/t/rpl_drop_db_fail.test
 file path=usr/mysql/5.5/mysql-test/suite/rpl/t/rpl_drop_temp-slave.opt
 file path=usr/mysql/5.5/mysql-test/suite/rpl/t/rpl_drop_temp.test
 file path=usr/mysql/5.5/mysql-test/suite/rpl/t/rpl_drop_view.test
@@ -4137,6 +4181,7 @@
 file path=usr/mysql/5.5/mysql-test/suite/rpl/t/rpl_loadfile.test
 file path=usr/mysql/5.5/mysql-test/suite/rpl/t/rpl_locale.test
 file path=usr/mysql/5.5/mysql-test/suite/rpl/t/rpl_log_pos.test
+file path=usr/mysql/5.5/mysql-test/suite/rpl/t/rpl_lost_events_on_rotate.test
 file path=usr/mysql/5.5/mysql-test/suite/rpl/t/rpl_manual_change_index_file.test
 file path=usr/mysql/5.5/mysql-test/suite/rpl/t/rpl_many_optimize.test
 file path=usr/mysql/5.5/mysql-test/suite/rpl/t/rpl_master_pos_wait.test
@@ -4219,6 +4264,7 @@
 file path=usr/mysql/5.5/mysql-test/suite/rpl/t/rpl_row_conflicts.test
 file path=usr/mysql/5.5/mysql-test/suite/rpl/t/rpl_row_corruption-slave.opt
 file path=usr/mysql/5.5/mysql-test/suite/rpl/t/rpl_row_corruption.test
+file path=usr/mysql/5.5/mysql-test/suite/rpl/t/rpl_row_create_select.test
 file path=usr/mysql/5.5/mysql-test/suite/rpl/t/rpl_row_create_table.test
 file path=usr/mysql/5.5/mysql-test/suite/rpl/t/rpl_row_delayed_ins.test
 file path=usr/mysql/5.5/mysql-test/suite/rpl/t/rpl_row_drop.test
@@ -4282,6 +4328,9 @@
 file path=usr/mysql/5.5/mysql-test/suite/rpl/t/rpl_semi_sync_event-master.opt
 file path=usr/mysql/5.5/mysql-test/suite/rpl/t/rpl_semi_sync_event-slave.opt
 file path=usr/mysql/5.5/mysql-test/suite/rpl/t/rpl_semi_sync_event.test
+file path=usr/mysql/5.5/mysql-test/suite/rpl/t/rpl_semi_sync_uninstall_plugin-master.opt
+file path=usr/mysql/5.5/mysql-test/suite/rpl/t/rpl_semi_sync_uninstall_plugin-slave.opt
+file path=usr/mysql/5.5/mysql-test/suite/rpl/t/rpl_semi_sync_uninstall_plugin.test
 file path=usr/mysql/5.5/mysql-test/suite/rpl/t/rpl_server_id1.test
 file path=usr/mysql/5.5/mysql-test/suite/rpl/t/rpl_server_id2-slave.opt
 file path=usr/mysql/5.5/mysql-test/suite/rpl/t/rpl_server_id2.test
@@ -4315,6 +4364,9 @@
 file path=usr/mysql/5.5/mysql-test/suite/rpl/t/rpl_sp_effects.test
 file path=usr/mysql/5.5/mysql-test/suite/rpl/t/rpl_spec_variables-slave.opt
 file path=usr/mysql/5.5/mysql-test/suite/rpl/t/rpl_spec_variables.test
+file path=usr/mysql/5.5/mysql-test/suite/rpl/t/rpl_special_charset-master.opt
+file path=usr/mysql/5.5/mysql-test/suite/rpl/t/rpl_special_charset-slave.opt
+file path=usr/mysql/5.5/mysql-test/suite/rpl/t/rpl_special_charset.test
 file path=usr/mysql/5.5/mysql-test/suite/rpl/t/rpl_sporadic_master-master.opt
 file path=usr/mysql/5.5/mysql-test/suite/rpl/t/rpl_sporadic_master.test
 file path=usr/mysql/5.5/mysql-test/suite/rpl/t/rpl_ssl.test
@@ -4434,8 +4486,6 @@
 file path=usr/mysql/5.5/mysql-test/suite/sys_vars/inc/rpl_recovery_rank_basic.inc
 file path=usr/mysql/5.5/mysql-test/suite/sys_vars/inc/slave_transaction_retries_basic.inc
 file path=usr/mysql/5.5/mysql-test/suite/sys_vars/inc/sort_buffer_size_basic.inc
-file path=usr/mysql/5.5/mysql-test/suite/sys_vars/inc/transaction_alloc_block_size_basic.inc
-file path=usr/mysql/5.5/mysql-test/suite/sys_vars/inc/transaction_prealloc_size_basic.inc
 file path=usr/mysql/5.5/mysql-test/suite/sys_vars/r/all_vars.result
 file path=usr/mysql/5.5/mysql-test/suite/sys_vars/r/auto_increment_increment_basic.result
 file path=usr/mysql/5.5/mysql-test/suite/sys_vars/r/auto_increment_increment_func.result
@@ -4882,10 +4932,8 @@
 file path=usr/mysql/5.5/mysql-test/suite/sys_vars/r/timestamp_sysdate_is_now_func.result
 file path=usr/mysql/5.5/mysql-test/suite/sys_vars/r/tmp_table_size_basic.result
 file path=usr/mysql/5.5/mysql-test/suite/sys_vars/r/tmpdir_basic.result
-file path=usr/mysql/5.5/mysql-test/suite/sys_vars/r/transaction_alloc_block_size_basic_32.result
-file path=usr/mysql/5.5/mysql-test/suite/sys_vars/r/transaction_alloc_block_size_basic_64.result
-file path=usr/mysql/5.5/mysql-test/suite/sys_vars/r/transaction_prealloc_size_basic_32.result
-file path=usr/mysql/5.5/mysql-test/suite/sys_vars/r/transaction_prealloc_size_basic_64.result
+file path=usr/mysql/5.5/mysql-test/suite/sys_vars/r/transaction_alloc_block_size_basic.result
+file path=usr/mysql/5.5/mysql-test/suite/sys_vars/r/transaction_prealloc_size_basic.result
 file path=usr/mysql/5.5/mysql-test/suite/sys_vars/r/tx_isolation_basic.result
 file path=usr/mysql/5.5/mysql-test/suite/sys_vars/r/tx_isolation_func.result
 file path=usr/mysql/5.5/mysql-test/suite/sys_vars/r/unique_checks_basic.result
@@ -5393,10 +5441,8 @@
 file path=usr/mysql/5.5/mysql-test/suite/sys_vars/t/timestamp_sysdate_is_now_func.test
 file path=usr/mysql/5.5/mysql-test/suite/sys_vars/t/tmp_table_size_basic.test
 file path=usr/mysql/5.5/mysql-test/suite/sys_vars/t/tmpdir_basic.test
-file path=usr/mysql/5.5/mysql-test/suite/sys_vars/t/transaction_alloc_block_size_basic_32.test
-file path=usr/mysql/5.5/mysql-test/suite/sys_vars/t/transaction_alloc_block_size_basic_64.test
-file path=usr/mysql/5.5/mysql-test/suite/sys_vars/t/transaction_prealloc_size_basic_32.test
-file path=usr/mysql/5.5/mysql-test/suite/sys_vars/t/transaction_prealloc_size_basic_64.test
+file path=usr/mysql/5.5/mysql-test/suite/sys_vars/t/transaction_alloc_block_size_basic.test
+file path=usr/mysql/5.5/mysql-test/suite/sys_vars/t/transaction_prealloc_size_basic.test
 file path=usr/mysql/5.5/mysql-test/suite/sys_vars/t/tx_isolation_basic.test
 file path=usr/mysql/5.5/mysql-test/suite/sys_vars/t/tx_isolation_func-master.opt
 file path=usr/mysql/5.5/mysql-test/suite/sys_vars/t/tx_isolation_func.test
@@ -5494,6 +5540,7 @@
 file path=usr/mysql/5.5/mysql-test/t/ctype_collate.test
 file path=usr/mysql/5.5/mysql-test/t/ctype_cp1250_ch.test
 file path=usr/mysql/5.5/mysql-test/t/ctype_cp1251.test
+file path=usr/mysql/5.5/mysql-test/t/ctype_cp932.test
 file path=usr/mysql/5.5/mysql-test/t/ctype_cp932_binlog_row.test
 file path=usr/mysql/5.5/mysql-test/t/ctype_cp932_binlog_stm.test
 file path=usr/mysql/5.5/mysql-test/t/ctype_create.test
@@ -5559,6 +5606,7 @@
 file path=usr/mysql/5.5/mysql-test/t/drop_debug.test
 file path=usr/mysql/5.5/mysql-test/t/empty_table.test
 file path=usr/mysql/5.5/mysql-test/t/endspace.test
+file path=usr/mysql/5.5/mysql-test/t/error_simulation-master.opt
 file path=usr/mysql/5.5/mysql-test/t/error_simulation.test
 file path=usr/mysql/5.5/mysql-test/t/errors.test
 file path=usr/mysql/5.5/mysql-test/t/events_1.test
@@ -5716,6 +5764,7 @@
 file path=usr/mysql/5.5/mysql-test/t/lock_sync.test
 file path=usr/mysql/5.5/mysql-test/t/lock_tables_lost_commit-master.opt
 file path=usr/mysql/5.5/mysql-test/t/lock_tables_lost_commit.test
+file path=usr/mysql/5.5/mysql-test/t/log_errchk.test
 file path=usr/mysql/5.5/mysql-test/t/log_state-master.opt
 file path=usr/mysql/5.5/mysql-test/t/log_state.test
 file path=usr/mysql/5.5/mysql-test/t/log_state_bug33693-master.opt
@@ -5964,6 +6013,7 @@
 file path=usr/mysql/5.5/mysql-test/t/shm.test
 file path=usr/mysql/5.5/mysql-test/t/show_check-master.opt
 file path=usr/mysql/5.5/mysql-test/t/show_check.test
+file path=usr/mysql/5.5/mysql-test/t/show_processlist.test
 file path=usr/mysql/5.5/mysql-test/t/show_profile.test
 file path=usr/mysql/5.5/mysql-test/t/signal.test
 file path=usr/mysql/5.5/mysql-test/t/signal_code.test
--- a/components/mysql-5-5/patches/mysql_config.patch	Thu Jun 18 22:21:14 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,91 +0,0 @@
-=== modified file 'cmake/libutils.cmake'
---- a/cmake/libutils.cmake	revid:[email protected]
-+++ b/cmake/libutils.cmake	revid:[email protected]
[email protected]@ -1,4 +1,4 @@
--# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
-+# Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved.
- # 
- # This program is free software; you can redistribute it and/or modify
- # it under the terms of the GNU General Public License as published by
[email protected]@ -158,6 +158,7 @@ MACRO(MERGE_STATIC_LIBS TARGET OUTPUT_NA
-   IF(OSLIBS)
-     LIST(REMOVE_DUPLICATES OSLIBS)
-     TARGET_LINK_LIBRARIES(${TARGET} ${OSLIBS})
-+    MESSAGE(STATUS "Library ${TARGET} depends on OSLIBS ${OSLIBS}")
-   ENDIF()
- 
-   # Make the generated dummy source file depended on all static input
-
-=== modified file 'scripts/CMakeLists.txt'
---- a/scripts/CMakeLists.txt	revid:[email protected]
-+++ b/scripts/CMakeLists.txt	revid:[email protected]
[email protected]@ -229,6 +229,11 @@
- SET(pkgplugindir ${prefix}/${INSTALL_PLUGINDIR})
- SET(localstatedir ${MYSQL_DATADIR})
- 
-+SET(RPATH_OPTION "")
-+IF(CMAKE_SYSTEM_NAME STREQUAL "SunOS")
-+ SET(RPATH_OPTION "-R$pkglibdir")
-+ENDIF()
-+
- # some scripts use  @[email protected]
- IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
-   SET(TARGET_LINUX "true")
[email protected]@ -313,6 +318,9 @@
-     INSTALL_SCRIPT(${CMAKE_CURRENT_BINARY_DIR}/${file}.pl COMPONENT Server_Scripts)
-   ENDFOREACH()
- ELSE()
-+# Configure this one, for testing, but do not install it.
-+  CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql_config.pl.in
-+    ${CMAKE_CURRENT_BINARY_DIR}/mysql_config.pl ESCAPE_QUOTES @ONLY)
-   # On Unix, most of the files end up in the bin directory
-   SET(mysql_config_COMPONENT COMPONENT Development)
-   SET(BIN_SCRIPTS
-
-=== modified file 'scripts/mysql_config.pl.in'
---- a/scripts/mysql_config.pl.in	revid:[email protected]
-+++ b/scripts/mysql_config.pl.in	revid:[email protected]
[email protected]@ -1,7 +1,7 @@
- #!/usr/bin/perl
- # -*- cperl -*-
- #
--# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
-+# Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
- #
- # This program is free software; you can redistribute it and/or modify
- # it under the terms of the GNU General Public License as published by
[email protected]@ -189,7 +189,7 @@ if ( $^O eq "MSWin32" )
- }
- else
- {
--  my $linkpath   = "-L$pkglibdir";
-+  my $linkpath   = "-L$pkglibdir @[email protected]";
-   @lib_opts   = ($linkpath,"-lmysqlclient");
-   @lib_r_opts = ($linkpath,"-lmysqlclient_r");
-   @lib_e_opts = ($linkpath,"-lmysqld");
-
-=== modified file 'scripts/mysql_config.sh'
---- a/scripts/mysql_config.sh	revid:[email protected]
-+++ b/scripts/mysql_config.sh	revid:[email protected]
[email protected]@ -1,5 +1,5 @@
- #!/bin/sh
--# Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
-+# Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
- # 
- # This program is free software; you can redistribute it and/or modify
- # it under the terms of the GNU General Public License as published by
[email protected]@ -110,10 +110,10 @@
- 
- # Create options 
- # We intentionally add a space to the beginning and end of lib strings, simplifies replace later
--libs=" $ldflags -L$pkglibdir -lmysqlclient @[email protected] @[email protected]"
-+libs=" $ldflags -L$pkglibdir @[email protected] -lmysqlclient @[email protected] @[email protected]"
- libs="$libs @[email protected] @[email protected] "
--libs_r=" $ldflags -L$pkglibdir -lmysqlclient_r @[email protected] @[email protected] @[email protected] "
--embedded_libs=" $ldflags -L$pkglibdir -lmysqld @[email protected] @[email protected] @[email protected] @[email protected] @[email protected] "
-+libs_r=" $ldflags -L$pkglibdir  @[email protected] -lmysqlclient_r @[email protected] @[email protected] @[email protected] "
-+embedded_libs=" $ldflags -L$pkglibdir @[email protected] -lmysqld @[email protected] @[email protected] @[email protected] @[email protected] @[email protected] "
- 
- if [ -r "$pkglibdir/libmygcc.a" ]; then
-   # When linking against the static library with a different version of GCC
-