database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

MDEV-4786 - merge 10.0-monty - 10.0

Browse Source 
Fixed main.plugin, main-test_sql_discovery.plugin failures.

storage/example/ha_example.cc:
  Issue a warning independently of DBUG status (needed for testing).
This commit is contained in:
Sergey Vojtovich
2013-08-01 17:12:58 +04:00
parent be995467f0
commit bd68d38cc7
1 changed files with 0 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
storage/example/ha_example.cc
View File

@@ -964,7 +964,6 @@ bool ha_example::check_if_incompatible_data(HA_CREATE_INFO *info,
DBUG_RETURN(COMPATIBLE_DATA_NO); DBUG_RETURN(COMPATIBLE_DATA_NO);
} }
#ifndef DBUG_OFF
for (uint i= 0; i < table->s->fields; i++) for (uint i= 0; i < table->s->fields; i++)
{ {
ha_field_option_struct *f_old, *f_new; ha_field_option_struct *f_old, *f_new;
@@ -982,7 +981,6 @@ bool ha_example::check_if_incompatible_data(HA_CREATE_INFO *info,
else else
DBUG_PRINT("info", ("old field %i did not changed", i)); DBUG_PRINT("info", ("old field %i did not changed", i));
} }
#endif
DBUG_RETURN(COMPATIBLE_DATA_YES); DBUG_RETURN(COMPATIBLE_DATA_YES);
} }