Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0

into mysql.com:/home/hf/work/mysql-5.0.clean

Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/hf/work/mysql-5.0.clean
0228f897 · unknown · f291fb72 · 52db68ca · 0228f897
Commit 0228f897 authored May 07, 2005 by unknown
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

mysql-test/t/type_newdecimal.test mysql-test/t/type_newdecimal.test +2 -1

No files found.
--- 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
 #