diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2016-08-24 19:30:32 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2016-08-24 19:30:32 -0400 |
| commit | c309e99ff9b48c1736ff468e72153048c4b56561 (patch) | |
| tree | 1fb9e8831597007bcfa9e7ea2b2aadb717b962cd /mysql-test/include | |
| parent | 8b09db8bfb81f1e7695cfcfa6ce2bec45247171f (diff) | |
| parent | 5bbe929d706e26cb3f9b291da6009526a17b1545 (diff) | |
| download | mariadb-git-c309e99ff9b48c1736ff468e72153048c4b56561.tar.gz | |
Merge branch '10.0' into 10.0-galera
Diffstat (limited to 'mysql-test/include')
| -rw-r--r-- | mysql-test/include/report-features.test | 12 | ||||
| -rw-r--r-- | mysql-test/include/wait_until_connected_again.inc | 2 | ||||
| -rw-r--r-- | mysql-test/include/wait_until_disconnected.inc | 2 |
3 files changed, 2 insertions, 14 deletions
diff --git a/mysql-test/include/report-features.test b/mysql-test/include/report-features.test deleted file mode 100644 index 75879f67165..00000000000 --- a/mysql-test/include/report-features.test +++ /dev/null @@ -1,12 +0,0 @@ -# -# show server variables -# - ---disable_query_log ---echo ===== ENGINES ===== -show engines; ---echo ===== VARIABLES ===== -show variables; ---echo ===== STOP ===== ---enable_query_log -exit; diff --git a/mysql-test/include/wait_until_connected_again.inc b/mysql-test/include/wait_until_connected_again.inc index 96240e36db7..6f64ef45440 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,2005,2006,2013 + --error 0,1040,1053,2002,2003,2005,2006,2013,1927 show status; dec $counter; diff --git a/mysql-test/include/wait_until_disconnected.inc b/mysql-test/include/wait_until_disconnected.inc index 71361682442..658bf0be739 100644 --- a/mysql-test/include/wait_until_disconnected.inc +++ b/mysql-test/include/wait_until_disconnected.inc @@ -12,7 +12,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,2005,2006,2013 + --error 0,1040,1053,2002,2003,2005,2006,2013,1927 show status; dec $counter; |