bzr commit into mysql-trunk-bugfixing branch (bar:3411) WL#5510

[Alexander Barkov]

#At file:///home/bar/mysql-bzr/mysql-trunk-bugfixing.w5510/ based on revid:marc.alff@stripped

 3411 Alexander Barkov	2010-12-02
      WL#5510 to_base64 and from_base64
      
      After-fix: re-recording the tests that auto-merged in a wrong way.

    modified:
      mysql-test/r/ctype_binary.result
      mysql-test/r/ctype_cp1251.result
      mysql-test/r/ctype_latin1.result
      mysql-test/r/ctype_ucs.result
      mysql-test/r/ctype_utf8.result
=== modified file 'mysql-test/r/ctype_binary.result'
--- a/mysql-test/r/ctype_binary.result	2010-12-02 13:44:21 +0000
+++ b/mysql-test/r/ctype_binary.result	2010-12-02 17:47:56 +0000
@@ -2748,25 +2748,6 @@ DROP TABLE t1;
 # End of Bug#54916
 #
 #
-# Bug#58190 BETWEEN no longer uses indexes for date or datetime fields
-#
-SELECT @@collation_connection;
-@@collation_connection
-binary
-CREATE TABLE t1 (
-id INT(11) DEFAULT NULL,
-date_column DATE DEFAULT NULL,
-KEY(date_column));
-INSERT INTO t1 VALUES (1,'2010-09-01'),(2,'2010-10-01');
-EXPLAIN SELECT * FROM t1 WHERE date_column BETWEEN '2010-09-01' AND '2010-10-01';
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	range	date_column	date_column	4	NULL	1	Using index condition
-ALTER TABLE t1 MODIFY date_column DATETIME DEFAULT NULL;
-EXPLAIN SELECT * FROM t1 WHERE date_column BETWEEN '2010-09-01' AND '2010-10-01';
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	range	date_column	date_column	9	NULL	1	Using index condition
-DROP TABLE t1;
-#
 # WL#5510 Functions to_base64 and from_base64
 #
 CREATE TABLE t1 AS SELECT TO_BASE64('test') AS to_base64;
@@ -2790,6 +2771,25 @@ test	4	74657374
 DROP TABLE t2;
 DROP TABLE t1;
 #
+# Bug#58190 BETWEEN no longer uses indexes for date or datetime fields
+#
+SELECT @@collation_connection;
+@@collation_connection
+binary
+CREATE TABLE t1 (
+id INT(11) DEFAULT NULL,
+date_column DATE DEFAULT NULL,
+KEY(date_column));
+INSERT INTO t1 VALUES (1,'2010-09-01'),(2,'2010-10-01');
+EXPLAIN SELECT * FROM t1 WHERE date_column BETWEEN '2010-09-01' AND '2010-10-01';
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	range	date_column	date_column	4	NULL	1	Using index condition
+ALTER TABLE t1 MODIFY date_column DATETIME DEFAULT NULL;
+EXPLAIN SELECT * FROM t1 WHERE date_column BETWEEN '2010-09-01' AND '2010-10-01';
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	range	date_column	date_column	9	NULL	1	Using index condition
+DROP TABLE t1;
+#
 # Bug#52159 returning time type from function and empty left join causes debug assertion
 #
 CREATE FUNCTION f1() RETURNS TIME RETURN 1;

=== modified file 'mysql-test/r/ctype_cp1251.result'
--- a/mysql-test/r/ctype_cp1251.result	2010-12-02 13:44:21 +0000
+++ b/mysql-test/r/ctype_cp1251.result	2010-12-02 17:47:56 +0000
@@ -3138,25 +3138,6 @@ DROP TABLE t1;
 # End of Bug#54916
 #
 #
-# Bug#58190 BETWEEN no longer uses indexes for date or datetime fields
-#
-SELECT @@collation_connection;
-@@collation_connection
-cp1251_general_ci
-CREATE TABLE t1 (
-id INT(11) DEFAULT NULL,
-date_column DATE DEFAULT NULL,
-KEY(date_column));
-INSERT INTO t1 VALUES (1,'2010-09-01'),(2,'2010-10-01');
-EXPLAIN SELECT * FROM t1 WHERE date_column BETWEEN '2010-09-01' AND '2010-10-01';
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	range	date_column	date_column	4	NULL	1	Using index condition
-ALTER TABLE t1 MODIFY date_column DATETIME DEFAULT NULL;
-EXPLAIN SELECT * FROM t1 WHERE date_column BETWEEN '2010-09-01' AND '2010-10-01';
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	range	date_column	date_column	9	NULL	1	Using index condition
-DROP TABLE t1;
-#
 # WL#5510 Functions to_base64 and from_base64
 #
 CREATE TABLE t1 AS SELECT TO_BASE64('test') AS to_base64;
