diff options
| author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2018-06-11 20:24:41 +0300 |
|---|---|---|
| committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2018-06-11 20:24:41 +0300 |
| commit | ecd4c2b4a953596e15b90c1108aaa74a87d9b945 (patch) | |
| tree | 408d2cc462f3d1888153f572a19782fa05fe219a | |
| parent | aba2d7301f30daab9f54e92d21a4a130dda11dc4 (diff) | |
| download | mariadb-git-ecd4c2b4a953596e15b90c1108aaa74a87d9b945.tar.gz | |
Add missed change from 7ffa82b03c8da12062223d5e332e972d6f828d44
| -rw-r--r-- | client/mysqltest.cc | 2 | ||||
| -rw-r--r-- | mysql-test/include/wait_until_connected_again.inc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/client/mysqltest.cc b/client/mysqltest.cc index b962813f558..803550ba7be 100644 --- a/client/mysqltest.cc +++ b/client/mysqltest.cc @@ -1507,7 +1507,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 2e80ea2ed7d..26168d10558 100644 --- a/mysql-test/include/wait_until_connected_again.inc +++ b/mysql-test/include/wait_until_connected_again.inc @@ -11,7 +11,7 @@ let $counter= 5000; let $mysql_errno= 9999; while ($mysql_errno) { - --error 0,ER_SERVER_SHUTDOWN,ER_CONNECTION_KILLED,2002,2006,2013 + --error 0,ER_SERVER_SHUTDOWN,ER_CONNECTION_KILLED,ER_LOCK_WAIT_TIMEOUT,2002,2006,2013 show status; dec $counter; |