mariadb/storage
Michael Widenius c580583756 Automatic merge
Added some minor changes that was done in my tree while waiting for test to run:
- Remove in Maria T_QUICK when retrying repair for enabling indexes, as the record file may be in use by other threads
- Disable code that is only relevant for EXTERNAL_LOCKING

include/m_string.h:
  Automatic merge
storage/maria/ha_maria.cc:
  Remove T_QUICK when retrying repair for enabling indexes, as the record file may be in use by other threads
storage/maria/ma_check.c:
  Automatic merge
storage/maria/ma_key.c:
  Automatic merge
storage/maria/ma_loghandler.c:
  Automatic merge
storage/maria/ma_open.c:
  Disable code that is only relevant for EXTERNAL_LOCKING
storage/maria/ma_sp_key.c:
  Automatic merge
storage/maria/ma_write.c:
  Automatic merge
storage/maria/trnman.c:
  Automatic merge
2008-06-28 16:57:00 +03:00
..
archive Merge bk-internal.mysql.com:/home/bk/mysql-maria 2008-05-29 21:39:25 +03:00
blackhole Merge mysql1000.(none):/home/andrei/MySQL/MERGE/5.0-main2rpl 2008-03-29 15:00:12 +02:00
csv Merge bk-internal.mysql.com:/home/bk/mysql-maria 2008-05-29 21:39:25 +03:00
example Merge trift2.:/MySQL/M51/mysql-5.1 2008-03-14 14:41:08 +01:00
federated Merge bk-internal.mysql.com:/home/bk/mysql-maria 2008-05-29 21:39:25 +03:00
heap Added versioning of Maria index 2008-06-26 08:18:28 +03:00
innobase Merge debian.(none):/MySQL/M51/mysql-5.1 2008-03-28 17:07:56 +02:00
maria Automatic merge 2008-06-28 16:57:00 +03:00
myisam Fix for Bug #37007 Maria: different checksum for MyISAM table depending on CHECKSUM=0|1 2008-06-28 15:45:15 +03:00
myisammrg Merge mysql.com:/home/my/mysql-5.1 2008-04-28 19:24:05 +03:00
ndb Merge trift2.:/MySQL/M51/ndb-decl-5.1 2008-03-27 13:20:24 +01:00
Makefile.am fixes for make distclean, solaris, macosx, windows 2007-12-13 13:28:35 +01:00