[Commits] bzr commit into Mariadb 5.2, with Maria 2.0:maria/5.2 branch (igor:2832)

Igor Babaev igor at askmonty.org
Mon Jul 26 20:34:44 EEST 2010


#At lp:maria/5.2 based on revid:igor at askmonty.org-20100721181012-gup92l0kigvx8k11

 2832 Igor Babaev	2010-07-26 [merge]
      Merge
      modified:
        include/maria.h
        mysql-test/suite/funcs_1/r/is_columns_is.result
        mysql-test/valgrind.supp
        mysys/mf_keycache.c
        scripts/make_win_bin_dist
        sql/CMakeLists.txt
        sql/ha_ndbcluster.cc
        sql/ha_ndbcluster.h
        sql/ha_partition.cc
        sql/ha_partition.h
        sql/handler.h
        sql/log_event.cc
        sql/log_event_old.cc
        sql/sql_acl.cc
        sql/sql_insert.cc
        sql/sql_load.cc
        sql/sql_table.cc
        storage/archive/ha_archive.cc
        storage/archive/ha_archive.h
        storage/example/ha_example.cc
        storage/federated/ha_federated.cc
        storage/federated/ha_federated.h
        storage/federatedx/ha_federatedx.cc
        storage/federatedx/ha_federatedx.h
        storage/maria/ha_maria.cc
        storage/maria/ha_maria.h
        storage/maria/ma_write.c
        storage/myisam/ha_myisam.cc
        storage/myisam/ha_myisam.h
        storage/xtradb/Makefile.am

=== modified file 'include/maria.h'
--- a/include/maria.h	2010-01-27 21:53:08 +0000
+++ b/include/maria.h	2010-07-23 20:37:21 +0000
@@ -452,7 +452,7 @@ my_bool maria_test_if_sort_rep(MARIA_HA 
 
 int maria_init_bulk_insert(MARIA_HA *info, ulong cache_size, ha_rows rows);
 void maria_flush_bulk_insert(MARIA_HA *info, uint inx);
-void maria_end_bulk_insert(MARIA_HA *info, my_bool table_will_be_deleted);
+void maria_end_bulk_insert(MARIA_HA *info);
 int maria_assign_to_pagecache(MARIA_HA *info, ulonglong key_map,
 			      PAGECACHE *key_cache);
 void maria_change_pagecache(PAGECACHE *old_key_cache,

=== modified file 'mysql-test/suite/funcs_1/r/is_columns_is.result'
--- a/mysql-test/suite/funcs_1/r/is_columns_is.result	2010-06-01 19:52:20 +0000
+++ b/mysql-test/suite/funcs_1/r/is_columns_is.result	2010-07-25 15:23:38 +0000
@@ -7,29 +7,29 @@ NULL	information_schema	CHARACTER_SETS	C
 NULL	information_schema	CHARACTER_SETS	DEFAULT_COLLATE_NAME	2		NO	varchar	32	96	NULL	NULL	utf8	utf8_general_ci	varchar(32)			select	
 NULL	information_schema	CHARACTER_SETS	DESCRIPTION	3		NO	varchar	60	180	NULL	NULL	utf8	utf8_general_ci	varchar(60)			select	
 NULL	information_schema	CHARACTER_SETS	MAXLEN	4	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(3)			select	
-NULL	information_schema	CLIENT_STATISTICS	ACCESS_DENIED	22	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(21)			select	
-NULL	information_schema	CLIENT_STATISTICS	BINLOG_BYTES_WRITTEN	9	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(21)			select	
+NULL	information_schema	CLIENT_STATISTICS	ACCESS_DENIED	22	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	CLIENT_STATISTICS	BINLOG_BYTES_WRITTEN	9	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
 NULL	information_schema	CLIENT_STATISTICS	BUSY_TIME	5	0	NO	double	NULL	NULL	21	NULL	NULL	NULL	double			select	
-NULL	information_schema	CLIENT_STATISTICS	BYTES_RECEIVED	7	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(21)			select	
-NULL	information_schema	CLIENT_STATISTICS	BYTES_SENT	8	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(21)			select	
+NULL	information_schema	CLIENT_STATISTICS	BYTES_RECEIVED	7	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	CLIENT_STATISTICS	BYTES_SENT	8	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
 NULL	information_schema	CLIENT_STATISTICS	CLIENT	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	CLIENT_STATISTICS	COMMIT_TRANSACTIONS	18	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(21)			select	
-NULL	information_schema	CLIENT_STATISTICS	CONCURRENT_CONNECTIONS	3	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(21)			select	
-NULL	information_schema	CLIENT_STATISTICS	CONNECTED_TIME	4	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(21)			select	
+NULL	information_schema	CLIENT_STATISTICS	COMMIT_TRANSACTIONS	18	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	CLIENT_STATISTICS	CONCURRENT_CONNECTIONS	3	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	CLIENT_STATISTICS	CONNECTED_TIME	4	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
 NULL	information_schema	CLIENT_STATISTICS	CPU_TIME	6	0	NO	double	NULL	NULL	21	NULL	NULL	NULL	double			select	
-NULL	information_schema	CLIENT_STATISTICS	DENIED_CONNECTIONS	20	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(21)			select	
-NULL	information_schema	CLIENT_STATISTICS	EMPTY_QUERIES	23	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(21)			select	
-NULL	information_schema	CLIENT_STATISTICS	LOST_CONNECTIONS	21	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(21)			select	
-NULL	information_schema	CLIENT_STATISTICS	OTHER_COMMANDS	17	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(21)			select	
-NULL	information_schema	CLIENT_STATISTICS	ROLLBACK_TRANSACTIONS	19	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(21)			select	
-NULL	information_schema	CLIENT_STATISTICS	ROWS_DELETED	12	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(21)			select	
-NULL	information_schema	CLIENT_STATISTICS	ROWS_INSERTED	13	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(21)			select	
-NULL	information_schema	CLIENT_STATISTICS	ROWS_READ	10	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(21)			select	
-NULL	information_schema	CLIENT_STATISTICS	ROWS_SENT	11	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(21)			select	
-NULL	information_schema	CLIENT_STATISTICS	ROWS_UPDATED	14	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(21)			select	
-NULL	information_schema	CLIENT_STATISTICS	SELECT_COMMANDS	15	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(21)			select	
-NULL	information_schema	CLIENT_STATISTICS	TOTAL_CONNECTIONS	2	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(21)			select	
-NULL	information_schema	CLIENT_STATISTICS	UPDATE_COMMANDS	16	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(21)			select	
+NULL	information_schema	CLIENT_STATISTICS	DENIED_CONNECTIONS	20	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	CLIENT_STATISTICS	EMPTY_QUERIES	23	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	CLIENT_STATISTICS	LOST_CONNECTIONS	21	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	CLIENT_STATISTICS	OTHER_COMMANDS	17	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	CLIENT_STATISTICS	ROLLBACK_TRANSACTIONS	19	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	CLIENT_STATISTICS	ROWS_DELETED	12	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	CLIENT_STATISTICS	ROWS_INSERTED	13	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	CLIENT_STATISTICS	ROWS_READ	10	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	CLIENT_STATISTICS	ROWS_SENT	11	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	CLIENT_STATISTICS	ROWS_UPDATED	14	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	CLIENT_STATISTICS	SELECT_COMMANDS	15	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	CLIENT_STATISTICS	TOTAL_CONNECTIONS	2	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	CLIENT_STATISTICS	UPDATE_COMMANDS	16	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
 NULL	information_schema	COLLATIONS	CHARACTER_SET_NAME	2		NO	varchar	32	96	NULL	NULL	utf8	utf8_general_ci	varchar(32)			select	
 NULL	information_schema	COLLATIONS	COLLATION_NAME	1		NO	varchar	32	96	NULL	NULL	utf8	utf8_general_ci	varchar(32)			select	
 NULL	information_schema	COLLATIONS	ID	3	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(11)			select	
@@ -137,7 +137,7 @@ NULL	information_schema	GLOBAL_STATUS	VA
 NULL	information_schema	GLOBAL_VARIABLES	VARIABLE_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	GLOBAL_VARIABLES	VARIABLE_VALUE	2	NULL	YES	varchar	1024	3072	NULL	NULL	utf8	utf8_general_ci	varchar(1024)			select	
 NULL	information_schema	INDEX_STATISTICS	INDEX_NAME	3		NO	varchar	192	576	NULL	NULL	utf8	utf8_general_ci	varchar(192)			select	
-NULL	information_schema	INDEX_STATISTICS	ROWS_READ	4	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(21)			select	
+NULL	information_schema	INDEX_STATISTICS	ROWS_READ	4	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
 NULL	information_schema	INDEX_STATISTICS	TABLE_NAME	2		NO	varchar	192	576	NULL	NULL	utf8	utf8_general_ci	varchar(192)			select	
 NULL	information_schema	INDEX_STATISTICS	TABLE_SCHEMA	1		NO	varchar	192	576	NULL	NULL	utf8	utf8_general_ci	varchar(192)			select	
 NULL	information_schema	INNODB_BUFFER_POOL_PAGES	fix_count	5	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
@@ -416,9 +416,9 @@ NULL	information_schema	TABLE_PRIVILEGES
 NULL	information_schema	TABLE_PRIVILEGES	TABLE_CATALOG	2	NULL	YES	varchar	512	1536	NULL	NULL	utf8	utf8_general_ci	varchar(512)			select	
 NULL	information_schema	TABLE_PRIVILEGES	TABLE_NAME	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	TABLE_PRIVILEGES	TABLE_SCHEMA	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	TABLE_STATISTICS	ROWS_CHANGED	4	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(21)			select	
-NULL	information_schema	TABLE_STATISTICS	ROWS_CHANGED_X_INDEXES	5	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(21)			select	
-NULL	information_schema	TABLE_STATISTICS	ROWS_READ	3	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(21)			select	
+NULL	information_schema	TABLE_STATISTICS	ROWS_CHANGED	4	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLE_STATISTICS	ROWS_CHANGED_X_INDEXES	5	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLE_STATISTICS	ROWS_READ	3	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
 NULL	information_schema	TABLE_STATISTICS	TABLE_NAME	2		NO	varchar	192	576	NULL	NULL	utf8	utf8_general_ci	varchar(192)			select	
 NULL	information_schema	TABLE_STATISTICS	TABLE_SCHEMA	1		NO	varchar	192	576	NULL	NULL	utf8	utf8_general_ci	varchar(192)			select	
 NULL	information_schema	TRIGGERS	ACTION_CONDITION	9	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
@@ -447,28 +447,28 @@ NULL	information_schema	USER_PRIVILEGES	
 NULL	information_schema	USER_PRIVILEGES	IS_GRANTABLE	4		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
 NULL	information_schema	USER_PRIVILEGES	PRIVILEGE_TYPE	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	USER_PRIVILEGES	TABLE_CATALOG	2	NULL	YES	varchar	512	1536	NULL	NULL	utf8	utf8_general_ci	varchar(512)			select	
-NULL	information_schema	USER_STATISTICS	ACCESS_DENIED	22	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(21)			select	
-NULL	information_schema	USER_STATISTICS	BINLOG_BYTES_WRITTEN	9	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(21)			select	
+NULL	information_schema	USER_STATISTICS	ACCESS_DENIED	22	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	USER_STATISTICS	BINLOG_BYTES_WRITTEN	9	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
 NULL	information_schema	USER_STATISTICS	BUSY_TIME	5	0	NO	double	NULL	NULL	21	NULL	NULL	NULL	double			select	
-NULL	information_schema	USER_STATISTICS	BYTES_RECEIVED	7	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(21)			select	
-NULL	information_schema	USER_STATISTICS	BYTES_SENT	8	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(21)			select	
-NULL	information_schema	USER_STATISTICS	COMMIT_TRANSACTIONS	18	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(21)			select	
-NULL	information_schema	USER_STATISTICS	CONCURRENT_CONNECTIONS	3	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(21)			select	
-NULL	information_schema	USER_STATISTICS	CONNECTED_TIME	4	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(21)			select	
+NULL	information_schema	USER_STATISTICS	BYTES_RECEIVED	7	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	USER_STATISTICS	BYTES_SENT	8	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	USER_STATISTICS	COMMIT_TRANSACTIONS	18	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	USER_STATISTICS	CONCURRENT_CONNECTIONS	3	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11)			select	
+NULL	information_schema	USER_STATISTICS	CONNECTED_TIME	4	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11)			select	
 NULL	information_schema	USER_STATISTICS	CPU_TIME	6	0	NO	double	NULL	NULL	21	NULL	NULL	NULL	double			select	
