Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-bugteam (cd84cb37) · Commits · Software / OSDI20 Artifacts / mariadb

mysql-test/r/innodb.result

+0 −19

Original line number	Diff line number	Diff line
		@@ -3263,22 +3263,3 @@ AUTO_INCREMENT
		200
		DROP TABLE t2;
		DROP TABLE t1;
		CREATE TABLE t1 (c1 int default NULL,
		c2 int default NULL
		) ENGINE=InnoDB DEFAULT CHARSET=latin1;
		TRUNCATE TABLE t1;
		affected rows: 0
		INSERT INTO t1 VALUES (1, 1), (2, 2), (3, 3), (4, 4), (5, 5);
		affected rows: 5
		info: Records: 5 Duplicates: 0 Warnings: 0
		TRUNCATE TABLE t1;
		affected rows: 0
		DROP TABLE t1;
		Variable_name Value
		Handler_update 0
		Variable_name Value
		Handler_delete 0
		Variable_name Value
		Handler_update 1
		Variable_name Value
		Handler_delete 1

mysql-test/t/disabled.def

+82 −6

Original line number	Diff line number	Diff line
		@@ -14,9 +14,85 @@ status : Bug#32966 main.status fails
		ps_ddl : Bug#12093 2007-12-14 pending WL#4165 / WL#4166
		csv_alter_table : Bug#33696 2008-01-21 pcrews no .result file - bug allows NULL columns in CSV tables
		user_limits : Bug#23921 random failure of user_limits.test
		binlog_cache_size_basic_32 : Bug #36522: Some tests of system variables have diffs on 64bit platorms
		bulk_insert_buffer_size_basic_32 : Bug #36522: Some tests of system variables have diffs on 64bit platorms
		delayed_insert_limit_basic_32 : Bug #36522: Some tests of system variables have diffs on 64bit platorms
		delayed_queue_size_basic_32 : Bug #36522: Some tests of system variables have diffs on 64bit platorms
		innodb_concurrency_tickets_basic_32 : Bug #36522: Some tests of system variables have diffs on 64bit platorms
		innodb_max_purge_lag_basic_32 : Bug #36522: Some tests of system variables have diffs on 64bit platorms
		innodb_sync_spin_loops_basic_32 : Bug #36522: Some tests of system variables have diffs on 64bit platorms
		join_buffer_size_basic_32 : Bug #36522: Some tests of system variables have diffs on 64bit platorms
		key_buffer_size_basic_32 : Bug #36522: Some tests of system variables have diffs on 64bit platorms
		key_cache_age_threshold_basic_32 : Bug #36522: Some tests of system variables have diffs on 64bit platorms
		key_cache_block_size_basic_32 : Bug #36522: Some tests of system variables have diffs on 64bit platorms
		key_cache_division_limit_basic_32 : Bug #36522: Some tests of system variables have diffs on 64bit platorms
		log_warnings_basic_32 : Bug #36522: Some tests of system variables have diffs on 64bit platorms
		max_binlog_cache_size_basic_32 : Bug #36522: Some tests of system variables have diffs on 64bit platorms
		max_connect_errors_basic_32 : Bug #36522: Some tests of system variables have diffs on 64bit platorms
		max_heap_table_size_basic_32 : Bug #36522: Some tests of system variables have diffs on 64bit platorms
		max_seeks_for_key_basic_32 : Bug #36522: Some tests of system variables have diffs on 64bit platorms
		max_tmp_tables_basic_32 : Bug #36522: Some tests of system variables have diffs on 64bit platorms
		max_write_lock_count_basic_32 : Bug #36522: Some tests of system variables have diffs on 64bit platorms
		min_examined_row_limit_basic_32 : Bug #36522: Some tests of system variables have diffs on 64bit platorms
		multi_range_count_basic_32 : Bug #36522: Some tests of system variables have diffs on 64bit platorms
		myisam_max_sort_file_size_basic_32 : Bug #36522: Some tests of system variables have diffs on 64bit platorms
		myisam_repair_threads_basic_32 : Bug #36522: Some tests of system variables have diffs on 64bit platorms
		myisam_sort_buffer_size_basic_32 : Bug #36522: Some tests of system variables have diffs on 64bit platorms
		net_retry_count_basic_32 : Bug #36522: Some tests of system variables have diffs on 64bit platorms
		query_alloc_block_size_basic_32 : Bug #36522: Some tests of system variables have diffs on 64bit platorms
		query_cache_limit_basic_32 : Bug #36522: Some tests of system variables have diffs on 64bit platorms
		query_cache_min_res_unit_basic_32 : Bug #36522: Some tests of system variables have diffs on 64bit platorms
		query_cache_size_basic_32 : Bug #36522: Some tests of system variables have diffs on 64bit platorms
		query_prealloc_size_basic_32 : Bug #36522: Some tests of system variables have diffs on 64bit platorms
		range_alloc_block_size_basic_32 : Bug #36522: Some tests of system variables have diffs on 64bit platorms
		rpl_recovery_rank_basic_32 : Bug #36522: Some tests of system variables have diffs on 64bit platorms
		server_id_basic_32 : Bug #36522: Some tests of system variables have diffs on 64bit platorms
		slave_transaction_retries_basic_32 : Bug #36522: Some tests of system variables have diffs on 64bit platorms
		sort_buffer_size_basic_32 : Bug #36522: Some tests of system variables have diffs on 64bit platorms
		sync_binlog_basic_32 : Bug #36522: Some tests of system variables have diffs on 64bit platorms
		timestamp_basic_32 : Bug #36522: Some tests of system variables have diffs on 64bit platorms
		tmp_table_size_basic_32 : Bug #36522: Some tests of system variables have diffs on 64bit platorms
		transaction_alloc_block_size_basic_32 : Bug #36522: Some tests of system variables have diffs on 64bit platorms
		transaction_prealloc_size_basic_32 : Bug #36522: Some tests of system variables have diffs on 64bit platorms
		wait_timeout_basic_32 : Bug #36522: Some tests of system variables have diffs on 64bit platorms
		binlog_cache_size_basic_64 : Bug #36522: Some tests of system variables have diffs on 64bit platorms
		bulk_insert_buffer_size_basic_64 : Bug #36522: Some tests of system variables have diffs on 64bit platorms
		delayed_insert_limit_basic_64 : Bug #36522: Some tests of system variables have diffs on 64bit platorms
		delayed_queue_size_basic_64 : Bug #36522: Some tests of system variables have diffs on 64bit platorms
		innodb_concurrency_tickets_basic_64 : Bug #36522: Some tests of system variables have diffs on 64bit platorms
		innodb_max_purge_lag_basic_64 : Bug #36522: Some tests of system variables have diffs on 64bit platorms
		innodb_sync_spin_loops_basic_64 : Bug #36522: Some tests of system variables have diffs on 64bit platorms
		join_buffer_size_basic_64 : Bug #36522: Some tests of system variables have diffs on 64bit platorms
		key_buffer_size_basic_64 : Bug #36522: Some tests of system variables have diffs on 64bit platorms
		key_cache_age_threshold_basic_64 : Bug #36522: Some tests of system variables have diffs on 64bit platorms
		key_cache_block_size_basic_64 : Bug #36522: Some tests of system variables have diffs on 64bit platorms
		key_cache_division_limit_basic_64 : Bug #36522: Some tests of system variables have diffs on 64bit platorms
		log_warnings_basic_64 : Bug #36522: Some tests of system variables have diffs on 64bit platorms
		max_binlog_cache_size_basic_64 : Bug #36522: Some tests of system variables have diffs on 64bit platorms
		max_connect_errors_basic_64 : Bug #36522: Some tests of system variables have diffs on 64bit platorms
		max_heap_table_size_basic_64 : Bug #36522: Some tests of system variables have diffs on 64bit platorms
		max_seeks_for_key_basic_64 : Bug #36522: Some tests of system variables have diffs on 64bit platorms
		max_tmp_tables_basic_64 : Bug #36522: Some tests of system variables have diffs on 64bit platorms
		max_write_lock_count_basic_64 : Bug #36522: Some tests of system variables have diffs on 64bit platorms
		min_examined_row_limit_basic_64 : Bug #36522: Some tests of system variables have diffs on 64bit platorms
		multi_range_count_basic_64 : Bug #36522: Some tests of system variables have diffs on 64bit platorms
		myisam_max_sort_file_size_basic_64 : Bug #36522: Some tests of system variables have diffs on 64bit platorms
		myisam_repair_threads_basic_64 : Bug #36522: Some tests of system variables have diffs on 64bit platorms
		myisam_sort_buffer_size_basic_64 : Bug #36522: Some tests of system variables have diffs on 64bit platorms
		net_retry_count_basic_64 : Bug #36522: Some tests of system variables have diffs on 64bit platorms
		query_alloc_block_size_basic_64 : Bug #36522: Some tests of system variables have diffs on 64bit platorms
		query_cache_limit_basic_64 : Bug #36522: Some tests of system variables have diffs on 64bit platorms
		query_cache_min_res_unit_basic_64 : Bug #36522: Some tests of system variables have diffs on 64bit platorms
		query_cache_size_basic_64 : Bug #36522: Some tests of system variables have diffs on 64bit platorms
		query_prealloc_size_basic_64 : Bug #36522: Some tests of system variables have diffs on 64bit platorms
		range_alloc_block_size_basic_64 : Bug #36522: Some tests of system variables have diffs on 64bit platorms
		rpl_recovery_rank_basic_64 : Bug #36522: Some tests of system variables have diffs on 64bit platorms
		server_id_basic_64 : Bug #36522: Some tests of system variables have diffs on 64bit platorms
		slave_transaction_retries_basic_64 : Bug #36522: Some tests of system variables have diffs on 64bit platorms
		sort_buffer_size_basic_64 : Bug #36522: Some tests of system variables have diffs on 64bit platorms
		max_heap_table_size_basic_32 : #36522: Some tests of system variables have diffs on 64bit platorms
		query_cache_size_basic_32 : #36522: Some tests of system variables have diffs on 64bit platorms
		tmp_table_size_basic_32 : #36522: Some tests of system variables have diffs on 64bit platorms
		sync_binlog_basic_64 : Bug #36522: Some tests of system variables have diffs on 64bit platorms
		timestamp_basic_64 : Bug #36522: Some tests of system variables have diffs on 64bit platorms
		tmp_table_size_basic_64 : Bug #36522: Some tests of system variables have diffs on 64bit platorms
		transaction_alloc_block_size_basic_64 : Bug #36522: Some tests of system variables have diffs on 64bit platorms
		transaction_prealloc_size_basic_64 : Bug #36522: Some tests of system variables have diffs on 64bit platorms
		wait_timeout_basic_64 : Bug #36522: Some tests of system variables have diffs on 64bit platorms

