database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

mysql-5.5.33 merge

Browse Source
This commit is contained in:
Sergei Golubchik
2013-09-06 22:31:30 +02:00
parent 824db55ce5 72c36f4415
commit b838d081ad
315 changed files with 2012 additions and 1282 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/sql_rename.cc
View File

@ -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
@ -294,7 +295,7 @@ do_rename(THD *thd, TABLE_LIST *ren_table, char *new_db, char *new_table_name,
(void) mysql_rename_table(ha_resolve_by_legacy_type(thd,
table_type),
new_db, new_alias,
ren_table->db, old_alias, 0);
ren_table->db, old_alias, NO_FK_CHECKS);
}
}
}