-NULL	information_schema	USER_STATISTICS	DENIED_CONNECTIONS	20	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(21)			select	
-NULL	information_schema	USER_STATISTICS	EMPTY_QUERIES	23	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(21)			select	
-NULL	information_schema	USER_STATISTICS	LOST_CONNECTIONS	21	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(21)			select	
-NULL	information_schema	USER_STATISTICS	OTHER_COMMANDS	17	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(21)			select	
-NULL	information_schema	USER_STATISTICS	ROLLBACK_TRANSACTIONS	19	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(21)			select	
-NULL	information_schema	USER_STATISTICS	ROWS_DELETED	12	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(21)			select	
-NULL	information_schema	USER_STATISTICS	ROWS_INSERTED	13	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(21)			select	
-NULL	information_schema	USER_STATISTICS	ROWS_READ	10	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(21)			select	
-NULL	information_schema	USER_STATISTICS	ROWS_SENT	11	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(21)			select	
-NULL	information_schema	USER_STATISTICS	ROWS_UPDATED	14	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(21)			select	
-NULL	information_schema	USER_STATISTICS	SELECT_COMMANDS	15	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(21)			select	
-NULL	information_schema	USER_STATISTICS	TOTAL_CONNECTIONS	2	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(21)			select	
-NULL	information_schema	USER_STATISTICS	UPDATE_COMMANDS	16	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(21)			select	
+NULL	information_schema	USER_STATISTICS	DENIED_CONNECTIONS	20	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	USER_STATISTICS	EMPTY_QUERIES	23	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	USER_STATISTICS	LOST_CONNECTIONS	21	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	USER_STATISTICS	OTHER_COMMANDS	17	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	USER_STATISTICS	ROLLBACK_TRANSACTIONS	19	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	USER_STATISTICS	ROWS_DELETED	12	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	USER_STATISTICS	ROWS_INSERTED	13	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	USER_STATISTICS	ROWS_READ	10	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	USER_STATISTICS	ROWS_SENT	11	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	USER_STATISTICS	ROWS_UPDATED	14	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	USER_STATISTICS	SELECT_COMMANDS	15	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	USER_STATISTICS	TOTAL_CONNECTIONS	2	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11)			select	
+NULL	information_schema	USER_STATISTICS	UPDATE_COMMANDS	16	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
 NULL	information_schema	USER_STATISTICS	USER	1		NO	varchar	48	144	NULL	NULL	utf8	utf8_general_ci	varchar(48)			select	
 NULL	information_schema	VIEWS	CHARACTER_SET_CLIENT	9		NO	varchar	32	96	NULL	NULL	utf8	utf8_general_ci	varchar(32)			select	
 NULL	information_schema	VIEWS	CHECK_OPTION	5		NO	varchar	8	24	NULL	NULL	utf8	utf8_general_ci	varchar(8)			select	
