bzr push into mysql-6.0-runtime branch (alik:2760 to 2761)

[Alexander Nozdrin]

 2761 Alexander Nozdrin	2008-11-21
      Address various notes from Rafal's review.
modified:
  mysql-test/suite/backup/r/backup_views.result
  mysql-test/suite/backup/t/backup_views.test
  sql/log.cc
  sql/si_objects.cc

 2760 Alexander Nozdrin	2008-11-20
      Add comments.
modified:
  sql/si_objects.cc

=== modified file 'mysql-test/suite/backup/r/backup_views.result'
--- a/mysql-test/suite/backup/r/backup_views.result	2008-11-19 16:32:01 +0000
+++ b/mysql-test/suite/backup/r/backup_views.result	2008-11-21 16:29:06 +0000
@@ -280,7 +280,6 @@ RESTORE FROM 'bup_objectview1.bak';
 backup_id
 #
 DROP DATABASE bup_db1;
-DROP DATABASE bup_db2;
 RESTORE FROM 'bup_objectview2.bak';
 backup_id
 #

=== modified file 'mysql-test/suite/backup/t/backup_views.test'
--- a/mysql-test/suite/backup/t/backup_views.test	2008-11-19 16:32:01 +0000
+++ b/mysql-test/suite/backup/t/backup_views.test	2008-11-21 16:29:06 +0000
@@ -211,7 +211,6 @@ RESTORE FROM 'bup_objectview1.bak';
 # An incomplete bup_db1 was created by the failing restore operation.
 # Remove it before trying restore of bup_db2.
 DROP DATABASE bup_db1;
-DROP DATABASE bup_db2;
 
 replace_column 1 #;
 RESTORE FROM 'bup_objectview2.bak';

=== modified file 'sql/log.cc'
--- a/sql/log.cc	2008-11-19 16:32:01 +0000
+++ b/sql/log.cc	2008-11-21 16:29:06 +0000
@@ -918,27 +918,8 @@ bool Log_to_csv_event_handler::
 
   if (history_data->command)
   {
-    LEX_STRING cmd;
-    uint str_end_unused;
-
-    if (String::needs_conversion(0, thd->charset(), system_charset_info,
-                                 &str_end_unused))
-    {
-      if (thd->convert_string(&cmd, system_charset_info,
-                              history_data->command,
-                              strlen(history_data->command),
-                              thd->charset()))
-        goto err;
-
-    }
-    else
-    {
-      cmd.str= history_data->command;
-      cmd.length= strlen(cmd.str);
-    }
-
-    if (table->field[ET_OBH_FIELD_COMMAND]->store(cmd.str, cmd.length,
-                                                  system_charset_info))
+    if (table->field[ET_OBH_FIELD_COMMAND]->store(history_data->command,
+       strlen(history_data->command), system_charset_info))
       goto err;
     table->field[ET_OBH_FIELD_COMMAND]->set_notnull();
   }

=== modified file 'sql/si_objects.cc'
--- a/sql/si_objects.cc	2008-11-20 19:15:49 +0000
+++ b/sql/si_objects.cc	2008-11-21 16:29:06 +0000
@@ -28,6 +28,16 @@
 
 DDL_blocker_class *DDL_blocker= NULL;
 
+///////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////
+
+#define STR(x) (int) (x).length(), (x).ptr()
+#define LXS(x) (int) (x).length, (x).str
+
+#define LXS_INIT(x) {((char *) (x)), ((size_t) (sizeof (x) - 1))}
+
+///////////////////////////////////////////////////////////////////////////
+
 #define QUERY_BUFFER_SIZE 4096
 
 ///////////////////////////////////////////////////////////////////////////
@@ -210,9 +220,7 @@ Out_stream &Out_stream::operator <<(cons
   chunk.str= chunk_buffer;
   chunk.length= my_snprintf(chunk_buffer, QUERY_BUFFER_SIZE,
     "%d %.*s\n",
-    (int) query->length,
-    (int) query->length,
-    (const char *) query->str);
+    (int) query->length, LXS(*query));
 
   m_serialization->append(chunk.str, chunk.length);
 
@@ -293,14 +301,6 @@ bool In_stream::next(LEX_STRING *chunk)
 
   return FALSE;
 }
-
-///////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////
-
-#define STR(x) (int) (x).length(), (x).ptr()
-#define LXS(x) (int) (x).length, (x).str
-
-#define LXS_INIT(x) {((char *) (x)), ((size_t) (sizeof (x) - 1))}
 
 ///////////////////////////////////////////////////////////////////////////