mariadb/storage
unknown bba3a1be5d Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint


sql/share/errmsg.txt:
  Auto merged
storage/innobase/Makefile.am:
  Auto merged
storage/innobase/handler/ha_innodb.cc:
  SCCS merged
2006-09-12 14:49:41 +02:00
..
archive Warning fixes for Windows, and an include fix for Windows for Innodb. 2006-09-07 16:17:16 -07:00
blackhole add 2 placeholder values for config and system variables. 2006-08-30 14:27:29 -07:00
csv add 2 placeholder values for config and system variables. 2006-08-30 14:27:29 -07:00
example add 2 placeholder values for config and system variables. 2006-08-30 14:27:29 -07:00
federated Warning fixes for Windows, and an include fix for Windows for Innodb. 2006-09-07 16:17:16 -07:00
heap add 2 placeholder values for config and system variables. 2006-08-30 14:27:29 -07:00
innobase Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1 2006-09-12 14:49:41 +02:00
myisam Merge shellback.(none):/home/msvensson/mysql/mysql-5.1 2006-09-08 16:01:51 +02:00
myisammrg add 2 placeholder values for config and system variables. 2006-08-30 14:27:29 -07:00
ndb Merge shellback.(none):/home/msvensson/mysql/mysql-5.1 2006-09-08 16:01:51 +02:00
Makefile.am fixes for 'make dist' and 'make distcheck' 2006-04-12 14:08:24 +02:00