summaryrefslogtreecommitdiff
path: root/mysql-test/t/timezone2.test
diff options
context:
space:
mode:
authorunknown <dlenev@mysql.com>2005-01-28 10:22:50 +0300
committerunknown <dlenev@mysql.com>2005-01-28 10:22:50 +0300
commit8cac2c0562ec5460368be91602b329ddce653d0d (patch)
tree654d19586759f3b5343d53fba8af67eb8e5ce42f /mysql-test/t/timezone2.test
parenta6bfe13c6f4fc2e0c2bebea8a295a445aa5765e8 (diff)
parentbf89dc063a6576cb08f2da29c8f505846965590b (diff)
downloadmariadb-git-8cac2c0562ec5460368be91602b329ddce653d0d.tar.gz
Manual merge of fixes for bugs #7899 "CREATE TABLE .. SELECT .. and
CONVERT_TZ() function does not work well together" and bug #7705 "CONVERT_TZ() crashes with subquery/WHERE on index column" in 5.0 tree. mysql-test/r/timezone2.result: Auto merged mysql-test/t/timezone2.test: Auto merged sql/item_timefunc.cc: Auto merged sql/item_timefunc.h: Auto merged sql/set_var.h: Auto merged sql/set_var.cc: Manual merge. sql/sql_lex.cc: Ignoring changes in st_lex::unlink_first_table()/link_first_table_back() made in 4.1 since they are not applicable to 5.0. sql/tztime.cc: Manual merge.
Diffstat (limited to 'mysql-test/t/timezone2.test')
-rw-r--r--mysql-test/t/timezone2.test17
1 files changed, 17 insertions, 0 deletions
diff --git a/mysql-test/t/timezone2.test b/mysql-test/t/timezone2.test
index 5b5d2aa774e..05736b92ad6 100644
--- a/mysql-test/t/timezone2.test
+++ b/mysql-test/t/timezone2.test
@@ -266,3 +266,20 @@ delete from mysql.db where user like 'mysqltest\_%';
delete from mysql.tables_priv where user like 'mysqltest\_%';
flush privileges;
drop table t1, t2;
+
+#
+# Test for bug #7705 "CONVERT_TZ() crashes with subquery/WHERE on index
+# column". Queries in which one of time zone arguments of CONVERT_TZ() is
+# determined as constant only at val() stage (not at fix_fields() stage),
+# should not crash server.
+#
+select convert_tz('2005-01-14 17:00:00', 'UTC', custTimeZone) from (select 'UTC' as custTimeZone) as tmp;
+
+#
+# Test for bug #7899 "CREATE TABLE .. SELECT .. and CONVERT_TZ() function
+# does not work well together". The following statement should return only
+# one NULL row and not result of full join.
+#
+create table t1 select convert_tz(NULL, NULL, NULL);
+select * from t1;
+drop table t1;