Commit c797e79b authored by unknown's avatar unknown
Browse files

Merge shellback.(none):/home/msvensson/mysql/same_tools/my41-same_tools 

into  shellback.(none):/home/msvensson/mysql/same_tools/my50-same_tools


mysql-test/include/ps_query.inc:
  Auto merged
mysql-test/r/check.result:
  Auto merged
mysql-test/r/connect.result:
  Auto merged
mysql-test/r/flush.result:
  Auto merged
mysql-test/r/flush_block_commit.result:
  Auto merged
mysql-test/r/func_misc.result:
  Auto merged
mysql-test/r/lock_multi.result:
  Auto merged
mysql-test/r/mix_innodb_myisam_binlog.result:
  Auto merged
mysql-test/r/ps_2myisam.result:
  Auto merged
mysql-test/r/ps_3innodb.result:
  Auto merged
mysql-test/r/ps_4heap.result:
  Auto merged
mysql-test/r/ps_5merge.result:
  Auto merged
mysql-test/r/ps_6bdb.result:
  Auto merged
mysql-test/r/ps_7ndb.result:
  Auto merged
mysql-test/r/rename.result:
  Auto merged
mysql-test/r/rpl000001.result:
  Auto merged
mysql-test/r/rpl_error_ignored_table.result:
  Auto merged
mysql-test/r/rpl_master_pos_wait.result:
  Auto merged
BitKeeper/deleted/.del-rpl000018.test:
  Auto merged
BitKeeper/deleted/.del-rpl_heap.test:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/r/synchronization.result:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
mysql-test/t/ps_1general.test:
  Auto merged
mysql-test/t/ps_grant.test:
  Auto merged
mysql-test/t/rpl_flush_tables.test:
  Auto merged
mysql-test/t/rpl_trunc_temp.test:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
BitKeeper/deleted/.del-show_msg80.inc:
  Delete: mysql-test/include/show_msg80.inc
BitKeeper/deleted/.del-init_file.result:
  Delete: mysql-test/r/init_file.result
BitKeeper/deleted/.del-mysql_client_test.result:
  Delete: mysql-test/r/mysql_client_test.result
BitKeeper/deleted/.del-show_msg.inc:
  Delete: mysql-test/include/show_msg.inc
client/Makefile.am:
  Use local file
client/mysqltest.c:
  Use backported version of mysqltest
mysql-test/r/mysqltest.result:
  Use backported file
mysql-test/t/mysqltest.test:
  Use backported version
mysql-test/r/type_blob.result:
  Manual merge
mysql-test/t/connect.test:
  Used local version
mysql-test/t/init_file.test:
  Manual merge
mysql-test/t/mysql_client_test.test:
  Manual merge
mysql-test/t/type_blob.test:
  Manual merge
parents d1e63094 503c0e1c

client/mysqltest.c

+5160 −3881

File changed.

Preview size limit exceeded, changes collapsed.

mysql-test/r/mysqltest.result

+74 −19
Original line number Diff line number Diff line
@@ -154,6 +154,19 @@ mysqltest: At line 1: End of line junk detected: "sleep 7 
"

mysqltest: At line 1: Extra delimiter ";" found

mysqltest: At line 1: Extra delimiter ";" found

mysqltest: At line 1: Missing argument(s) to 'error'

mysqltest: At line 1: Missing argument(s) to 'error'

mysqltest: At line 1: The sqlstate definition must start with an uppercase S

mysqltest: At line 1: The error name definition must start with an uppercase E

mysqltest: At line 1: Invalid argument to error: '9eeeee' - the errno may only consist of digits[0-9]

mysqltest: At line 1: Invalid argument to error: '1sssss' - the errno may only consist of digits[0-9]

mysqltest: At line 1: The sqlstate must be exactly 5 chars long

mysqltest: At line 1: The sqlstate may only consist of digits[0-9] and _uppercase_ letters

mysqltest: At line 1: The sqlstate must be exactly 5 chars long

mysqltest: At line 1: Not available in mysqltest for MySQL 4.1.22

mysqltest: At line 1: Invalid argument to error: '999e9' - the errno may only consist of digits[0-9]

mysqltest: At line 1: Invalid argument to error: '9b' - the errno may only consist of digits[0-9]

mysqltest: At line 1: Too many errorcodes specified

MySQL

"MySQL"

MySQL: The world''s most popular open source database
@@ -168,8 +181,8 @@ source database 
- most popular open

- source database

- MySQL: The world''s

-- most popular open

-- source database

-- most popular

-- open source database

# MySQL: The

