mariadb/client
unknown 4f113ac4f3 Merging conflicts resolved
VC++Files/libmysqld/libmysqld.dsp:
  Auto merged
client/mysql.cc:
  Auto merged
include/my_sys.h:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
ndb/src/kernel/blocks/suma/Suma.cpp:
  Auto merged
ndb/src/mgmsrv/InitConfigFileParser.cpp:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/strfunc.cc:
  Auto merged
VC++Files/sql/mysqld.dsp:
  Libraries changed
mysys/default.c:
  get_defaults_files implementation added
sql/sql_base.cc:
  merging
sql/sql_show.cc:
  merging
2005-01-11 21:00:53 +04:00
..
.cvsignore
client_priv.h WL#2319 V2: Exclude tables from dump 2004-12-27 19:10:30 +01:00
completion_hash.cc few harmless warnings from automated code-checking tools fixed 2005-01-08 21:25:31 +01:00
completion_hash.h
get_password.c
Makefile.am Merge with 4.1 2004-12-22 13:54:39 +02:00
my_readline.h
mysql.cc Merging conflicts resolved 2005-01-11 21:00:53 +04:00
mysqladmin.cc Merge mysql.com:/home/jwinstead2/mysql-4.1-clean 2005-01-06 21:39:57 +01:00
mysqlbinlog.cc Changing the default of libmysqlclient : it's now NO reconnection. 2004-12-09 14:44:10 +01:00
mysqlcheck.c Changing the default of libmysqlclient : it's now NO reconnection. 2004-12-09 14:44:10 +01:00
mysqldump.c Merge mysql.com:/home/jwinstead2/mysql-4.1-clean 2005-01-06 21:39:57 +01:00
mysqlimport.c Changing the default of libmysqlclient : it's now NO reconnection. 2004-12-09 14:44:10 +01:00
mysqlmanager-pwgen.c Merge with 4.0 2004-09-01 04:12:09 +03:00
mysqlmanagerc.c
mysqlshow.c Changing the default of libmysqlclient : it's now NO reconnection. 2004-12-09 14:44:10 +01:00
mysqltest.c WL#964 2005-01-02 19:58:49 +05:00
readline.cc
sql_string.cc
sql_string.h