diff options
| author | unknown <kent@mysql.com> | 2005-12-18 15:26:37 +0100 |
|---|---|---|
| committer | unknown <kent@mysql.com> | 2005-12-18 15:26:37 +0100 |
| commit | 2de5c141627638ad375c1911f9a4a0b378599f4f (patch) | |
| tree | 12d22d19e36b93f1eaf7dd5261664eda0a781028 /mysql-test/r | |
| parent | a3a5df43a53748e93c81df849f11c46abcb1ebd9 (diff) | |
| parent | 348efa52204e005abbf8d3c2610819c454fde9f5 (diff) | |
| download | mariadb-git-2de5c141627638ad375c1911f9a4a0b378599f4f.tar.gz | |
Merge
mysql-test/r/ndb_basic.result:
Auto merged
mysql-test/r/ndb_multi.result:
Auto merged
mysql-test/t/ndb_basic.test:
Auto merged
mysql-test/t/ndb_multi.test:
Auto merged
sql/sql_class.cc:
Auto merged
Diffstat (limited to 'mysql-test/r')
| -rw-r--r-- | mysql-test/r/rpl000001.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/rpl000001.result b/mysql-test/r/rpl000001.result index 450e728090e..de9f6f16b2a 100644 --- a/mysql-test/r/rpl000001.result +++ b/mysql-test/r/rpl000001.result @@ -50,7 +50,7 @@ select (@id := id) - id from t2; 0 kill @id; drop table t2; -ERROR 08S01: Server shutdown in progress +Got one of the listed errors set global sql_slave_skip_counter=1; start slave; select count(*) from t1; |