unknown 6afa409b07 Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.1-new ...

into  mysql.com:/home/alexi/innodb/mysql-5.1-merged


mysql-test/r/innodb.result:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged

2006-02-10 01:15:45 +03:00

..

archive

Windows/Visual Studio 2003 fixes for the 5.1.5 release.

2006-01-13 22:09:48 +01:00

bdb

storage/bdb/dist/s_all

2005-12-23 12:46:48 +01:00

csv

The handlerton structures for archive and CSV had not been updated. Nicht so gute. I also fixed CSV to use fast alter table and put in a test in archive in case someone tries to do the same there (hint... it won't work).

2006-02-07 22:42:57 -08:00

example

build fix when building with example storage engine.

2006-02-02 11:02:09 +11:00

heap

Merge mysql.com:/home/kostja/mysql/tmp_merge

2006-02-08 23:53:45 +03:00

innobase

Fixed BUG#9680: Wrong error from cascading update

2006-02-09 20:43:10 +03:00

myisam

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

2006-02-05 11:06:29 +02:00

myisammrg

WL#1324 table name to file name encoding

2005-12-31 09:01:26 +04:00

ndb

Merge mysql.com:/home/kostja/mysql/mysql-5.0-root

2006-02-09 13:35:59 +03:00

Makefile.am

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

2005-12-22 20:06:05 -08:00