unknown 6658fb34e5 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 ...

into  mysql.com:/home/dlenev/src/mysql-5.0-bg11896


mysql-test/t/sp-error.test:
  Auto merged
mysql-test/t/trigger.test:
  Auto merged
sql/sql_base.cc:
  Auto merged
mysql-test/r/trigger.result:
  Manual merge.
sql/share/errmsg.txt:
  Manual merge.

2005-08-23 09:15:05 +04:00

..

charsets

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

2005-07-21 17:55:16 +05:00

.cvsignore

Import changeset

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

errmsg.txt

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

2005-08-23 09:15:05 +04:00

Makefile.am

- manual merge

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