mysql-test/t/innodb.test

+0 −46

Original line number	Diff line number	Diff line
		@@ -2458,52 +2458,6 @@ SELECT AUTO_INCREMENT FROM INFORMATION_SCHEMA.TABLES WHERE table_name = 't2';
		DROP TABLE t2;
		DROP TABLE t1;
		# End 34920 test
		#
		# Bug #29507 TRUNCATE shows to many rows effected
		#
		CONNECTION default;
		CREATE TABLE t1 (c1 int default NULL,
		c2 int default NULL
		) ENGINE=InnoDB DEFAULT CHARSET=latin1;

		--enable_info
		TRUNCATE TABLE t1;

		INSERT INTO t1 VALUES (1, 1), (2, 2), (3, 3), (4, 4), (5, 5);
		TRUNCATE TABLE t1;

		--disable_info
		DROP TABLE t1;
		#
		# Bug#35537 Innodb doesn't increment handler_update and handler_delete.
		#
		-- disable_query_log
		-- disable_result_log

		CONNECT (c1,localhost,root,,);

		DROP TABLE IF EXISTS bug35537;
		CREATE TABLE bug35537 (
		c1 int
		) ENGINE=InnoDB;

		INSERT INTO bug35537 VALUES (1);

		-- enable_result_log

		SHOW SESSION STATUS LIKE 'Handler_update%';
		SHOW SESSION STATUS LIKE 'Handler_delete%';

		UPDATE bug35537 SET c1 = 2 WHERE c1 = 1;
		DELETE FROM bug35537 WHERE c1 = 2;

		SHOW SESSION STATUS LIKE 'Handler_update%';
		SHOW SESSION STATUS LIKE 'Handler_delete%';

		DROP TABLE bug35537;

		DISCONNECT c1;
		CONNECTION default;

		#######################################################################
		# #

