Commit 4de0989e authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/stewart/Documents/MySQL/5.0/main 

into mysql.com:/home/stewart/Documents/MySQL/5.0/bug11132
parents 82297c1c 8771b9f4

mysql-test/r/information_schema.result

+12 −0
Original line number Diff line number Diff line
@@ -823,3 +823,15 @@ GRANT SELECT ON *.* TO 'user4'@'localhost' 
drop user user1@localhost, user2@localhost, user3@localhost, user4@localhost;

use test;

drop database mysqltest;

create procedure p1 () modifies sql data set @a = 5;

create procedure p2 () set @a = 5;

select sql_data_access from information_schema.routines

where specific_name like 'p%';

sql_data_access

MODIFIES SQL DATA

CONTAINS SQL

drop procedure p1;

drop procedure p2;

show create database information_schema;

Database	Create Database

information_schema	CREATE DATABASE `information_schema` /*!40100 DEFAULT CHARACTER SET utf8 */

mysql-test/r/select.result

+3 −0
Original line number Diff line number Diff line
@@ -2699,3 +2699,6 @@ id select_type table type possible_keys key key_len ref rows Extra 
1	SIMPLE	t2	ALL	NULL	NULL	NULL	NULL	3	

1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	5	Using where

DROP TABLE t1,t2;

select x'10' + 0, X'10' + 0, b'10' + 0, B'10' + 0;

x'10' + 0	X'10' + 0	b'10' + 0	B'10' + 0

16	16	2	2

mysql-test/t/information_schema.test

+15 −0
Original line number Diff line number Diff line
@@ -542,3 +542,18 @@ connection default; 
drop user user1@localhost, user2@localhost, user3@localhost, user4@localhost;

use test;

drop database mysqltest;



#

# Bug #11055 information_schema: routines.sql_data_access has wrong value

#

create procedure p1 () modifies sql data set @a = 5;

create procedure p2 () set @a = 5;

select sql_data_access from information_schema.routines

where specific_name like 'p%';

drop procedure p1;

drop procedure p2;



#

# Bug #9434 SHOW CREATE DATABASE information_schema;

#

show create database information_schema;

mysql-test/t/select.test

+5 −0
Original line number Diff line number Diff line
@@ -2271,3 +2271,8 @@ EXPLAIN SELECT t1.a FROM t1 INNER JOIN t2 ON t1.a=t2.a; 


DROP TABLE t1,t2;



#

# Bug #10650

#



select x'10' + 0, X'10' + 0, b'10' + 0, B'10' + 0;

mysys/charset.c

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ static my_bool init_state_maps(CHARSET_INFO *cs) 


  /* Special handling of hex and binary strings */

  state_map[(uchar)'x']= state_map[(uchar)'X']= (uchar) MY_LEX_IDENT_OR_HEX;

  state_map[(uchar)'b']= state_map[(uchar)'b']= (uchar) MY_LEX_IDENT_OR_BIN;

  state_map[(uchar)'b']= state_map[(uchar)'B']= (uchar) MY_LEX_IDENT_OR_BIN;

  state_map[(uchar)'n']= state_map[(uchar)'N']= (uchar) MY_LEX_IDENT_OR_NCHAR;

  return 0;

}