Commit 6cae4c33 authored by Georgi Kodinov's avatar Georgi Kodinov

merged 5.1-bugteam -> merge-5.1-bugteam

parents 05dbb26d e337639d
...@@ -2469,8 +2469,6 @@ int ha_partition::open(const char *name, int mode, uint test_if_locked) ...@@ -2469,8 +2469,6 @@ int ha_partition::open(const char *name, int mode, uint test_if_locked)
~(PARTITION_DISABLED_TABLE_FLAGS)) | ~(PARTITION_DISABLED_TABLE_FLAGS)) |
(PARTITION_ENABLED_TABLE_FLAGS))) (PARTITION_ENABLED_TABLE_FLAGS)))
{ {
DBUG_PRINT("error", ("check_table_flag 0x%x != 0x%x table_flags()",
check_table_flags, (*file)->ha_table_flags()));
error= HA_ERR_INITIALIZATION; error= HA_ERR_INITIALIZATION;
goto err_handler; goto err_handler;
} }
......
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