unknown 69bfcd9c40 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 ...

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0


client/mysql.cc:
  Auto merged
client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/mysqltest.result:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
mysys/my_init.c:
  Auto merged
sql/sql_update.cc:
  Auto merged
Makefile.am:
  Manual merge
mysql-test/r/cast.result:
  Manual merge
mysql-test/t/cast.test:
  Manual merge
ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp:
  Manual merge
sql/ha_ndbcluster.cc:
  Manual merge
sql/item.h:
  Manual merge
sql/opt_sum.cc:
  Manual merge
sql/sql_delete.cc:
  Manual merge
sql/sql_lex.cc:
  Manual merge
sql/sql_load.cc:
  Manual merge
sql/sql_prepare.cc:
  Manual merge

2005-09-28 11:34:53 +02:00

..

.cvsignore

…

client_priv.h

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

2005-08-26 15:56:52 +03: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 neptunus.(none):/home/msvensson/mysql/mysql-4.1

2005-09-28 11:34:53 +02:00

mysqladmin.cc

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

2005-08-26 15:56:52 +03:00

mysqlbinlog.cc

Added clarification comment regarding added ROLLBACK to mysqlbinlog output

2005-09-21 14:27:41 +02:00

mysqlcheck.c

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

2005-08-26 15:56:52 +03:00

mysqldump.c

BUG #7815 - Post-review fixes required for push.

2005-09-27 09:40:51 -07:00

mysqlimport.c

Merge mysql.com:/home/hartmut/projects/mysql/dev/4.1

2005-09-08 00:57:02 +02: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.1

2005-08-26 15:56:52 +03:00

mysqltest.c

Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1

2005-09-28 11:34:53 +02: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