Commit 5ffe6a7b authored by unknown's avatar unknown
Browse files

Merge 


sql/ha_innodb.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/table.h:
  Auto merged
parents b857b6e7 fcca1791

mysql-test/include/have_ndb.inc

+30 −3
Original line number Diff line number Diff line
@@ -2,6 +2,33 @@ 
disable_query_log;

show variables like "have_ndbcluster";

enable_query_log;

#connect (server1,127.0.0.1,root,,test,$MASTER_MYPORT,$MASTER_MYSOCK);

#connect (server2,127.0.0.1,root,,test,$MASTER_MYPORT1,$MASTER_MYSOCK1);

#connection server1;
 


# Setup connections to both MySQL Servers connected to the cluster

connect (server1,127.0.0.1,root,,test,$MASTER_MYPORT,);

connect (server2,127.0.0.1,root,,test,$MASTER_MYPORT1,);



# Check that server1 has NDB  support

connection server1;

disable_query_log;

--disable_warnings

drop table if exists t1, t2;

--enable_warnings

flush tables;

@r/have_ndb.require show variables like "have_ndbcluster";

@r/server_id.require show variables like "server_id";

enable_query_log;



# Check that server2 has NDB support

connection server2;

disable_query_log;

--disable_warnings

drop table if exists t1, t2;

--enable_warnings

flush tables;

@r/have_ndb.require show variables like "have_ndbcluster";

@r/server_id1.require show variables like "server_id";

enable_query_log;



# Set the default connection to 'server1'

connection server1;

mysql-test/r/ndb_cache.result

+164 −16
Original line number Diff line number Diff line 
drop table if exists t1;

set GLOBAL query_cache_type=on;

set GLOBAL query_cache_size=1355776;

reset query cache;

flush status;

drop table if exists t1,t2;

CREATE TABLE t1 (a int) ENGINE=ndbcluster;

CREATE TABLE t2 (a int);

CREATE TABLE t1 ( pk int not null primary key,

a int, b int not null, c varchar(20)) ENGINE=ndbcluster;

insert into t1 value (1, 2, 3, 'First row');

select * from t1;

a

pk	a	b	c

1	2	3	First row

show status like "Qcache_queries_in_cache";

Variable_name	Value

Qcache_queries_in_cache	0

Qcache_queries_in_cache	1

show status like "Qcache_inserts";

Variable_name	Value

Qcache_inserts	0

Qcache_inserts	1

show status like "Qcache_hits";

Variable_name	Value

Qcache_hits	0

select * from t2;

a

select * from t1;

pk	a	b	c

1	2	3	First row

show status like "Qcache_hits";

Variable_name	Value

Qcache_hits	1

update t1 set a=3 where pk=1;

select * from t1;

pk	a	b	c

1	3	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

insert into t1 value (2, 7, 8, 'Second row');

insert into t1 value (4, 5, 6, 'Fourth row');

select * from t1;

pk	a	b	c

2	7	8	Second row

4	5	6	Fourth row

1	3	3	First row

show status like "Qcache_inserts";

Variable_name	Value

Qcache_inserts	3

show status like "Qcache_hits";

Variable_name	Value

Qcache_hits	1

select * from t1;

pk	a	b	c

2	7	8	Second row

4	5	6	Fourth 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

1	3	3	First row

show status like "Qcache_queries_in_cache";

Variable_name	Value

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

1	3	3	First row

show status like "Qcache_hits";

Variable_name	Value

Qcache_hits	3

delete from t1 where c='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

1	3	3	First row

show status like "Qcache_hits";

Variable_name	Value

Qcache_hits	3

use test;

select * from t1;

pk	a	b	c

2	7	8	Second row

1	3	3	First row

select * from t1 where b=3;

pk	a	b	c

1	3	3	First row

show status like "Qcache_hits";

Variable_name	Value

Qcache_hits	4

update t1 set a=4 where b=3;

use test;

show status like "Qcache_queries_in_cache";

Variable_name	Value

Qcache_queries_in_cache	0

select * from t1;

pk	a	b	c

2	7	8	Second row

1	4	3	First row

select * from t1;

pk	a	b	c

2	7	8	Second row

1	4	3	First row

show status like "Qcache_inserts";

Variable_name	Value

Qcache_inserts	7

show status like "Qcache_hits";

Variable_name	Value

Qcache_hits	5

select * from t1;

pk	a	b	c

2	7	8	Second row

1	4	3	First row

select * from t1;

pk	a	b	c

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

show status like "Qcache_inserts";

Variable_name	Value

