3611 Nirbhay Choubey 2011-11-15 [merge]
Merge of fix for bug#11827359 from mysql-5.5.
modified:
client/mysql_upgrade.c
mysql-test/r/mysql_upgrade.result
mysql-test/t/mysql_upgrade.test
3610 Marc Alff 2011-11-15
Bug#13389196 BUILD FAILS IF P_S IS DISABLED WITH: -DWITH_PERFSCHEMA_STORAGE_ENGINE:BOOL=OFF
Before this fix, the code failed to build without the performance schema.
The problem was that in sql/sql_class.h, the structures:
- PSI_statement_locker_state
- PSI_idle_locker_state
are undefined in this case.
The fix is to use the proper #ifdef symbol when compiling with a given
performance schema instrumentation:
- HAVE_PSI_STATEMENT_INTERFACE for the statement instrumentation
- HAVE_PSI_IDLE_INTERFACE for the idle instrumentation
modified:
sql/sql_class.h
=== modified file 'client/mysql_upgrade.c'
--- a/client/mysql_upgrade.c 2011-08-29 12:08:58 +0000
+++ b/client/mysql_upgrade.c 2011-11-15 12:34:23 +0000
@@ -286,6 +286,8 @@ get_one_option(int optid, const struct m
case 'v': /* --verbose */
case 'f': /* --force */
+ case 's': /* --upgrade-system-tables */
+ case OPT_WRITE_BINLOG: /* --write-binlog */
add_option= FALSE;
break;
=== modified file 'mysql-test/r/mysql_upgrade.result'
--- a/mysql-test/r/mysql_upgrade.result 2011-08-19 13:04:28 +0000
+++ b/mysql-test/r/mysql_upgrade.result 2011-11-15 12:34:23 +0000
@@ -224,3 +224,41 @@ GRANT ALL PRIVILEGES ON `roelt`.`test2`
DROP USER 'user3'@'%';
End of 5.1 tests
The --upgrade-system-tables option was used, databases won't be touched.
+#
+# Bug#11827359 60223: MYSQL_UPGRADE PROBLEM WITH OPTION
+# SKIP-WRITE-BINLOG
+#
+# Droping the previously created mysql_upgrade_info file..
+# Running mysql_upgrade with --skip-write-binlog..
+mtr.global_suppressions OK
+mtr.test_suppressions OK
+mysql.columns_priv OK
+mysql.db OK
+mysql.event OK
+mysql.func OK
+mysql.general_log OK
+mysql.help_category OK
+mysql.help_keyword OK
+mysql.help_relation OK
+mysql.help_topic OK
+mysql.host OK
+mysql.innodb_index_stats OK
+mysql.innodb_table_stats OK
+mysql.ndb_binlog_index OK
+mysql.plugin OK
+mysql.proc OK
+mysql.procs_priv OK
+mysql.proxies_priv OK
+mysql.servers OK
+mysql.slave_master_info OK
+mysql.slave_relay_log_info OK
+mysql.slave_worker_info OK
+mysql.slow_log OK
+mysql.tables_priv OK
+mysql.time_zone OK
+mysql.time_zone_leap_second OK
+mysql.time_zone_name OK
+mysql.time_zone_transition OK
+mysql.time_zone_transition_type OK
+mysql.user OK
+End of tests
=== modified file 'mysql-test/t/mysql_upgrade.test'
--- a/mysql-test/t/mysql_upgrade.test 2010-08-11 17:56:56 +0000
+++ b/mysql-test/t/mysql_upgrade.test 2011-11-15 12:18:42 +0000
@@ -102,5 +102,24 @@ DROP USER 'user3'@'%';
# Test the --upgrade-system-tables option
#
--replace_result $MYSQLTEST_VARDIR var
---exec $MYSQL_UPGRADE --skip-verbose --upgrade-system-tables
+--exec $MYSQL_UPGRADE --skip-verbose --force --upgrade-system-tables
+--echo #
+--echo # Bug#11827359 60223: MYSQL_UPGRADE PROBLEM WITH OPTION
+--echo # SKIP-WRITE-BINLOG
+--echo #
+
+let $MYSQLD_DATADIR= `select @@datadir`;
+
+--echo # Droping the previously created mysql_upgrade_info file..
+--remove_file $MYSQLD_DATADIR/mysql_upgrade_info
+
+--echo # Running mysql_upgrade with --skip-write-binlog..
+--replace_result $MYSQLTEST_VARDIR var
+--exec $MYSQL_UPGRADE --skip-verbose --skip-write-binlog
+
+# mysql_upgrade must have created mysql_upgrade_info file,
+# so the following command should never fail.
+--remove_file $MYSQLD_DATADIR/mysql_upgrade_info
+
+--echo End of tests
No bundle (reason: useless for push emails).
| Thread |
|---|
| • bzr push into mysql-trunk branch (nirbhay.choubey:3610 to 3611) Bug#11827359 | Nirbhay Choubey | 16 Nov |
