mariadb/storage/innobase
Vasil Dimov 32aef81ec4 Merge from mysql-5.1-innodb:
------------------------------------------------------------
  revno: 3430
  revision-id: vasil.dimov@oracle.com-20100428103452-6btsq4xv6v1etb5b
  parent: vasil.dimov@oracle.com-20100428103200-vs5nzx245sv2qy7n
  committer: Vasil Dimov <vasil.dimov@oracle.com>
  branch nick: mysql-5.1-innodb
  timestamp: Wed 2010-04-28 13:34:52 +0300
  message:
    Bug#53046 dict_update_statistics_low can still be run concurrently
    on same table
    
    Followup to vasil.dimov@oracle.com-20100428102033-dt3caf531rs3lidr :
    
    Add more asserions, which I forgot.
  modified:
    storage/innodb_plugin/dict/dict0dict.c 2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Fdict%2Fdict0dict.c
  ------------------------------------------------------------
  revno: 3429
  revision-id: vasil.dimov@oracle.com-20100428103200-vs5nzx245sv2qy7n
  parent: vasil.dimov@oracle.com-20100428102033-dt3caf531rs3lidr
  committer: Vasil Dimov <vasil.dimov@oracle.com>
  branch nick: mysql-5.1-innodb
  timestamp: Wed 2010-04-28 13:32:00 +0300
  message:
    Revert the fix of Bug#38996 Race condition in ANALYZE TABLE
    
    This is branches/zip@r6032 in SVN and _is part_ of
    revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6113
    in BZR.
    
    This is being reverted because now the code is serialized directly on
    index->stat_n_diff_key_vals[] as the fix for
    Bug#53046 dict_update_statistics_low can still be run concurrently on same table
    goes.
  modified:
    storage/innodb_plugin/handler/ha_innodb.cc 2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Fhandler%2Fha_innodb.cc
  ------------------------------------------------------------
  revno: 3428
  revision-id: vasil.dimov@oracle.com-20100428102033-dt3caf531rs3lidr
  parent: vasil.dimov@oracle.com-20100428084627-wtrmc66wqvjsdgj7
  committer: Vasil Dimov <vasil.dimov@oracle.com>
  branch nick: mysql-5.1-innodb
  timestamp: Wed 2010-04-28 13:20:33 +0300
  message:
    Followup to vasil.dimov@oracle.com-20100428084627-wtrmc66wqvjsdgj7:
    
    Address Marko's suggestions wrt the fix of
    Bug#53046 dict_update_statistics_low can still be run concurrently
    on same table
  modified:
    storage/innodb_plugin/dict/dict0dict.c 2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Fdict%2Fdict0dict.c
  ------------------------------------------------------------
  revno: 3427
  revision-id: vasil.dimov@oracle.com-20100428084627-wtrmc66wqvjsdgj7
  parent: mmakela@bk-internal.mysql.com-20100428063325-irts4ze9et5bsqdq
  committer: Vasil Dimov <vasil.dimov@oracle.com>
  branch nick: mysql-5.1-innodb
  timestamp: Wed 2010-04-28 11:46:27 +0300
  message:
    Fix Bug#53046 dict_update_statistics_low can still be run concurrently
    on same table
    
    Protect dict_index_t::stat_n_diff_key_vals[] with an array of
    mutexes.
    
    Testing: tested all code paths under UNIV_SYNC_DEBUG
    for the one in dict_print() one has to enable the InnoDB table monitor:
    CREATE TABLE innodb_table_monitor (a int) ENGINE=INNODB;
  modified:
    storage/innodb_plugin/btr/btr0cur.c 2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Fbtr%2Fbtr0cur.c
    storage/innodb_plugin/dict/dict0dict.c 2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Fdict%2Fdict0dict.c
    storage/innodb_plugin/handler/ha_innodb.cc 2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Fhandler%2Fha_innodb.cc
    storage/innodb_plugin/include/dict0dict.h 2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Finclude%2Fdict0dict.h
  ------------------------------------------------------------
