diff options
| author | Vladislav Vaintroub <wlad@montyprogram.com> | 2012-01-26 17:35:01 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@montyprogram.com> | 2012-01-26 17:35:01 +0100 |
| commit | 924ac28bae02aa41d0d46cd9fef8d6587104e7cd (patch) | |
| tree | 3918fd5f3d7a546337ab4b36f7aa222c7c9ef966 /mysql-test/include | |
| parent | 57b6cb39aa268a49ad05f86025386ddde6516670 (diff) | |
| parent | 2551e1ae3306cdab1521b34722b46d6f929bd92b (diff) | |
| download | mariadb-git-924ac28bae02aa41d0d46cd9fef8d6587104e7cd.tar.gz | |
merge
Diffstat (limited to 'mysql-test/include')
| -rw-r--r-- | mysql-test/include/show_slave_status.inc | 1 | ||||
| -rw-r--r-- | mysql-test/include/wait_until_connected_again.inc | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/mysql-test/include/show_slave_status.inc b/mysql-test/include/show_slave_status.inc index 67b1c987954..d04c6354386 100644 --- a/mysql-test/include/show_slave_status.inc +++ b/mysql-test/include/show_slave_status.inc @@ -69,6 +69,7 @@ while ($_show_slave_status_items) --let $_show_slave_status_name= `SELECT SUBSTRING_INDEX('$_show_slave_status_items', ',', 1)` --let $_show_slave_status_items= `SELECT LTRIM(SUBSTRING('$_show_slave_status_items', LENGTH('$_show_slave_status_name') + 2))` + --replace_regex /\.[\\\/]master/master/ --let $_show_slave_status_value= query_get_value(SHOW SLAVE STATUS, $_show_slave_status_name, 1) --let $_show_slave_status_value= `SELECT REPLACE("$_show_slave_status_value", '$MYSQL_TEST_DIR', 'MYSQL_TEST_DIR')` --echo $_show_slave_status_name = '$_show_slave_status_value' diff --git a/mysql-test/include/wait_until_connected_again.inc b/mysql-test/include/wait_until_connected_again.inc index aff92141a8b..96240e36db7 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,2002,2003,2006,2013 + --error 0,1040,1053,2002,2003,2005,2006,2013 show status; dec $counter; |