unknown 8cac2c0562 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.

2005-01-28 10:22:50 +03:00

9.7 KiB

Raw Blame History

View Raw