mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 22:12:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
88196 commits 2780 branches 343 tags 1.6 GiB
Commit graph

6 commits

Author SHA1 Message Date
Michael Widenius
1d0f70c2f8 Temporary commit of merge of MariaDB 10.0-base and MySQL 5.6 2012-08-01 17:27:34 +03:00
Marko Mäkelä
7545f86670 Merge mysql-5.1 to mysql-5.5. 
This patch was already pushed to mysql-5.5 by Inaam Rana.
 2011-06-23 15:57:25 +03:00
Inaam Rana
9df4c14354 merge from mysql-5.1 
Bug 12635227 - 61188: DROP TABLE EXTREMELY SLOW
 2011-06-17 16:29:19 -04:00
Marko Mäkelä
67a0d9c0e0 Fix bit-rot left by the multiple buffer pools patch. 
Rename buf_pool_watch, buf_pool_mutex, buf_pool_zip_mutex
to buf_pool->watch, buf_pool->mutex, buf_pool->zip_mutex
in comments. Refer to buf_pool->flush_list_mutex instead of
flush_list_mutex.

Remove obsolete declarations of buf_pool_mutex and buf_pool_zip_mutex.
 2010-10-20 14:46:28 +03:00
Vasil Dimov
c7525a0130 Merge from innodb-branches-innodb+ (2) 2010-04-19 20:53:16 +03:00
Guilhem Bichot
7ceb29ff17 Renamed storage/innodb_plugin to storage/innobase, so that 1) it's the same 
layout as we always had in trees containing only the builtin
2) win\configure.js WITH_INNOBASE_STORAGE_ENGINE still works.

storage/innobase/CMakeLists.txt:
  fix to new directory name (and like 5.1)
storage/innobase/Makefile.am:
  fix to new directory name (and like 5.1)
storage/innobase/handler/ha_innodb.cc:
  fix to new directory name (and like 5.1)
storage/innobase/plug.in:
  fix to new directory name (and like 5.1)
 2009-08-07 12:16:00 +02:00
Renamed from storage/innodb_plugin/include/buf0buddy.h (Browse further)