@@ -550,28 +550,28 @@ COL_CML	TABLE_SCHEMA	TABLE_NAME	COLUMN_N
 3.0000	information_schema	CHARACTER_SETS	DESCRIPTION	varchar	60	180	utf8	utf8_general_ci	varchar(60)
 NULL	information_schema	CHARACTER_SETS	MAXLEN	bigint	NULL	NULL	NULL	NULL	bigint(3)
 3.0000	information_schema	CLIENT_STATISTICS	CLIENT	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-NULL	information_schema	CLIENT_STATISTICS	TOTAL_CONNECTIONS	int	NULL	NULL	NULL	NULL	int(21)
-NULL	information_schema	CLIENT_STATISTICS	CONCURRENT_CONNECTIONS	int	NULL	NULL	NULL	NULL	int(21)
-NULL	information_schema	CLIENT_STATISTICS	CONNECTED_TIME	int	NULL	NULL	NULL	NULL	int(21)
+NULL	information_schema	CLIENT_STATISTICS	TOTAL_CONNECTIONS	bigint	NULL	NULL	NULL	NULL	bigint(21)
+NULL	information_schema	CLIENT_STATISTICS	CONCURRENT_CONNECTIONS	bigint	NULL	NULL	NULL	NULL	bigint(21)
+NULL	information_schema	CLIENT_STATISTICS	CONNECTED_TIME	bigint	NULL	NULL	NULL	NULL	bigint(21)
 NULL	information_schema	CLIENT_STATISTICS	BUSY_TIME	double	NULL	NULL	NULL	NULL	double
 NULL	information_schema	CLIENT_STATISTICS	CPU_TIME	double	NULL	NULL	NULL	NULL	double
-NULL	information_schema	CLIENT_STATISTICS	BYTES_RECEIVED	int	NULL	NULL	NULL	NULL	int(21)
-NULL	information_schema	CLIENT_STATISTICS	BYTES_SENT	int	NULL	NULL	NULL	NULL	int(21)
-NULL	information_schema	CLIENT_STATISTICS	BINLOG_BYTES_WRITTEN	int	NULL	NULL	NULL	NULL	int(21)
-NULL	information_schema	CLIENT_STATISTICS	ROWS_READ	int	NULL	NULL	NULL	NULL	int(21)
-NULL	information_schema	CLIENT_STATISTICS	ROWS_SENT	int	NULL	NULL	NULL	NULL	int(21)
-NULL	information_schema	CLIENT_STATISTICS	ROWS_DELETED	int	NULL	NULL	NULL	NULL	int(21)
-NULL	information_schema	CLIENT_STATISTICS	ROWS_INSERTED	int	NULL	NULL	NULL	NULL	int(21)
-NULL	information_schema	CLIENT_STATISTICS	ROWS_UPDATED	int	NULL	NULL	NULL	NULL	int(21)
-NULL	information_schema	CLIENT_STATISTICS	SELECT_COMMANDS	int	NULL	NULL	NULL	NULL	int(21)
-NULL	information_schema	CLIENT_STATISTICS	UPDATE_COMMANDS	int	NULL	NULL	NULL	NULL	int(21)
-NULL	information_schema	CLIENT_STATISTICS	OTHER_COMMANDS	int	NULL	NULL	NULL	NULL	int(21)
-NULL	information_schema	CLIENT_STATISTICS	COMMIT_TRANSACTIONS	int	NULL	NULL	NULL	NULL	int(21)
-NULL	information_schema	CLIENT_STATISTICS	ROLLBACK_TRANSACTIONS	int	NULL	NULL	NULL	NULL	int(21)
-NULL	information_schema	CLIENT_STATISTICS	DENIED_CONNECTIONS	int	NULL	NULL	NULL	NULL	int(21)
-NULL	information_schema	CLIENT_STATISTICS	LOST_CONNECTIONS	int	NULL	NULL	NULL	NULL	int(21)
-NULL	information_schema	CLIENT_STATISTICS	ACCESS_DENIED	int	NULL	NULL	NULL	NULL	int(21)
-NULL	information_schema	CLIENT_STATISTICS	EMPTY_QUERIES	int	NULL	NULL	NULL	NULL	int(21)
+NULL	information_schema	CLIENT_STATISTICS	BYTES_RECEIVED	bigint	NULL	NULL	NULL	NULL	bigint(21)
+NULL	information_schema	CLIENT_STATISTICS	BYTES_SENT	bigint	NULL	NULL	NULL	NULL	bigint(21)
+NULL	information_schema	CLIENT_STATISTICS	BINLOG_BYTES_WRITTEN	bigint	NULL	NULL	NULL	NULL	bigint(21)
+NULL	information_schema	CLIENT_STATISTICS	ROWS_READ	bigint	NULL	NULL	NULL	NULL	bigint(21)
+NULL	information_schema	CLIENT_STATISTICS	ROWS_SENT	bigint	NULL	NULL	NULL	NULL	bigint(21)
+NULL	information_schema	CLIENT_STATISTICS	ROWS_DELETED	bigint	NULL	NULL	NULL	NULL	bigint(21)
+NULL	information_schema	CLIENT_STATISTICS	ROWS_INSERTED	bigint	NULL	NULL	NULL	NULL	bigint(21)
+NULL	information_schema	CLIENT_STATISTICS	ROWS_UPDATED	bigint	NULL	NULL	NULL	NULL	bigint(21)
+NULL	information_schema	CLIENT_STATISTICS	SELECT_COMMANDS	bigint	NULL	NULL	NULL	NULL	bigint(21)
+NULL	information_schema	CLIENT_STATISTICS	UPDATE_COMMANDS	bigint	NULL	NULL	NULL	NULL	bigint(21)
+NULL	information_schema	CLIENT_STATISTICS	OTHER_COMMANDS	bigint	NULL	NULL	NULL	NULL	bigint(21)
+NULL	information_schema	CLIENT_STATISTICS	COMMIT_TRANSACTIONS	bigint	NULL	NULL	NULL	NULL	bigint(21)
+NULL	information_schema	CLIENT_STATISTICS	ROLLBACK_TRANSACTIONS	bigint	NULL	NULL	NULL	NULL	bigint(21)
+NULL	information_schema	CLIENT_STATISTICS	DENIED_CONNECTIONS	bigint	NULL	NULL	NULL	NULL	bigint(21)
+NULL	information_schema	CLIENT_STATISTICS	LOST_CONNECTIONS	bigint	NULL	NULL	NULL	NULL	bigint(21)
+NULL	information_schema	CLIENT_STATISTICS	ACCESS_DENIED	bigint	NULL	NULL	NULL	NULL	bigint(21)
+NULL	information_schema	CLIENT_STATISTICS	EMPTY_QUERIES	bigint	NULL	NULL	NULL	NULL	bigint(21)
 3.0000	information_schema	COLLATIONS	COLLATION_NAME	varchar	32	96	utf8	utf8_general_ci	varchar(32)
 3.0000	information_schema	COLLATIONS	CHARACTER_SET_NAME	varchar	32	96	utf8	utf8_general_ci	varchar(32)
 NULL	information_schema	COLLATIONS	ID	bigint	NULL	NULL	NULL	NULL	bigint(11)
