Commit 49e641a0 authored by unknown's avatar unknown
Browse files

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

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push


sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
parents 92cc2b80 ce025393

BUILD/SETUP.sh

+2 −3
Original line number Diff line number Diff line
@@ -52,9 +52,8 @@ global_warnings="-Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wch 
#debug_extra_warnings="-Wuninitialized"

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-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"

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 --with-csv-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-csv-storage-engine --with-openssl --with-embedded-server --with-big-tables"

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



path=`dirname $0`

libmysqld/lib_sql.cc

+3 −4
Original line number Diff line number Diff line
@@ -532,10 +532,9 @@ void *create_embedded_thd(int client_flag, char *db) 
int check_embedded_connection(MYSQL *mysql)

{

  THD *thd= (THD*)mysql->thd;

  thd->host= (char*)my_localhost;

  thd->host_or_ip= thd->host;

  thd->user= my_strdup(mysql->user, MYF(0));

  thd->priv_user= thd->user;

  Security_context *sctx= thd->security_ctx;

  sctx->host_or_ip= sctx->host= (char*)my_localhost;

  sctx->priv_user= sctx->user= my_strdup(mysql->user, MYF(0));

  return check_user(thd, COM_CONNECT, NULL, 0, thd->db, true);

}

mysql-test/r/rpl_multi_delete.result

+9 −0
Original line number Diff line number Diff line
@@ -19,4 +19,13 @@ a 
select * from t2;

a

1

delete from t1;

delete from t2;

insert into t1 values(1);

insert into t2 values(1);

DELETE t1.*, t2.* from t1, t2;

select * from t1;

a

select * from t2;

a

drop table t1,t2;

mysql-test/r/rpl_multi_update.result

+13 −0
Original line number Diff line number Diff line
@@ -24,3 +24,16 @@ a b 
1	0

2	1

UPDATE t1, t2 SET t1.b = t2.b WHERE t1.a = t2.a;

delete from t1;

delete from t2;

insert into t1 values(1,1);

insert into t2 values(1,1);

update t1 set a=2;

UPDATE t1, t2 SET t1.a = t2.a;

select * from t1;

a	b

1	1

select * from t2;

a	b

1	1

drop table t1, t2;

mysql-test/r/rpl_sp.result

+1 −1
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ call foo4(); 
Got one of the listed errors

show warnings;

Level	Code	Message

Error	1142	INSERT command denied to user 'zedjzlcsjhd'@'localhost' for table 't1'

Error	1142	INSERT command denied to user 'zedjzlcsjhd'@'127.0.0.1' for table 't1'

Warning	1417	A routine failed and has neither NO SQL nor READS SQL DATA in its declaration and binary logging is enabled; if non-transactional tables were updated, the binary log will miss their changes

alter procedure foo4 sql security invoker;

call foo4();