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

Merge 10.0 into 10.1

Browse Source
This commit is contained in:
Marko Mäkelä
2019-03-26 13:51:40 +02:00
parent 065ba53ccb 137812c88a
commit 42fd537244
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_parse.cc
View File

@ -6063,7 +6063,7 @@ static bool check_rename_table(THD *thd, TABLE_LIST *first_table,
0, 0)) 0, 0))
return 1; return 1;
/* check if these are refering to temporary tables */ /* check if these are referring to temporary tables */
table->table= find_temporary_table_for_rename(thd, first_table, table); table->table= find_temporary_table_for_rename(thd, first_table, table);
table->next_local->table= table->table; table->next_local->table= table->table;

2
tests/mysql_client_test.c
View File

@ -19451,8 +19451,8 @@ static void test_big_packet()
opt_password, current_db, opt_port, opt_password, current_db, opt_port,
opt_unix_socket, 0))) opt_unix_socket, 0)))
{ {
mysql_close(mysql_local);
fprintf(stderr, "\n connection failed(%s)", mysql_error(mysql_local)); fprintf(stderr, "\n connection failed(%s)", mysql_error(mysql_local));
mysql_close(mysql_local);
exit(1); exit(1);
} }