Commit ccc3052d authored by unknown's avatar unknown
Browse files

Cleanups after merge from 4.1. 


mysql-test/r/ps_1general.result:
  Update results
mysql-test/r/ps_2myisam.result:
  Update results
mysql-test/r/ps_3innodb.result:
  Update results
mysql-test/r/ps_4heap.result:
  Update results
mysql-test/r/ps_5merge.result:
  Update results
mysql-test/r/ps_6bdb.result:
  Update results
mysql-test/r/ps_7ndb.result:
  Update results
mysql-test/r/select.result:
  Update results
mysql-test/t/disabled.def:
  Disable ndb_condition_pushdown test
mysql-test/t/select.test:
  Fix bad merge
sql/field_conv.cc:
  Update name of warning message
sql/mysqld.cc:
  Set proper thd->killed
tests/mysql_client_test.c:
  Update test cases, change verify_prepared_field() help function
  so it is passed the filename and line from where it is called
  and includes that in the error message.
parent e9c64ae2

mysql-test/r/ps_1general.result

+6 −6
Original line number Diff line number Diff line
@@ -473,12 +473,12 @@ def id 8 3 1 N 32929 0 63 
def					select_type	253	19	6	N	1	31	8

def					table	253	64	2	Y	0	31	8

def					type	253	10	3	Y	0	31	8

def					possible_keys	252	4096	0	Y	0	31	8

def					possible_keys	253	4096	0	Y	0	31	8

def					key	253	64	0	Y	0	31	8

def					key_len	253	4096	0	Y	128	31	63

def					ref	252	1024	0	Y	0	31	8

def					ref	253	1024	0	Y	0	31	8

def					rows	8	10	1	Y	32928	0	63

def					Extra	252	255	14	N	1	31	8

def					Extra	253	255	14	N	1	31	8

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	4	Using filesort

SET @arg00=1 ;
@@ -489,12 +489,12 @@ def id 8 3 1 N 32929 0 63 
def					select_type	253	19	6	N	1	31	8

def					table	253	64	2	Y	0	31	8

def					type	253	10	5	Y	0	31	8

def					possible_keys	252	4096	7	Y	0	31	8

def					possible_keys	253	4096	7	Y	0	31	8

def					key	253	64	7	Y	0	31	8

def					key_len	253	4096	1	Y	128	31	63

def					ref	252	1024	0	Y	0	31	8

def					ref	253	1024	0	Y	0	31	8

def					rows	8	10	1	Y	32928	0	63

def					Extra	252	255	27	N	1	31	8

def					Extra	253	255	27	N	1	31	8

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	range	PRIMARY	PRIMARY	4	NULL	3	Using where; Using filesort

drop table if exists t2;

mysql-test/r/ps_2myisam.result

+3 −3
Original line number Diff line number Diff line
@@ -1154,12 +1154,12 @@ def id 8 3 1 N 32929 0 63 
def					select_type	253	19	6	N	1	31	8

def					table	253	64	2	Y	0	31	8

def					type	253	10	3	Y	0	31	8

def					possible_keys	252	4096	0	Y	0	31	8

def					possible_keys	253	4096	0	Y	0	31	8

def					key	253	64	0	Y	0	31	8

def					key_len	253	4096	0	Y	128	31	63

def					ref	252	1024	0	Y	0	31	8

def					ref	253	1024	0	Y	0	31	8

def					rows	8	10	1	Y	32928	0	63

def					Extra	252	255	0	N	1	31	8

def					Extra	253	255	0	N	1	31	8

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t9	ALL	NULL	NULL	NULL	NULL	2	

drop table if exists t2 ;

mysql-test/r/ps_3innodb.result

+3 −3
Original line number Diff line number Diff line
@@ -1154,12 +1154,12 @@ def id 8 3 1 N 32929 0 63 
def					select_type	253	19	6	N	1	31	8

def					table	253	64	2	Y	0	31	8

def					type	253	10	3	Y	0	31	8

def					possible_keys	252	4096	0	Y	0	31	8

def					possible_keys	253	4096	0	Y	0	31	8

def					key	253	64	0	Y	0	31	8

def					key_len	253	4096	0	Y	128	31	63

def					ref	252	1024	0	Y	0	31	8

def					ref	253	1024	0	Y	0	31	8

def					rows	8	10	1	Y	32928	0	63

def					Extra	252	255	0	N	1	31	8

def					Extra	253	255	0	N	1	31	8

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t9	ALL	NULL	NULL	NULL	NULL	2	

test_sequence

mysql-test/r/ps_4heap.result

+3 −3
Original line number Diff line number Diff line
@@ -1155,12 +1155,12 @@ def id 8 3 1 N 32929 0 63 
def					select_type	253	19	6	N	1	31	8

def					table	253	64	2	Y	0	31	8

def					type	253	10	3	Y	0	31	8

def					possible_keys	252	4096	0	Y	0	31	8

def					possible_keys	253	4096	0	Y	0	31	8

def					key	253	64	0	Y	0	31	8

def					key_len	253	4096	0	Y	128	31	63

def					ref	252	1024	0	Y	0	31	8

def					ref	253	1024	0	Y	0	31	8

def					rows	8	10	1	Y	32928	0	63

def					Extra	252	255	0	N	1	31	8

def					Extra	253	255	0	N	1	31	8

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t9	ALL	NULL	NULL	NULL	NULL	2	

test_sequence

mysql-test/r/ps_5merge.result

+6 −6
Original line number Diff line number Diff line
@@ -1197,12 +1197,12 @@ def id 8 3 1 N 32929 0 63 
def					select_type	253	19	6	N	1	31	8

def					table	253	64	2	Y	0	31	8

def					type	253	10	3	Y	0	31	8

def					possible_keys	252	4096	0	Y	0	31	8

def					possible_keys	253	4096	0	Y	0	31	8

def					key	253	64	0	Y	0	31	8

def					key_len	253	4096	0	Y	128	31	63

def					ref	252	1024	0	Y	0	31	8

def					ref	253	1024	0	Y	0	31	8

def					rows	8	10	1	Y	32928	0	63

def					Extra	252	255	0	N	1	31	8

def					Extra	253	255	0	N	1	31	8

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t9	ALL	NULL	NULL	NULL	NULL	2	

test_sequence
@@ -4209,12 +4209,12 @@ def id 8 3 1 N 32929 0 63 
def					select_type	253	19	6	N	1	31	8

def					table	253	64	2	Y	0	31	8

def					type	253	10	3	Y	0	31	8

def					possible_keys	252	4096	0	Y	0	31	8

def					possible_keys	253	4096	0	Y	0	31	8

def					key	253	64	0	Y	0	31	8

def					key_len	253	4096	0	Y	128	31	63

def					ref	252	1024	0	Y	0	31	8

def					ref	253	1024	0	Y	0	31	8

def					rows	8	10	1	Y	32928	0	63

def					Extra	252	255	0	N	1	31	8

def					Extra	253	255	0	N	1	31	8

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t9	ALL	NULL	NULL	NULL	NULL	2	

test_sequence