Fix for Bug#30217: Views: changes in metadata behaviour

between 5.0 and 5.1.
  
The problem was that in the patch for Bug#11986 it was decided
to store original query in UTF8 encoding for the INFORMATION_SCHEMA.
This approach however turned out to be quite difficult to implement
properly. The main problem is to preserve the same IS-output after
dump/restore.
  
So, the fix is to rollback to the previous functionality, but also
to fix it to support multi-character-set-queries properly. The idea
is to generate INFORMATION_SCHEMA-query from the item-tree after
parsing view declaration. The IS-query should:
  - be completely in UTF8;
  - not contain character set introducers.
  
For more information, see WL4052.

1 files changed, 2 insertions, 2 deletions

diff --git a/sql/item_row.cc b/sql/item_row.cc
index 369aa04930e..28de03bf049 100644
--- a/sql/item_row.cc
+++ b/sql/item_row.cc
@@ -134,14 +134,14 @@ bool Item_row::check_cols(uint c)
   return 0;
 }
 
-void Item_row::print(String *str)
+void Item_row::print(String *str, enum_query_type query_type)
 {
   str->append('(');
   for (uint i= 0; i < arg_count; i++)
   {
     if (i)
       str->append(',');
-    items[i]->print(str);
+    items[i]->print(str, query_type);
   }
   str->append(')');
 }