Commit 29a37a30 authored by unknown's avatar unknown
Browse files

Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 

into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug3-5.0


sql/sql_parse.cc:
  Auto merged
parents 3e9a575a aeb7fe83

Makefile.am

+0 −6
Original line number Diff line number Diff line
@@ -97,12 +97,6 @@ tags: 
	support-files/build-tags

.PHONY:		init-db bin-dist



# Test installation



test:

	cd mysql-test; \

	./mysql-test-run && ./mysql-test-run --ps-protocol



# Test installation. Ports are configurable from the environment.



MYSQL_TEST_MANAGER_PORT =	9305

mysql-test/r/mysqltest.result

+2 −5
Original line number Diff line number Diff line
@@ -179,9 +179,7 @@ source database 
echo message echo message



mysqltest: At line 1: Empty variable

sh: -c: line 0: syntax error near unexpected token `;'

sh: -c: line 0: `;'

mysqltest: At line 1: command ";" failed

mysqltest: At line 1: command "';' 2> /dev/null" failed

mysqltest: At line 1: Missing argument in exec

MySQL

"MySQL"
@@ -303,8 +301,7 @@ mysqltest: At line 1: First argument to dec must be a variable (start with $) 
mysqltest: At line 1: End of line junk detected: "1000"

mysqltest: At line 1: Missing arguments to system, nothing to do!

mysqltest: At line 1: Missing arguments to system, nothing to do!

sh: NonExistsinfComamdn: command not found

mysqltest: At line 1: system command 'NonExistsinfComamdn' failed

mysqltest: At line 1: system command 'NonExistsinfComamdn 2> /dev/null' failed

test

test2

test3

mysql-test/r/rpl_replicate_do.result

+11 −0
Original line number Diff line number Diff line
@@ -29,3 +29,14 @@ drop table if exists t1,t2,t11; 
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_PORT	1	master-bin.000001	1658	#	#	master-bin.000001	Yes	Yes			test.t1				0		0	1658	#	None		0	No						#

create table t1 (ts timestamp);

set one_shot time_zone='met';

insert into t1 values('2005-08-12 00:00:00');

set one_shot time_zone='met';

select * from t1;

ts

2005-08-12 00:00:00

set one_shot time_zone='met';

select * from t1;

ts

2005-08-12 00:00:00

mysql-test/t/mysqltest.test

+2 −2
Original line number Diff line number Diff line
@@ -424,7 +424,7 @@ echo ; 


# Illegal use of exec

--error 1

--exec echo "--exec ;" | $MYSQL_TEST 2>&1

--exec echo "--exec ';' 2> /dev/null" | $MYSQL_TEST 2>&1



--error 1

--exec echo "--exec " | $MYSQL_TEST 2>&1
@@ -672,7 +672,7 @@ system echo "hej" > /dev/null; 
--error 1

--exec echo "system $NONEXISTSINFVAREABLI;" | $MYSQL_TEST 2>&1

--error 1

--exec echo "system NonExistsinfComamdn;" | $MYSQL_TEST 2>&1

--exec echo "system NonExistsinfComamdn 2> /dev/null;" | $MYSQL_TEST 2>&1



--disable_abort_on_error

system NonExistsinfComamdn;

mysql-test/t/rpl_replicate_do.test

+18 −0
Original line number Diff line number Diff line
@@ -36,4 +36,22 @@ sync_with_master; 
--replace_column 1 # 8 # 9 # 23 # 33 #

show slave status;



#

# BUG#12542

# TEST: "SET ONE_SHOT should always be executed on slave"

#

# We could use any timezone different than server default in this test

#

connection master;

create table t1 (ts timestamp);

set one_shot time_zone='met';

insert into t1 values('2005-08-12 00:00:00');

set one_shot time_zone='met';

select * from t1;

sync_slave_with_master;



connection slave;

set one_shot time_zone='met';

select * from t1;



# End of 4.1 tests