mariadb/libmysql
unknown 5b1ced4580 Merge....
BitKeeper/etc/logging_ok:
  auto-union
client/mysqladmin.c:
  Auto merged
include/mysql.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/lex.h:
  Auto merged
sql/mini_client.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
libmysql/password.c:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_acl.h:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/mysqld.cc:
  Manual merge
2002-11-24 17:26:26 +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
conf_to_src.c Update copyright 2001-12-06 14:10:51 +02:00
dll.c Update copyright 2001-12-06 14:10:51 +02:00
errmsg.c Merge with 4.0 2002-11-21 15:56:48 +02:00
get_password.c Update copyright 2001-12-06 14:10:51 +02:00
libmysql.c Merge.... 2002-11-24 17:26:26 +03:00
libmysql.def Portability fixes to be able to compile MySQL with VC++ 2002-10-08 22:28:24 +03:00
Makefile.am Fixes and code cleanups after merge with 4.0.3 2002-10-02 13:33:08 +03:00
Makefile.shared Merge mysql.com:/home/pz/mysql/mysql-4.1-root 2002-10-23 23:28:36 +04:00
manager.c Fixes and code cleanups after merge with 4.0.3 2002-10-02 13:33:08 +03:00
password.c Portability fixes for HP compiler and HPUX11 2002-11-09 13:26:46 +02:00