@@ -681,7 +681,7 @@ NULL	information_schema	FILES	CHECKSUM	b
 3.0000	information_schema	INDEX_STATISTICS	TABLE_SCHEMA	varchar	192	576	utf8	utf8_general_ci	varchar(192)
 3.0000	information_schema	INDEX_STATISTICS	TABLE_NAME	varchar	192	576	utf8	utf8_general_ci	varchar(192)
 3.0000	information_schema	INDEX_STATISTICS	INDEX_NAME	varchar	192	576	utf8	utf8_general_ci	varchar(192)
-NULL	information_schema	INDEX_STATISTICS	ROWS_READ	int	NULL	NULL	NULL	NULL	int(21)
+NULL	information_schema	INDEX_STATISTICS	ROWS_READ	bigint	NULL	NULL	NULL	NULL	bigint(21)
 3.0000	information_schema	INNODB_BUFFER_POOL_PAGES	page_type	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 NULL	information_schema	INNODB_BUFFER_POOL_PAGES	space_id	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
 NULL	information_schema	INNODB_BUFFER_POOL_PAGES	page_no	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
@@ -960,9 +960,9 @@ NULL	information_schema	TABLES	CHECKSUM	
 3.0000	information_schema	TABLE_PRIVILEGES	IS_GRANTABLE	varchar	3	9	utf8	utf8_general_ci	varchar(3)
 3.0000	information_schema	TABLE_STATISTICS	TABLE_SCHEMA	varchar	192	576	utf8	utf8_general_ci	varchar(192)
 3.0000	information_schema	TABLE_STATISTICS	TABLE_NAME	varchar	192	576	utf8	utf8_general_ci	varchar(192)
-NULL	information_schema	TABLE_STATISTICS	ROWS_READ	int	NULL	NULL	NULL	NULL	int(21)
-NULL	information_schema	TABLE_STATISTICS	ROWS_CHANGED	int	NULL	NULL	NULL	NULL	int(21)
-NULL	information_schema	TABLE_STATISTICS	ROWS_CHANGED_X_INDEXES	int	NULL	NULL	NULL	NULL	int(21)
+NULL	information_schema	TABLE_STATISTICS	ROWS_READ	bigint	NULL	NULL	NULL	NULL	bigint(21)
+NULL	information_schema	TABLE_STATISTICS	ROWS_CHANGED	bigint	NULL	NULL	NULL	NULL	bigint(21)
+NULL	information_schema	TABLE_STATISTICS	ROWS_CHANGED_X_INDEXES	bigint	NULL	NULL	NULL	NULL	bigint(21)
 3.0000	information_schema	TRIGGERS	TRIGGER_CATALOG	varchar	512	1536	utf8	utf8_general_ci	varchar(512)
 3.0000	information_schema	TRIGGERS	TRIGGER_SCHEMA	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	TRIGGERS	TRIGGER_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
@@ -990,28 +990,28 @@ NULL	information_schema	TRIGGERS	CREATED
 3.0000	information_schema	USER_PRIVILEGES	PRIVILEGE_TYPE	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	USER_PRIVILEGES	IS_GRANTABLE	varchar	3	9	utf8	utf8_general_ci	varchar(3)
 3.0000	information_schema	USER_STATISTICS	USER	varchar	48	144	utf8	utf8_general_ci	varchar(48)
-NULL	information_schema	USER_STATISTICS	TOTAL_CONNECTIONS	int	NULL	NULL	NULL	NULL	int(21)
-NULL	information_schema	USER_STATISTICS	CONCURRENT_CONNECTIONS	int	NULL	NULL	NULL	NULL	int(21)
-NULL	information_schema	USER_STATISTICS	CONNECTED_TIME	int	NULL	NULL	NULL	NULL	int(21)
+NULL	information_schema	USER_STATISTICS	TOTAL_CONNECTIONS	int	NULL	NULL	NULL	NULL	int(11)
+NULL	information_schema	USER_STATISTICS	CONCURRENT_CONNECTIONS	int	NULL	NULL	NULL	NULL	int(11)
+NULL	information_schema	USER_STATISTICS	CONNECTED_TIME	int	NULL	NULL	NULL	NULL	int(11)
 NULL	information_schema	USER_STATISTICS	BUSY_TIME	double	NULL	NULL	NULL	NULL	double
 NULL	information_schema	USER_STATISTICS	CPU_TIME	double	NULL	NULL	NULL	NULL	double
