=== modified file 'include/mysql_com.h'
--- include/mysql_com.h	2012-10-01 11:15:29 +0000
+++ include/mysql_com.h	2012-11-09 14:39:38 +0000
@@ -158,10 +158,10 @@
 #define REFRESH_USER_RESOURCES	0x80000L
 #define REFRESH_CHECKPOINT	0x100000L /* Don't do checkpoints */
 
-#define REFRESH_TABLE_STATS     (1L << 20) /* Refresh table stats hash table */
-#define REFRESH_INDEX_STATS     (1L << 21) /* Refresh index stats hash table */
-#define REFRESH_USER_STATS      (1L << 22) /* Refresh user stats hash table */
-#define REFRESH_CLIENT_STATS    (1L << 23) /* Refresh client stats hash table */
+#define REFRESH_TABLE_STATS     (1L << 21) /* Refresh table stats hash table */
+#define REFRESH_INDEX_STATS     (1L << 22) /* Refresh index stats hash table */
+#define REFRESH_USER_STATS      (1L << 23) /* Refresh user stats hash table */
+#define REFRESH_CLIENT_STATS    (1L << 24) /* Refresh client stats hash table */
 
 #define CLIENT_LONG_PASSWORD	1	/* new more secure passwords */
 #define CLIENT_FOUND_ROWS	2	/* Found instead of affected rows */

=== added file 'mysql-test/r/refresh-opts-conflict.result'
--- mysql-test/r/refresh-opts-conflict.result	1970-01-01 00:00:00 +0000
+++ mysql-test/r/refresh-opts-conflict.result	2012-11-09 14:39:38 +0000
@@ -0,0 +1,14 @@
+drop table if exists t1;
+flush table_statistics;
+create table t1(n int);
+insert into t1 values(1);
+select * from information_schema.table_statistics;
+TABLE_SCHEMA	TABLE_NAME	ROWS_READ	ROWS_CHANGED	ROWS_CHANGED_X_INDEXES
+test	t1	0	1	1
+flush tables with read lock and disable checkpoint;
+select * from information_schema.table_statistics;
+TABLE_SCHEMA	TABLE_NAME	ROWS_READ	ROWS_CHANGED	ROWS_CHANGED_X_INDEXES
+test	t1	0	1	1
+unlock tables;
+commit;
+drop table t1;

=== added file 'mysql-test/t/refresh-opts-conflict-master.opt'
--- mysql-test/t/refresh-opts-conflict-master.opt	1970-01-01 00:00:00 +0000
+++ mysql-test/t/refresh-opts-conflict-master.opt	2012-11-09 14:39:38 +0000
@@ -0,0 +1,1 @@
+--userstat

=== added file 'mysql-test/t/refresh-opts-conflict.test'
--- mysql-test/t/refresh-opts-conflict.test	1970-01-01 00:00:00 +0000
+++ mysql-test/t/refresh-opts-conflict.test	2012-11-09 14:39:38 +0000
@@ -0,0 +1,18 @@
+--disable_warnings
+drop table if exists t1;
+--enable_warnings
+
+flush table_statistics;
+create table t1(n int);
+
+insert into t1 values(1);
+
+select * from information_schema.table_statistics;
+
+flush tables with read lock and disable checkpoint;
+
+select * from information_schema.table_statistics;
+
+unlock tables;
+commit;
+drop table t1;