diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2015-08-03 23:09:43 +0300 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2015-08-03 23:09:43 +0300 |
| commit | 9a5787db51ef571e2beaeda1402cf7578c95eaf6 (patch) | |
| tree | 3dc0e3cfc17077929d701b1e3701c7c9f92f7aa7 /mysql-test/r/innodb_load_xa.result | |
| parent | 4188ba9c1e0ea195adf00d9e6d11b29ef18b2109 (diff) | |
| parent | 96badb16afcf8a6ae3d03918419fc51ace4be236 (diff) | |
| download | mariadb-git-9a5787db51ef571e2beaeda1402cf7578c95eaf6.tar.gz | |
Merge commit '96badb16afcf' into 10.0
Conflicts:
client/mysql_upgrade.c
mysql-test/r/func_misc.result
mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result
mysql-test/suite/innodb/r/innodb-fk.result
mysql-test/t/subselect_sj_mat.test
sql/item.cc
sql/item_func.cc
sql/log.cc
sql/log_event.cc
sql/rpl_utility.cc
sql/slave.cc
sql/sql_class.cc
sql/sql_class.h
sql/sql_select.cc
storage/innobase/dict/dict0crea.c
storage/innobase/dict/dict0dict.c
storage/innobase/handler/ha_innodb.cc
storage/xtradb/dict/dict0crea.c
storage/xtradb/dict/dict0dict.c
storage/xtradb/handler/ha_innodb.cc
vio/viosslfactories.c
Diffstat (limited to 'mysql-test/r/innodb_load_xa.result')
| -rw-r--r-- | mysql-test/r/innodb_load_xa.result | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/r/innodb_load_xa.result b/mysql-test/r/innodb_load_xa.result index 85e6d52c098..017bc7450bd 100644 --- a/mysql-test/r/innodb_load_xa.result +++ b/mysql-test/r/innodb_load_xa.result @@ -19,3 +19,5 @@ mysqld-bin.000001 # Query # # use `test`; insert t1 values (2) mysqld-bin.000001 # Query # # COMMIT drop table t1; uninstall plugin innodb; +Warnings: +Warning 1620 Plugin is busy and will be uninstalled on shutdown |