bzr commit into mysql-next-mr-bugfixing branch (tor.didriksen:3130)

[Tor Didriksen]

#At file:///export/home/didrik/mysqldev-next-mr/next-mr-opt-backporting-br2/ based on revid:tor.didriksen@stripped

 3130 Tor Didriksen	2010-05-05 [merge]
      Fix assorted compiler warnings.

    modified:
      sql/handler.cc
      sql/sql_base.cc
      sql/sql_update.cc
      sql/sys_vars.cc
=== modified file 'sql/handler.cc'
--- a/sql/handler.cc	2010-05-04 09:13:10 +0000
+++ b/sql/handler.cc	2010-05-05 11:44:16 +0000
@@ -58,7 +58,8 @@ static handlerton *installed_htons[128];
 
 #define BITMAP_STACKBUF_SIZE (128/8)
 
-KEY_CREATE_INFO default_key_create_info= { HA_KEY_ALG_UNDEF, 0, {NullS,0} };
+KEY_CREATE_INFO default_key_create_info=
+  { HA_KEY_ALG_UNDEF, 0, {NullS, 0}, {NullS, 0} };
 
 /* number of entries in handlertons[] */
 ulong total_ha= 0;

=== modified file 'sql/sql_base.cc'
--- a/sql/sql_base.cc	2010-03-25 11:14:23 +0000
+++ b/sql/sql_base.cc	2010-05-05 11:44:16 +0000
@@ -729,6 +729,7 @@ TABLE_SHARE *get_cached_table_share(cons
 }  
 
 
+#ifdef DISABLED_UNTIL_GRL_IS_MADE_PART_OF_MDL
 /**
    @brief Mark table share as having one more user (increase its reference
           count).
@@ -746,6 +747,7 @@ static void reference_table_share(TABLE_
                      (ulong) share, share->ref_count));
   DBUG_VOID_RETURN;
 }
+#endif
 
 
 /*

=== modified file 'sql/sql_update.cc'
--- a/sql/sql_update.cc	2010-03-25 11:14:23 +0000
+++ b/sql/sql_update.cc	2010-05-05 11:44:16 +0000
@@ -206,7 +206,6 @@ int mysql_update(THD *thd,
   ulonglong     id;
   List<Item> all_fields;
   THD::killed_state killed_status= THD::NOT_KILLED;
-  MDL_ticket *start_of_statement_svp= thd->mdl_context.mdl_savepoint();
   DBUG_ENTER("mysql_update");
 
   if (open_tables(thd, &table_list, &table_count, 0))
@@ -956,7 +955,6 @@ int mysql_multi_update_prepare(THD *thd)
   uint  table_count= lex->table_count;
   const bool using_lock_tables= thd->locked_tables_mode != LTM_NONE;
   bool original_multiupdate= (thd->lex->sql_command == SQLCOM_UPDATE_MULTI);
-  MDL_ticket *start_of_statement_svp= thd->mdl_context.mdl_savepoint();
   DBUG_ENTER("mysql_multi_update_prepare");
 
   /* following need for prepared statements, to run next time multi-update */

=== modified file 'sql/sys_vars.cc'
--- a/sql/sys_vars.cc	2010-04-20 14:21:32 +0000
+++ b/sql/sys_vars.cc	2010-05-05 11:44:16 +0000
@@ -2824,7 +2824,7 @@ static Sys_var_charptr Sys_slave_load_tm
 static bool fix_slave_net_timeout(sys_var *self, THD *thd, enum_var_type type)
 {
   mysql_mutex_lock(&LOCK_active_mi);
-  DBUG_PRINT("info", ("slave_net_timeout=%lu mi->heartbeat_period=%.3f",
+  DBUG_PRINT("info", ("slave_net_timeout=%u mi->heartbeat_period=%.3f",
                      slave_net_timeout,
                      (active_mi? active_mi->heartbeat_period : 0.0)));
   if (active_mi && slave_net_timeout < active_mi->heartbeat_period)


Attachment: [text/bzr-bundle] bzr/[e-mail]