--world''s

# most popular
@@ -195,8 +208,8 @@ source database 
# source database

-- MySQL: The

-- world''s most

-- popular open

-- source database

-- popular

-- open source database

# MySQL: The

- world''s most

-- popular open
@@ -217,16 +230,18 @@ hej 


a long variable content

a long variable content

a long $where variable content

a long a long variable content variable content

a long \$where variable content



banana = banana

Not a banana: ba\$cat\$cat

mysqltest: At line 1: Missing arguments to let

mysqltest: At line 1: Missing variable name in let

mysqltest: At line 1: Variable name in hi=hi does not start with '$'

mysqltest: At line 1: Missing assignment operator in let

mysqltest: At line 1: Missing assignment operator in let

mysqltest: At line 1: Missing assignment operator in let

mysqltest: At line 1: Missing variable name in let

mysqltest: At line 1: Variable name in =hi does not start with '$'

mysqltest: At line 1: Missing variable name in let

mysqltest: At line 1: Missing assignment operator in let

# Execute: --echo # <whatever> success: $success

# <whatever> success: 1
@@ -237,7 +252,7 @@ mysqltest: At line 1: Missing assignment operator in let 
1

# Execute: echo $success ;

1 

mysqltest: At line 1: Missing file name in source

mysqltest: At line 1: Missing required argument 'filename' to command 'source'

mysqltest: At line 1: Could not open file ./non_existingFile

mysqltest: In included file "MYSQLTEST_VARDIR/tmp/recursive.sql": At line 1: Source directives are nesting too deep

mysqltest: In included file "MYSQLTEST_VARDIR/tmp/error.sql": At line 1: query 'garbage ' failed: 1064: 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 'garbage' at line 1
@@ -330,16 +345,16 @@ Counter is greater than 0, (counter=10) 
Counter is not 0, (counter=0)

1

Testing while with not

mysqltest: In included file "./include/mysqltest_while.inc": At line 64: Nesting too deeply

mysqltest: In included file "MYSQLTEST_VARDIR/tmp/mysqltest_while.inc": At line 64: Nesting too deeply

mysqltest: At line 1: missing '(' in while

mysqltest: At line 1: missing ')' in while

mysqltest: At line 1: Missing '{' after while. Found "dec $i"

mysqltest: At line 1: Stray '}' - end of block before beginning

mysqltest: At line 1: Stray 'end' command - end of block before beginning

mysqltest: At line 1: query '' failed: 1065: Query was empty

mysqltest: At line 1: query '{' failed: 1064: 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

mysqltest: At line 1: Missing '{' after while. Found "echo hej"

mysqltest: At line 3: Missing end of block

mysqltest: At line 1: Missing newline between while and '{'

mysqltest: At line 3: Missing end of block

mysqltest: At line 1: missing '(' in if

mysqltest: At line 1: Stray 'end' command - end of block before beginning

select "b" bs col1, "c" bs col2;
@@ -369,17 +384,15 @@ mysqltest: At line 1: Wrong column number to replace_column in 'replace_column 1 
mysqltest: At line 1: Invalid integer argument "10!"

mysqltest: At line 1: End of line junk detected: "!"

mysqltest: At line 1: Invalid integer argument "a"

mysqltest: At line 1: Syntax error in connect - expected '(' found 'mysqltest: At line 1: Missing connection host

mysqltest: At line 1: Missing connection host

mysqltest: At line 1: Missing connection user

mysqltest: At line 1: Missing connection user

mysqltest: At line 1: Missing connection password

mysqltest: At line 1: Missing connection db

mysqltest: At line 1: Could not open connection 'con2': 1049 Unknown database 'illegal_db'

mysqltest: At line 1: Missing required argument 'connection name' to command 'connect'

mysqltest: At line 1: Missing required argument 'connection name' to command 'connect'

mysqltest: At line 1: Missing required argument 'host' to command 'connect'

mysqltest: At line 1: Missing required argument 'host' to command 'connect'

mysqltest: At line 1: query 'connect  con2,localhost,root,,illegal_db' failed: 1049: Unknown database 'illegal_db'

mysqltest: At line 1: Illegal argument for port: 'illegal_port'

mysqltest: At line 1: Illegal option to connect: SMTP

OK

mysqltest: In included file "MYSQLTEST_VARDIR/tmp/mysqltest.sql": At line 7: Connection limit exhausted - increase MAX_CONS in mysqltest.c

mysqltest: In included file "MYSQLTEST_VARDIR/tmp/mysqltest.sql": At line 7: Connection limit exhausted, you can have max 128 connections

