Commit 3b4f9680 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/mydev/mysql-5.1 

into  mysql.com:/home/mydev/mysql-5.1-bug11527
parents 37245522 52d34999

mysql-test/mysql-test-run.pl

+1 −1
Original line number Diff line number Diff line
@@ -2904,7 +2904,7 @@ sub run_mysqltest ($) { 
    if ( $opt_debug )

    {

      $cmdline_mysqlslap .=

        " --debug=d:t:A,$opt_vardir_trace/log/mysqldump.trace";

        " --debug=d:t:A,$opt_vardir_trace/log/mysqlslap.trace";

    }

  }

mysql-test/r/binlog_row_ctype_cp932.result

+0 −14
Original line number Diff line number Diff line
@@ -11315,20 +11315,6 @@ DROP TABLE t1; 
DROP TABLE t2;

DROP TABLE t3;

DROP TABLE t4;

RESET MASTER;

CREATE TABLE t1(f1 blob);

PREPARE stmt1 FROM 'INSERT INTO t1 VALUES(?)';

SET @var1= x'8300';

EXECUTE stmt1 USING @var1;

SHOW BINLOG EVENTS FROM 102;

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

master-bin.000001	102	Query	1	189	use `test`; CREATE TABLE t1(f1 blob)

master-bin.000001	189	Table_map	1	228	test.t1

master-bin.000001	228	Write_rows	1	262	

SELECT HEX(f1) FROM t1;

HEX(f1)

8300

DROP table t1;

SET collation_connection='cp932_japanese_ci';

create table t1 select repeat('a',4000) a;

delete from t1;

mysql-test/r/binlog_row_insert_select.result

+1 −0
Original line number Diff line number Diff line 
drop table if exists t1,t2;

create table t1(a int, unique(a));

insert into t1 values(2);

create table t2(a int);

mysql-test/r/grant2.result

+21 −0
Original line number Diff line number Diff line
@@ -334,3 +334,24 @@ lock table mysql.user write; 
 revoke all on *.* from 'mysqltest_1'@'localhost';

unlock tables;

drop user 'mysqltest_1'@'localhost';

create database TESTDB;

create table t2(a int);

create temporary table t1 as select * from mysql.user;

delete from mysql.user where host='localhost';

INSERT INTO mysql.user (host, user, password) VALUES

('%','mysqltest_1',password('password'));

Warnings:

Warning	1364	Field 'ssl_cipher' doesn't have a default value

Warning	1364	Field 'x509_issuer' doesn't have a default value

Warning	1364	Field 'x509_subject' doesn't have a default value

INSERT INTO mysql.db (host, db, user, select_priv) VALUES

('%','TESTDB','mysqltest_1','Y');

FLUSH PRIVILEGES;

create database TEStdb;

ERROR 42000: Access denied for user 'mysqltest_1'@'%' to database 'TEStdb'

delete from mysql.user;

delete from mysql.db where host='%' and user='mysqltest_1' and db='TESTDB';

insert into mysql.user select * from t1;

drop table t1, t2;

drop database TESTDB;

flush privileges;

mysql-test/r/ndb_cache_multi2.result

+10 −14
Original line number Diff line number Diff line 
drop table if exists t1, t2;

== Connected to server1 ==

set GLOBAL query_cache_type=on;

set GLOBAL query_cache_size=1355776;

set GLOBAL ndb_cache_check_time=1;

reset query cache;

flush status;

== Connected to server2 ==

set GLOBAL query_cache_type=on;

set GLOBAL query_cache_size=1355776;

set GLOBAL ndb_cache_check_time=1;

reset query cache;

flush status;

== Connected to server1 ==

create table t1 (a int) engine=ndbcluster;

create table t2 (a int) engine=ndbcluster;

insert into t1 value (2);
@@ -16,18 +19,22 @@ insert into t2 value (3); 
select * from t1;

a

2

select a != 3 from t1;

a != 3

1

select * from t2;

a

3

show status like "Qcache_queries_in_cache";

Variable_name	Value

Qcache_queries_in_cache	2

Qcache_queries_in_cache	3

show status like "Qcache_inserts";

Variable_name	Value

Qcache_inserts	2

Qcache_inserts	3

show status like "Qcache_hits";

Variable_name	Value

Qcache_hits	0

== Connected to server2 ==

show status like "Qcache_queries_in_cache";

Variable_name	Value

Qcache_queries_in_cache	0
@@ -50,24 +57,13 @@ 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

== Connected to server1 ==

select * from t1;

a

3

show status like "Qcache_queries_in_cache";

Variable_name	Value

Qcache_queries_in_cache	3

show status like "Qcache_inserts";

Variable_name	Value

Qcache_inserts	4

drop table t1, t2;

set GLOBAL query_cache_size=0;

set GLOBAL ndb_cache_check_time=0;