diff options
| author | Vasil Dimov <vasil.dimov@oracle.com> | 2010-05-19 23:48:50 +0300 |
|---|---|---|
| committer | Vasil Dimov <vasil.dimov@oracle.com> | 2010-05-19 23:48:50 +0300 |
| commit | dc4a8b35a044065dd53123ef20e82efbf4be5614 (patch) | |
| tree | 82a7b3260184402d662503b59f1f77ccf4915e05 /mysql-test/include | |
| parent | 68f13abf5417d65d3120ce8b10079f4930ba5ced (diff) | |
| parent | 759d5bc5351c79ef4835d6ba7ff6db98b56b2041 (diff) | |
| download | mariadb-git-dc4a8b35a044065dd53123ef20e82efbf4be5614.tar.gz | |
Merge mysql-trunk-bugfixing -> mysql-trunk-innodb
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 |
2 files changed, 3 insertions, 1 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)-/; |