bzr push into mysql-trunk-cluster branch (magnus.blaudd:3406 to 3407) WL#5881

[magnus.blaudd]

 3407 magnus.blaudd@stripped	2011-11-14
      WL#5881
       - remove unrelated whitespace changes

    modified:
      include/mysql.h.pp
      sql/binlog.cc
      sql/log_event.h
      sql/sql_delete.cc
      sql/sql_select.cc
 3406 magnus.blaudd@stripped	2011-11-14
      WL#5881
       - remove MCP patch for global schema lock 

    modified:
      sql/handler.cc
      sql/handler.h
      sql/sql_db.cc
      sql/sql_parse.cc
      sql/sql_rename.cc
      sql/sql_table.cc
      sql/sql_truncate.cc
      storage/ndb/CMakeLists.txt
=== modified file 'include/mysql.h.pp'
--- a/include/mysql.h.pp	2011-09-07 10:08:09 +0000
+++ b/include/mysql.h.pp	2011-11-14 15:00:16 +0000
@@ -50,15 +50,15 @@ enum enum_field_types { MYSQL_TYPE_DECIM
    MYSQL_TYPE_NEWDATE, MYSQL_TYPE_VARCHAR,
    MYSQL_TYPE_BIT,
                         MYSQL_TYPE_NEWDECIMAL=246,
-                        MYSQL_TYPE_ENUM=247,
-                        MYSQL_TYPE_SET=248,
-                        MYSQL_TYPE_TINY_BLOB=249,
-                        MYSQL_TYPE_MEDIUM_BLOB=250,
-                        MYSQL_TYPE_LONG_BLOB=251,
-                        MYSQL_TYPE_BLOB=252,
-                        MYSQL_TYPE_VAR_STRING=253,
-                        MYSQL_TYPE_STRING=254,
-                        MYSQL_TYPE_GEOMETRY=255
+   MYSQL_TYPE_ENUM=247,
+   MYSQL_TYPE_SET=248,
+   MYSQL_TYPE_TINY_BLOB=249,
+   MYSQL_TYPE_MEDIUM_BLOB=250,
+   MYSQL_TYPE_LONG_BLOB=251,
+   MYSQL_TYPE_BLOB=252,
+   MYSQL_TYPE_VAR_STRING=253,
+   MYSQL_TYPE_STRING=254,
+   MYSQL_TYPE_GEOMETRY=255
 };
 enum mysql_enum_shutdown_level {
   SHUTDOWN_DEFAULT = 0,

=== modified file 'sql/binlog.cc'
--- a/sql/binlog.cc	2011-09-28 10:06:31 +0000
+++ b/sql/binlog.cc	2011-11-14 15:00:16 +0000
@@ -3618,7 +3618,7 @@ bool MYSQL_BIN_LOG::write(Log_event *eve
     if ((thd && !(thd->variables.option_bits & OPTION_BIN_LOG)) ||
 	(thd->lex->sql_command != SQLCOM_ROLLBACK_TO_SAVEPOINT &&
          thd->lex->sql_command != SQLCOM_SAVEPOINT &&
-         (!event_info->is_no_filter_event() &&
+         (!event_info->is_no_filter_event() && 
           !binlog_filter->db_ok(local_db))))
       DBUG_RETURN(0);
 #endif /* HAVE_REPLICATION */

=== modified file 'sql/log_event.h'
--- a/sql/log_event.h	2011-09-07 10:08:09 +0000
+++ b/sql/log_event.h	2011-11-14 15:00:16 +0000
@@ -550,6 +550,7 @@ struct sql_ex_info
 */
 #define LOG_EVENT_MTS_ISOLATE_F 0x200
 
+
 /**
   @def OPTIONS_WRITTEN_TO_BIN_LOG
 

=== modified file 'sql/sql_delete.cc'
--- a/sql/sql_delete.cc	2011-09-28 08:39:40 +0000
+++ b/sql/sql_delete.cc	2011-11-14 15:00:16 +0000
@@ -334,6 +334,7 @@ bool mysql_delete(THD *thd, TABLE_LIST *
   else
     will_batch= !table->file->start_bulk_delete();
 
+
   table->mark_columns_needed_for_delete();
 
   while (!(error=info.read_record(&info)) && !thd->killed &&

=== modified file 'sql/sql_select.cc'
--- a/sql/sql_select.cc	2011-09-28 09:14:07 +0000
+++ b/sql/sql_select.cc	2011-11-14 15:00:16 +0000
@@ -5259,7 +5259,7 @@ const_table_extraction_done:
              2. are part of nested outer join.
           */
 	  if (eq_part.is_prefix(table->key_info[key].key_parts) &&
-              !table->fulltext_searched &&                             // 1
+              !table->fulltext_searched &&                           // 1
               !table->pos_in_table_list->in_outer_join_nest())       // 2
 	  {
             if (table->key_info[key].flags & HA_NOSAME)

No bundle (reason: useless for push emails).