unknown ad0516d91e Merge ...

BitKeeper/deleted/.del-Makefile.am~6cfa0db5e7778d09:
  Auto merged
BitKeeper/deleted/.del-Makefile.am~41238af048e60515:
  Auto merged
mysql-test/Makefile.am:
  Auto merged
netware/Makefile.am:
  Auto merged
tests/Makefile.am:
  Auto merged
vio/Makefile.am:
  SCCS merged

2005-07-06 00:06:11 +02:00

..

.cvsignore

Import changeset

2000-07-31 21:29:14 +02:00

client_priv.h

Correction of merge mishandling in 'client/client_priv.h'.

2005-05-26 12:58:55 +02:00

completion_hash.cc

few harmless warnings from automated code-checking tools fixed

2005-01-08 21:25:31 +01:00

completion_hash.h

upgrade readline to version 4.3

2002-11-19 18:26:53 +04:00

get_password.c

Merge with 4.0.14

2003-08-11 22:44:43 +03:00

Makefile.am

Merge

2005-07-06 00:06:11 +02:00

my_readline.h

mysql.cc:

2004-05-05 22:47:09 +02:00

mysql.cc

Merge mysql.com:/home/jimw/my/mysql-4.1-clean

2005-06-20 15:02:45 -07:00

mysqladmin.cc

Merge of 4.1->5.0. This contained the fixes for GCC 4.0

2005-06-01 21:56:30 -07:00

mysqlbinlog.cc

yassl changeset 2:

2005-04-30 19:48:45 +02:00

mysqlcheck.c

Merge mysql.com:/home/jimw/my/mysql-4.1-clean

2005-04-06 15:24:12 -07:00

mysqldump.c

Merging 4.1 into 5.0

2005-07-05 16:02:03 +02: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

Added global my_getopt_error_reporter function pointer which is

2004-08-31 21:27:58 +05:00

mysqlshow.c

Bug #10947 mysqlshow wildcard failure on Windows

2005-06-10 14:03:22 -05:00

mysqltest.c

Merge with 4.1

2005-07-03 14:17:52 +03:00

readline.cc

fixed conversion errors (Windows IA64 build)

2005-03-07 09:47:24 +01:00

sql_string.cc

Merge with 4.1

2005-06-07 00:31:53 +03:00

sql_string.h

Bug#8610: The ucs2_turkish_ci collation fails with upper('i')

2005-06-06 16:54:15 +05:00