WL#2269 Enable query cache for NDB part 2

-This is mostly fixes for correct behaviour when using query cache + transactions + the thread that
fetches commit count from NDB at regular intervals. The major fix is to add a
list in thd_ndb, that keeps a list of NDB_SHARE's that were modified by
transaction and then "clearing" them in ndbcluster_commit.


mysql-test/r/ndb_cache2.result:
  Updated test cases for the ndb_util thread, more simultaneous tables and more tesst
mysql-test/t/ndb_cache2.test:
  Updated test cases for the ndb_util thread, more simultaneous tables and more advanced tesst
sql/ha_ndbcluster.cc:
  Add table changed during transaction to list of changed tables in Thd_ndb, this list is then used in ndbcluster_commit to invalidate the cached commit_count in share
  Fix so that ndb_util_thread uses milliseconds "sleeps"
  Changed so that ndb_commit_count uses the commit_count from share if available
sql/ha_ndbcluster.h:
  Add commit_count_lock to NBD_SHARE, use for detecting simultaneous attempts to update commit_count
  Add list of tables changed by transaction to Thd_ndb
  Change check_ndb_connection to take thd as argument, use current_thd as default
  Added m_rows_changed variable to keep track of if this handler has modified any records within the transaction
sql/set_var.cc:
  Change format of code
  Sort sys__ variables in aplha order

1 files changed, 474 insertions, 44 deletions

diff --git a/mysql-test/r/ndb_cache2.result b/mysql-test/r/ndb_cache2.result
index 2815674a20a..2876002f864 100644
--- a/mysql-test/r/ndb_cache2.result
+++ b/mysql-test/r/ndb_cache2.result
@@ -1,14 +1,45 @@
-drop table if exists t1;
+drop table if exists t1, t2, t3, t4, t5;
 set GLOBAL query_cache_type=on;
 set GLOBAL query_cache_size=1355776;
-set GLOBAL ndb_cache_check_time=1;
+set GLOBAL ndb_cache_check_time=100;
 reset query cache;
 flush status;
-CREATE TABLE t1 ( pk int not null primary key,
-a int, b int not null, c varchar(20)) ENGINE=ndbcluster;
+CREATE TABLE t1 (
+pk int not null primary key,
+a1 int,
+b1 int not null,
+c1 varchar(20)
+) ENGINE=ndb;
+CREATE TABLE t2 (
+pk int not null primary key,
+a2 int,
+b2 int not null
+) ENGINE=ndb;
+CREATE TABLE t3 (
+pk int not null primary key,
+a3 int,
+b3 int not null,
+c3 int not null,
+d3 varchar(20)
+) ENGINE=ndb;
+CREATE TABLE t4 (
+a4 int,
+b4 int not null,
+c4 char(20)
+) ENGINE=ndbcluster;
+CREATE TABLE t5 (
+pk int not null primary key,
+a5 int,
+b5 int not null,
+c5 varchar(255)
+) ENGINE=ndbcluster;
 insert into t1 value (1, 2, 3, 'First row');
+insert into t2 value (1, 2, 3);
+insert into t3 value (1, 2, 3, 4, '3 - First row');
+insert into t4 value (2, 3, '4 - First row');
+insert into t5 value (1, 2, 3, '5 - First row');
 select * from t1;
-pk	a	b	c
+pk	a1	b1	c1
 1	2	3	First row
 show status like "Qcache_queries_in_cache";
 Variable_name	Value
@@ -20,14 +51,14 @@ show status like "Qcache_hits";
 Variable_name	Value
 Qcache_hits	0
 select * from t1;
-pk	a	b	c
+pk	a1	b1	c1
 1	2	3	First row
 show status like "Qcache_hits";
 Variable_name	Value
 Qcache_hits	1
-update t1 set a=3 where pk=1;
+update t1 set a1=3 where pk=1;
 select * from t1;
-pk	a	b	c
+pk	a1	b1	c1
 1	3	3	First row
 show status like "Qcache_inserts";
 Variable_name	Value
@@ -38,7 +69,7 @@ Qcache_hits	1
 insert into t1 value (2, 7, 8, 'Second row');
 insert into t1 value (4, 5, 6, 'Fourth row');
 select * from t1 order by pk desc;
-pk	a	b	c
+pk	a1	b1	c1
 4	5	6	Fourth row
 2	7	8	Second row
 1	3	3	First row
