unknown 2dfdcae398 Merge mysql.com:/home/hf/work/mysql-4.1.mrg ...

into  mysql.com:/home/hf/work/mysql-5.0.mrg


libmysqld/embedded_priv.h:
  Auto merged
sql-common/client.c:
  Auto merged
include/mysql.h:
  merging
libmysql/libmysql.c:
  merging
libmysqld/lib_sql.cc:
  merging
libmysqld/libmysqld.c:
  merging
sql/sql_parse.cc:
  merging

2006-07-18 14:52:29 +05:00

87 KiB

Raw Blame History

View Raw