Commit 757ad317 authored by unknown's avatar unknown
Browse files

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

into lmy002.wdf.sap.corp:/home/georg/work/mysql-5.0


tests/mysql_client_test.c:
  Auto merged
parents 90002cdc 58f67c6d

BUILD/SETUP.sh

+3 −4
Original line number Diff line number Diff line
@@ -48,10 +48,9 @@ global_warnings="-Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wch 
c_warnings="$global_warnings -Wunused"

cxx_warnings="$global_warnings -Woverloaded-virtual -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor"



base_max_configs="--with-innodb --with-berkeley-db --with-ndbcluster --with-archive-storage-engine --with-raid --with-openssl --with-raid --with-big-tables"

max_leave_isam_configs="--with-innodb --with-berkeley-db --with-ndbcluster --with-archive-storage-engine --with-federated-storage-engine --with-raid --with-openssl --with-raid --with-embedded-server --with-big-tables"

max_no_es_configs="$max_leave_isam_configs --without-isam"

max_configs="$max_no_es_configs --with-embedded-server"

base_max_configs="--with-innodb --with-berkeley-db --with-ndbcluster --with-archive-storage-engine --with-openssl --with-big-tables --with-blackhole-storage-engine --with-federated-storage-engine"

max_leave_isam_configs="--with-innodb --with-berkeley-db --with-ndbcluster --with-archive-storage-engine --with-federated-storage-engine --with-blackhole-storage-engine --with-openssl --with-embedded-server --with-big-tables"

max_configs="$base_max_configs --with-embedded-server"



path=`dirname $0`

. "$path/check-cpu"

BUILD/compile-pentium-debug-max-no-embedded

+1 −1
Original line number Diff line number Diff line
@@ -6,6 +6,6 @@ path=`dirname $0` 
extra_flags="$pentium_cflags $debug_cflags $max_cflags"

c_warnings="$c_warnings $debug_extra_warnings"

cxx_warnings="$cxx_warnings $debug_extra_warnings"

extra_configs="$pentium_configs $debug_configs $max_no_es_configs"

extra_configs="$pentium_configs $debug_configs $base_max_configs"



. "$path/FINISH.sh"

mysql-test/r/ctype_ucs.result

+19 −0
Original line number Diff line number Diff line
@@ -657,3 +657,22 @@ a b 
1.1	1.100

2.1	2.100

DROP TABLE t1;

create table t1 (utext varchar(20) character set ucs2);

insert into t1 values ("lily");

insert into t1 values ("river");

prepare stmt from 'select utext from t1 where utext like ?';

set @param1='%%';

execute stmt using @param1;

utext

lily

river

execute stmt using @param1;

utext

lily

river

select utext from t1 where utext like '%%';

utext

lily

river

drop table t1;

deallocate prepare stmt;

mysql-test/r/ps.result

+0 −19
Original line number Diff line number Diff line
@@ -759,25 +759,6 @@ execute stmt using @a, @b; 
?=?

1

deallocate prepare stmt;

create table t1 (utext varchar(20) character set ucs2);

insert into t1 values ("lily");

insert into t1 values ("river");

prepare stmt from 'select utext from t1 where utext like ?';

set @param1='%%';

execute stmt using @param1;

utext

lily

river

execute stmt using @param1;

utext

lily

river

select utext from t1 where utext like '%%';

utext

lily

river

drop table t1;

deallocate prepare stmt;

create table t1 (a int);

prepare stmt from "select ??";

ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '?' at line 1

mysql-test/r/sp-security.result

+24 −0
Original line number Diff line number Diff line
@@ -212,3 +212,27 @@ REVOKE ALL PRIVILEGES, GRANT OPTION FROM user1@localhost; 
drop function bug_9503;

use test;

drop database mysqltest;

use test;

select current_user();

current_user()

root@localhost

select user();

user()

root@localhost

create procedure bug7291_0 () sql security invoker select current_user(), user();

create procedure bug7291_1 () sql security definer call bug7291_0();

create procedure bug7291_2 () sql security invoker call bug7291_0();

grant execute on procedure bug7291_0 to user1@localhost;

grant execute on procedure bug7291_1 to user1@localhost;

grant execute on procedure bug7291_2 to user1@localhost;

call bug7291_2();

current_user()	user()

user1@localhost	user1@localhost

call bug7291_1();

current_user()	user()

root@localhost	user1@localhost

drop procedure bug7291_1;

drop procedure bug7291_2;

drop procedure bug7291_0;

REVOKE ALL PRIVILEGES, GRANT OPTION FROM user1@localhost;

drop user user1@localhost;