bk commit into 5.1 tree (gluh:1.2577)

[gluh]

Below is the list of changes that have just been committed into a local
5.1 repository of gluh. When gluh 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, 2007-10-11 16:41:05+05:00, gluh@stripped +1 -0
  after merge fix

  sql/sql_yacc.yy@stripped, 2007-10-11 16:41:03+05:00, gluh@stripped +1 -1
    after merge fix

diff -Nrup a/sql/sql_yacc.yy b/sql/sql_yacc.yy
--- a/sql/sql_yacc.yy	2007-10-11 16:13:11 +05:00
+++ b/sql/sql_yacc.yy	2007-10-11 16:41:03 +05:00
@@ -9958,7 +9958,7 @@ literal:
             $$= new Item_string(NULL, /* name will be set in select_item */
                                 str ? str->ptr() : "",
                                 str ? str->length() : 0,
-                                Lex->underscore_charset);
+                                $1);
             if ($$ && !$$->check_well_formed_result(&$$->str_value))
             {
               $$= new Item_null();