summaryrefslogtreecommitdiff
path: root/mysql-test/t/variables.test
diff options
context:
space:
mode:
authorGeorgi Kodinov <Georgi.Kodinov@Oracle.com>2011-02-02 20:13:28 +0200
committerGeorgi Kodinov <Georgi.Kodinov@Oracle.com>2011-02-02 20:13:28 +0200
commitfe145b0900d8006310232e2edb4137c04c116702 (patch)
tree12d9c3f5bea6c6481050211f64ad22118d925c93 /mysql-test/t/variables.test
parentd98270e1a39c5c9d40b9d3fbca7d8a3ebeb92ccc (diff)
parent72ae1d65dd62f1e2cc308549a84a46feadd158f4 (diff)
downloadmariadb-git-fe145b0900d8006310232e2edb4137c04c116702.tar.gz
merge
Diffstat (limited to 'mysql-test/t/variables.test')
-rw-r--r--mysql-test/t/variables.test2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/t/variables.test b/mysql-test/t/variables.test
index d31939ed3dd..b766c1c7dc6 100644
--- a/mysql-test/t/variables.test
+++ b/mysql-test/t/variables.test
@@ -779,7 +779,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