mysqltest: In included file "MYSQLTEST_VARDIR/tmp/mysqltest.sql": At line 3: connection 'test_con1' not found in connection pool

mysqltest: In included file "MYSQLTEST_VARDIR/tmp/mysqltest.sql": At line 2: Connection test_con1 already exists

connect(localhost,root,,test,MASTER_PORT,MASTER_SOCKET);
@@ -447,3 +460,45 @@ sleep; 
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 'sleep' at line 1

;

ERROR 42000: Query was empty

select "b" as col1, "c" as col2;

col1	col2

b	c

select "b" as col1, "b" as col2, "c" as col3;

col1	col2	col3

b	b	c

seled "b" bs col1, "d" bs col2;

col1	col2

b	d

select "raspberry and strawberry","blackberry","tomato";

raspberry and strawberry	blackberry	tomato

raspberry and strawberry	blackberry	tomato

mysqltest: At line 1: Error parsing replace_regex "a"

mysqltest: At line 1: Error parsing replace_regex "a;"

mysqltest: At line 1: Error parsing replace_regex "a"

mysqltest: At line 1: Error parsing replace_regex "a "

mysqltest: At line 1: Error parsing replace_regex "a b"

mysqltest: At line 1: Error parsing replace_regex "/a b c"

mysqltest: At line 1: Error parsing replace_regex "/a /b c "

create table t1 (a int, b int);

insert into t1 values (1,3);

insert into t1 values (2,4);

select * from t1;

a	D

1	1

1	4

drop table t1;

mysqltest: At line 1: Missing required argument 'filename' to command 'remove_file'

mysqltest: At line 1: Missing required argument 'filename' to command 'write_file'

mysqltest: At line 1: End of file encountered before 'EOF' delimiter was found

mysqltest: At line 1: End of line junk detected: "write_file filename ";

"

mysqltest: At line 1: Missing required argument 'filename' to command 'file_exists'

mysqltest: At line 1: Missing required argument 'from_file' to command 'copy_file'

mysqltest: At line 1: Missing required argument 'to_file' to command 'copy_file'

hello

hello

hello

mysqltest: At line 1: Max delimiter length(16) exceeded

hello

hello

End of tests

mysql-test/r/rpl000018.result

deleted100644 → 0
+0 −14
Original line number Diff line number Diff line 
reset master;

reset slave;

start slave;

show binary logs;

Log_name

master-bin.000001

master-bin.000002

drop table if exists t1;

create table t1(n int);

insert into t1 values (3351);

select * from t1;

n

3351

drop table t1;

mysql-test/r/rpl_chain_temp_table.result

deleted100644 → 0
+0 −30
Original line number Diff line number Diff line 
slave stop;

drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;

reset master;

reset slave;

drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;

slave start;

reset master;

change master to master_host='127.0.0.1',master_port=9307, master_user='root';

start slave;

create temporary table t1 (a int);

create temporary table t1 (a int);

show status like 'slave_open_temp_tables';

Variable_name	Value

Slave_open_temp_tables	2

create temporary table t1 (a int);

create temporary table t1 (a int);

show status like 'slave_open_temp_tables';

Variable_name	Value

Slave_open_temp_tables	4

stop slave;

insert into t1 values(1);

create table t2 as select * from t1;

start slave;

show status like 'slave_open_temp_tables';

Variable_name	Value

Slave_open_temp_tables	4

select * from t2;

a

1

drop table t2;

mysql-test/r/rpl_failsafe.result

deleted100644 → 0
+0 −34
Original line number Diff line number Diff line 
stop slave;

drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;

reset master;

reset slave;

drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;

start slave;

show variables like 'rpl_recovery_rank';

Variable_name	Value

rpl_recovery_rank	1

show status like 'Rpl_status';

Variable_name	Value

Rpl_status	AUTH_MASTER

create table t1(n int);

drop table t1;

show variables like 'rpl_recovery_rank';

Variable_name	Value

rpl_recovery_rank	2

show status like 'Rpl_status';

Variable_name	Value

Rpl_status	ACTIVE_SLAVE

start slave;

show variables like 'rpl_recovery_rank';

Variable_name	Value

rpl_recovery_rank	3

show status like 'Rpl_status';

Variable_name	Value

Rpl_status	ACTIVE_SLAVE

start slave;

show variables like 'rpl_recovery_rank';

Variable_name	Value

rpl_recovery_rank	4

show status like 'Rpl_status';

Variable_name	Value

Rpl_status	ACTIVE_SLAVE