mariadb/libmysql
unknown 028dfdb3f7 merge
BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
Build-tools/Do-compile:
  Auto merged
include/my_global.h:
  Auto merged
innobase/row/row0ins.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
libmysqld/Makefile.am:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
scripts/mysql_install_db.sh:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
innobase/fil/fil0fil.c:
  merge (Use heikki's code)
2004-06-21 10:24:40 +03:00
..
.cvsignore Import changeset 2000-07-31 21:29:14 +02:00
acinclude.m4 Import changeset 2000-07-31 21:29:14 +02:00
client_settings.h Fix VC++ compiler error (function redifinition) for embedded server 2004-05-10 20:55:52 -03:00
conf_to_src.c Added missing SSL library (Should be in source distribution) 2003-11-28 12:18:13 +02:00
dll.c - Code cleanup: replaced C++-style comments with the proper syntax for 2003-09-24 08:35:02 +02:00
errmsg.c merge with 4.0 (to get compiler error fixes for innodb) 2004-03-19 15:17:56 +02:00
get_password.c fixed bug #1174 2003-09-02 12:09:27 -04:00
libmysql.c merge 2004-06-21 10:24:40 +03:00
libmysql.def mysql_stmt_field_count() 2004-06-06 02:27:05 +04:00
Makefile.am merge with 4.0.15 2003-08-29 13:44:35 +03:00
Makefile.shared Unicode Collation Algorithm subset implementation 2004-03-24 16:16:08 +04:00
manager.c merge with 4.0 to get security fixes and latest bug fixes 2004-02-20 17:43:02 +02:00