-NULL	information_schema	USER_STATISTICS	BYTES_RECEIVED	int	NULL	NULL	NULL	NULL	int(21)
-NULL	information_schema	USER_STATISTICS	BYTES_SENT	int	NULL	NULL	NULL	NULL	int(21)
-NULL	information_schema	USER_STATISTICS	BINLOG_BYTES_WRITTEN	int	NULL	NULL	NULL	NULL	int(21)
-NULL	information_schema	USER_STATISTICS	ROWS_READ	int	NULL	NULL	NULL	NULL	int(21)
-NULL	information_schema	USER_STATISTICS	ROWS_SENT	int	NULL	NULL	NULL	NULL	int(21)
-NULL	information_schema	USER_STATISTICS	ROWS_DELETED	int	NULL	NULL	NULL	NULL	int(21)
-NULL	information_schema	USER_STATISTICS	ROWS_INSERTED	int	NULL	NULL	NULL	NULL	int(21)
-NULL	information_schema	USER_STATISTICS	ROWS_UPDATED	int	NULL	NULL	NULL	NULL	int(21)
-NULL	information_schema	USER_STATISTICS	SELECT_COMMANDS	int	NULL	NULL	NULL	NULL	int(21)
-NULL	information_schema	USER_STATISTICS	UPDATE_COMMANDS	int	NULL	NULL	NULL	NULL	int(21)
-NULL	information_schema	USER_STATISTICS	OTHER_COMMANDS	int	NULL	NULL	NULL	NULL	int(21)
-NULL	information_schema	USER_STATISTICS	COMMIT_TRANSACTIONS	int	NULL	NULL	NULL	NULL	int(21)
-NULL	information_schema	USER_STATISTICS	ROLLBACK_TRANSACTIONS	int	NULL	NULL	NULL	NULL	int(21)
-NULL	information_schema	USER_STATISTICS	DENIED_CONNECTIONS	int	NULL	NULL	NULL	NULL	int(21)
-NULL	information_schema	USER_STATISTICS	LOST_CONNECTIONS	int	NULL	NULL	NULL	NULL	int(21)
-NULL	information_schema	USER_STATISTICS	ACCESS_DENIED	int	NULL	NULL	NULL	NULL	int(21)
-NULL	information_schema	USER_STATISTICS	EMPTY_QUERIES	int	NULL	NULL	NULL	NULL	int(21)
+NULL	information_schema	USER_STATISTICS	BYTES_RECEIVED	bigint	NULL	NULL	NULL	NULL	bigint(21)
+NULL	information_schema	USER_STATISTICS	BYTES_SENT	bigint	NULL	NULL	NULL	NULL	bigint(21)
+NULL	information_schema	USER_STATISTICS	BINLOG_BYTES_WRITTEN	bigint	NULL	NULL	NULL	NULL	bigint(21)
+NULL	information_schema	USER_STATISTICS	ROWS_READ	bigint	NULL	NULL	NULL	NULL	bigint(21)
+NULL	information_schema	USER_STATISTICS	ROWS_SENT	bigint	NULL	NULL	NULL	NULL	bigint(21)
+NULL	information_schema	USER_STATISTICS	ROWS_DELETED	bigint	NULL	NULL	NULL	NULL	bigint(21)
+NULL	information_schema	USER_STATISTICS	ROWS_INSERTED	bigint	NULL	NULL	NULL	NULL	bigint(21)
+NULL	information_schema	USER_STATISTICS	ROWS_UPDATED	bigint	NULL	NULL	NULL	NULL	bigint(21)
+NULL	information_schema	USER_STATISTICS	SELECT_COMMANDS	bigint	NULL	NULL	NULL	NULL	bigint(21)
+NULL	information_schema	USER_STATISTICS	UPDATE_COMMANDS	bigint	NULL	NULL	NULL	NULL	bigint(21)
+NULL	information_schema	USER_STATISTICS	OTHER_COMMANDS	bigint	NULL	NULL	NULL	NULL	bigint(21)
+NULL	information_schema	USER_STATISTICS	COMMIT_TRANSACTIONS	bigint	NULL	NULL	NULL	NULL	bigint(21)
+NULL	information_schema	USER_STATISTICS	ROLLBACK_TRANSACTIONS	bigint	NULL	NULL	NULL	NULL	bigint(21)
+NULL	information_schema	USER_STATISTICS	DENIED_CONNECTIONS	bigint	NULL	NULL	NULL	NULL	bigint(21)
+NULL	information_schema	USER_STATISTICS	LOST_CONNECTIONS	bigint	NULL	NULL	NULL	NULL	bigint(21)
+NULL	information_schema	USER_STATISTICS	ACCESS_DENIED	bigint	NULL	NULL	NULL	NULL	bigint(21)
+NULL	information_schema	USER_STATISTICS	EMPTY_QUERIES	bigint	NULL	NULL	NULL	NULL	bigint(21)
 3.0000	information_schema	VIEWS	TABLE_CATALOG	varchar	512	1536	utf8	utf8_general_ci	varchar(512)
 3.0000	information_schema	VIEWS	TABLE_SCHEMA	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	VIEWS	TABLE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)

=== modified file 'mysql-test/valgrind.supp'
--- a/mysql-test/valgrind.supp	2010-07-19 18:53:28 +0000
+++ b/mysql-test/valgrind.supp	2010-07-25 15:23:38 +0000
@@ -544,8 +544,6 @@
    Memcheck:Leak
    fun:malloc
    fun:_dl_signal_error
-   fun:_dl_signal_error
-   fun:_dl_lookup_symbol_x
 }
 
 #

=== modified file 'mysys/mf_keycache.c'
--- a/mysys/mf_keycache.c	2010-05-27 21:30:37 +0000
+++ b/mysys/mf_keycache.c	2010-07-24 06:10:03 +0000
@@ -5106,7 +5106,7 @@ static SIMPLE_KEY_CACHE_CB 
                                    ulonglong* dirty_part_map)
 {
   uint i= KEYCACHE_BASE_EXPR( file, filepos) % keycache->partitions;
-  *dirty_part_map|= 1<<i; 
+  *dirty_part_map|= 1ULL << i; 
   return keycache->partition_array[i];
 }
 

=== modified file 'scripts/make_win_bin_dist'
--- a/scripts/make_win_bin_dist	2010-05-12 14:27:18 +0000
+++ b/scripts/make_win_bin_dist	2010-07-25 15:23:38 +0000
@@ -163,7 +163,7 @@ if [ -f "storage/pbxt/bin/xtstat.exe" ] 
   cp storage/pbxt/bin/xtstat.{exe,pdb} $DESTDIR/bin
 fi
 
-cp server-tools/instance-manager/$TARGET/*.{exe,map}     $DESTDIR/bin/
+cp server-tools/instance-manager/$TARGET/*.exe           $DESTDIR/bin/
 if [ x"$TARGET" != x"release" ] ; then
   cp server-tools/instance-manager/$TARGET/*.pdb         $DESTDIR/bin/
   cp client/$TARGET/mysql.pdb                            $DESTDIR/bin/
@@ -361,7 +361,7 @@ cp -R mysql-test/{t,r,include,suite,std_
 
 rm -rf $DESTDIR/mysql-test/lib/My/SafeProcess/my_safe_kill.{dir,vcproj}
 rm -rf $DESTDIR/mysql-test/lib/My/SafeProcess/my_safe_process.{dir,vcproj}
-rm -rf $DESTDIR/mysql-test/lib/My/SafeProcess/{Debug,RelWithDebInfo}/*.{ilk,idb,map}
+rm -rf $DESTDIR/mysql-test/lib/My/SafeProcess/{Debug,RelWithDebInfo}/*.{ilk,idb}
 
 
 # Note that this will not copy "extra" if a soft link

=== modified file 'sql/CMakeLists.txt'
--- a/sql/CMakeLists.txt	2010-07-09 11:39:19 +0000
+++ b/sql/CMakeLists.txt	2010-07-25 15:23:38 +0000
@@ -18,6 +18,7 @@ SET(CMAKE_CXX_FLAGS_DEBUG 
     "${CMAKE_CXX_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX -DUSE_SYMDIR /Zi")
 SET(CMAKE_C_FLAGS_DEBUG 
     "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX -DUSE_SYMDIR /Zi")
+SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /MAP /MAPINFO:EXPORTS")
 
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include 
                     ${CMAKE_SOURCE_DIR}/extra/yassl/include 

=== modified file 'sql/ha_ndbcluster.cc'
--- a/sql/ha_ndbcluster.cc	2010-06-01 19:52:20 +0000
+++ b/sql/ha_ndbcluster.cc	2010-07-25 15:09:21 +0000
@@ -4232,7 +4232,7 @@ void ha_ndbcluster::start_bulk_insert(ha
 /**
   End of an insert.
 */
