~drizzle-trunk/drizzle/development

Merge Revision revid:vasil.dimov@oracle.com-20100504104629-0ovtc5lae2ghn7he from MySQL InnoDB

Original revid:vasil.dimov@oracle.com-20100504104629-0ovtc5lae2ghn7he

Original Authors: Vasil Dimov <vasil.dimov@oracle.com>
Original commit message:
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
  ------------------------------------------------------------

stewart@willster:~/drizzle/update-innobase$ cat commit_msg 
bzr commit --author="Vasil Dimov <vasil.dimov@oracle.com>" --author="Stewart Smith <stewart@flamingspork.com>" 

Merge Revision revid:vasil.dimov@oracle.com-20100504104629-0ovtc5lae2ghn7he from MySQL InnoDB

Original revid:vasil.dimov@oracle.com-20100504104629-0ovtc5lae2ghn7he

Original Authors: Vasil Dimov <vasil.dimov@oracle.com>
Original commit message:
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
  ------------------------------------------------------------
Filename Latest Rev Last Changed Committer Comment Size
..
client_priv.h 1802.10.2 14 years ago Monty Taylor Update all of the copyright headers to include the 3.4 KB Diff Download File
conclusions.h 1857.2.1 14 years ago Vijay Samuel Merge fixed distcheck error in conclusions.h 5 KB Diff Download File
drizzle.1 1097.1.1 15 years ago Monty Taylor Fixed manpage warnings. Make debian lintian happy. 39.5 KB Diff Download File
drizzle.cc 1909.5.1 14 years ago Andrew Hutchings Re-write of linebuffer to stop buffer overrrun and 128 KB Diff Download File
drizzled.8 1782.2.3 14 years ago Monty Taylor Also symlink the manpages. 2.4 KB Diff Download File
drizzledump.cc 1888.1.3 14 years ago Brian Aker Merge in Andrew 27.9 KB Diff Download File
drizzledump_data.cc 1897.3.1 14 years ago Andrew Hutchings drizzledump MySQL migration fixes: Fix 'TIME defau 16.7 KB Diff Download File
drizzledump_data.h 1883.3.1 14 years ago Andrew Hutchings Cleanup drizzledump and drizzle for cppcheck 8.1 KB Diff Download File
drizzledump_drizzle.cc 1810.6.9 14 years ago Andrew Hutchings Fix drizzledump support again 9.6 KB Diff Download File
drizzledump_drizzle.h 1810.6.4 14 years ago Andrew Hutchings Add foreign keys to Drizzle server 2.9 KB Diff Download File
drizzledump_mysql.cc 1897.3.1 14 years ago Andrew Hutchings drizzledump MySQL migration fixes: Fix 'TIME defau 16.2 KB Diff Download File
drizzledump_mysql.h 1810.6.6 14 years ago Andrew Hutchings Add foriegn key support for MySQL 3 KB Diff Download File
drizzleimport.1 1022.2.25 15 years ago Monty Taylor Imported manpages for the things we ship. Started 9.1 KB Diff Download File
drizzleimport.cc 1802.10.2 14 years ago Monty Taylor Update all of the copyright headers to include the 18.1 KB Diff Download File
drizzleslap.1 1022.2.25 15 years ago Monty Taylor Imported manpages for the things we ship. Started 13.5 KB Diff Download File
File drizzleslap.cc 1918 14 years ago Brian Aker Merge in change to handle update follbacks in slap 70.2 KB Diff Download File
drizzletest.cc 1883.3.1 14 years ago Andrew Hutchings Cleanup drizzledump and drizzle for cppcheck 186 KB Diff Download File
errname.cc 1796.4.11 14 years ago Andrew Hutchings Add global constraint on read buffer 24 KB Diff Download File
errname.h 1122.2.10 15 years ago Monty Taylor Fixed all of the include guards. 1.1 KB Diff Download File
get_password.cc 1839.2.1 14 years ago Andrew Hutchings Output password prompt on stderr Don't output '*' 4 KB Diff Download File
get_password.h 1627.2.2 14 years ago Monty Taylor Moved password parsing code into get_password.cc. 1.1 KB Diff Download File
include.am 1897.1.3 14 years ago Brian Aker Updating with moving out wakeup to its own file. W 1.9 KB Diff Download File
linebuffer.cc 1909.5.1 14 years ago Andrew Hutchings Re-write of linebuffer to stop buffer overrrun and 1.3 KB Diff Download File
linebuffer.h 1909.5.1 14 years ago Andrew Hutchings Re-write of linebuffer to stop buffer overrrun and 1.1 KB Diff Download File
option_string.h 1848.5.4 14 years ago Vijay Samuel Merge added #ifndef tags 2.3 KB Diff Download File
statement.h 1848.5.4 14 years ago Vijay Samuel Merge added #ifndef tags 2.4 KB Diff Download File
stats.h 1848.5.4 14 years ago Vijay Samuel Merge added #ifndef tags 2.4 KB Diff Download File
thread_context.h 1848.5.4 14 years ago Vijay Samuel Merge added #ifndef tags 1.5 KB Diff Download File
wakeup.h 1897.1.3 14 years ago Brian Aker Updating with moving out wakeup to its own file. W 1.6 KB Diff Download File