Commit e139d971 authored by Monty's avatar Monty

Fixed compiler warning and failing test suite because system dependency

parent 96e95b54
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
--echo # --echo #
SELECT @@wsrep_on; SELECT @@wsrep_on;
--replace_result /usr/lib64/ /usr/lib/
SELECT @@GLOBAL.wsrep_provider; SELECT @@GLOBAL.wsrep_provider;
SET @@GLOBAL.wsrep_cluster_address='gcomm://'; SET @@GLOBAL.wsrep_cluster_address='gcomm://';
...@@ -316,10 +316,10 @@ int maria_extra(MARIA_HA *info, enum ha_extra_function function, ...@@ -316,10 +316,10 @@ int maria_extra(MARIA_HA *info, enum ha_extra_function function,
/* Fall trough */ /* Fall trough */
case HA_EXTRA_PREPARE_FOR_RENAME: case HA_EXTRA_PREPARE_FOR_RENAME:
{ {
DBUG_ASSERT(!share->temporary);
my_bool do_flush= MY_TEST(function != HA_EXTRA_PREPARE_FOR_DROP); my_bool do_flush= MY_TEST(function != HA_EXTRA_PREPARE_FOR_DROP);
my_bool save_global_changed; my_bool save_global_changed;
enum flush_type type; enum flush_type type;
DBUG_ASSERT(!share->temporary);
/* /*
This share, to have last_version=0, needs to save all its data/index 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 blocks to disk if this is not for a DROP TABLE. Otherwise they would be
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment