bk commit into 5.0 tree (evgen:1.2243) BUG#10977

[eugene]

Below is the list of changes that have just been committed into a local
5.0 repository of evgen. When evgen does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-07-17 16:12:42+04:00, evgen@stripped +2 -0
  select.result, select.test:
    Test case for bug#10977 altered to make it work in both plain and ps-protocol modes.

  mysql-test/r/select.result@stripped, 2006-07-17 16:11:50+04:00, evgen@stripped +4 -3
    Test case for bug#10977 altered to make it work in both plain and ps-protocol modes.

  mysql-test/t/select.test@stripped, 2006-07-17 16:11:22+04:00, evgen@stripped +2 -1
    Test case for bug#10977 altered to make it work in both plain and ps-protocol modes.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	evgen
# Host:	moonbone.local
# Root:	/work/10977-bug-5.0-opt-mysql

--- 1.132/mysql-test/r/select.result	2006-07-17 16:12:46 +04:00
+++ 1.133/mysql-test/r/select.result	2006-07-17 16:12:46 +04:00
@@ -3398,8 +3398,9 @@
 SELECT 0.9888889889 * 1.011111411911;
 0.9888889889 * 1.011111411911
 0.9998769417899202067879
-select 1 as ' a ';
-a 
-1
+prepare stmt from 'select 1 as " a "';
 Warnings:
 Warning	1466	Leading spaces are removed from name ' a '
+execute stmt;
+a 
+1

--- 1.108/mysql-test/t/select.test	2006-07-17 16:12:46 +04:00
+++ 1.109/mysql-test/t/select.test	2006-07-17 16:12:46 +04:00
@@ -2910,4 +2910,5 @@
 #
 # Bug #10977: No warning issued if a column name is truncated
 #
-select 1 as ' a ';
+prepare stmt from 'select 1 as " a "';
+execute stmt;