mariadb/storage
Michael Widenius 690d8cc6ba Fixed lp:947474 "Assertion `table->file->stats.records > 0 || error' failed in join_read_const_table on concurrent SELECT and ALTER, constant Aria table"
Remove Aria state history for drop/rename

mysql-test/suite/maria/r/maria-recovery2.result:
  Updated old (wrong) test result
sql/handler.cc:
  Fixed wrong argument to implict_commit
storage/maria/ha_maria.cc:
  Ensure that we don't use file->trn if THD_TRN is 0. (This means that implict_commit() has been called and the trn object is not ours anymore)
storage/maria/ma_extra.c:
  Remove Aria state history for drop/rename
storage/maria/ma_rename.c:
  Remove Aria state history for rename
storage/maria/ma_state.c:
  More DBUG_PRINT
2012-03-20 16:04:50 +02:00
..
archive Merge 5.3->5.5 2012-03-17 01:26:58 -07:00
blackhole Merge with MariaDB 5.1 2011-11-24 18:48:58 +02:00
csv 5.3 merge 2012-01-13 15:50:02 +01:00
example Reduce size of windows MSI by approx. 50% 2012-03-16 20:52:17 +01:00
federated mysql-5.5 merge 2012-01-16 20:16:35 +01:00
federatedx rename debug variable to debug_dbug, to make test pass in release builds 2011-12-15 22:07:58 +01:00
heap overlay support for mysql-test-run and mysqltest 2012-02-23 07:50:11 +01:00
innobase another fix for --innodb-trx* name conflict 2012-03-14 19:47:15 +01:00
maria Fixed lp:947474 "Assertion `table->file->stats.records > 0 || error' failed in join_read_const_table on concurrent SELECT and ALTER, constant Aria table" 2012-03-20 16:04:50 +02:00
myisam Fixed lp:925377 "Querying myisam table metadata while 'alter table..enable keys' is running may corrupt the table" 2012-02-28 23:18:52 +02:00
myisammrg 5.3 merge 2012-01-13 15:50:02 +01:00
ndb Merge with MariaDB 5.1 2011-11-24 18:48:58 +02:00
oqgraph 5.3.4 merge 2012-02-15 18:08:08 +01:00
pbxt misc test/result fixes 2012-03-01 17:04:57 +01:00
perfschema monty's cleanup of my_thr_init.c 2012-03-13 13:29:44 +01:00
sphinx fix SphinxSE version as reported in I_S.PLUGINS 2012-03-13 13:31:21 +01:00
xtradb Merge MWL #247 from mariadb 5.3 -> mariadb 5.5. 2012-03-02 15:03:20 -08:00