diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2018-03-22 08:51:43 +0200 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2018-03-23 07:27:01 +0200 |
| commit | 2e5495a52993a5ca9093bfbcc9aa4d610c80f0dc (patch) | |
| tree | dcd440e10bbe12cbaa842136412563398b4cbafb | |
| parent | c25743c620388a466978d4cf268751a72e9bf4f1 (diff) | |
| download | mariadb-git-bb-10.1-MDEV-14616.tar.gz | |
MDEV-14616: WSREP has not yet prepared node for application use errorbb-10.1-MDEV-14616
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
| -rw-r--r-- | client/mysqltest.cc | 4 | ||||
| -rw-r--r-- | mysql-test/include/wait_until_connected_again.inc | 2 | ||||
| -rw-r--r-- | mysql-test/t/mysqltest.test | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/client/mysqltest.cc b/client/mysqltest.cc index 895c837f68b..77584e70afe 100644 --- a/client/mysqltest.cc +++ b/client/mysqltest.cc @@ -520,7 +520,7 @@ struct st_match_err struct st_expected_errors { - struct st_match_err err[10]; + struct st_match_err err[12]; uint count; }; static struct st_expected_errors saved_expected_errors; @@ -1462,7 +1462,7 @@ void free_used_memory() dynstr_free(&(*q)->content); my_free((*q)); } - for (i= 0; i < 10; i++) + for (i= 0; i < 12; i++) { if (var_reg[i].alloced_len) my_free(var_reg[i].str_val); diff --git a/mysql-test/include/wait_until_connected_again.inc b/mysql-test/include/wait_until_connected_again.inc index 265f110fe72..b13d07e94bb 100644 --- a/mysql-test/include/wait_until_connected_again.inc +++ b/mysql-test/include/wait_until_connected_again.inc @@ -14,7 +14,7 @@ while ($mysql_errno) # Strangely enough, the server might return "Too many connections" # while being shutdown, thus 1040 is an "allowed" error # 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; dec $counter; diff --git a/mysql-test/t/mysqltest.test b/mysql-test/t/mysqltest.test index b2eb101a37c..60f41042d56 100644 --- a/mysql-test/t/mysqltest.test +++ b/mysql-test/t/mysqltest.test @@ -685,7 +685,7 @@ remove_file $MYSQLTEST_VARDIR/tmp/mysqltest.sql; # Too many errorcodes specified --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 # ---------------------------------------------------------------------------- |