@@ -49,15 +80,15 @@ show status like "Qcache_hits";
 Variable_name	Value
 Qcache_hits	1
 select * from t1 order by pk desc;
-pk	a	b	c
+pk	a1	b1	c1
 4	5	6	Fourth row
 2	7	8	Second row
 1	3	3	First row
 show status like "Qcache_hits";
 Variable_name	Value
 Qcache_hits	2
-select * from t1 where b=3;
-pk	a	b	c
+select * from t1 where b1=3;
+pk	a1	b1	c1
 1	3	3	First row
 show status like "Qcache_queries_in_cache";
 Variable_name	Value
@@ -65,44 +96,44 @@ Qcache_queries_in_cache	2
 show status like "Qcache_hits";
 Variable_name	Value
 Qcache_hits	2
-select * from t1 where b=3;
-pk	a	b	c
+select * from t1 where b1=3;
+pk	a1	b1	c1
 1	3	3	First row
 show status like "Qcache_hits";
 Variable_name	Value
 Qcache_hits	3
-delete from t1 where c='Fourth row';
+delete from t1 where c1='Fourth row';
 show status like "Qcache_queries_in_cache";
 Variable_name	Value
 Qcache_queries_in_cache	0
-select * from t1 where b=3;
-pk	a	b	c
+select * from t1 where b1=3;
+pk	a1	b1	c1
 1	3	3	First row
 show status like "Qcache_hits";
 Variable_name	Value
 Qcache_hits	3
 use test;
 select * from t1 order by pk desc;
-pk	a	b	c
+pk	a1	b1	c1
 2	7	8	Second row
 1	3	3	First row
-select * from t1 where b=3;
-pk	a	b	c
+select * from t1 where b1=3;
+pk	a1	b1	c1
 1	3	3	First row
 show status like "Qcache_hits";
 Variable_name	Value
 Qcache_hits	4
-update t1 set a=4 where b=3;
+update t1 set a1=4 where b1=3;
 use test;
 show status like "Qcache_queries_in_cache";
 Variable_name	Value
 Qcache_queries_in_cache	0
 select * from t1 order by pk desc;
-pk	a	b	c
+pk	a1	b1	c1
 2	7	8	Second row
 1	4	3	First row
 select * from t1 order by pk desc;
-pk	a	b	c
+pk	a1	b1	c1
 2	7	8	Second row
 1	4	3	First row
 show status like "Qcache_inserts";
@@ -112,11 +143,11 @@ show status like "Qcache_hits";
 Variable_name	Value
 Qcache_hits	5
 select * from t1 order by pk desc;
-pk	a	b	c
+pk	a1	b1	c1
 2	7	8	Second row
 1	4	3	First row
 select * from t1 order by pk desc;
-pk	a	b	c
+pk	a1	b1	c1
 2	7	8	Second row
 1	4	3	First row
 show status like "Qcache_queries_in_cache";
@@ -128,64 +159,463 @@ Qcache_inserts	7
 show status like "Qcache_hits";
 Variable_name	Value
 Qcache_hits	7
+select * from t2;
+pk	a2	b2
+1	2	3
+select * from t3;
+pk	a3	b3	c3	d3
+1	2	3	4	3 - First row
+select * from t4;
+a4	b4	c4
+2	3	4 - First row
+select * from t5;
+pk	a5	b5	c5
+1	2	3	5 - First row
+show status like "Qcache_queries_in_cache";
+Variable_name	Value
+Qcache_queries_in_cache	5
+flush status;
 begin;
-update t1 set a=5 where pk=1;
+update t1 set a1=5 where pk=1;
 show status like "Qcache_queries_in_cache";
 Variable_name	Value
-Qcache_queries_in_cache	0
+Qcache_queries_in_cache	4
 show status like "Qcache_inserts";
 Variable_name	Value
-Qcache_inserts	7
+Qcache_inserts	0
 show status like "Qcache_hits";
 Variable_name	Value
-Qcache_hits	7
+Qcache_hits	0
 select * from t1 order by pk desc;
-pk	a	b	c
+pk	a1	b1	c1
 2	7	8	Second row
 1	4	3	First row
 show status like "Qcache_queries_in_cache";
 Variable_name	Value
-Qcache_queries_in_cache	1
+Qcache_queries_in_cache	5
 show status like "Qcache_inserts";
 Variable_name	Value
-Qcache_inserts	8
+Qcache_inserts	1
 show status like "Qcache_hits";
 Variable_name	Value
