mariadb/libmysql
unknown c6e23c8549 Merge with 4.0 to get the latest bug patches to 4.1
BitKeeper/etc/ignore:
  added sql/mysql_tzinfo_to_sql
BitKeeper/etc/logging_ok:
  auto-union
acinclude.m4:
  Auto merged
extra/perror.c:
  Auto merged
include/mysql.h:
  Auto merged
innobase/include/mach0data.ic:
  Auto merged
innobase/include/mtr0log.h:
  Auto merged
innobase/include/mtr0log.ic:
  Auto merged
innobase/mem/mem0dbg.c:
  Auto merged
innobase/pars/lexyy.c:
  Auto merged
BitKeeper/deleted/.del-4.0.XX-gpl.ipr~f5909a9e9bd8094:
  Auto merged
BitKeeper/deleted/.del-Clients and Tools.fgl~bf0f776883577f02:
  Auto merged
BitKeeper/deleted/.del-Development.fgl~6392ce285e73f5fc:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/innodb_cache.result:
  Auto merged
mysql-test/r/lowercase_table2.result:
  Auto merged
mysql-test/t/innodb_cache.test:
  Auto merged
mysql-test/t/lowercase_table2.test:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged
sql/handler.cc:
  Auto merged
scripts/make_win_src_distribution.sh:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
libmysql/libmysql.c:
  Merge with 4.0
mysql-test/r/bdb.result:
  Merge with 4.0
mysql-test/r/range.result:
  Merge with 4.0
mysql-test/t/bdb.test:
  Merge with 4.0
mysys/hash.c:
  Merge with 4.0
scripts/mysql_install_db.sh:
  Merge with 4.0
sql/field.cc:
  Merge with 4.0
sql/field.h:
  Merge with 4.0
sql/mysql_priv.h:
  Merge with 4.0
sql/sql_handler.cc:
  Merge with 4.0
sql/sql_select.cc:
  Merge with 4.0
sql/sql_table.cc:
  Merge with 4.0
2004-06-25 20:13:05 +03:00
..
.cvsignore
acinclude.m4
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 with 4.0 to get the latest bug patches to 4.1 2004-06-25 20:13:05 +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 Fix for Bug#4030 "Client side conversion string -> date type doesn't 2004-06-24 19:08:36 +04:00
manager.c merge with 4.0 to get security fixes and latest bug fixes 2004-02-20 17:43:02 +02:00