-int ha_ndbcluster::end_bulk_insert(bool abort)
+int ha_ndbcluster::end_bulk_insert()
 {
   int error= 0;
   DBUG_ENTER("end_bulk_insert");

=== modified file 'sql/ha_ndbcluster.h'
--- a/sql/ha_ndbcluster.h	2008-05-29 18:39:25 +0000
+++ b/sql/ha_ndbcluster.h	2010-07-23 20:37:21 +0000
@@ -322,7 +322,7 @@ class ha_ndbcluster: public handler
   double scan_time();
   ha_rows records_in_range(uint inx, key_range *min_key, key_range *max_key);
   void start_bulk_insert(ha_rows rows);
-  int end_bulk_insert(bool abort);
+  int end_bulk_insert();
 
   static Thd_ndb* seize_thd_ndb();
   static void release_thd_ndb(Thd_ndb* thd_ndb);

=== modified file 'sql/ha_partition.cc'
--- a/sql/ha_partition.cc	2010-07-16 22:41:44 +0000
+++ b/sql/ha_partition.cc	2010-07-25 15:09:21 +0000
@@ -3416,18 +3416,17 @@ ha_rows ha_partition::guess_bulk_insert_
 
   SYNOPSIS
     end_bulk_insert()
-    abort		1 if table will be deleted (error condition)
 
   RETURN VALUE
     >0                      Error code
     0                       Success
 
   Note: end_bulk_insert can be called without start_bulk_insert
-        being called, see bug¤44108.
+        being called, see bug#44108.
 
 */
 
-int ha_partition::end_bulk_insert(bool abort)
+int ha_partition::end_bulk_insert()
 {
   int error= 0;
   uint i;
@@ -3440,7 +3439,7 @@ int ha_partition::end_bulk_insert(bool a
   {
     int tmp;
     if (bitmap_is_set(&m_bulk_insert_started, i) &&
-        (tmp= m_file[i]->ha_end_bulk_insert(abort)))
+        (tmp= m_file[i]->ha_end_bulk_insert()))
       error= tmp;
   }
   bitmap_clear_all(&m_bulk_insert_started);

=== modified file 'sql/ha_partition.h'
--- a/sql/ha_partition.h	2010-07-16 22:41:44 +0000
+++ b/sql/ha_partition.h	2010-07-25 15:09:21 +0000
@@ -364,7 +364,7 @@ public:
   virtual int delete_row(const uchar * buf);
   virtual int delete_all_rows(void);
   virtual void start_bulk_insert(ha_rows rows);
-  virtual int end_bulk_insert(bool);
+  virtual int end_bulk_insert();
 private:
   ha_rows guess_bulk_insert_rows();
   void start_part_bulk_insert(THD *thd, uint part_id);

=== modified file 'sql/handler.h'
--- a/sql/handler.h	2010-07-16 22:41:44 +0000
+++ b/sql/handler.h	2010-07-25 15:09:21 +0000
@@ -1382,10 +1382,10 @@ public:
     estimation_rows_to_insert= rows;
     start_bulk_insert(rows);
   }
-  int ha_end_bulk_insert(bool abort)
+  int ha_end_bulk_insert()
   {
     estimation_rows_to_insert= 0;
-    return end_bulk_insert(abort);
+    return end_bulk_insert();
   }
   int ha_bulk_update_row(const uchar *old_data, uchar *new_data,
                          uint *dup_key_found);
@@ -2062,7 +2062,7 @@ private:
   virtual int repair(THD* thd, HA_CHECK_OPT* check_opt)
   { return HA_ADMIN_NOT_IMPLEMENTED; }
   virtual void start_bulk_insert(ha_rows rows) {}
-  virtual int end_bulk_insert(bool abort) { return 0; }
+  virtual int end_bulk_insert() { return 0; }
   virtual int index_read(uchar * buf, const uchar * key, uint key_len,
                          enum ha_rkey_function find_flag)
    { return  HA_ERR_WRONG_COMMAND; }

=== modified file 'sql/log_event.cc'
--- a/sql/log_event.cc	2010-07-16 22:41:44 +0000
+++ b/sql/log_event.cc	2010-07-25 15:09:21 +0000
@@ -8521,7 +8521,7 @@ Write_rows_log_event::do_after_row_opera
       ultimately. Still todo: fix
     */
   }
-  if ((local_error= m_table->file->ha_end_bulk_insert(0)))
+  if ((local_error= m_table->file->ha_end_bulk_insert()))
   {
     m_table->file->print_error(local_error, MYF(0));
   }

=== modified file 'sql/log_event_old.cc'
--- a/sql/log_event_old.cc	2010-07-16 22:41:44 +0000
+++ b/sql/log_event_old.cc	2010-07-25 15:09:21 +0000
@@ -948,7 +948,7 @@ int Write_rows_log_event_old::do_after_r
     fires bug#27077
     todo: explain or fix
   */
-  if ((local_error= table->file->ha_end_bulk_insert(0)))
+  if ((local_error= table->file->ha_end_bulk_insert()))
   {
     table->file->print_error(local_error, MYF(0));
   }
@@ -2644,7 +2644,7 @@ Write_rows_log_event_old::do_after_row_o
     fires bug#27077
     todo: explain or fix
   */
-  if ((local_error= m_table->file->ha_end_bulk_insert(0)))
+  if ((local_error= m_table->file->ha_end_bulk_insert()))
   {
     m_table->file->print_error(local_error, MYF(0));
   }

=== modified file 'sql/sql_acl.cc'
--- a/sql/sql_acl.cc	2010-07-19 18:53:28 +0000
+++ b/sql/sql_acl.cc	2010-07-23 20:02:38 +0000
@@ -162,7 +162,7 @@ static LEX_STRING old_password_plugin_na
 LEX_STRING *default_auth_plugin_name= &native_password_plugin_name;
 
 static plugin_ref native_password_plugin;
-#ifndef EMBEDDED_LIBRARY
+#ifndef NO_EMBEDDED_ACCESS_CHECKS
 static plugin_ref old_password_plugin;
 #endif
 

