diff options
| author | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2011-02-02 19:05:28 +0200 |
|---|---|---|
| committer | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2011-02-02 19:05:28 +0200 |
| commit | 72ae1d65dd62f1e2cc308549a84a46feadd158f4 (patch) | |
| tree | 4635605ae0572f713774190b2fe771d0df3a1f96 /mysql-test/t/variables.test | |
| parent | e805a0fd9de24cf1a9a6fb7bd10a336dbcd46fe9 (diff) | |
| parent | a70c34bf0f34703fd330f8cb828e48b303c5296a (diff) | |
| download | mariadb-git-72ae1d65dd62f1e2cc308549a84a46feadd158f4.tar.gz | |
merge to 5.1.
Diffstat (limited to 'mysql-test/t/variables.test')
| -rw-r--r-- | mysql-test/t/variables.test | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/t/variables.test b/mysql-test/t/variables.test index 74d5c8450a2..2513f4fbcc8 100644 --- a/mysql-test/t/variables.test +++ b/mysql-test/t/variables.test @@ -791,7 +791,7 @@ SET @@myisam_mmap_size= 500M; --echo # Bug #52315: utc_date() crashes when system time > year 2037 --echo # ---error 0, ER_UNKNOWN_ERROR +--error 0, ER_WRONG_VALUE_FOR_VAR SET TIMESTAMP=2*1024*1024*1024; --echo #Should not crash --disable_result_log |