diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-07-21 16:39:19 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-07-21 16:39:19 +0200 |
| commit | b7b5f6f1ab49948b0e15b762266d4640b3d6b7fb (patch) | |
| tree | 7c302c2025184dbd053aa6135f0ff28c8ce6f359 /mysql-test/r/mysql_upgrade.result | |
| parent | 5f6380adde2dac3f32b40339b9b702c0135eb7d6 (diff) | |
| parent | c1d6a2d7e194225ccc19a68ea5d0f368632620d0 (diff) | |
| download | mariadb-git-b7b5f6f1ab49948b0e15b762266d4640b3d6b7fb.tar.gz | |
10.0-monty merge
includes:
* remove some remnants of "Bug#14521864: MYSQL 5.1 TO 5.5 BUGS PARTITIONING"
* introduce LOCK_share, now LOCK_ha_data is strictly for engines
* rea_create_table() always creates .par file (even in "frm-only" mode)
* fix a 5.6 bug, temp file leak on dummy ALTER TABLE
Diffstat (limited to 'mysql-test/r/mysql_upgrade.result')
| -rw-r--r-- | mysql-test/r/mysql_upgrade.result | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/mysql-test/r/mysql_upgrade.result b/mysql-test/r/mysql_upgrade.result index a08e6f63fb4..74832162afb 100644 --- a/mysql-test/r/mysql_upgrade.result +++ b/mysql-test/r/mysql_upgrade.result @@ -21,15 +21,11 @@ mysql.host OK mysql.index_stats 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.table_stats OK mysql.tables_priv OK mysql.time_zone OK @@ -67,15 +63,11 @@ mysql.host OK mysql.index_stats 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.table_stats OK mysql.tables_priv OK mysql.time_zone OK @@ -113,15 +105,11 @@ mysql.host OK mysql.index_stats 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.table_stats OK mysql.tables_priv OK mysql.time_zone OK @@ -161,15 +149,11 @@ mysql.host OK mysql.index_stats 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.table_stats OK mysql.tables_priv OK mysql.time_zone OK @@ -213,15 +197,11 @@ mysql.host OK mysql.index_stats 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.table_stats OK mysql.tables_priv OK mysql.time_zone OK @@ -268,15 +248,11 @@ mysql.host OK mysql.index_stats 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.table_stats OK mysql.tables_priv OK mysql.time_zone OK @@ -326,15 +302,11 @@ mysql.host OK mysql.index_stats 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.table_stats OK mysql.tables_priv OK mysql.time_zone OK |