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

Merge with MySQL 5.1.47

Browse Source 
Fixed some bugs introduced in 5.1.47
Disabled some tests until we have merged with latest Xtradb

configure.in:
  Added testing if valgrind/memcheck.h exists
storage/pbxt/src/ha_pbxt.cc:
  LOCK_plugin is not anymore locked in init
This commit is contained in:
Michael Widenius
2010-05-26 21:55:40 +03:00
parent 9febcb4776 af6d89a6aa
commit 4aa9d903c1
309 changed files with 7473 additions and 5074 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/sql_table.cc
View File

@@ -6969,6 +6969,13 @@ view_err:
&candidate_key_count))
goto err;
DBUG_EXECUTE_IF("alter_table_only_metadata_change", {
if (need_copy_table_res != ALTER_TABLE_METADATA_ONLY)
goto err; });
DBUG_EXECUTE_IF("alter_table_only_index_change", {
if (need_copy_table_res != ALTER_TABLE_INDEX_CHANGED)
goto err; });
if (need_copy_table == ALTER_TABLE_METADATA_ONLY)
need_copy_table= need_copy_table_res;
}