diff options
| author | Jon Olav Hauglid <jon.hauglid@sun.com> | 2010-05-18 14:52:51 +0200 |
|---|---|---|
| committer | Jon Olav Hauglid <jon.hauglid@sun.com> | 2010-05-18 14:52:51 +0200 |
| commit | 198d51efe7a7bcd9ffceb2953faccc39d6df55d6 (patch) | |
| tree | 7a7d548b20b27bd6b1cdb29f4052ffd1b406f39b /mysql-test/include | |
| parent | d1dd2d11c4207b8e75931b9c575ea51273185b4b (diff) | |
| parent | 21643fb22e527f4328b1dde1d21193b5e80455e3 (diff) | |
| download | mariadb-git-198d51efe7a7bcd9ffceb2953faccc39d6df55d6.tar.gz | |
manual merge from mysql-trunk-bugfixing
Diffstat (limited to 'mysql-test/include')
| -rw-r--r-- | mysql-test/include/ctype_numconv.inc | 2 | ||||
| -rw-r--r-- | mysql-test/include/mysqld--help.inc | 2 | ||||
| -rw-r--r-- | mysql-test/include/show_slave_status.inc | 2 | ||||
| -rw-r--r-- | mysql-test/include/show_slave_status2.inc | 2 | ||||
| -rw-r--r-- | mysql-test/include/test_fieldsize.inc | 2 |
5 files changed, 6 insertions, 4 deletions
diff --git a/mysql-test/include/ctype_numconv.inc b/mysql-test/include/ctype_numconv.inc index 959ca7dfeea..be82f67b9f8 100644 --- a/mysql-test/include/ctype_numconv.inc +++ b/mysql-test/include/ctype_numconv.inc @@ -457,6 +457,8 @@ select * from t1; show create table t1; drop table t1; +# Ensure that row_count() value is reset after drop table. +select 1; select hex(concat(row_count())); create table t1 as select concat(row_count()) as c1; show create table t1; diff --git a/mysql-test/include/mysqld--help.inc b/mysql-test/include/mysqld--help.inc index e318823d8af..f21f8b20aa4 100644 --- a/mysql-test/include/mysqld--help.inc +++ b/mysql-test/include/mysqld--help.inc @@ -23,7 +23,7 @@ perl; while (<F>) { next if 1../The following groups are read/; # formatting, skip line consisting entirely of dashes and blanks - next if /^[\- ]+$/; + next if /^[\- ]+\s?$/; next if /Value \(after reading options\)/; # skip table header next if /^($re1) /; next if /^($re2)-/; diff --git a/mysql-test/include/show_slave_status.inc b/mysql-test/include/show_slave_status.inc index b315b9e45ca..9f51b8bcea1 100644 --- a/mysql-test/include/show_slave_status.inc +++ b/mysql-test/include/show_slave_status.inc @@ -2,5 +2,5 @@ # that varies depending on where the test is executed. --replace_result $MASTER_MYPORT MASTER_PORT ---replace_column 1 # 8 # 9 # 16 # 23 # 33 # 35 # 36 # +--replace_column 1 # 8 # 9 # 16 # 23 # 33 # 35 # 36 # 41 # query_vertical SHOW SLAVE STATUS; diff --git a/mysql-test/include/show_slave_status2.inc b/mysql-test/include/show_slave_status2.inc index 7e970b31d8e..e078b19be12 100644 --- a/mysql-test/include/show_slave_status2.inc +++ b/mysql-test/include/show_slave_status2.inc @@ -4,5 +4,5 @@ # masked out log positions --replace_result $MASTER_MYPORT MASTER_PORT $DEFAULT_MASTER_PORT 3306 ---replace_column 1 # 7 # 8 # 9 # 16 # 22 # 23 # 33 # 35 # 36 # +--replace_column 1 # 7 # 8 # 9 # 16 # 22 # 23 # 33 # 35 # 36 # 41 # query_vertical SHOW SLAVE STATUS; diff --git a/mysql-test/include/test_fieldsize.inc b/mysql-test/include/test_fieldsize.inc index 606bc63779d..ec7b705396d 100644 --- a/mysql-test/include/test_fieldsize.inc +++ b/mysql-test/include/test_fieldsize.inc @@ -24,7 +24,7 @@ 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 # +--replace_column 1 # 4 # 7 # 8 # 9 # 16 # 22 # 23 # 33 # 35 # 36 # 41 # --query_vertical SHOW SLAVE STATUS # The following should be 0 |