diff options
| author | unknown <Li-Bing.Song@sun.com> | 2010-05-26 22:34:25 +0800 |
|---|---|---|
| committer | unknown <Li-Bing.Song@sun.com> | 2010-05-26 22:34:25 +0800 |
| commit | 71e534542bfb6b2cc40909a8bb975fc7564998d0 (patch) | |
| tree | 20ebc2f49e17beacbc4a6ebcaa6727f8eb8e765d /mysql-test/include/test_fieldsize.inc | |
| parent | 42d91c688c27f9b2496ec6e82535b69ec5d69697 (diff) | |
| parent | 8f8e1d6fb85d4be1e8e44beb22b26a72f76ac84e (diff) | |
| download | mariadb-git-71e534542bfb6b2cc40909a8bb975fc7564998d0.tar.gz | |
Manual merge
Diffstat (limited to 'mysql-test/include/test_fieldsize.inc')
| -rw-r--r-- | mysql-test/include/test_fieldsize.inc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/mysql-test/include/test_fieldsize.inc b/mysql-test/include/test_fieldsize.inc index 606bc63779d..105574b15b9 100644 --- a/mysql-test/include/test_fieldsize.inc +++ b/mysql-test/include/test_fieldsize.inc @@ -22,10 +22,9 @@ eval $test_insert; connection slave; START SLAVE; ---source include/wait_for_slave_sql_to_stop.inc ---replace_result $MASTER_MYPORT MASTER_PORT ---replace_column 1 # 4 # 7 # 8 # 9 # 16 # 22 # 23 # 33 # 35 # 36 # ---query_vertical SHOW SLAVE STATUS +--let $slave_sql_errno= 1677 +--let $show_slave_sql_error= 1 +--source include/wait_for_slave_sql_error.inc # The following should be 0 SELECT COUNT(*) FROM t1; |