unknown 2e5a6f9eaa Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 ...

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


BitKeeper/etc/ignore:
  auto-union
Docs/Makefile.am:
  Auto merged
Makefile.am:
  Auto merged
client/mysql.cc:
  Auto merged
client/mysqltest.c:
  Auto merged
include/Makefile.am:
  Auto merged
myisam/myisampack.c:
  Auto merged
mysql-test/lib/mtr_io.pl:
  Auto merged
mysql-test/lib/mtr_process.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/view_grant.result:
  Auto merged
mysql-test/t/view_grant.test:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql-common/my_time.c:
  Auto merged
sql/sql_handler.cc:
  Auto merged
extra/yassl/taocrypt/include/algebra.hpp:
  Manual merge with import of upstream yaSSL

2006-12-04 19:28:38 +01:00

..

client.c

Fixed portability issue in my_thr_init.c (was added in my last push)

2006-11-30 18:25:05 +02:00

Makefile.am

Fix for BUG#15110: mysqldump --triggers: does not include DEFINER clause

2006-01-11 02:07:40 +03:00

my_time.c

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

2006-12-04 19:28:38 +01:00

my_user.c

Fix for BUG#15110: mysqldump --triggers: does not include DEFINER clause

2006-01-11 02:07:40 +03:00

pack.c

Added missing SSL library (Should be in source distribution)

2003-11-28 12:18:13 +02:00