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

MDEV-14616: WSREP has not yet prepared node for application use error

Browse Source 
MariaDB adjustments.

mysqltest.cc : Allow 12 error codes at --error

wait_until_connected_again.inc: Replace numeric error codes with symbols

mysqltest.test: Add error codes to test that tests too many errorcodes
This commit is contained in:
Jan Lindström
2018-03-22 08:51:43 +02:00
parent 992370693f
commit 7ffa82b03c
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
client/mysqltest.cc
View File

@ -520,7 +520,7 @@ struct st_match_err
struct st_expected_errors struct st_expected_errors
{ {
struct st_match_err err[10]; struct st_match_err err[12];
uint count; uint count;
}; };
static struct st_expected_errors saved_expected_errors; static struct st_expected_errors saved_expected_errors;
@ -1462,7 +1462,7 @@ void free_used_memory()
dynstr_free(&(*q)->content); dynstr_free(&(*q)->content);
my_free((*q)); my_free((*q));
} }
for (i= 0; i < 10; i++) for (i= 0; i < 12; i++)
{ {
if (var_reg[i].alloced_len) if (var_reg[i].alloced_len)
my_free(var_reg[i].str_val); my_free(var_reg[i].str_val);

2
mysql-test/include/wait_until_connected_again.inc
View File

@ -14,7 +14,7 @@ while ($mysql_errno)
# Strangely enough, the server might return "Too many connections" # Strangely enough, the server might return "Too many connections"
# while being shutdown, thus 1040 is an "allowed" error # while being shutdown, thus 1040 is an "allowed" error
# See BUG#36228 # See BUG#36228
--error 0,1040,1053,1205,2002,2003,2005,2006,2013,1927 --error 0,ER_CON_COUNT_ERROR,ER_SERVER_SHUTDOWN,ER_LOCK_WAIT_TIMEOUT,ER_CONNECTION_KILLED,2002,2003,2005,2006,2013
show status; show status;
dec $counter; dec $counter;

2
mysql-test/t/mysqltest.test
View File

@ -685,7 +685,7 @@ remove_file $MYSQLTEST_VARDIR/tmp/mysqltest.sql;
# Too many errorcodes specified # Too many errorcodes specified
--error 1 --error 1
--exec echo "--error 1,2,3,4,5,6,7,8,9,10,11" | $MYSQL_TEST 2>&1 --exec echo "--error 1,2,3,4,5,6,7,8,9,10,11,12,13" | $MYSQL_TEST 2>&1
# ---------------------------------------------------------------------------- # ----------------------------------------------------------------------------