From 3f2e94c401b87dd14b17307dab88e15067a24322 Mon Sep 17 00:00:00 2001
From: "anozdrin/alik@ibm." <>
Date: Thu, 12 Jul 2007 12:49:39 +0400
Subject: Fix for 5.1 for BUG#10491: Server returns data as charset binary SHOW
 CREATE TABLE or SELECT FROM I_S.

This is the last patch for this bug, which depends on the big
CS patch and was pending.

The problem was that SHOW CREATE statements returned original
queries in the binary character set. That could cause the query
to be unreadable.

The fix is to use original character_set_client when sending
the original query to the client. In order to preserve the query
in mysqldump, 'binary' character set results should be set when
issuing SHOW CREATE statement. If either source or destination
character set is 'binary' , no conversion is performed.
The idea is that since the source character set is no longer
'binary', we fix the destination character set to still produce
valid dumps.
---
 sql/sql_show.cc | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'sql/sql_show.cc')

diff --git a/sql/sql_show.cc b/sql/sql_show.cc
index f66897df671..04374c1d1c1 100644
--- a/sql/sql_show.cc
+++ b/sql/sql_show.cc
@@ -639,7 +639,8 @@ mysqld_show_create(THD *thd, TABLE_LIST *table_list)
 
   if (table_list->view)
   {
-    protocol->store(buffer.ptr(), buffer.length(), &my_charset_bin);
+    protocol->store(buffer.ptr(), buffer.length(),
+                    table_list->view_creation_ctx->get_client_cs());
 
     protocol->store(table_list->view_creation_ctx->get_client_cs()->csname,
                     system_charset_info);
@@ -5983,6 +5984,8 @@ static bool show_create_trigger_impl(THD *thd,
   LEX_STRING trg_connection_cl_name;
   LEX_STRING trg_db_cl_name;
 
+  CHARSET_INFO *trg_client_cs;
+
   /*
     TODO: Check privileges here. This functionality will be added by
     implementation of the following WL items:
@@ -6008,6 +6011,11 @@ static bool show_create_trigger_impl(THD *thd,
                                                      trg_sql_mode,
                                                      &trg_sql_mode_str);
 
+  /* Resolve trigger client character set. */
+
+  if (resolve_charset(trg_client_cs_name.str, NULL, &trg_client_cs))
+    return TRUE;
+
   /* Send header. */
 
   fields.push_back(new Item_empty_string("Trigger", NAME_LEN));
@@ -6054,7 +6062,7 @@ static bool show_create_trigger_impl(THD *thd,
 
   p->store(trg_sql_original_stmt.str,
            trg_sql_original_stmt.length,
-           &my_charset_bin);
+           trg_client_cs);
 
   p->store(trg_client_cs_name.str,
            trg_client_cs_name.length,
-- 
cgit v1.2.1