diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2014-10-09 17:25:08 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2014-10-09 17:25:08 -0400 |
| commit | 068fb8569f2300e4a5c08413a756417d923ecf5f (patch) | |
| tree | ab008f1be51ee322cbeeb5aa73042430a6e63347 /mysql-test/include | |
| parent | 59277a7d83374bc293cd58f8be509a81792d829e (diff) | |
| parent | dbda20caffbb22115b6f30069b716bc505c49d11 (diff) | |
| download | mariadb-git-068fb8569f2300e4a5c08413a756417d923ecf5f.tar.gz | |
bzr merge -rtag:mariadb-5.5.40 maria/5.5
Diffstat (limited to 'mysql-test/include')
| -rw-r--r-- | mysql-test/include/mysqlhotcopy.inc | 2 | ||||
| -rw-r--r-- | mysql-test/include/wait_until_count_sessions.inc | 2 | ||||
| -rw-r--r--[-rwxr-xr-x] | mysql-test/include/world.inc | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | mysql-test/include/world_schema.inc | 0 |
4 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/include/mysqlhotcopy.inc b/mysql-test/include/mysqlhotcopy.inc index 779ed7f36e0..f775d782b28 100644 --- a/mysql-test/include/mysqlhotcopy.inc +++ b/mysql-test/include/mysqlhotcopy.inc @@ -109,7 +109,7 @@ DROP DATABASE hotcopy_save; --replace_result $MYSQLD_DATADIR MYSQLD_DATADIR --list_files $MYSQLD_DATADIR/hotcopy_save --replace_result $MASTER_MYSOCK MASTER_MYSOCK ---error 9,11,2304 +--error 1 --exec $MYSQLHOTCOPY --quiet -S $MASTER_MYSOCK -u root hotcopy_test hotcopy_save --replace_result $MASTER_MYSOCK MASTER_MYSOCK --exec $MYSQLHOTCOPY --quiet --allowold -S $MASTER_MYSOCK -u root hotcopy_test hotcopy_save diff --git a/mysql-test/include/wait_until_count_sessions.inc b/mysql-test/include/wait_until_count_sessions.inc index 26b0d8f2633..245fb68b5c3 100644 --- a/mysql-test/include/wait_until_count_sessions.inc +++ b/mysql-test/include/wait_until_count_sessions.inc @@ -10,7 +10,7 @@ # 1. We wait for $current_sessions <= $count_sessions because in the use case # with count_sessions.inc before and wait_until_count_sessions.inc after # the core of the test it could happen that the disconnects of sessions -# belonging to the preceeding test are not finished. +# belonging to the preceding test are not finished. # sessions at test begin($count_sessions) = m + n # sessions of the previous test which will be soon disconnected = n (n >= 0) # sessions at test end ($current sessions, assuming the test disconnects diff --git a/mysql-test/include/world.inc b/mysql-test/include/world.inc index eae6556c422..eae6556c422 100755..100644 --- a/mysql-test/include/world.inc +++ b/mysql-test/include/world.inc diff --git a/mysql-test/include/world_schema.inc b/mysql-test/include/world_schema.inc index c683faf0114..c683faf0114 100755..100644 --- a/mysql-test/include/world_schema.inc +++ b/mysql-test/include/world_schema.inc |