From 048cb42dbfadc57761ec8575b344046db91808cd Mon Sep 17 00:00:00 2001
From: unknown <gluh@mysql.com/eagle.(none)>
Date: Thu, 11 Oct 2007 16:41:05 +0500
Subject: [PATCH] after merge fix

---
 sql/sql_yacc.yy | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
index 44667a425fe..adf14228e75 100644
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -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();