mariadb/mysql-test/t/bdb.test at 9f55b7cb13d2e5373934aceb51cae5f7ea9aa010

mirror of https://github.com/MariaDB/server.git synced 2025-11-10 23:02:54 +03:00

Files

unknown bdf18f4331 Merge mysql.com:/home/jimw/my/mysql-5.0-7955

into  mysql.com:/home/jimw/my/mysql-5.1-clean


sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
mysql-test/r/bdb.result:
  Resolve conflict
mysql-test/t/bdb.test:
  Resolve conflict
sql/share/errmsg.txt:
  Resolve conflict

2006-02-17 11:03:34 -08:00

31 KiB

Raw Blame History

View Raw

31 KiB Raw Blame History

31 KiB

Raw Blame History