summaryrefslogtreecommitdiff
path: root/mysql-test/t/execution_constants.test
diff options
context:
space:
mode:
authorGeorgi Kodinov <Georgi.Kodinov@Oracle.com>2011-10-12 15:07:15 +0300
committerGeorgi Kodinov <Georgi.Kodinov@Oracle.com>2011-10-12 15:07:15 +0300
commite8313e13aa765deb8b948731c6c5b23914c11722 (patch)
treeacbdc8415cbba55527d849790c836f70d5df21dc /mysql-test/t/execution_constants.test
parent41b2a8a9f344dbd032884f753ad4159850bf05c8 (diff)
parentb7a4918fe8e1ace2c3ef21a4a4b2ad737d3ccf69 (diff)
downloadmariadb-git-e8313e13aa765deb8b948731c6c5b23914c11722.tar.gz
merge mysql-5.5->mysql-5.5-security
Diffstat (limited to 'mysql-test/t/execution_constants.test')
-rw-r--r--mysql-test/t/execution_constants.test10
1 files changed, 5 insertions, 5 deletions
diff --git a/mysql-test/t/execution_constants.test b/mysql-test/t/execution_constants.test
index 92b1deb9921..285197cd1f4 100644
--- a/mysql-test/t/execution_constants.test
+++ b/mysql-test/t/execution_constants.test
@@ -38,7 +38,7 @@ while ($i)
{
# If we SEGV because the min stack size is exceeded, this would return error
# 2013 .
- error 0,1436 //
+ error 0,ER_STACK_OVERRUN_NEED_MORE //
eval $query_head 0 $query_tail//
if ($mysql_errno)
@@ -48,10 +48,10 @@ while ($i)
# limit, we still have enough space reserved to report an error.
let $i = 1//
- # Check that mysql_errno is 1436
- if ($mysql_errno != 1436)
+ # Check that mysql_errname is ER_STACK_OVERRUN_NEED_MORE
+ if ($mysql_errname != ER_STACK_OVERRUN_NEED_MORE)
{
- die Wrong error triggered, expected 1436 but got $mysql_errno//
+ die Wrong error triggered, expected ER_STACK_OVERRUN_NEED_MORE but got $mysql_errname//
}
}
@@ -76,7 +76,7 @@ while ($i)
enable_result_log//
enable_query_log//
-echo Assertion: mysql_errno 1436 == $mysql_errno//
+echo Assertion: mysql_errname ER_STACK_OVERRUN_NEED_MORE == $mysql_errname//
delimiter ;//
DROP TABLE `t_bug21476`;