diff options
| author | Alfranio Correia <alfranio.correia@sun.com> | 2009-05-21 09:36:38 +0100 |
|---|---|---|
| committer | Alfranio Correia <alfranio.correia@sun.com> | 2009-05-21 09:36:38 +0100 |
| commit | 9ce928de59cc18e69de588929e9b6e5abf07e733 (patch) | |
| tree | f98c003529e01890b754db89407ac3bfecf513aa /mysql-test | |
| parent | 60955e54a2514decef0369350969f5d06414e688 (diff) | |
| parent | f6eb9426ce9ba72e5a6d74755734d22aadba32e0 (diff) | |
| download | mariadb-git-9ce928de59cc18e69de588929e9b6e5abf07e733.tar.gz | |
auto-merge 5.1-bugteam (local) --> 5.1-bugteam
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/suite/rpl/r/rpl_slave_load_tmpdir_not_exist.result | 2 | ||||
| -rw-r--r-- | mysql-test/suite/rpl/t/rpl_slave_load_tmpdir_not_exist.test | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/suite/rpl/r/rpl_slave_load_tmpdir_not_exist.result b/mysql-test/suite/rpl/r/rpl_slave_load_tmpdir_not_exist.result index a158fb5dfc4..3ed14a9cb6b 100644 --- a/mysql-test/suite/rpl/r/rpl_slave_load_tmpdir_not_exist.result +++ b/mysql-test/suite/rpl/r/rpl_slave_load_tmpdir_not_exist.result @@ -3,4 +3,4 @@ MASTER_CONNECT_RETRY=1, MASTER_HOST='127.0.0.1', MASTER_PORT=MASTER_MYPORT; START SLAVE; -Unable to use slave's temporary directory ../../../error - Can't read dir of '../../../error' (Errcode: 2) +12 diff --git a/mysql-test/suite/rpl/t/rpl_slave_load_tmpdir_not_exist.test b/mysql-test/suite/rpl/t/rpl_slave_load_tmpdir_not_exist.test index 3a80fa43f20..68c41abf537 100644 --- a/mysql-test/suite/rpl/t/rpl_slave_load_tmpdir_not_exist.test +++ b/mysql-test/suite/rpl/t/rpl_slave_load_tmpdir_not_exist.test @@ -20,5 +20,5 @@ eval CHANGE MASTER TO MASTER_USER='root', START SLAVE; source include/wait_for_slave_sql_to_stop.inc; -let $error=query_get_value("show slave status", Last_SQL_Error, 1); -echo $error; +let $errno=query_get_value("show slave status", Last_SQL_Errno, 1); +echo $errno; |