@@ -3180,6 +3161,25 @@ test	4	74657374
 DROP TABLE t2;
 DROP TABLE t1;
 #
+# Bug#58190 BETWEEN no longer uses indexes for date or datetime fields
+#
+SELECT @@collation_connection;
+@@collation_connection
+cp1251_general_ci
+CREATE TABLE t1 (
+id INT(11) DEFAULT NULL,
+date_column DATE DEFAULT NULL,
+KEY(date_column));
+INSERT INTO t1 VALUES (1,'2010-09-01'),(2,'2010-10-01');
+EXPLAIN SELECT * FROM t1 WHERE date_column BETWEEN '2010-09-01' AND '2010-10-01';
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	range	date_column	date_column	4	NULL	1	Using index condition
+ALTER TABLE t1 MODIFY date_column DATETIME DEFAULT NULL;
+EXPLAIN SELECT * FROM t1 WHERE date_column BETWEEN '2010-09-01' AND '2010-10-01';
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	range	date_column	date_column	9	NULL	1	Using index condition
+DROP TABLE t1;
+#
 # Bug#52159 returning time type from function and empty left join causes debug assertion
 #
 CREATE FUNCTION f1() RETURNS TIME RETURN 1;

=== modified file 'mysql-test/r/ctype_latin1.result'
--- a/mysql-test/r/ctype_latin1.result	2010-12-02 13:44:21 +0000
+++ b/mysql-test/r/ctype_latin1.result	2010-12-02 17:47:56 +0000
@@ -3158,25 +3158,6 @@ DROP TABLE t1;
 # End of Bug#54916
 #
 #
-# Bug#58190 BETWEEN no longer uses indexes for date or datetime fields
-#
-SELECT @@collation_connection;
-@@collation_connection
-latin1_swedish_ci
-CREATE TABLE t1 (
-id INT(11) DEFAULT NULL,
-date_column DATE DEFAULT NULL,
-KEY(date_column));
-INSERT INTO t1 VALUES (1,'2010-09-01'),(2,'2010-10-01');
-EXPLAIN SELECT * FROM t1 WHERE date_column BETWEEN '2010-09-01' AND '2010-10-01';
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	range	date_column	date_column	4	NULL	1	Using index condition
-ALTER TABLE t1 MODIFY date_column DATETIME DEFAULT NULL;
-EXPLAIN SELECT * FROM t1 WHERE date_column BETWEEN '2010-09-01' AND '2010-10-01';
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	range	date_column	date_column	9	NULL	1	Using index condition
-DROP TABLE t1;
-#
 # WL#5510 Functions to_base64 and from_base64
 #
 CREATE TABLE t1 AS SELECT TO_BASE64('test') AS to_base64;
@@ -3200,6 +3181,25 @@ test	4	74657374
 DROP TABLE t2;
 DROP TABLE t1;
 #
+# Bug#58190 BETWEEN no longer uses indexes for date or datetime fields
+#
+SELECT @@collation_connection;
+@@collation_connection
+latin1_swedish_ci
+CREATE TABLE t1 (
+id INT(11) DEFAULT NULL,
+date_column DATE DEFAULT NULL,
+KEY(date_column));
+INSERT INTO t1 VALUES (1,'2010-09-01'),(2,'2010-10-01');
+EXPLAIN SELECT * FROM t1 WHERE date_column BETWEEN '2010-09-01' AND '2010-10-01';
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	range	date_column	date_column	4	NULL	1	Using index condition
+ALTER TABLE t1 MODIFY date_column DATETIME DEFAULT NULL;
+EXPLAIN SELECT * FROM t1 WHERE date_column BETWEEN '2010-09-01' AND '2010-10-01';
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	range	date_column	date_column	9	NULL	1	Using index condition
+DROP TABLE t1;
+#
 # Bug#52159 returning time type from function and empty left join causes debug assertion
 #
 CREATE FUNCTION f1() RETURNS TIME RETURN 1;

=== modified file 'mysql-test/r/ctype_ucs.result'
--- a/mysql-test/r/ctype_ucs.result	2010-12-02 13:44:21 +0000
+++ b/mysql-test/r/ctype_ucs.result	2010-12-02 17:47:56 +0000
@@ -4056,25 +4056,6 @@ DROP TABLE t1;
 # End of Bug#54916
 #
 #