=== modified file 'sql/sql_insert.cc'
--- a/sql/sql_insert.cc	2010-07-20 05:41:24 +0000
+++ b/sql/sql_insert.cc	2010-07-25 15:09:21 +0000
@@ -881,7 +881,7 @@ bool mysql_insert(THD *thd,TABLE_LIST *t
       auto_inc values from the delayed_insert thread as they share TABLE.
     */
     table->file->ha_release_auto_increment();
-    if (using_bulk_insert && table->file->ha_end_bulk_insert(0) && !error)
+    if (using_bulk_insert && table->file->ha_end_bulk_insert() && !error)
     {
       table->file->print_error(my_errno,MYF(0));
       error=1;
@@ -3288,7 +3288,7 @@ bool select_insert::send_eof()
   DBUG_PRINT("enter", ("trans_table=%d, table_type='%s'",
                        trans_table, table->file->table_type()));
 
-  error= (!thd->prelocked_mode) ? table->file->ha_end_bulk_insert(0) : 0;
+  error= (!thd->prelocked_mode) ? table->file->ha_end_bulk_insert() : 0;
   table->file->extra(HA_EXTRA_NO_IGNORE_DUP_KEY);
   table->file->extra(HA_EXTRA_WRITE_CANNOT_REPLACE);
 
@@ -3371,7 +3371,7 @@ void select_insert::abort() {
       before.
     */
     if (!thd->prelocked_mode)
-      table->file->ha_end_bulk_insert(0);
+      table->file->ha_end_bulk_insert();
 
     /*
       If at least one row has been inserted/modified and will stay in

=== modified file 'sql/sql_load.cc'
--- a/sql/sql_load.cc	2010-05-26 18:55:40 +0000
+++ b/sql/sql_load.cc	2010-07-23 20:37:21 +0000
@@ -432,7 +432,7 @@ int mysql_load(THD *thd,sql_exchange *ex
       error= read_sep_field(thd, info, table_list, fields_vars,
                             set_fields, set_values, read_info,
 			    *enclosed, skip_lines, ignore);
-    if (!thd->prelocked_mode && table->file->ha_end_bulk_insert(0) && !error)
+    if (!thd->prelocked_mode && table->file->ha_end_bulk_insert() && !error)
     {
       table->file->print_error(my_errno, MYF(0));
       error= 1;

=== modified file 'sql/sql_table.cc'
--- a/sql/sql_table.cc	2010-07-17 19:58:08 +0000
+++ b/sql/sql_table.cc	2010-07-25 15:09:21 +0000
@@ -7959,7 +7959,7 @@ err:
 
   if (error > 0)
     to->file->extra(HA_EXTRA_PREPARE_FOR_DROP);
-  if (errpos >= 3 && to->file->ha_end_bulk_insert(error > 1) && error <= 0)
+  if (errpos >= 3 && to->file->ha_end_bulk_insert() && error <= 0)
   {
     to->file->print_error(my_errno,MYF(0));
     error= 1;

=== modified file 'storage/archive/ha_archive.cc'
--- a/storage/archive/ha_archive.cc	2010-07-20 23:07:45 +0000
+++ b/storage/archive/ha_archive.cc	2010-07-25 15:09:21 +0000
@@ -1555,7 +1555,7 @@ void ha_archive::start_bulk_insert(ha_ro
   Other side of start_bulk_insert, is end_bulk_insert. Here we turn off the bulk insert
   flag, and set the share dirty so that the next select will call sync for us.
 */
-int ha_archive::end_bulk_insert(bool table_will_be_deleted)
+int ha_archive::end_bulk_insert()
 {
   DBUG_ENTER("ha_archive::end_bulk_insert");
   bulk_insert= FALSE;

=== modified file 'storage/archive/ha_archive.h'
--- a/storage/archive/ha_archive.h	2008-05-29 15:33:33 +0000
+++ b/storage/archive/ha_archive.h	2010-07-23 20:37:21 +0000
@@ -134,7 +134,7 @@ public:
   int optimize(THD* thd, HA_CHECK_OPT* check_opt);
   int repair(THD* thd, HA_CHECK_OPT* check_opt);
   void start_bulk_insert(ha_rows rows);
-  int end_bulk_insert(bool table_will_be_deleted);
+  int end_bulk_insert();
   enum row_type get_row_type() const 
   { 
     return ROW_TYPE_COMPRESSED;

=== modified file 'storage/example/ha_example.cc'
--- a/storage/example/ha_example.cc	2010-07-19 18:53:28 +0000
+++ b/storage/example/ha_example.cc	2010-07-24 06:10:03 +0000
@@ -370,13 +370,13 @@ int ha_example::open(const char *name, i
 #ifndef DBUG_OFF
   example_table_options_struct *options=
     (example_table_options_struct *)table->s->option_struct;
-#endif
 
   DBUG_ASSERT(options);
   DBUG_PRINT("info", ("strparam: '%-.64s'  ullparam: %llu  enumparam: %u  "\
                       "boolparam: %u",
                       (options->strparam ? options->strparam : "<NULL>"),
                       options->ullparam, options->enumparam, options->boolparam));
+#endif
 
   DBUG_RETURN(0);
 }
@@ -922,9 +922,8 @@ int ha_example::create(const char *name,
                           field_options->compex_param_to_parse_it_in_engine :
                           "<NULL>")));
   }
-
-  DBUG_RETURN(0);
 #endif
+  DBUG_RETURN(0);
 }
 
 

=== modified file 'storage/federated/ha_federated.cc'
--- a/storage/federated/ha_federated.cc	2010-06-01 19:52:20 +0000
+++ b/storage/federated/ha_federated.cc	2010-07-25 15:09:21 +0000
@@ -1983,12 +1983,12 @@ void ha_federated::start_bulk_insert(ha_
   @retval       != 0    Error occured at remote server. Also sets my_errno.
 */
 
-int ha_federated::end_bulk_insert(bool abort)
+int ha_federated::end_bulk_insert()
 {
   int error= 0;
   DBUG_ENTER("ha_federated::end_bulk_insert");
   
-  if (!abort && bulk_insert.str && bulk_insert.length)
+  if (!table_will_be_deleted && bulk_insert.str && bulk_insert.length)
   {
     if (real_query(bulk_insert.str, bulk_insert.length))
       error= stash_remote_error();
@@ -2905,6 +2905,8 @@ int ha_federated::extra(ha_extra_functio
   case HA_EXTRA_INSERT_WITH_UPDATE:
     insert_dup_update= TRUE;
     break;
+  case HA_EXTRA_PREPARE_FOR_DROP:
+    table_will_be_deleted = TRUE;
   default:
     /* do nothing */
     DBUG_PRINT("info",("unhandled operation: %d", (uint) operation));
@@ -3305,6 +3307,7 @@ int ha_federated::external_lock(THD *thd
     }
   }
 #endif /* XXX_SUPERCEDED_BY_WL2952 */
+  table_will_be_deleted = FALSE;
   DBUG_RETURN(error);
 }
 

=== modified file 'storage/federated/ha_federated.h'
--- a/storage/federated/ha_federated.h	2010-04-28 12:52:24 +0000
+++ b/storage/federated/ha_federated.h	2010-07-23 20:37:21 +0000
@@ -88,7 +88,7 @@ class ha_federated: public handler
     Array of all stored results we get during a query execution.
   */
   DYNAMIC_ARRAY results;
-  bool position_called;
+  bool position_called, table_will_be_deleted;
   uint fetch_num; // stores the fetch num
   MYSQL_ROW_OFFSET current_position;  // Current position used by ::position()
   int remote_error_number;
@@ -210,7 +210,7 @@ public:
   int close(void);                                              // required
 
   void start_bulk_insert(ha_rows rows);
-  int end_bulk_insert(bool abort);
+  int end_bulk_insert();
   int write_row(uchar *buf);
   int update_row(const uchar *old_data, uchar *new_data);
   int delete_row(const uchar *buf);

=== modified file 'storage/federatedx/ha_federatedx.cc'
--- a/storage/federatedx/ha_federatedx.cc	2010-07-16 22:57:55 +0000
+++ b/storage/federatedx/ha_federatedx.cc	2010-07-25 15:09:21 +0000
@@ -2143,12 +2143,12 @@ void ha_federatedx::start_bulk_insert(ha
   @retval       != 0    Error occured at remote server. Also sets my_errno.
 */
 
-int ha_federatedx::end_bulk_insert(bool abort)
+int ha_federatedx::end_bulk_insert()
 {
   int error= 0;
   DBUG_ENTER("ha_federatedx::end_bulk_insert");
   
-  if (bulk_insert.str && bulk_insert.length && !abort)
+  if (bulk_insert.str && bulk_insert.length && !table_will_be_deleted)
   {
     if ((error= txn->acquire(share, FALSE, &io)))
       DBUG_RETURN(error);
@@ -3082,6 +3082,9 @@ int ha_federatedx::extra(ha_extra_functi
   case HA_EXTRA_INSERT_WITH_UPDATE:
     insert_dup_update= TRUE;
     break;
+  case HA_EXTRA_PREPARE_FOR_DROP:
+    table_will_be_deleted = TRUE;
+    break;
   default:
     /* do nothing */
     DBUG_PRINT("info",("unhandled operation: %d", (uint) operation));
@@ -3391,6 +3394,7 @@ int ha_federatedx::external_lock(MYSQL_T
     txn->release(&io);
   else
   {
+    table_will_be_deleted = FALSE;
     txn= get_txn(thd);  
     if (!(error= txn->acquire(share, lock_type == F_RDLCK, &io)) &&
         (lock_type == F_WRLCK || !io->is_autocommit()))

=== modified file 'storage/federatedx/ha_federatedx.h'
--- a/storage/federatedx/ha_federatedx.h	2009-11-14 19:33:59 +0000
+++ b/storage/federatedx/ha_federatedx.h	2010-07-23 20:37:21 +0000
@@ -259,7 +259,7 @@ class ha_federatedx: public handler
   int remote_error_number;
   char remote_error_buf[FEDERATEDX_QUERY_BUFFER_SIZE];
   bool ignore_duplicates, replace_duplicates;
-  bool insert_dup_update;
+  bool insert_dup_update, table_will_be_deleted;
   DYNAMIC_STRING bulk_insert;
 
 private:
@@ -379,7 +379,7 @@ public:
   int close(void);                                              // required
 
   void start_bulk_insert(ha_rows rows);
-  int end_bulk_insert(bool abort);
+  int end_bulk_insert();
   int write_row(uchar *buf);
   int update_row(const uchar *old_data, uchar *new_data);
   int delete_row(const uchar *buf);

=== modified file 'storage/maria/ha_maria.cc'
--- a/storage/maria/ha_maria.cc	2010-06-16 10:58:56 +0000
+++ b/storage/maria/ha_maria.cc	2010-07-25 15:09:21 +0000
@@ -1980,14 +1980,14 @@ void ha_maria::start_bulk_insert(ha_rows
     != 0  Error
 */
 
-int ha_maria::end_bulk_insert(bool table_will_be_deleted)
+int ha_maria::end_bulk_insert()
 {
   int err;
   DBUG_ENTER("ha_maria::end_bulk_insert");
-  maria_end_bulk_insert(file, table_will_be_deleted);
+  maria_end_bulk_insert(file);
   if ((err= maria_extra(file, HA_EXTRA_NO_CACHE, 0)))
     goto end;
-  if (can_enable_indexes && !table_will_be_deleted)
+  if (can_enable_indexes && !file->s->deleting)
     err= enable_indexes(HA_KEY_SWITCH_NONUNIQ_SAVE);
 end:
   if (bulk_insert_single_undo != BULK_INSERT_NONE)

=== modified file 'storage/maria/ha_maria.h'
--- a/storage/maria/ha_maria.h	2010-06-13 22:13:32 +0000
+++ b/storage/maria/ha_maria.h	2010-07-23 20:37:21 +0000
@@ -123,7 +123,7 @@ public:
   int enable_indexes(uint mode);
   int indexes_are_disabled(void);
   void start_bulk_insert(ha_rows rows);
-  int end_bulk_insert(bool abort);
+  int end_bulk_insert();
   ha_rows records_in_range(uint inx, key_range * min_key, key_range * max_key);
   void update_create_info(HA_CREATE_INFO * create_info);
   int create(const char *name, TABLE * form, HA_CREATE_INFO * create_info);

=== modified file 'storage/maria/ma_write.c'
--- a/storage/maria/ma_write.c	2010-03-09 19:22:24 +0000
+++ b/storage/maria/ma_write.c	2010-07-23 20:37:21 +0000
@@ -1755,7 +1755,7 @@ void maria_flush_bulk_insert(MARIA_HA *i
   }
 }
 
-void maria_end_bulk_insert(MARIA_HA *info, my_bool abort)
+void maria_end_bulk_insert(MARIA_HA *info)
 {
   DBUG_ENTER("maria_end_bulk_insert");
   if (info->bulk_insert)
@@ -1765,7 +1765,7 @@ void maria_end_bulk_insert(MARIA_HA *inf
     {
       if (is_tree_inited(&info->bulk_insert[i]))
       {
-        if (abort)
+        if (info->s->deleting)
           reset_free_element(&info->bulk_insert[i]);
         delete_tree(&info->bulk_insert[i]);
       }

=== modified file 'storage/myisam/ha_myisam.cc'
--- a/storage/myisam/ha_myisam.cc	2010-06-05 14:53:36 +0000
+++ b/storage/myisam/ha_myisam.cc	2010-07-25 15:09:21 +0000
@@ -1589,11 +1589,11 @@ void ha_myisam::start_bulk_insert(ha_row
     != 0  Error
 */
 
-int ha_myisam::end_bulk_insert(bool abort)
+int ha_myisam::end_bulk_insert()
 {
   mi_end_bulk_insert(file);
   int err=mi_extra(file, HA_EXTRA_NO_CACHE, 0);
-  if (!err && !abort)
+  if (!err && !file->s->deleting)
   {
     if (can_enable_indexes)
     {

=== modified file 'storage/myisam/ha_myisam.h'
--- a/storage/myisam/ha_myisam.h	2010-06-05 14:53:36 +0000
+++ b/storage/myisam/ha_myisam.h	2010-07-25 15:09:21 +0000
@@ -107,7 +107,7 @@ class ha_myisam: public handler
   int enable_indexes(uint mode);
   int indexes_are_disabled(void);
   void start_bulk_insert(ha_rows rows);
-  int end_bulk_insert(bool abort);
+  int end_bulk_insert();
   ha_rows records_in_range(uint inx, key_range *min_key, key_range *max_key);
   void update_create_info(HA_CREATE_INFO *create_info);
   int create(const char *name, TABLE *form, HA_CREATE_INFO *create_info);

=== modified file 'storage/xtradb/Makefile.am'
--- a/storage/xtradb/Makefile.am	2010-06-09 21:29:18 +0000
+++ b/storage/xtradb/Makefile.am	2010-07-24 06:10:03 +0000
@@ -330,7 +330,7 @@ libxtradb_a_CFLAGS=	$(AM_CFLAGS)
 EXTRA_LTLIBRARIES=	ha_xtradb.la
 pkgplugin_LTLIBRARIES=	@plugin_xtradb_shared_target@
 
-ha_xtradb_la_LDFLAGS=	-module -rpath $(pkgplugindir)
+ha_xtradb_la_LDFLAGS=	-module -rpath $(pkgplugindir) -L$(top_builddir)/libservices -lmysqlservices
 ha_xtradb_la_CXXFLAGS=	$(AM_CFLAGS) $(INNODB_DYNAMIC_CFLAGS)
 ha_xtradb_la_CFLAGS=	$(AM_CFLAGS) $(INNODB_DYNAMIC_CFLAGS)
 ha_xtradb_la_SOURCES=	$(libxtradb_a_SOURCES)



More information about the commits mailing list