List:Commits« Previous MessageNext Message »
From:marko.makela Date:November 8 2011 9:56pm
Subject:bzr push into mysql-trunk branch (marko.makela:3462 to 3464)
View as plain text  
 3464 Marko Mäkelä	2011-11-08
      Break too long lines and adjust white space.

    modified:
      storage/innobase/row/row0merge.cc
      storage/innobase/row/row0mysql.cc
      storage/innobase/sync/sync0sync.cc
      storage/innobase/trx/trx0roll.cc
      storage/innobase/trx/trx0sys.cc
 3463 Marko Mäkelä	2011-11-08
      Add a mutex_own assertion.

    modified:
      storage/innobase/read/read0read.cc
 3462 Sunny Bains	2011-11-09 [merge]
      Merge from mysql-trunk.
      Fix a compiler error in ibuf0ibuf.c.

    removed:
      BUILD/compile-alpha-debug
      BUILD/compile-darwin-mwcc
      BUILD/compile-irix-mips64-mipspro
      BUILD/compile-pentium-icc
      BUILD/compile-pentium-icc-valgrind-max
      BUILD/compile-pentium-icc-yassl
      BUILD/compile-pentium-pgcc
      mysql-test/suite/binlog/r/binlog_truncate_innodb.result
      mysql-test/suite/binlog/t/binlog_truncate_innodb.test
      mysys/my_new.cc
    added:
      mysys/my_isnan.c
      unittest/gunit/filesort_buffer-t.cc
      unittest/gunit/stdcxx-t.cc
    renamed:
      mysys/psi_noop.cc => mysys/psi_noop.c
      sql/udf_example.c => sql/udf_example.cc
    modified:
      BUILD/SETUP.sh
      BUILD/build_mccge.sh
      BUILD/compile-dist
      BUILD/compile-solaris-amd64
      BUILD/compile-solaris-amd64-forte
      BUILD/compile-solaris-amd64-forte-debug
      BUILD/compile-solaris-sparc
      BUILD/compile-solaris-sparc-debug
      BUILD/compile-solaris-sparc-forte
      BUILD/compile-solaris-sparc-purify
      client/CMakeLists.txt
      client/mysql.cc
      client/mysql_upgrade.c
      client/mysqlbinlog.cc
      client/mysqldump.c
      client/mysqltest.cc
      client/sql_string.cc
      cmake/build_configurations/mysql_release.cmake
      cmake/configure.pl
      cmake/info_macros.cmake.in
      cmake/os/Windows.cmake
      cmake/readline.cmake
      config.h.cmake
      configure.cmake
      dbug/dbug.c
      include/m_string.h
      include/my_global.h
      include/my_pthread.h
      include/mysql.h
      include/mysql/psi/mysql_socket.h
      include/mysql/psi/mysql_thread.h
      include/mysql/psi/psi.h
      include/mysql/psi/psi_abi_v1.h
      include/mysql_com.h
      include/waiting_threads.h
      libmysql/libmysql.c
      libmysqld/lib_sql.cc
      mysql-test/include/join_cache.inc
      mysql-test/mysql-test-run.pl
      mysql-test/r/filesort_debug.result
      mysql-test/r/join_cache_bka.result
      mysql-test/r/join_cache_bka_nixbnl.result
      mysql-test/r/join_cache_bkaunique.result
      mysql-test/r/join_cache_bnl.result
      mysql-test/r/join_cache_nojb.result
      mysql-test/r/udf.result
      mysql-test/suite/binlog/t/disabled.def
      mysql-test/suite/funcs_1/t/storedproc.test
      mysql-test/suite/opt_trace/include/general.inc
      mysql-test/suite/opt_trace/include/general2.inc
      mysql-test/suite/opt_trace/include/subquery.inc
      mysql-test/suite/opt_trace/r/filesort_pq.result
      mysql-test/suite/opt_trace/r/general2_no_prot.result
      mysql-test/suite/opt_trace/r/general2_ps_prot.result
      mysql-test/suite/opt_trace/r/general_no_prot_none.result
      mysql-test/suite/opt_trace/r/general_ps_prot_none.result
      mysql-test/suite/opt_trace/r/subquery_no_prot.result
      mysql-test/suite/opt_trace/r/subquery_ps_prot.result
      mysql-test/suite/perfschema/t/socket_instances_func.test
      mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test
      mysql-test/suite/rpl/t/rpl_temporary.test
      mysql-test/t/csv.test
      mysql-test/t/disabled.def
      mysql-test/t/filesort_debug.test
      mysql-test/t/information_schema_parameters.test
      mysql-test/t/information_schema_routines.test
      mysql-test/t/lock.test
      mysql-test/t/mysql_plugin.test
      mysql-test/t/mysqlbinlog2.test
      mysql-test/t/ps.test
      mysql-test/t/ps_ddl.test
      mysql-test/t/sp-error.test
      mysql-test/t/sp.test
      mysql-test/t/trigger.test
      mysql-test/t/udf.test
      mysql-test/t/view_grant.test
      mysql-test/valgrind.supp
      mysys/CMakeLists.txt
      mysys/array.c
      mysys/default.c
      mysys/lf_alloc-pin.c
      mysys/lf_dynarray.c
      mysys/mf_format.c
      mysys/mf_iocache.c
      mysys/my_alloc.c
      mysys/my_bitmap.c
      mysys/my_compare.c
      mysys/my_compress.c
      mysys/my_file.c
      mysys/stacktrace.c
      mysys/waiting_threads.c
      scripts/mysql_config.pl.in
      scripts/mysql_config.sh
      sql-common/client.c
      sql-common/client_plugin.c
      sql-common/my_time.c
      sql/CMakeLists.txt
      sql/binlog.cc
      sql/debug_sync.cc
      sql/field.cc
      sql/field.h
      sql/field_conv.cc
      sql/filesort.cc
      sql/filesort_utils.cc
      sql/filesort_utils.h
      sql/ha_partition.cc
      sql/handler.cc
      sql/handler.h
      sql/item.cc
      sql/item_buff.cc
      sql/item_cmpfunc.cc
      sql/item_func.cc
      sql/item_func.h
      sql/item_strfunc.cc
      sql/item_strfunc.h
      sql/item_sum.cc
      sql/item_timefunc.cc
      sql/item_timefunc.h
      sql/key.cc
      sql/log.cc
      sql/log_event.cc
      sql/log_event.h
      sql/log_event_old.cc
      sql/mdl.cc
      sql/mdl.h
      sql/mysqld.cc
      sql/net_serv.cc
      sql/opt_range.cc
      sql/opt_range.h
      sql/opt_trace.cc
      sql/opt_trace.h
      sql/opt_trace2server.cc
      sql/protocol.cc
      sql/rpl_mi.cc
      sql/rpl_record.cc
      sql/rpl_rli.cc
      sql/rpl_slave.cc
      sql/rpl_utility.cc
      sql/rpl_utility.h
      sql/set_var.cc
      sql/set_var.h
      sql/sp_head.cc
      sql/spatial.h
      sql/sql_acl.cc
      sql/sql_analyse.cc
      sql/sql_cache.cc
      sql/sql_class.cc
      sql/sql_class.h
      sql/sql_client.cc
      sql/sql_connect.cc
      sql/sql_const.h
      sql/sql_error.cc
      sql/sql_join_cache.cc
      sql/sql_load.cc
      sql/sql_parse.cc
      sql/sql_partition.cc
      sql/sql_plugin.cc
      sql/sql_plugin.h
      sql/sql_prepare.cc
      sql/sql_profile.cc
      sql/sql_select.cc
      sql/sql_select.h
      sql/sql_show.cc
      sql/sql_string.cc
      sql/sql_table.cc
      sql/sql_table.h
      sql/sql_yacc.yy
      sql/table.h
      sql/thr_malloc.cc
      sql/tztime.cc
      sql/udf_example.def
      sql/unireg.cc
      storage/csv/ha_tina.cc
      storage/federated/ha_federated.cc
      storage/heap/hp_create.c
      storage/heap/hp_static.c
      storage/heap/hp_test2.c
      storage/innobase/btr/btr0pcur.cc
      storage/innobase/handler/ha_innodb.cc
      storage/innobase/ibuf/ibuf0ibuf.cc
      storage/innobase/include/btr0pcur.h
      storage/innobase/include/btr0pcur.ic
      storage/innobase/sync/sync0rw.cc
      storage/myisam/ha_myisam.cc
      storage/myisam/mi_cache.c
      storage/myisam/mi_check.c
      storage/myisam/mi_create.c
      storage/myisam/mi_dynrec.c
      storage/myisam/mi_extra.c
      storage/myisam/mi_open.c
      storage/myisam/mi_packrec.c
      storage/myisam/mi_static.c
      storage/myisam/myisamlog.c
      storage/myisam/myisampack.c
      storage/myisam/rt_mbr.c
      storage/myisam/sort.c
      storage/myisammrg/ha_myisammrg.cc
      strings/ctype-big5.c
      strings/ctype-bin.c
      strings/ctype-gbk.c
      strings/ctype-mb.c
      strings/ctype-simple.c
      strings/ctype-tis620.c
      strings/ctype-uca.c
      strings/ctype-ucs2.c
      strings/ctype-utf8.c
      strings/ctype.c
      strings/decimal.c
      strings/dtoa.c
      strings/my_vsnprintf.c
      support-files/mysql.spec.sh
      tests/mysql_client_test.c
      unittest/gunit/CMakeLists.txt
      unittest/gunit/gunit_test_main.cc
      unittest/gunit/item-t.cc
      unittest/mysys/lf-t.c
      unittest/mysys/my_atomic-t.c
      unittest/mysys/thr_template.c
      unittest/mysys/waiting_threads-t.c
      vio/viosocket.c
      win/create_def_file.js
      mysys/psi_noop.c
      sql/udf_example.cc
