Commit e123c2a1 authored by unknown's avatar unknown
Browse files

Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0 

into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-5.0
parents 83f460ff a1392a32

innobase/include/sync0sync.h

+2 −0
Original line number Diff line number Diff line
@@ -415,6 +415,8 @@ or row lock! */ 
/*------------------------------------- Insert buffer tree */

#define	SYNC_IBUF_BITMAP_MUTEX	351

#define	SYNC_IBUF_BITMAP	350

/*------------------------------------- MySQL query cache mutex */

/*------------------------------------- MySQL binlog mutex */

/*-------------------------------*/

#define	SYNC_KERNEL		300

#define SYNC_REC_LOCK		299

innobase/row/row0ins.c

+4 −1
Original line number Diff line number Diff line
@@ -723,7 +723,10 @@ row_ins_foreign_check_on_constraint( 
	trx = thr_get_trx(thr);



	/* Since we are going to delete or update a row, we have to invalidate

	the MySQL query cache for table */

	the MySQL query cache for table. A deadlock of threads is not possible

	here because the caller of this function does not hold any latches with

	the sync0sync.h rank above the kernel mutex. The query cache mutex has

	a rank just above the kernel mutex. */



	row_ins_invalidate_query_cache(thr, table->name);

libmysql_r/Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 


target = libmysqlclient_r.la

target_defs = -DDONT_USE_RAID -DMYSQL_CLIENT @LIB_EXTRA_CCFLAGS@

LIBS = @LIBS@ @openssl_libs@

LIBS = @LIBS@ @ZLIB_LIBS@ @openssl_libs@



INCLUDES = @MT_INCLUDES@ \

	   -I$(top_srcdir)/include $(openssl_includes) @ZLIB_INCLUDES@ \

mysql-test/r/analyse.result

+6 −0
Original line number Diff line number Diff line
@@ -96,3 +96,9 @@ select * from t2; 
Field_name	Min_value	Max_value	Min_length	Max_length	Empties_or_zeros	Nulls	Avg_value_or_avg_length	Std	Optimal_fieldtype

test.t1.a	1	2	1	1	0	0	1.5000	0.5000	ENUM('1','2') NOT NULL

drop table t1,t2;

create table t1 (v varchar(128));

insert into t1 values ('abc'),('abc\'def\\hij\"klm\0opq'),('\''),('\"'),('\\'),('a\0'),('b\''),('c\"'),('d\\'),('\'b'),('\"c'),('\\d'),('a\0\0\0b'),('a\'\'\'\'b'),('a\"\"\"\"b'),('a\\\\\\\\b'),('\'\0\\\"'),('\'\''),('\"\"'),('\\\\'),('The\ZEnd');

select * from t1 procedure analyse();

Field_name	Min_value	Max_value	Min_length	Max_length	Empties_or_zeros	Nulls	Avg_value_or_avg_length	Std	Optimal_fieldtype

test.t1.v	"	\\	1	19	0	0	3.7619	NULL	ENUM('"','""','"c','\'\0\\"','\'','\'\'','\'b','a\0\0\0b','a\0','a""""b','a\'\'\'\'b','abc','abc\'def\\hij"klm\0opq','a\\\\\\\\b','b\'','c"','d\\','The\ZEnd','\\','\\d','\\\\') NOT NULL

drop table t1;

mysql-test/t/analyse.test

+4 −0
Original line number Diff line number Diff line
@@ -38,3 +38,7 @@ select * from t2; 
insert into t2 select * from t1 procedure analyse();

select * from t2;

drop table t1,t2;

create table t1 (v varchar(128));

insert into t1 values ('abc'),('abc\'def\\hij\"klm\0opq'),('\''),('\"'),('\\'),('a\0'),('b\''),('c\"'),('d\\'),('\'b'),('\"c'),('\\d'),('a\0\0\0b'),('a\'\'\'\'b'),('a\"\"\"\"b'),('a\\\\\\\\b'),('\'\0\\\"'),('\'\''),('\"\"'),('\\\\'),('The\ZEnd');

select * from t1 procedure analyse();

drop table t1;