mariadb/config
unknown ad32d8553e Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb


mysql-test/t/disabled.def:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
2006-05-15 20:35:17 +02:00
..
ac-macros Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 2006-05-15 20:35:17 +02:00