List:Commits« Previous MessageNext Message »
From:kevin.lewis Date:February 27 2013 7:30pm
Subject:bzr push into mysql-5.6 branch (kevin.lewis:4849 to 4850) Bug#16305265
View as plain text  
 4850 kevin.lewis@stripped	2013-02-27 [merge]
      Merge Bug#16305265 from mysql-5.5 to mysql-5.6

    modified:
      storage/innobase/dict/dict0boot.cc
      storage/innobase/fts/fts0pars.cc
      storage/innobase/handler/ha_innodb.cc
      storage/innobase/include/mach0data.ic
      storage/innobase/include/trx0trx.h
      storage/innobase/row/row0mysql.cc
      storage/innobase/srv/srv0srv.cc
      storage/innobase/srv/srv0start.cc
 4849 Marko Mäkelä	2013-02-27 [merge]
      Merge mysql-5.6 to local copy.

    modified:
      storage/innobase/buf/buf0buddy.cc
      storage/innobase/buf/buf0buf.cc
      storage/innobase/buf/buf0flu.cc
      storage/innobase/buf/buf0lru.cc
      storage/innobase/handler/i_s.cc
      storage/innobase/include/buf0buf.h
      storage/innobase/include/buf0buf.ic
      storage/innobase/include/univ.i
=== modified file 'storage/innobase/dict/dict0boot.cc'
--- a/storage/innobase/dict/dict0boot.cc	revid:marko.makela@oracle.com-20130227180040-o8noq4nndw2kkx0o
+++ b/storage/innobase/dict/dict0boot.cc	revid:kevin.lewis@stripped7190536-jltk8cbm6q4i3xs8
@@ -32,7 +32,6 @@ Created 4/18/1996 Heikki Tuuri
 #include "dict0crea.h"
 #include "btr0btr.h"
 #include "dict0load.h"
-#include "dict0load.h"
 #include "trx0trx.h"
 #include "srv0srv.h"
 #include "ibuf0ibuf.h"

=== modified file 'storage/innobase/fts/fts0pars.cc'
--- a/storage/innobase/fts/fts0pars.cc	revid:marko.makela@stripped
+++ b/storage/innobase/fts/fts0pars.cc	revid:kevin.lewis@strippedom-20130227190536-jltk8cbm6q4i3xs8
@@ -717,11 +717,6 @@ yy_symbol_value_print (yyoutput, yytype,
 # else
   YYUSE (yyoutput);
 # endif
-  switch (yytype)
-    {
-      default:
-	break;
-    }
 }
 
 
@@ -1081,13 +1076,6 @@ yydestruct (yymsg, yytype, yyvaluep)
   if (!yymsg)
     yymsg = "Deleting";
   YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
-
-  switch (yytype)
-    {
-
-      default:
-	break;
-    }
 }
 
 /* Prevent warnings from -Wmissing-prototypes.  */

=== modified file 'storage/innobase/handler/ha_innodb.cc'
--- a/storage/innobase/handler/ha_innodb.cc	revid:marko.makela@stripped8noq4nndw2kkx0o
+++ b/storage/innobase/handler/ha_innodb.cc	revid:kevin.lewis@stripped4i3xs8
@@ -10098,8 +10098,10 @@ innobase_rename_table(
 
 	DEBUG_SYNC_C("innodb_rename_table_ready");
 
+	trx_start_for_ddl(trx, TRX_DICT_OP_INDEX);
+
 	/* Serialize data dictionary operations with dictionary mutex:
-	no deadlocks can occur then in these operations */
+	no deadlocks can occur then in these operations. */
 
 	row_mysql_lock_data_dictionary(trx);
 

=== modified file 'storage/innobase/include/mach0data.ic'
--- a/storage/innobase/include/mach0data.ic	revid:marko.makela@stripped-o8noq4nndw2kkx0o
+++ b/storage/innobase/include/mach0data.ic	revid:kevin.lewis@stripped6q4i3xs8
@@ -873,6 +873,8 @@ mach_read_ulint(
 	default:
 		ut_error;
 	}
+
+	return(0);
 }
 
 #endif /* !UNIV_HOTBACKUP */

