unknown 3eafe5cf98 Merge mysql.com:/usr/home/bar/mysql-4.1.b22645 ...

into  mysql.com:/usr/home/bar/mysql-5.0.b22645


mysql-test/r/variables.result:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/log.cc:
  Removing one_shot from 5.0.
sql/sql_locale.cc:
  After merge fix
sql/set_var.cc:
  After merge fix
sql/set_var.h:
  After merge fix

2006-12-05 14:08:19 +04:00

21 KiB

Raw Blame History

View Raw