unknown b2c40c1698 Merge mysql.com:/home/cps/mysql/trees/4.1-runtime-bug9191 ...

into  mysql.com:/home/cps/mysql/trees/5.0-runtime-bug9191


configure.in:
  Auto merged
include/my_time.h:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/timezone2.result:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
mysql-test/t/timezone2.test:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/time.cc:
  Auto merged
BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003:
  Auto merged
sql-common/my_time.c:
  manual merge
sql/item_timefunc.cc:
  manual merge
sql/tztime.cc:
  manual merge

2006-11-01 17:35:35 +03:00

..

client.c

Merge mysql.com:/home/gluh/MySQL/Merge/4.1

2006-09-27 18:06:46 +05: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 mysql.com:/home/cps/mysql/trees/4.1-runtime-bug9191

2006-11-01 17:35:35 +03: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