1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed compiler warning and failing test suite because system dependency

Browse Source
This commit is contained in:
Monty 2016-08-29 13:11:34 +03:00
parent 96e95b5465
commit e139d971ec
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mysql-test/suite/wsrep/t/mdev_10186.test
View File

@ -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://';

2
storage/maria/ma_extra.c
View File

@ -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