Commit 36261a96 authored by unknown's avatar unknown
Browse files

Merge bk-internal:/home/bk/mysql-5.0 

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0


mysql-test/mysql-test-run.pl:
  Auto merged
sql/sql_parse.cc:
  Auto merged
mysql-test/r/trigger.result:
  Manual merge
mysql-test/t/trigger.test:
  Manual merge
parents 66b56724 2e4d7bd8

mysql-test/mysql-test-run.pl

+1 −2
Original line number Diff line number Diff line
@@ -3230,8 +3230,7 @@ sub ddd_arguments { 
	       "break mysql_parse\n" .

	       "commands 1\n" .

	       "disable 1\n" .

	       "end\n" .

	       "run");

	       "end");

  }



  if ( $opt_manual_ddd )

mysql-test/r/ctype_latin2_ch.result

+1 −0
Original line number Diff line number Diff line
@@ -28,3 +28,4 @@ select * from t1 ignore index (primary) where tt like 'AA%'; 
id	tt

select * from t1 where tt like '%AA%';

id	tt

drop table t1;

mysql-test/r/grant2.result

+14 −0
Original line number Diff line number Diff line
@@ -356,3 +356,17 @@ insert into mysql.user select * from t1; 
drop table t1, t2;

drop database TESTDB;

flush privileges;

grant all privileges on test.* to `a@`@localhost;

grant execute on * to `a@`@localhost;

create table t2 (s1 int);

insert into t2 values (1);

drop function if exists f2;

create function f2 () returns int begin declare v int; select s1 from t2

into v; return v; end//

select f2();

f2()

1

drop function f2;

drop table t2;

REVOKE ALL PRIVILEGES, GRANT OPTION FROM `a@`@localhost;

drop user `a@`@localhost;

mysql-test/r/openssl_1.result

+2 −3
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ f1 
5

delete from t1;

ERROR 42000: DELETE command denied to user 'ssl_user4'@'localhost' for table 't1'

delete from mysql.user where user='ssl_user%';

delete from mysql.db where user='ssl_user%';

flush privileges;

drop user ssl_user1@localhost, ssl_user2@localhost,

ssl_user3@localhost, ssl_user4@localhost;

drop table t1;

mysql-test/r/rpl_openssl.result

+2 −1
Original line number Diff line number Diff line
@@ -24,7 +24,8 @@ Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File 
stop slave;

change master to master_user='root',master_password='', master_ssl=0;

start slave;

drop user replssl@localhost;

drop table t1;

show slave status;

Slave_IO_State	Master_Host	Master_User	Master_Port	Connect_Retry	Master_Log_File	Read_Master_Log_Pos	Relay_Log_File	Relay_Log_Pos	Relay_Master_Log_File	Slave_IO_Running	Slave_SQL_Running	Replicate_Do_DB	Replicate_Ignore_DB	Replicate_Do_Table	Replicate_Ignore_Table	Replicate_Wild_Do_Table	Replicate_Wild_Ignore_Table	Last_Errno	Last_Error	Skip_Counter	Exec_Master_Log_Pos	Relay_Log_Space	Until_Condition	Until_Log_File	Until_Log_Pos	Master_SSL_Allowed	Master_SSL_CA_File	Master_SSL_CA_Path	Master_SSL_Cert	Master_SSL_Cipher	Master_SSL_Key	Seconds_Behind_Master

#	127.0.0.1	root	MASTER_MYPORT	1	master-bin.000001	474	#	#	master-bin.000001	Yes	Yes							0		0	474	#	None		0	No	MYSQL_TEST_DIR/std_data/cacert.pem		MYSQL_TEST_DIR/std_data/client-cert.pem		MYSQL_TEST_DIR/std_data/client-key.pem	#
 
#	127.0.0.1	root	MASTER_MYPORT	1	master-bin.000001	564	#	#	master-bin.000001	Yes	Yes							0		0	564	#	None		0	No	MYSQL_TEST_DIR/std_data/cacert.pem		MYSQL_TEST_DIR/std_data/client-cert.pem		MYSQL_TEST_DIR/std_data/client-key.pem	#