diff options
| author | Vinay Fisrekar <vinay.fisrekar@sun.com> | 2011-02-07 12:34:43 +0530 |
|---|---|---|
| committer | Vinay Fisrekar <vinay.fisrekar@sun.com> | 2011-02-07 12:34:43 +0530 |
| commit | 2f3fdbcfb85ed46a5444f378f663a20f09df5177 (patch) | |
| tree | e59c0d15f97e2401dfda4ee503403e63fb18dd5a /mysql-test/suite/engines | |
| parent | d197051eacb98391b6dfa8ef5ce4bbedbebcbee4 (diff) | |
| parent | e29b40f86fcd75c72eb622f3219fbe386d81b8aa (diff) | |
| download | mariadb-git-2f3fdbcfb85ed46a5444f378f663a20f09df5177.tar.gz | |
bzr merger from mysql-5.1 to mysql-5.5
Bug#59955 - engines/funcs/ps_string_not_null test needs better cleanup
Diffstat (limited to 'mysql-test/suite/engines')
| -rw-r--r-- | mysql-test/suite/engines/funcs/r/ps_string_not_null.result | bin | 11681 -> 11681 bytes | |||
| -rw-r--r-- | mysql-test/suite/engines/funcs/t/ps_string_not_null.test | 2 |
2 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/suite/engines/funcs/r/ps_string_not_null.result b/mysql-test/suite/engines/funcs/r/ps_string_not_null.result Binary files differindex 859fab8b490..5f2a630811c 100644 --- a/mysql-test/suite/engines/funcs/r/ps_string_not_null.result +++ b/mysql-test/suite/engines/funcs/r/ps_string_not_null.result diff --git a/mysql-test/suite/engines/funcs/t/ps_string_not_null.test b/mysql-test/suite/engines/funcs/t/ps_string_not_null.test index f9e937cb24d..662adfd7a88 100644 --- a/mysql-test/suite/engines/funcs/t/ps_string_not_null.test +++ b/mysql-test/suite/engines/funcs/t/ps_string_not_null.test @@ -1,5 +1,5 @@ --disable_warnings -DROP TABLE IF EXISTS t2; +DROP TABLE IF EXISTS t1; --enable_warnings CREATE TABLE t1(c1 CHAR(100) NOT NULL); PREPARE stmt1 FROM 'INSERT INTO t1 (c1) VALUES(?)'; |