=== modified file 'storage/innobase/include/trx0trx.h'
--- a/storage/innobase/include/trx0trx.h	revid:marko.makela@stripped
+++ b/storage/innobase/include/trx0trx.h	revid:kevin.lewis@oracle.com-20130227190536-jltk8cbm6q4i3xs8
@@ -676,7 +676,7 @@ lock_sys->mutex and sometimes by trx->mu
 struct trx_t{
 	ulint		magic_n;
 
-	ib_mutex_t		mutex;		/*!< Mutex protecting the fields
+	ib_mutex_t	mutex;		/*!< Mutex protecting the fields
 					state and lock
 					(except some fields of lock, which
 					are protected by lock_sys->mutex) */

=== modified file 'storage/innobase/row/row0mysql.cc'
--- a/storage/innobase/row/row0mysql.cc	revid:marko.makela@stripped
+++ b/storage/innobase/row/row0mysql.cc	revid:kevin.lewis@oracle.com-20130227190536-jltk8cbm6q4i3xs8
@@ -4673,6 +4673,7 @@ row_rename_table_for_mysql(
 
 	ut_a(old_name != NULL);
 	ut_a(new_name != NULL);
+	ut_ad(trx->state == TRX_STATE_ACTIVE);
 
 	if (srv_created_new_raw || srv_force_recovery) {
 		fputs("InnoDB: A new raw disk partition was initialized or\n"
@@ -4697,7 +4698,6 @@ row_rename_table_for_mysql(
 	}
 
 	trx->op_info = "renaming table";
-	trx_start_if_not_started_xa(trx);
 
 	old_is_tmp = row_is_mysql_tmp_table_name(old_name);
 	new_is_tmp = row_is_mysql_tmp_table_name(new_name);

=== modified file 'storage/innobase/srv/srv0srv.cc'
--- a/storage/innobase/srv/srv0srv.cc	revid:marko.makela@strippedndw2kkx0o
+++ b/storage/innobase/srv/srv0srv.cc	revid:kevin.lewis@stripped
@@ -1465,7 +1465,7 @@ srv_export_innodb_status(void)
 		export_vars.innodb_purge_trx_id_age = 0;
 	} else {
 		export_vars.innodb_purge_trx_id_age =
-			trx_sys->rw_max_trx_id - done_trx_no + 1;
+			(ulint) (trx_sys->rw_max_trx_id - done_trx_no + 1);
 	}
 
 	if (!up_limit_id
@@ -1473,7 +1473,7 @@ srv_export_innodb_status(void)
 		export_vars.innodb_purge_view_trx_id_age = 0;
 	} else {
 		export_vars.innodb_purge_view_trx_id_age =
-			trx_sys->rw_max_trx_id - up_limit_id;
+			(ulint) (trx_sys->rw_max_trx_id - up_limit_id);
 	}
 #endif /* UNIV_DEBUG */
 

=== modified file 'storage/innobase/srv/srv0start.cc'
--- a/storage/innobase/srv/srv0start.cc	revid:marko.makela@stripped0227180040-o8noq4nndw2kkx0o
+++ b/storage/innobase/srv/srv0start.cc	revid:kevin.lewis@strippedtk8cbm6q4i3xs8
@@ -1876,7 +1876,7 @@ innobase_start_or_create_for_mysql(void)
 
 	/* Create i/o-handler threads: */
 
-	for (ulint i = 0; i < srv_n_file_io_threads; ++i) {
+	for (i = 0; i < srv_n_file_io_threads; ++i) {
 
 		n[i] = i;
 

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-5.6 branch (kevin.lewis:4849 to 4850) Bug#16305265kevin.lewis4 Apr