-# Bug#58190 BETWEEN no longer uses indexes for date or datetime fields
-#
-SELECT @@collation_connection;
-@@collation_connection
-ucs2_general_ci
-CREATE TABLE t1 (
-id INT(11) DEFAULT NULL,
-date_column DATE DEFAULT NULL,
-KEY(date_column));
-INSERT INTO t1 VALUES (1,'2010-09-01'),(2,'2010-10-01');
-EXPLAIN SELECT * FROM t1 WHERE date_column BETWEEN '2010-09-01' AND '2010-10-01';
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	2	Using where
-ALTER TABLE t1 MODIFY date_column DATETIME DEFAULT NULL;
-EXPLAIN SELECT * FROM t1 WHERE date_column BETWEEN '2010-09-01' AND '2010-10-01';
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	2	Using where
-DROP TABLE t1;
-#
 # WL#5510 Functions to_base64 and from_base64
 #
 CREATE TABLE t1 AS SELECT TO_BASE64('test') AS to_base64;
@@ -4098,6 +4079,25 @@ test	8	0074006500730074
 DROP TABLE t2;
 DROP TABLE t1;
 #
+# Bug#58190 BETWEEN no longer uses indexes for date or datetime fields
+#
+SELECT @@collation_connection;
+@@collation_connection
+ucs2_general_ci
+CREATE TABLE t1 (
+id INT(11) DEFAULT NULL,
+date_column DATE DEFAULT NULL,
+KEY(date_column));
+INSERT INTO t1 VALUES (1,'2010-09-01'),(2,'2010-10-01');
+EXPLAIN SELECT * FROM t1 WHERE date_column BETWEEN '2010-09-01' AND '2010-10-01';
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	2	Using where
+ALTER TABLE t1 MODIFY date_column DATETIME DEFAULT NULL;
+EXPLAIN SELECT * FROM t1 WHERE date_column BETWEEN '2010-09-01' AND '2010-10-01';
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	2	Using where
+DROP TABLE t1;
+#
 # Bug#52159 returning time type from function and empty left join causes debug assertion
 #
 CREATE FUNCTION f1() RETURNS TIME RETURN 1;

=== modified file 'mysql-test/r/ctype_utf8.result'
--- a/mysql-test/r/ctype_utf8.result	2010-12-02 13:44:21 +0000
+++ b/mysql-test/r/ctype_utf8.result	2010-12-02 17:47:56 +0000
@@ -4970,25 +4970,6 @@ DROP TABLE t1;
 # End of Bug#54916
 #
 #
-# Bug#58190 BETWEEN no longer uses indexes for date or datetime fields
-#
-SELECT @@collation_connection;
-@@collation_connection
-utf8_general_ci
-CREATE TABLE t1 (
-id INT(11) DEFAULT NULL,
-date_column DATE DEFAULT NULL,
-KEY(date_column));
-INSERT INTO t1 VALUES (1,'2010-09-01'),(2,'2010-10-01');
-EXPLAIN SELECT * FROM t1 WHERE date_column BETWEEN '2010-09-01' AND '2010-10-01';
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	range	date_column	date_column	4	NULL	1	Using index condition
-ALTER TABLE t1 MODIFY date_column DATETIME DEFAULT NULL;
-EXPLAIN SELECT * FROM t1 WHERE date_column BETWEEN '2010-09-01' AND '2010-10-01';
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	range	date_column	date_column	9	NULL	1	Using index condition
-DROP TABLE t1;
-#
 # WL#5510 Functions to_base64 and from_base64
 #
 CREATE TABLE t1 AS SELECT TO_BASE64('test') AS to_base64;
@@ -5012,6 +4993,25 @@ test	4	74657374
 DROP TABLE t2;
 DROP TABLE t1;
 #
+# Bug#58190 BETWEEN no longer uses indexes for date or datetime fields
+#
+SELECT @@collation_connection;
+@@collation_connection
+utf8_general_ci
+CREATE TABLE t1 (
+id INT(11) DEFAULT NULL,
+date_column DATE DEFAULT NULL,
+KEY(date_column));
+INSERT INTO t1 VALUES (1,'2010-09-01'),(2,'2010-10-01');
+EXPLAIN SELECT * FROM t1 WHERE date_column BETWEEN '2010-09-01' AND '2010-10-01';
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	range	date_column	date_column	4	NULL	1	Using index condition
+ALTER TABLE t1 MODIFY date_column DATETIME DEFAULT NULL;
+EXPLAIN SELECT * FROM t1 WHERE date_column BETWEEN '2010-09-01' AND '2010-10-01';
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	range	date_column	date_column	9	NULL	1	Using index condition
+DROP TABLE t1;
+#
 # Bug#52159 returning time type from function and empty left join causes debug assertion
 #
 CREATE FUNCTION f1() RETURNS TIME RETURN 1;


Attachment: [text/bzr-bundle] bzr/[e-mail]