diff options
| author | Sergey Vojtovich <svoj@mariadb.org> | 2013-08-01 17:12:58 +0400 |
|---|---|---|
| committer | Sergey Vojtovich <svoj@mariadb.org> | 2013-08-01 17:12:58 +0400 |
| commit | bd68d38cc7404d733c5c0a827675fd5b805f7e96 (patch) | |
| tree | c1a1ad04baa0a8d1fcdece8d2d96817d808638c6 /storage | |
| parent | be995467f0cc51ab20defceb2dd4dd35977133c2 (diff) | |
| download | mariadb-git-bd68d38cc7404d733c5c0a827675fd5b805f7e96.tar.gz | |
MDEV-4786 - merge 10.0-monty - 10.0
Fixed main.plugin, main-test_sql_discovery.plugin failures.
storage/example/ha_example.cc:
Issue a warning independently of DBUG status (needed for testing).
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/example/ha_example.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/storage/example/ha_example.cc b/storage/example/ha_example.cc index c5ee238a235..2e27f29a396 100644 --- a/storage/example/ha_example.cc +++ b/storage/example/ha_example.cc @@ -964,7 +964,6 @@ bool ha_example::check_if_incompatible_data(HA_CREATE_INFO *info, DBUG_RETURN(COMPATIBLE_DATA_NO); } -#ifndef DBUG_OFF for (uint i= 0; i < table->s->fields; i++) { ha_field_option_struct *f_old, *f_new; @@ -982,7 +981,6 @@ bool ha_example::check_if_incompatible_data(HA_CREATE_INFO *info, else DBUG_PRINT("info", ("old field %i did not changed", i)); } -#endif DBUG_RETURN(COMPATIBLE_DATA_YES); } |