unknown 2d8e733dd3 Merge mysql.com:/home/jimw/my/mysql-5.0-clean ...

into  mysql.com:/home/jimw/my/mysql-5.1-clean


client/mysqltest.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/r/mysqltest.result:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
BitKeeper/deleted/.del-ndb_load.result:
  Auto merged
BitKeeper/deleted/.del-ndb_load.test:
  Auto merged
mysql-test/t/disabled.def:
  Resolve conflict

2006-02-15 12:06:20 -08:00

..

.cvsignore

…

client_priv.h

Adding thread support for mysqlimport. You can now specify a number of threads to use and it will thread the loading of the database. Anyone who has had to go through the pain of loading the database will immediatly get the reason for this.

2006-02-13 00:45:59 -08: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

Made mysqlimport link against mysys so that it could make use of the safe mutex functions.

2006-02-13 04:48:14 -08:00

my_readline.h

mysql.cc:

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

mysql.cc

BUG#16217 forced to introduce a separate mysql client command to adopt its

2006-02-09 16:23:09 +02:00

mysqladmin.cc

many warnings (practically safe but annoying) corrected

2006-01-03 17:54:54 +01:00

mysqlbinlog.cc

Merge mysql.com:/home/kostja/mysql/tmp_merge

2006-02-02 16:57:34 +03:00

mysqlcheck.c

Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0

2005-12-04 15:34:47 +02:00

mysqldump.c

Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new

2006-02-02 20:54:07 +03:00

mysqlimport.c

mysqlimport.c:

2006-02-14 12:11:26 -06: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

Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0

2005-12-04 15:34:47 +02:00

mysqlslap.c

Automerge

2006-02-15 00:01:46 +01:00

mysqltest.c

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

2006-02-15 12:06:20 -08: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