-Qcache_hits	7
+Qcache_hits	0
 commit;
 show status like "Qcache_queries_in_cache";
 Variable_name	Value
-Qcache_queries_in_cache	1
+Qcache_queries_in_cache	5
 show status like "Qcache_inserts";
 Variable_name	Value
-Qcache_inserts	8
+Qcache_inserts	1
 show status like "Qcache_hits";
 Variable_name	Value
-Qcache_hits	7
+Qcache_hits	0
 select * from t1 order by pk desc;
-pk	a	b	c
+pk	a1	b1	c1
 2	7	8	Second row
 1	5	3	First row
 show status like "Qcache_inserts";
 Variable_name	Value
-Qcache_inserts	9
+Qcache_inserts	2
 show status like "Qcache_hits";
 Variable_name	Value
-Qcache_hits	7
+Qcache_hits	0
 select * from t1 order by pk desc;
-pk	a	b	c
+pk	a1	b1	c1
 2	7	8	Second row
 1	5	3	First row
 show status like "Qcache_queries_in_cache";
 Variable_name	Value
-Qcache_queries_in_cache	1
+Qcache_queries_in_cache	5
+show status like "Qcache_inserts";
+Variable_name	Value
+Qcache_inserts	2
+show status like "Qcache_hits";
+Variable_name	Value
+Qcache_hits	1
+flush status;
+begin;
+update t1 set a1=6 where pk=1;
+show status like "Qcache_queries_in_cache";
+Variable_name	Value
+Qcache_queries_in_cache	4
+show status like "Qcache_inserts";
+Variable_name	Value
+Qcache_inserts	0
+show status like "Qcache_hits";
+Variable_name	Value
+Qcache_hits	0
+select * from t1 order by pk desc;
+pk	a1	b1	c1
+2	7	8	Second row
+1	5	3	First row
+select * from t1 order by pk desc;
+pk	a1	b1	c1
+2	7	8	Second row
+1	5	3	First row
+show status like "Qcache_queries_in_cache";
+Variable_name	Value
+Qcache_queries_in_cache	5
+show status like "Qcache_inserts";
+Variable_name	Value
+Qcache_inserts	1
+show status like "Qcache_hits";
+Variable_name	Value
+Qcache_hits	1
+select * from t1 order by pk desc;
+pk	a1	b1	c1
+2	7	8	Second row
+1	6	3	First row
+select * from t1 order by pk desc;
+pk	a1	b1	c1
+2	7	8	Second row
+1	6	3	First row
+show status like "Qcache_queries_in_cache";
+Variable_name	Value
+Qcache_queries_in_cache	5
+show status like "Qcache_inserts";
+Variable_name	Value
+Qcache_inserts	1
+show status like "Qcache_hits";
+Variable_name	Value
+Qcache_hits	1
+commit;
+show status like "Qcache_queries_in_cache";
+Variable_name	Value
+Qcache_queries_in_cache	5
+show status like "Qcache_inserts";
+Variable_name	Value
+Qcache_inserts	1
+show status like "Qcache_hits";
+Variable_name	Value
+Qcache_hits	1
+select * from t1 order by pk desc;
+pk	a1	b1	c1
+2	7	8	Second row
+1	6	3	First row
+show status like "Qcache_inserts";
+Variable_name	Value
+Qcache_inserts	2
+show status like "Qcache_hits";
+Variable_name	Value
+Qcache_hits	1
+select * from t1 order by pk desc;
+pk	a1	b1	c1
+2	7	8	Second row
+1	6	3	First row
+show status like "Qcache_queries_in_cache";
+Variable_name	Value
+Qcache_queries_in_cache	5
+show status like "Qcache_inserts";
+Variable_name	Value
+Qcache_inserts	2
+show status like "Qcache_hits";
+Variable_name	Value
+Qcache_hits	2
+flush status;
+begin;
+insert into t1 set pk=5, a1=6, b1=3, c1="New row";
+show status like "Qcache_queries_in_cache";
+Variable_name	Value
+Qcache_queries_in_cache	4
+show status like "Qcache_inserts";
+Variable_name	Value
+Qcache_inserts	0
+show status like "Qcache_hits";
+Variable_name	Value
+Qcache_hits	0
+select * from t1 where pk=5;
+pk	a1	b1	c1
+select * from t1 order by pk desc;
+pk	a1	b1	c1
+2	7	8	Second row
+1	6	3	First row
+show status like "Qcache_queries_in_cache";
+Variable_name	Value
+Qcache_queries_in_cache	6
+show status like "Qcache_inserts";
+Variable_name	Value
+Qcache_inserts	2
+show status like "Qcache_hits";
+Variable_name	Value
+Qcache_hits	0
+select * from t1 where pk=5;
+pk	a1	b1	c1
+5	6	3	New row
+select * from t1 where pk=5;
+pk	a1	b1	c1
+5	6	3	New row
+select * from t1 order by pk desc;
+pk	a1	b1	c1
+5	6	3	New row
+2	7	8	Second row
+1	6	3	First row
+select * from t1 order by pk desc;
+pk	a1	b1	c1
+5	6	3	New row
+2	7	8	Second row
+1	6	3	First row
+show status like "Qcache_queries_in_cache";
+Variable_name	Value
+Qcache_queries_in_cache	6
+show status like "Qcache_inserts";
+Variable_name	Value
+Qcache_inserts	2
+show status like "Qcache_hits";
+Variable_name	Value
+Qcache_hits	0
+commit;
+select * from t1 order by pk desc;
+pk	a1	b1	c1
+5	6	3	New row
+2	7	8	Second row
+1	6	3	First row
+show status like "Qcache_queries_in_cache";
+Variable_name	Value
+Qcache_queries_in_cache	5
+show status like "Qcache_inserts";
+Variable_name	Value
+Qcache_inserts	3
+show status like "Qcache_hits";
+Variable_name	Value
+Qcache_hits	0
+flush status;
+begin;
+delete from t1 where pk=2;
+show status like "Qcache_queries_in_cache";
+Variable_name	Value
+Qcache_queries_in_cache	4
+show status like "Qcache_inserts";
+Variable_name	Value
+Qcache_inserts	0
+show status like "Qcache_hits";
+Variable_name	Value
+Qcache_hits	0
+select * from t1 where pk=2;
+pk	a1	b1	c1
+2	7	8	Second row
+select * from t1 order by pk desc;
+pk	a1	b1	c1
+5	6	3	New row
+2	7	8	Second row
+1	6	3	First row
+show status like "Qcache_queries_in_cache";
+Variable_name	Value
+Qcache_queries_in_cache	6
+show status like "Qcache_inserts";
+Variable_name	Value
+Qcache_inserts	2
+show status like "Qcache_hits";
+Variable_name	Value
+Qcache_hits	0
+select * from t1 where pk=2;
+pk	a1	b1	c1
+select * from t1 order by pk desc;
+pk	a1	b1	c1
+5	6	3	New row
+1	6	3	First row
+select * from t1 order by pk desc;
+pk	a1	b1	c1
+5	6	3	New row
+1	6	3	First row
+select * from t1 where pk=2;
+pk	a1	b1	c1
+show status like "Qcache_queries_in_cache";
+Variable_name	Value
+Qcache_queries_in_cache	6
+show status like "Qcache_inserts";
+Variable_name	Value
+Qcache_inserts	2
+show status like "Qcache_hits";
+Variable_name	Value
+Qcache_hits	0
+commit;
+select * from t1 order by pk desc;
+pk	a1	b1	c1
+5	6	3	New row
+1	6	3	First row
+select * from t1 where pk=2;
+pk	a1	b1	c1
+show status like "Qcache_queries_in_cache";
+Variable_name	Value
+Qcache_queries_in_cache	6
+show status like "Qcache_inserts";
+Variable_name	Value
+Qcache_inserts	4
+show status like "Qcache_hits";
+Variable_name	Value
+Qcache_hits	0
+flush status;
+begin;
+update t1 set a1=9 where pk=1;
+update t2 set a2=9 where pk=1;
+update t3 set a3=9 where pk=1;
+update t4 set a4=9 where a4=2;
+update t5 set a5=9 where pk=1;
+show status like "Qcache_queries_in_cache";
+Variable_name	Value
+Qcache_queries_in_cache	0
+show status like "Qcache_inserts";
+Variable_name	Value
+Qcache_inserts	0
+show status like "Qcache_hits";
+Variable_name	Value
+Qcache_hits	0
+select * from t1 order by pk desc;
+pk	a1	b1	c1
+5	6	3	New row
+1	6	3	First row
+select * from t2;
+pk	a2	b2
+1	2	3
+select * from t3;
+pk	a3	b3	c3	d3
+1	2	3	4	3 - First row
+select * from t4;
+a4	b4	c4
+2	3	4 - First row
+select * from t5;
+pk	a5	b5	c5
+1	2	3	5 - First row
+show status like "Qcache_queries_in_cache";
+Variable_name	Value
+Qcache_queries_in_cache	5
+show status like "Qcache_inserts";
+Variable_name	Value
+Qcache_inserts	5
+show status like "Qcache_hits";
+Variable_name	Value
+Qcache_hits	0
+select * from t1 order by pk desc;
+pk	a1	b1	c1
+5	6	3	New row
+1	9	3	First row
+select * from t1 order by pk desc;
+pk	a1	b1	c1
+5	6	3	New row
+1	9	3	First row
+select * from t2;
+pk	a2	b2
+1	9	3
+select * from t3;
+pk	a3	b3	c3	d3
+1	9	3	4	3 - First row
+select * from t4;
+a4	b4	c4
+9	3	4 - First row
+select * from t5;
+pk	a5	b5	c5
+1	9	3	5 - First row
+show status like "Qcache_queries_in_cache";
+Variable_name	Value
+Qcache_queries_in_cache	5
+show status like "Qcache_inserts";
+Variable_name	Value
+Qcache_inserts	5
+show status like "Qcache_hits";
+Variable_name	Value
+Qcache_hits	0
+commit;
+select * from t1 order by pk desc;
+pk	a1	b1	c1
+5	6	3	New row
+1	9	3	First row
+select * from t2;
+pk	a2	b2
+1	9	3
+select * from t3;
+pk	a3	b3	c3	d3
+1	9	3	4	3 - First row
+select * from t4;
+a4	b4	c4
+9	3	4 - First row
+select * from t5;
+pk	a5	b5	c5
+1	9	3	5 - First row
+show status like "Qcache_queries_in_cache";
+Variable_name	Value
+Qcache_queries_in_cache	5
+show status like "Qcache_inserts";
+Variable_name	Value
+Qcache_inserts	10
+show status like "Qcache_hits";
+Variable_name	Value
+Qcache_hits	0
+select * from t1 order by pk desc;
+pk	a1	b1	c1
+5	6	3	New row
+1	9	3	First row
+select * from t2;
+pk	a2	b2
+1	9	3
+select * from t3;
+pk	a3	b3	c3	d3
+1	9	3	4	3 - First row
+select * from t4;
+a4	b4	c4
+9	3	4 - First row
+select * from t5;
+pk	a5	b5	c5
+1	9	3	5 - First row
+show status like "Qcache_queries_in_cache";
+Variable_name	Value
+Qcache_queries_in_cache	5
+show status like "Qcache_inserts";
+Variable_name	Value
+Qcache_inserts	10
+show status like "Qcache_hits";
+Variable_name	Value
+Qcache_hits	5
+select * from t1 order by pk desc;
+pk	a1	b1	c1
+5	6	3	New row
+1	9	3	First row
+select * from t2;
+pk	a2	b2
+1	9	3
+select * from t3;
+pk	a3	b3	c3	d3
+1	9	3	4	3 - First row
+select * from t4;
+a4	b4	c4
+9	3	4 - First row
+select * from t5;
+pk	a5	b5	c5
+1	9	3	5 - First row
+show status like "Qcache_queries_in_cache";
+Variable_name	Value
+Qcache_queries_in_cache	5
+show status like "Qcache_inserts";
+Variable_name	Value
+Qcache_inserts	10
+show status like "Qcache_hits";
+Variable_name	Value
+Qcache_hits	10
+select * from t1 order by pk desc;
+pk	a1	b1	c1
+5	6	3	New row
+1	9	3	First row
+select * from t2;
+pk	a2	b2
+1	9	3
+select * from t3;
+pk	a3	b3	c3	d3
+1	9	3	4	3 - First row
+select * from t4;
+a4	b4	c4
+9	3	4 - First row
+select * from t5;
+pk	a5	b5	c5
+1	9	3	5 - First row
+show status like "Qcache_queries_in_cache";
+Variable_name	Value
+Qcache_queries_in_cache	5
 show status like "Qcache_inserts";
 Variable_name	Value
-Qcache_inserts	9
+Qcache_inserts	10
 show status like "Qcache_hits";
 Variable_name	Value
-Qcache_hits	8
-drop table t1;
+Qcache_hits	15
+drop table t1, t2, t3, t4, t5;
 show status like "Qcache_queries_in_cache";
 Variable_name	Value
 Qcache_queries_in_cache	0