diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-09-21 10:14:42 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-09-21 10:14:42 +0200 |
| commit | 9af177042ed0e297b8f26f2c2f8ae00b3a814a90 (patch) | |
| tree | 0d8d2fab7ebeb02f3c25c00ac1543754b625bde8 /sql/sql_rename.cc | |
| parent | a6add4ff43a905cee1bfd00b2ec2d276018866ce (diff) | |
| parent | 2fe0836eed16ce5809c34064893681f12c77da9f (diff) | |
| download | mariadb-git-9af177042ed0e297b8f26f2c2f8ae00b3a814a90.tar.gz | |
10.0-base merge.
Partitioning/InnoDB changes are *not* merged (they'll come from 5.6)
TokuDB does not compile (not updated to 10.0 SE API)
Diffstat (limited to 'sql/sql_rename.cc')
| -rw-r--r-- | sql/sql_rename.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/sql_rename.cc b/sql/sql_rename.cc index 78acb4a519f..6babdd7c636 100644 --- a/sql/sql_rename.cc +++ b/sql/sql_rename.cc @@ -1,5 +1,6 @@ /* - Copyright (c) 2000, 2010, Oracle and/or its affiliates. + Copyright (c) 2000, 2013, Oracle and/or its affiliates. + Copyright (c) 2011, 2013, Monty Program Ab. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -296,7 +297,7 @@ do_rename(THD *thd, TABLE_LIST *ren_table, char *new_db, char *new_table_name, and handler's data and report about failure to rename table. */ (void) mysql_rename_table(hton, new_db, new_alias, - ren_table->db, old_alias, 0); + ren_table->db, old_alias, NO_FK_CHECKS); } } } |