unknown 9c3a41f388 Merge mysql.com:/home/ram/work/mysql-4.1 ...

into mysql.com:/home/ram/work/mysql-5.0


include/my_global.h:
  Auto merged
BitKeeper/etc/logging_ok:
  auto-union
sql/share/charsets/Index.xml:
  Auto merged

2005-05-06 20:11:01 +05:00

..

charsets

Merge mysql.com:/home/ram/work/mysql-4.1

2005-05-06 20:11:01 +05:00

.cvsignore

Import changeset

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

errmsg.txt

Approximative fixes for BUG#2610,2611,9100 i.e. WL#2146 binlogging/replication of routines (stored procs and functions).

2005-05-05 14:20:53 +02:00

Makefile.am

- manual merge

2005-04-21 08:30:59 +02:00