2010-05-04 13:46:29 +03:00
..
btr Merge from mysql-5.1-innodb: 2010-05-04 13:46:29 +03:00
buf buf_flush_list() should return failure if one of the buffer pool 2010-04-26 23:24:45 -04:00
data Merge r3403..3414 from mysql-5.1-innodb: 2010-04-22 14:24:42 +03:00
dict Merge from mysql-5.1-innodb: 2010-05-04 13:46:29 +03:00
dyn Renamed storage/innodb_plugin to storage/innobase, so that 1) it's the same 2009-08-07 12:16:00 +02:00
eval Renamed storage/innodb_plugin to storage/innobase, so that 1) it's the same 2009-08-07 12:16:00 +02:00
fil Import branches/innodb+ from SVN on top of storage/innobase. 2010-04-12 18:20:41 +03:00
fsp Import branches/innodb+ from SVN on top of storage/innobase. 2010-04-12 18:20:41 +03:00
fut Renamed storage/innodb_plugin to storage/innobase, so that 1) it's the same 2009-08-07 12:16:00 +02:00
ha Merge from innodb-branches-innodb+ (2) 2010-04-19 20:53:16 +03:00
handler Merge from mysql-5.1-innodb: 2010-05-04 13:46:29 +03:00
ibuf Merge from innodb-branches-innodb+ (2) 2010-04-19 20:53:16 +03:00
include Merge from mysql-5.1-innodb: 2010-05-04 13:46:29 +03:00
lock Merge from mysql-5.1-innodb: 2010-05-04 13:19:37 +03:00
log Merge from mysql-5.1-innodb: 2010-05-04 13:17:26 +03:00
mach Renamed storage/innodb_plugin to storage/innobase, so that 1) it's the same 2009-08-07 12:16:00 +02:00
mem Merge from innodb-branches-innodb+ (2) 2010-04-19 20:53:16 +03:00
mtr Merge from innodb-branches-innodb+ (2) 2010-04-19 20:53:16 +03:00
mysql-test/patches Move InnoDB tests from storage/innobase/mysql-test/ (where they were ignored) 2010-04-14 14:14:48 +03:00
os Import branches/innodb+ from SVN on top of storage/innobase. 2010-04-12 18:20:41 +03:00
page Merge from innodb-branches-innodb+ (2) 2010-04-19 20:53:16 +03:00
pars Import branches/innodb+ from SVN on top of storage/innobase. 2010-04-12 18:20:41 +03:00
que Set the slot to NULL when creating a query thread. 2010-05-04 10:07:51 +10:00
read Renamed storage/innodb_plugin to storage/innobase, so that 1) it's the same 2009-08-07 12:16:00 +02:00
rem Merge r3403..3414 from mysql-5.1-innodb: 2010-04-22 14:24:42 +03:00
row Merge from mysql-5.1-innodb: 2010-05-04 13:21:33 +03:00
srv Add missing semi-colon. 2010-04-30 21:38:12 +10:00
sync Merge from innodb-branches-innodb+ 2010-04-22 12:00:59 +03:00
thr Import branches/innodb+ from SVN on top of storage/innobase. 2010-04-12 18:20:41 +03:00
trx Fix bug introduced by r3038. When a transaction is rolled back by the 2010-04-28 06:47:47 +10:00
usr Merge Innodb Plugin 1.0.6 from mysql-5.1-bugteam storage/innodb_plugin to mysql-trunk-merge. 2009-12-02 19:30:50 +05:30
ut Merge from innodb-branches-innodb+ (2) 2010-04-19 20:53:16 +03:00
CMakeLists.txt Merge from innodb-branches-innodb+ 2010-04-22 12:00:59 +03:00
compile-innodb Update compile-innodb to use cmake and remove the debug version. 2010-04-15 12:33:07 +03:00
COPYING Renamed storage/innodb_plugin to storage/innobase, so that 1) it's the same 2009-08-07 12:16:00 +02:00
COPYING.Google Renamed storage/innodb_plugin to storage/innobase, so that 1) it's the same 2009-08-07 12:16:00 +02:00
COPYING.Percona Renamed storage/innodb_plugin to storage/innobase, so that 1) it's the same 2009-08-07 12:16:00 +02:00
COPYING.Sun_Microsystems Renamed storage/innodb_plugin to storage/innobase, so that 1) it's the same 2009-08-07 12:16:00 +02:00
Doxyfile Renamed storage/innodb_plugin to storage/innobase, so that 1) it's the same 2009-08-07 12:16:00 +02:00
ha_innodb.def Renamed storage/innodb_plugin to storage/innobase, so that 1) it's the same 2009-08-07 12:16:00 +02:00
Makefile.am Merge from innodb-branches-innodb+ 2010-04-22 12:00:59 +03:00
plug.in Import branches/innodb+ from SVN on top of storage/innobase. 2010-04-12 18:20:41 +03:00