mariadb/libmysql
unknown 19c2ce47db Merge with 4.1
BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/deleted/.del-Makefile.am:
  Auto merged
BitKeeper/deleted/.del-Makefile.am~1:
  Delete: Docs/Images/Makefile.am
client/mysqltest.c:
  Auto merged
include/mysql.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
myisam/mi_check.c:
  Auto merged
mysql-test/r/grant.result:
  Auto merged
mysql-test/r/ps_1general.result:
  Auto merged
mysql-test/t/grant.test:
  Auto merged
mysql-test/t/mix_innodb_myisam_binlog.test:
  Auto merged
mysql-test/t/ps_1general.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/share/french/errmsg.txt:
  Auto merged
sql/share/greek/errmsg.txt:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/time.cc:
  Auto merged
sql-common/my_time.c:
  Auto merged
sql/share/portuguese/errmsg.txt:
  Auto merged
sql/share/romanian/errmsg.txt:
  Auto merged
sql/share/serbian/errmsg.txt:
  Auto merged
sql/share/spanish/errmsg.txt:
  Auto merged
sql/share/swedish/errmsg.txt:
  Auto merged
configure.in:
  Merge with 4.0
mysql-test/r/mix_innodb_myisam_binlog.result:
  Merge with 4.0
mysys/default.c:
  Merge with 4.1 (to get new extension handling)
sql/log.cc:
  Merge with 4.0
tests/client_test.c:
  Merge with 4.1 (to get possibility to run any tests)
2004-11-12 19:58:24 +02: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 merge with 4.1 2004-10-29 19:26:52 +03:00
conf_to_src.c manually merged 2004-08-18 19:57:55 +02:00
dll.c manually merged 2004-08-18 19:57:55 +02:00
errmsg.c Merge mysql.com:/home/wax/mysql/mysql-4.1 2004-08-19 19:41:30 +06:00
get_password.c - rename: EXCEPTIONS->EXCEPTIONS-CLIENT 2004-08-05 17:05:11 +02:00
libmysql.c Merge with 4.1 to get new thd->mem_root handling 2004-11-08 17:53:32 +02:00
libmysql.def libmysql.def, libmysql.c: 2004-11-05 09:00:04 +04:00
Makefile.am merge with 4.0 2004-11-12 11:17:53 +02:00
Makefile.shared Activating the new string->number conversion functions 2004-09-25 17:20:50 +05:00
manager.c A fix (bug #6057: Data Type Problem in manager.c). 2004-10-18 12:43:52 +05:00