diff options
| author | Monty <monty@mariadb.org> | 2016-08-29 13:11:34 +0300 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2016-08-29 13:11:34 +0300 |
| commit | e139d971ecbffe00d9a5626fdcd69aa1b9ba0f2c (patch) | |
| tree | 13a2f706c6a12d11a325e7d32c929db317872bf3 | |
| parent | 96e95b5465e2e3e629d532f24ebe166f979dd220 (diff) | |
| download | mariadb-git-e139d971ecbffe00d9a5626fdcd69aa1b9ba0f2c.tar.gz | |
Fixed compiler warning and failing test suite because system dependency
| -rw-r--r-- | mysql-test/suite/wsrep/t/mdev_10186.test | 1 | ||||
| -rw-r--r-- | storage/maria/ma_extra.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/mysql-test/suite/wsrep/t/mdev_10186.test b/mysql-test/suite/wsrep/t/mdev_10186.test index ec5e9462821..90665d3c97f 100644 --- a/mysql-test/suite/wsrep/t/mdev_10186.test +++ b/mysql-test/suite/wsrep/t/mdev_10186.test @@ -7,6 +7,7 @@ --echo # SELECT @@wsrep_on; +--replace_result /usr/lib64/ /usr/lib/ SELECT @@GLOBAL.wsrep_provider; SET @@GLOBAL.wsrep_cluster_address='gcomm://'; diff --git a/storage/maria/ma_extra.c b/storage/maria/ma_extra.c index 50ad44f09a9..117a302b418 100644 --- a/storage/maria/ma_extra.c +++ b/storage/maria/ma_extra.c @@ -316,10 +316,10 @@ int maria_extra(MARIA_HA *info, enum ha_extra_function function, /* Fall trough */ case HA_EXTRA_PREPARE_FOR_RENAME: { - DBUG_ASSERT(!share->temporary); my_bool do_flush= MY_TEST(function != HA_EXTRA_PREPARE_FOR_DROP); my_bool save_global_changed; enum flush_type type; + DBUG_ASSERT(!share->temporary); /* This share, to have last_version=0, needs to save all its data/index blocks to disk if this is not for a DROP TABLE. Otherwise they would be |