storage/innobase/Makefile.am

+20 −20

Original line number	Diff line number	Diff line
		@@ -159,11 +159,11 @@ libinnobase_a_CXXFLAGS= $(AM_CFLAGS)
		libinnobase_a_CFLAGS = $(AM_CFLAGS)

		EXTRA_LTLIBRARIES = ha_innodb.la
		pkgplugin_LTLIBRARIES= @plugin_innobase_shared_target@
		pkglib_LTLIBRARIES = @plugin_innobase_shared_target@

		ha_innodb_la_LDFLAGS = -module -rpath $(pkgplugindir)
		ha_innodb_la_CXXFLAGS= $(AM_CFLAGS) $(INNODB_DYNAMIC_CFLAGS)
		ha_innodb_la_CFLAGS= $(AM_CFLAGS) $(INNODB_DYNAMIC_CFLAGS)
		ha_innodb_la_CXXFLAGS= $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
		ha_innodb_la_CFLAGS = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
		ha_innodb_la_SOURCES = $(libinnobase_a_SOURCES)

		EXTRA_DIST = CMakeLists.txt plug.in \

storage/innobase/handler/ha_innodb.cc

+1 −12

Original line number	Diff line number	Diff line
		@@ -3752,8 +3752,6 @@ ha_innobase::update_row(

		ut_a(prebuilt->trx == trx);

		ha_statistic_increment(&SSV::ha_update_count);

		if (table->timestamp_field_type & TIMESTAMP_AUTO_SET_ON_UPDATE)
		table->timestamp_field->set_time();

		@@ -3843,8 +3841,6 @@ ha_innobase::delete_row(

		ut_a(prebuilt->trx == trx);

		ha_statistic_increment(&SSV::ha_delete_count);

		/* Only if the table has an AUTOINC column */
		if (table->found_next_number_field && record == table->record[0]) {
		ulonglong dummy = 0;
		@@ -5786,13 +5782,6 @@ ha_innobase::info(
		n_rows++;
		}

		/* Fix bug#29507: TRUNCATE shows too many rows affected.
		Do not show the estimates for TRUNCATE command. */
		if (thd_sql_command(user_thd) == SQLCOM_TRUNCATE) {

		n_rows = 0;
		}

		stats.records = (ha_rows)n_rows;
		stats.deleted = 0;
		stats.data_file_length = ((ulonglong)
		@@ -5803,7 +5792,7 @@ ha_innobase::info(
		* UNIV_PAGE_SIZE;
		stats.delete_length =
		fsp_get_available_space_in_free_extents(
		ib_table->space) * 1024;
		ib_table->space);
		stats.check_time = 0;

		if (stats.records == 0) {