unknown 3e09e4adce Merge ramayana.hindu.god:/home/tsmith/m/bk/51 ...

into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51


mysql-test/suite/rpl_ndb/t/disabled.def:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged

2007-07-17 11:33:26 -06:00

..

.cvsignore

Import changeset

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

client_priv.h

Move WEXITSTATUS #define from mysqltest.c to client_priv.h, and

2007-04-18 20:47:55 -06:00

CMakeLists.txt

Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work

2007-06-16 06:17:19 +02:00

completion_hash.cc

WL#3817: Simplify string / memory area types and make things more consistent (first part)

2007-05-10 12:59:39 +03:00

completion_hash.h

my_strtoll10-x86.s:

2006-12-31 01:02:27 +01:00

echo.c

echo.c:

2007-03-20 18:31:49 +01:00

get_password.c

Merge mysql.com:/home/kent/bk/main/mysql-5.0

2006-12-23 20:20:40 +01:00

Makefile.am

Manual merge: Makefile lines must start with tab, not blank.

2007-05-02 14:16:21 +02:00

my_readline.h

WL#3817: Simplify string / memory area types and make things more consistent (first part)

2007-05-10 12:59:39 +03:00

mysql_upgrade.c

WL#3817: Simplify string / memory area types and make things more consistent (first part)

2007-05-10 12:59:39 +03:00

mysql.cc

Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1

2007-05-24 13:24:36 +03:00

mysqladmin.cc

WL#3817: Simplify string / memory area types and make things more consistent (first part)

2007-05-10 12:59:39 +03:00

mysqlbinlog.cc

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

2007-06-01 12:12:06 +04:00

mysqlcheck.c

WL#3817: Simplify string / memory area types and make things more consistent (first part)

2007-05-10 12:59:39 +03:00

mysqldump.c

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

2007-07-16 17:22:33 +04:00

mysqlimport.c

WL#3817: Simplify string / memory area types and make things more consistent (first part)

2007-05-10 12:59:39 +03:00

mysqlshow.c

WL#3817: Simplify string / memory area types and make things more consistent (first part)

2007-05-10 12:59:39 +03:00

mysqlslap.c

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user

2007-06-02 06:33:18 +02:00

mysqltest.c

Merge damien-katzs-computer.local:/Users/dkatz/50

2007-07-13 01:56:57 -04:00

readline.cc

WL#3817: Simplify string / memory area types and make things more consistent (first part)

2007-05-10 12:59:39 +03:00

sql_string.cc

WL#3817: Simplify string / memory area types and make things more consistent (first part)

2007-05-10 12:59:39 +03:00

sql_string.h

Fixed compiler warnings

2007-02-23 13:13:55 +02:00