summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <holyfoot@mysql.com>2005-05-07 12:13:12 +0500
committerunknown <holyfoot@mysql.com>2005-05-07 12:13:12 +0500
commit0228f897259751242398164dd4be6689146b8377 (patch)
tree633c11060eb101d7eac5b1f799eef8db3723e54d
parentf291fb7285f9d5da0877c49140978db304e15263 (diff)
parent52db68ca481bd55daafd53220eeb0c5308df67b7 (diff)
downloadmariadb-git-0228f897259751242398164dd4be6689146b8377.tar.gz
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/hf/work/mysql-5.0.clean
-rw-r--r--mysql-test/t/type_newdecimal.test3
1 files changed, 2 insertions, 1 deletions
diff --git a/mysql-test/t/type_newdecimal.test b/mysql-test/t/type_newdecimal.test
index 0a152cb339e..7b33a46ae96 100644
--- a/mysql-test/t/type_newdecimal.test
+++ b/mysql-test/t/type_newdecimal.test
@@ -880,9 +880,10 @@ select 0/0;
#
# bug #9546
#
+--disable_ps_protocol
select 9999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999 as x;
select 9999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999 + 1 as x;
-
+--enable_ps_protocol
#
# Bug #10004
#