From 6ee11219032009116a864e36dd020406858246c3 Mon Sep 17 00:00:00 2001 From: vasil <> Date: Mon, 9 Feb 2009 11:47:16 +0000 Subject: [PATCH] branches/zip: Remove mysql-test/patches/bug35261.diff because that bug has been fixed in the MySQL repository. --- mysql-test/patches/bug35261.diff | 85 -------------------------------- 1 file changed, 85 deletions(-) delete mode 100644 mysql-test/patches/bug35261.diff diff --git a/mysql-test/patches/bug35261.diff b/mysql-test/patches/bug35261.diff deleted file mode 100644 index 4b849776e8..0000000000 --- a/mysql-test/patches/bug35261.diff +++ /dev/null @@ -1,85 +0,0 @@ ---- mysql-test/t/date_formats.test.orig 2007-06-15 02:53:07.000000000 +0300 -+++ mysql-test/t/date_formats.test 2008-03-19 17:25:10.000000000 +0200 -@@ -7,9 +7,15 @@ - --enable_warnings - - --replace_result ROW <format> STATEMENT <format> MIXED <format> --SHOW GLOBAL VARIABLES LIKE "%e_format"; -+SELECT variable_name, variable_value -+FROM information_schema.global_variables -+WHERE variable_name IN ('date_format', 'datetime_format', 'time_format') -+ORDER BY variable_name; - --replace_result ROW <format> STATEMENT <format> MIXED <format> --SHOW SESSION VARIABLES LIKE "%e_format"; -+SELECT variable_name, variable_value -+FROM information_schema.session_variables -+WHERE variable_name IN ('date_format', 'datetime_format', 'time_format') -+ORDER BY variable_name; - - # - # Test setting a lot of different formats to see which formats are accepted and -@@ -37,7 +43,10 @@ - set datetime_format= '%h:%i:%s.%f %p %Y-%m-%d'; - - --replace_result ROW <format> STATEMENT <format> MIXED <format> --SHOW SESSION VARIABLES LIKE "%e_format"; -+SELECT variable_name, variable_value -+FROM information_schema.session_variables -+WHERE variable_name IN ('date_format', 'datetime_format', 'time_format') -+ORDER BY variable_name; - - --error 1231 - SET time_format='%h:%i:%s'; ---- mysql-test/r/date_formats.result.orig 2008-02-12 21:09:14.000000000 +0200 -+++ mysql-test/r/date_formats.result 2008-03-19 17:26:33.000000000 +0200 -@@ -1,14 +1,20 @@ - drop table if exists t1; --SHOW GLOBAL VARIABLES LIKE "%e_format"; --Variable_name Value --date_format %d.%m.%Y --datetime_format %Y-%m-%d %H:%i:%s --time_format %H.%i.%s --SHOW SESSION VARIABLES LIKE "%e_format"; --Variable_name Value --date_format %d.%m.%Y --datetime_format %Y-%m-%d %H:%i:%s --time_format %H.%i.%s -+SELECT variable_name, variable_value -+FROM information_schema.global_variables -+WHERE variable_name IN ('date_format', 'datetime_format', 'time_format') -+ORDER BY variable_name; -+variable_name variable_value -+DATETIME_FORMAT %Y-%m-%d %H:%i:%s -+DATE_FORMAT %d.%m.%Y -+TIME_FORMAT %H.%i.%s -+SELECT variable_name, variable_value -+FROM information_schema.session_variables -+WHERE variable_name IN ('date_format', 'datetime_format', 'time_format') -+ORDER BY variable_name; -+variable_name variable_value -+DATETIME_FORMAT %Y-%m-%d %H:%i:%s -+DATE_FORMAT %d.%m.%Y -+TIME_FORMAT %H.%i.%s - SET time_format='%H%i%s'; - SET time_format='%H:%i:%s.%f'; - SET time_format='%h-%i-%s.%f%p'; -@@ -26,11 +32,14 @@ - set datetime_format= '%H:%i:%s.%f %m-%d-%Y'; - set datetime_format= '%h:%i:%s %p %Y-%m-%d'; - set datetime_format= '%h:%i:%s.%f %p %Y-%m-%d'; --SHOW SESSION VARIABLES LIKE "%e_format"; --Variable_name Value --date_format %m-%d-%Y --datetime_format %h:%i:%s.%f %p %Y-%m-%d --time_format %h:%i:%s%p -+SELECT variable_name, variable_value -+FROM information_schema.session_variables -+WHERE variable_name IN ('date_format', 'datetime_format', 'time_format') -+ORDER BY variable_name; -+variable_name variable_value -+DATETIME_FORMAT %h:%i:%s.%f %p %Y-%m-%d -+DATE_FORMAT %m-%d-%Y -+TIME_FORMAT %h:%i:%s%p - SET time_format='%h:%i:%s'; - ERROR 42000: Variable 'time_format' can't be set to the value of '%h:%i:%s' - SET time_format='%H %i:%s'; -- 2.30.9