Commit dad790f3 authored by unknown's avatar unknown
Browse files

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

into mysql.com:/M50/mysql-5.0


Build-tools/Do-compile:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
scripts/make_win_src_distribution.sh:
  Auto merged
parents 1fbea39b dad8e1f5

innobase/row/row0sel.c

+0 −6
Original line number Diff line number Diff line
@@ -2352,16 +2352,10 @@ row_sel_store_mysql_rec( 
	byte*			blob_buf;

	int			pad_char;

	ulint			i;

	dict_index_t*		index;

	

	ut_ad(prebuilt->mysql_template);

	ut_ad(rec_offs_validate(rec, NULL, offsets));



	index = prebuilt->index;

	if (prebuilt->need_to_access_clustered) {

		index = dict_table_get_first_index(index->table);

	}



	if (prebuilt->blob_heap != NULL) {

		mem_heap_free(prebuilt->blob_heap);

		prebuilt->blob_heap = NULL;

mysql-test/include/system_db_struct.inc

+1 −0
Original line number Diff line number Diff line
@@ -11,3 +11,4 @@ show create table func; 
show create table tables_priv;

show create table columns_priv;

show create table procs_priv;

show create table proc;

mysql-test/r/information_schema.result

+1 −1
Original line number Diff line number Diff line
@@ -505,7 +505,7 @@ proc body blob 
proc	definer	char(77)

proc	created	timestamp

proc	modified	timestamp

proc	sql_mode	set('REAL_AS_FLOAT','PIPES_AS_CONCAT','ANSI_QUOTES','IGNORE_SPACE','NOT_USED','ONLY_FULL_GROUP_BY','NO_UNSIGNED_SUBTRACTION','NO_DIR_IN_CREATE','POSTGRESQL','ORACLE','MSSQL','DB2','MAXDB','NO_KEY_OPTIONS','NO_TABLE_OPTIONS','NO_FIELD_OPTIONS','MYSQL323','MYSQL40','ANSI','NO_AUTO_VALUE_ON_ZERO')

proc	sql_mode	set('REAL_AS_FLOAT','PIPES_AS_CONCAT','ANSI_QUOTES','IGNORE_SPACE','NOT_USED','ONLY_FULL_GROUP_BY','NO_UNSIGNED_SUBTRACTION','NO_DIR_IN_CREATE','POSTGRESQL','ORACLE','MSSQL','DB2','MAXDB','NO_KEY_OPTIONS','NO_TABLE_OPTIONS','NO_FIELD_OPTIONS','MYSQL323','MYSQL40','ANSI','NO_AUTO_VALUE_ON_ZERO','NO_BACKSLASH_ESCAPES','STRICT_TRANS_TABLES','STRICT_ALL_TABLES','NO_ZERO_IN_DATE','NO_ZERO_DATE','INVALID_DATES','ERROR_FOR_DIVISION_BY_ZERO','TRADITIONAL','NO_AUTO_CREATE_USER','HIGH_NOT_PRECEDENCE')

proc	comment	char(64)

drop table t115;

create procedure p108 () begin declare c cursor for select data_type

mysql-test/r/join_outer.result

+22 −0
Original line number Diff line number Diff line
@@ -889,3 +889,25 @@ a b a b 
2	2	2	2

NULL	NULL	3	3

DROP TABLE t0,t1,t2,t3;

CREATE TABLE t1 (a int PRIMARY KEY, b int);

CREATE TABLE t2 (a int PRIMARY KEY, b int);

INSERT INTO t1 VALUES (1,1), (2,1), (3,1), (4,2);

INSERT INTO t2 VALUES (1,2), (2,2);

SELECT * FROM t1 LEFT JOIN t2 ON t1.a=t2.a;

a	b	a	b

1	1	1	2

2	1	2	2

3	1	NULL	NULL

4	2	NULL	NULL

SELECT * FROM t1 LEFT JOIN t2 ON t1.a=t2.a WHERE t1.b=1;

a	b	a	b

1	1	1	2

2	1	2	2

3	1	NULL	NULL

SELECT * FROM t1 LEFT JOIN t2 ON t1.a=t2.a

WHERE t1.b=1 XOR (NOT ISNULL(t2.a) AND t2.b=1);

a	b	a	b

1	1	1	2

2	1	2	2

3	1	NULL	NULL

DROP TABLE t1,t2;

mysql-test/r/query_cache.result

+22 −0
Original line number Diff line number Diff line
@@ -957,3 +957,25 @@ drop table t1; 
select table_name from information_schema.tables

where table_schema="test";

table_name

SET SESSION query_cache_type = 1;

set global query_cache_size=1024*1024;

flush query cache;

create table t1 ( a int );

insert into t1 values (1);

select a from t1;

a

1

select a from t1;

a

1

show status like 'qcache_queries_in_cache';

Variable_name	Value

Qcache_queries_in_cache	1

repair table t1;

Table	Op	Msg_type	Msg_text

test.t1	repair	status	OK

show status like 'qcache_queries_in_cache';

Variable_name	Value

Qcache_queries_in_cache	0

drop table t1;

set GLOBAL query_cache_size=0;