Qcache_inserts	1

Qcache_inserts	7

show status like "Qcache_hits";

Variable_name	Value

Qcache_hits	0

Qcache_hits	7

begin;

update t1 set a=5 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	7

show status like "Qcache_hits";

Variable_name	Value

Qcache_hits	7

select * from t1;

a

select * from t2;

a

pk	a	b	c

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

show status like "Qcache_inserts";

Variable_name	Value

Qcache_inserts	1

Qcache_inserts	8

show status like "Qcache_hits";

Variable_name	Value

Qcache_hits	1

drop table t1, t2;

Qcache_hits	7

commit;

show status like "Qcache_queries_in_cache";

Variable_name	Value

Qcache_queries_in_cache	1

show status like "Qcache_inserts";

Variable_name	Value

Qcache_inserts	8

show status like "Qcache_hits";

Variable_name	Value

Qcache_hits	7

select * from t1;

pk	a	b	c

2	7	8	Second row

1	5	3	First row

show status like "Qcache_inserts";

Variable_name	Value

Qcache_inserts	9

show status like "Qcache_hits";

Variable_name	Value

Qcache_hits	7

select * from t1;

pk	a	b	c

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

show status like "Qcache_inserts";

Variable_name	Value

Qcache_inserts	9

show status like "Qcache_hits";

Variable_name	Value

Qcache_hits	8

drop table t1;

show status like "Qcache_queries_in_cache";

Variable_name	Value

Qcache_queries_in_cache	0

SET GLOBAL query_cache_size=0;

mysql-test/r/ndb_cache_multi.result

0 → 100644
+72 −0
Original line number Diff line number Diff line 
drop table if exists t1, t2;

set GLOBAL query_cache_type=on;

set GLOBAL query_cache_size=1355776;

reset query cache;

flush status;

set GLOBAL query_cache_type=on;

set GLOBAL query_cache_size=1355776;

reset query cache;

flush status;

create table t1 (a int) engine=ndbcluster;

create table t2 (a int) engine=ndbcluster;

insert into t1 value (2);

insert into t2 value (3);

select * from t1;

a

2

select * from t2;

a

3

show status like "Qcache_queries_in_cache";

Variable_name	Value

Qcache_queries_in_cache	2

show status like "Qcache_inserts";

Variable_name	Value

Qcache_inserts	2

show status like "Qcache_hits";

Variable_name	Value

Qcache_hits	0

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;

a

2

show status like "Qcache_queries_in_cache";

Variable_name	Value

Qcache_queries_in_cache	1

show status like "Qcache_inserts";

Variable_name	Value

Qcache_inserts	1

show status like "Qcache_hits";

Variable_name	Value

Qcache_hits	0

update t1 set a=3 where a=2;

show status like "Qcache_queries_in_cache";

Variable_name	Value

Qcache_queries_in_cache	2

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;

a

3

show status like "Qcache_queries_in_cache";

Variable_name	Value

Qcache_queries_in_cache	2

show status like "Qcache_inserts";

Variable_name	Value

Qcache_inserts	3

show status like "Qcache_hits";

Variable_name	Value

Qcache_hits	0

drop table t1, t2;

mysql-test/r/ndb_multi.result

0 → 100644
+49 −0
Original line number Diff line number Diff line 
drop table if exists t1, t2, t3, t4;

flush status;

create table t1 (a int) engine=ndbcluster;

create table t2 (a int) engine=ndbcluster;

insert into t1 value (2);

insert into t2 value (3);

select * from t1;

a

2

select * from t2;

a

3

show status like 'handler_discover%';

Variable_name	Value

Handler_discover	0

flush status;

select * from t1;

a

2

update t1 set a=3 where a=2;

show status like 'handler_discover%';

Variable_name	Value

Handler_discover	1

create table t3 (a int not null primary key, b varchar(22),

c int, last_col text) engine=ndb;

insert into t3 values(1, 'Hi!', 89, 'Longtext column');

create table t4 (pk int primary key, b int) engine=ndb;

select * from t1;

a

3

select * from t3;

a	b	c	last_col

1	Hi!	89	Longtext column

show status like 'handler_discover%';

Variable_name	Value

Handler_discover	1

show tables like 't4';

Tables_in_test (t4)

t4

show status like 'handler_discover%';

Variable_name	Value

Handler_discover	2

show tables;

Tables_in_test

t1

t2

t3

t4

drop table t1, t2, t3, t4;

mysql-test/r/server_id.require

0 → 100644
+2 −0
Original line number Diff line number Diff line 
Variable_name	Value

server_id	1