database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Merge branch '10.3' into 10.4

Browse Source
This commit is contained in:
Oleksandr Byelkin
2019-05-19 20:55:37 +02:00
parent 7f8187bc43 2ae83affef
commit c07325f932
3893 changed files with 11766 additions and 6460 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
sql/sql_truncate.cc
View File

@ -12,7 +12,7 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#include "mariadb.h"
#include "debug_sync.h" // DEBUG_SYNC
@ -147,15 +147,11 @@ fk_truncate_illegal_if_parent(THD *thd, TABLE *table)
/* Loop over the set of foreign keys for which this table is a parent. */
while ((fk_info= it++))
{
DBUG_ASSERT(!lex_string_cmp(system_charset_info,
fk_info->referenced_db,
&table->s->db));
DBUG_ASSERT(!lex_string_cmp(system_charset_info,
fk_info->referenced_table,
&table->s->table_name));
if (lex_string_cmp(system_charset_info, fk_info->foreign_db,
if (lex_string_cmp(system_charset_info, fk_info->referenced_db,
&table->s->db) ||
lex_string_cmp(system_charset_info, fk_info->referenced_table,
&table->s->table_name) ||
lex_string_cmp(system_charset_info, fk_info->foreign_db,
&table->s->db) ||
lex_string_cmp(system_charset_info, fk_info->foreign_table,
&table->s->table_name))