=== modified file 'storage/innobase/read/read0read.cc'
--- a/storage/innobase/read/read0read.cc	revid:sunny.bains@stripped
+++ b/storage/innobase/read/read0read.cc	revid:marko.makela@oracle.com-20111108215549-qs2dtkad5x2hd0xh
@@ -338,6 +338,7 @@ struct	CreateView {
 
 	void	operator()(const trx_t* trx)
 	{
+		ut_ad(mutex_own(&trx_sys->mutex));
 		ut_ad(trx->in_trx_list);
 
 		/* trx->state cannot change from or to NOT_STARTED

=== modified file 'storage/innobase/row/row0merge.cc'
--- a/storage/innobase/row/row0merge.cc	revid:sunny.bains@stripped
+++ b/storage/innobase/row/row0merge.cc	revid:marko.makela@stripped
@@ -654,11 +654,10 @@ row_merge_heap_create(
 	mem_heap_t*	heap	= mem_heap_create(2 * i * sizeof **offsets1
 						  + 3 * sizeof **buf);
 
-	*buf = static_cast<mrec_buf_t*>(mem_heap_alloc(heap, 3 * sizeof **buf));
-
+	*buf = static_cast<mrec_buf_t*>(
+		mem_heap_alloc(heap, 3 * sizeof **buf));
 	*offsets1 = static_cast<ulint*>(
 		mem_heap_alloc(heap, i * sizeof **offsets1));
-
 	*offsets2 = static_cast<ulint*>(
 		mem_heap_alloc(heap, i * sizeof **offsets2));
 

=== modified file 'storage/innobase/row/row0mysql.cc'
--- a/storage/innobase/row/row0mysql.cc	revid:sunny.bains@oracle.com-20111108204944-4bfuwrdndmr6vyr9
+++ b/storage/innobase/row/row0mysql.cc	revid:marko.makela@stripped111108215549-qs2dtkad5x2hd0xh
@@ -1095,7 +1095,8 @@ run_again:
 	} else {
 		err = lock_table(
 			0, prebuilt->table,
-			static_cast<enum lock_mode>(prebuilt->select_lock_type),
+			static_cast<enum lock_mode>(
+				prebuilt->select_lock_type),
 			thr);
 	}
 

=== modified file 'storage/innobase/sync/sync0sync.cc'
--- a/storage/innobase/sync/sync0sync.cc	revid:sunny.bains@stripped4944-4bfuwrdndmr6vyr9
+++ b/storage/innobase/sync/sync0sync.cc	revid:marko.makela@strippedad5x2hd0xh
@@ -1577,7 +1577,7 @@ sync_close(void)
 	sync_thread_level_arrays_free();
 #endif /* UNIV_SYNC_DEBUG */
 
-	sync_initialized = FALSE;	
+	sync_initialized = FALSE;
 }
 
 /*******************************************************************//**

=== modified file 'storage/innobase/trx/trx0roll.cc'
--- a/storage/innobase/trx/trx0roll.cc	revid:sunny.bains@strippedmr6vyr9
+++ b/storage/innobase/trx/trx0roll.cc	revid:marko.makela@stripped
@@ -105,7 +105,8 @@ trx_rollback_to_savepoint_low(
 	que_run_threads(roll_node->undo_thr);
 
 	/* Free the memory reserved by the undo graph. */
-	que_graph_free(static_cast<que_t*>(roll_node->undo_thr->common.parent));
+	que_graph_free(static_cast<que_t*>(
+			       roll_node->undo_thr->common.parent));
 
 	if (savept == NULL) {
 		trx_rollback_finish(trx);
@@ -589,7 +590,8 @@ trx_rollback_active(
 	trx_rollback_finish(thr_get_trx(roll_node->undo_thr));
 
 	/* Free the memory reserved by the undo graph */
-	que_graph_free(static_cast<que_t*>(roll_node->undo_thr->common.parent));
+	que_graph_free(static_cast<que_t*>(
+			       roll_node->undo_thr->common.parent));
 
 	ut_a(trx->lock.que_state == TRX_QUE_RUNNING);
 

=== modified file 'storage/innobase/trx/trx0sys.cc'
--- a/storage/innobase/trx/trx0sys.cc	revid:sunny.bains@stripped4-4bfuwrdndmr6vyr9
+++ b/storage/innobase/trx/trx0sys.cc	revid:marko.makela@strippedd0xh
@@ -218,7 +218,8 @@ trx_doublewrite_init(
 		ut_malloc((1 + buf_size) * UNIV_PAGE_SIZE));
 
 	trx_doublewrite->write_buf = static_cast<byte*>(
-		ut_align(trx_doublewrite->write_buf_unaligned, UNIV_PAGE_SIZE));
+		ut_align(trx_doublewrite->write_buf_unaligned,
+			 UNIV_PAGE_SIZE));
 
 	trx_doublewrite->buf_block_arr = static_cast<buf_page_t**>(
 		mem_zalloc(buf_size * sizeof(void*)));

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk branch (marko.makela:3462 to 3464) marko.makela11 Nov