summaryrefslogtreecommitdiff
path: root/mysql-test/r/ps_1general.result
diff options
context:
space:
mode:
authorAlexander Nozdrin <alik@sun.com>2009-11-12 15:10:26 +0300
committerAlexander Nozdrin <alik@sun.com>2009-11-12 15:10:26 +0300
commit0e7c10445f42af4b61d738034e63303b88bf570f (patch)
tree620a4604b76d4dc5951c401d1c4131a79bbfcd3a /mysql-test/r/ps_1general.result
parent25067ea7e15276dc2c7739015c6a8900805548db (diff)
parentad6883c4f2df12fe054d996e3ed32669248bfb08 (diff)
downloadmariadb-git-0e7c10445f42af4b61d738034e63303b88bf570f.tar.gz
Auto-merge from mysql-trunk.
Diffstat (limited to 'mysql-test/r/ps_1general.result')
-rw-r--r--mysql-test/r/ps_1general.result3
1 files changed, 3 insertions, 0 deletions
diff --git a/mysql-test/r/ps_1general.result b/mysql-test/r/ps_1general.result
index 1b2a0cc50b2..3ab65c24040 100644
--- a/mysql-test/r/ps_1general.result
+++ b/mysql-test/r/ps_1general.result
@@ -279,6 +279,9 @@ b char(10) YES NULL
SET @arg00=1;
execute stmt4 using @arg00;
Field Type Null Key Default Extra
+Warnings:
+Warning 1292 Truncated incorrect DOUBLE value: 'a'
+Warning 1292 Truncated incorrect DOUBLE value: 'b'
prepare stmt4 from ' show columns from t2 from test like ''a%'' ';
execute stmt4;
Field Type Null Key Default Extra