diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-04-30 00:33:06 +0400 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-04-30 00:33:06 +0400 |
| commit | 85ed11c60d569a54a32cce1588594ee18c43e40a (patch) | |
| tree | a2457e79f43173dfb97236266c5bb7a47fdbf65f /sql/sql_table.cc | |
| parent | 21b8741b57204f784633c6337f9abacaa59ff3e2 (diff) | |
| parent | 2303a8c6e4dd94eb6b682c61e0ff333c21b188b2 (diff) | |
| download | mariadb-git-85ed11c60d569a54a32cce1588594ee18c43e40a.tar.gz | |
Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.
Conflicts:
Text conflict in configure.in
Text conflict in dbug/dbug.c
Text conflict in mysql-test/r/ps.result
Text conflict in mysql-test/t/ps.test
Text conflict in sql/CMakeLists.txt
Text conflict in sql/ha_ndbcluster.cc
Text conflict in sql/mysqld.cc
Text conflict in sql/sql_plugin.cc
Text conflict in sql/sql_table.cc
Diffstat (limited to 'sql/sql_table.cc')
| -rw-r--r-- | sql/sql_table.cc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc index c752905d14c..03976e2784a 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -6935,7 +6935,14 @@ view_err: &index_add_buffer, &index_add_count, &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; } |