Merge 10.0-base -> 10.0 (GTID).

2026-01-06 05:22:24 +03:00 · 2013-04-17 15:17:01 +02:00
parent f398ced7f0 30b2c64c4e
commit 0e7410a154
261 changed files with 17249 additions and 8774 deletions
--- a/mysql-test/r/mysql_upgrade_ssl.result
+++ b/mysql-test/r/mysql_upgrade_ssl.result
@@ -27,6 +27,7 @@ mysql.plugin                                       OK
 mysql.proc                                         OK
 mysql.procs_priv                                   OK
 mysql.proxies_priv                                 OK
+mysql.rpl_slave_state                              OK
 mysql.servers                                      OK
 mysql.slave_master_info                            OK
 mysql.slave_relay_log_info                         OK