1. 18 May, 2010 2 commits
    • Vasil Dimov's avatar
      Silence a valgrind warning caused by zlib: · fc56efda
      Vasil Dimov authored
      ==31182== Conditional jump or move depends on uninitialised value(s)
      ==31182==    at 0xA9188B: longest_match (deflate.c:1143)
      ==31182==    by 0xA92C19: deflate_slow (deflate.c:1595)
      ==31182==    by 0xA90C6B: deflate (deflate.c:790)
      ==31182==    by 0x9B447B: page_zip_compress (page0zip.c:1342)
      ==31182==    by 0x9A8540: page_cur_insert_rec_zip_reorg (page0cur.c:1174)
      ==31182==    by 0x9A8998: page_cur_insert_rec_zip (page0cur.c:1279)
      ==31182==    by 0x9214F9: page_cur_tuple_insert (page0cur.ic:264)
      ==31182==    by 0x9221A2: btr_cur_optimistic_insert (btr0cur.c:1314)
      ==31182==    by 0x9C99EB: row_ins_index_entry_low (row0ins.c:2087)
      ==31182==    by 0x9C9DFB: row_ins_index_entry (row0ins.c:2167)
      ==31182==    by 0x9CA057: row_ins_index_entry_step (row0ins.c:2252)
      ==31182==    by 0x9CA0FD: row_ins (row0ins.c:2384)
      ==31182==    by 0x9CA760: row_ins_step (row0ins.c:2494)
      ==31182==    by 0x8CBF7E: row_insert_for_mysql (row0mysql.c:1138)
      ==31182==    by 0x8BCF32: ha_innobase::write_row(unsigned char*) (ha_innodb.cc:4929)
      ==31182==    by 0x736E03: handler::ha_write_row(unsigned char*) (handler.cc:4682)
      fc56efda
    • Vasil Dimov's avatar
      Silence a valgrind warning caused by zlib: · ce003079
      Vasil Dimov authored
      innodb.innodb-zip                        [ fail ]  Found warnings/errors in server log file!
              Test ended at 2010-05-17 16:41:25
      line
      ==31182== Thread 13:
      ==31182== Conditional jump or move depends on uninitialised value(s)
      ==31182==    at 0xA9193F: longest_match (deflate.c:1143)
      ==31182==    by 0xA92C19: deflate_slow (deflate.c:1595)
      ==31182==    by 0xA90C6B: deflate (deflate.c:790)
      ==31182==    by 0x928A07: btr_store_big_rec_extern_fields (btr0cur.c:4092)
      ==31182==    by 0x9C9B90: row_ins_index_entry_low (row0ins.c:2119)
      ==31182==    by 0x9C9DFB: row_ins_index_entry (row0ins.c:2167)
      ==31182==    by 0x9CA057: row_ins_index_entry_step (row0ins.c:2252)
      ==31182==    by 0x9CA0FD: row_ins (row0ins.c:2384)
      ==31182==    by 0x9CA760: row_ins_step (row0ins.c:2494)
      ==31182==    by 0x8CBF7E: row_insert_for_mysql (row0mysql.c:1138)
      ==31182==    by 0x8BCF32: ha_innobase::write_row(unsigned char*) (ha_innodb.cc:4929)
      ==31182==    by 0x736E03: handler::ha_write_row(unsigned char*) (handler.cc:4682)
      ==31182==    by 0x5B0EEE: write_record(THD*, TABLE*, st_copy_info*) (sql_insert.cc:1670)
      ==31182==    by 0x5B129D: select_insert::send_data(List<Item>&) (sql_insert.cc:3279)
      ==31182==    by 0x5F31ED: end_send(JOIN*, st_join_table*, bool) (sql_select.cc:12428)
      ==31182==    by 0x5F9B9B: evaluate_join_record(JOIN*, st_join_table*, int) (sql_select.cc:11632)
      ce003079
  2. 17 May, 2010 2 commits
    • Jimmy Yang's avatar
      Fix bug #52546, crash on shutdown of plugin with innodb_use_sys_malloc=0. · d754b571
      Jimmy Yang authored
      rb://339, approved by Sunny Bains.
      d754b571
    • Vasil Dimov's avatar
      Silence a spurious valrgind warning: · a6142ed8
      Vasil Dimov authored
      ==2229== Uninitialised byte(s) found during client check request
      ==2229==    at 0x9A599D: buf_page_get_gen (buf0buf.c:3003)
      ==2229==    by 0x9D58CD: fsp_header_init (fsp0fsp.c:974)
      ==2229==    by 0x95BEAE: innobase_start_or_create_for_mysql (srv0start.c:1537)
      ==2229==    by 0x91DDBB: innobase_init(void*) (ha_innodb.cc:2409)
      ==2229==    by 0x73AF1F: ha_initialize_handlerton(st_plugin_int*) (handler.cc:475)
      ==2229==    by 0x5DBAE3: plugin_initialize(st_plugin_int*) (sql_plugin.cc:1057)
      ==2229==    by 0x5DD185: plugin_init(int*, char**, int) (sql_plugin.cc:1343)
      ==2229==    by 0x53830A: init_server_components() (mysqld.cc:4141)
      ==2229==    by 0x539048: mysqld_main(int, char**) (mysqld.cc:4742)
      ==2229==    by 0x52D412: main (main.cc:24)
      ==2229==  Address 0x998B00C is not stack'd, malloc'd or (recently) free'd
      ==2229== (Memcheck does not allow error to be suppressed)
      
      Approved by:	Marko (rb://345)
      a6142ed8
  3. 14 May, 2010 3 commits
    • Vasil Dimov's avatar
    • Vasil Dimov's avatar
      Add a debug assertion to make it clear that we expect · 1256e166
      Vasil Dimov authored
      to own the kernel mutex in fill_trx_row().
      1256e166
    • Marko Mäkelä's avatar
      Merge from mysql-5.1-innodb: · b6fa4b11
      Marko Mäkelä authored
      Post-merge fixes: Remove the MYSQL_VERSION_ID checks, because they only
      apply to the InnoDB Plugin. Fix potential race condition accessing
      trx->op_info and trx->detailed_error.
      ------------------------------------------------------------
      revno: 3466
      revision-id: marko.makela@oracle.com-20100514130815-ym7j7cfu88ro6km4
      parent: marko.makela@oracle.com-20100514130228-n3n42nw7ht78k0wn
      committer: Marko Mäkelä <marko.makela@oracle.com>
      branch nick: mysql-5.1-innodb2
      timestamp: Fri 2010-05-14 16:08:15 +0300
      message:
        Make the InnoDB FOREIGN KEY parser understand multi-statements. (Bug #48024)
        Also make InnoDB thinks that /*/ only starts a comment. (Bug #53644).
      
        This fixes the bugs in the InnoDB Plugin.
      
        ha_innodb.h: Use trx_query_string() instead of trx_query() when
        available (MySQL 5.1.42 or later).
      
        innobase_get_stmt(): New function, to retrieve the currently running
        SQL statement.
      
        struct trx_struct: Remove mysql_query_str. Use innobase_get_stmt() instead.
      
        dict_strip_comments(): Add and observe the parameter sql_length. Treat
        /*/ as the start of a comment.
      
        dict_create_foreign_constraints(), row_table_add_foreign_constraints():
        Add the parameter sql_length.
      b6fa4b11
  4. 13 May, 2010 2 commits
    • Vasil Dimov's avatar
      0ad0827f
    • Vasil Dimov's avatar
      Followup to Bug#51920, fix binlog.binlog_killed · 2d299d84
      Vasil Dimov authored
      This is a followup to the fix of
      
      Bug#51920 Innodb connections in row lock wait ignore KILL until lock wait
      timeout
      
      in that fix (rb://279) the behavior was changed to honor when a trx is
      interrupted during lock wait, but the returned error code was still
      "lock wait timeout" when it should be "interrupted".
      
      This change fixes the non-deterministically failing test binlog.binlog_killed,
      that failed like this:
      
      binlog.binlog_killed 'stmt'              [ fail ]
              Test ended at 2010-05-12 11:39:08
      
      CURRENT_TEST: binlog.binlog_killed
      mysqltest: At line 208: query 'reap' failed with wrong errno 1205: 'Lock wait timeout exceeded; try restarting transaction', instead of 0...
      
      Approved by:	Sunny Bains (rb://344)
      2d299d84
  5. 12 May, 2010 12 commits
  6. 11 May, 2010 10 commits
    • Marko Mäkelä's avatar
      Merge from mysql-5.1-innodb: · 8de7ea8f
      Marko Mäkelä authored
        ------------------------------------------------------------
        revno: 3459
        revision-id: marko.makela@oracle.com-20100511165845-lsw7seixftgzpfqt
        parent: vasil.dimov@oracle.com-20100511110029-18xvuu6r7har8toh
        committer: Marko Mäkelä <marko.makela@oracle.com>
        branch nick: mysql-5.1-innodb2
        timestamp: Tue 2010-05-11 19:58:45 +0300
        message:
          Fix sys_vars.tx_isolation_func.test, which was broken in revno 3432
          when making READ UNCOMMITTED lock as little as READ COMMITTED.
      8de7ea8f
    • Marko Mäkelä's avatar
      Merge from mysql-5.1-innodb: · 8079d0d6
      Marko Mäkelä authored
        ------------------------------------------------------------
        revno: 3459
        revision-id: marko.makela@oracle.com-20100511105308-grp2t3prh3tqivw0
        parent: marko.makela@oracle.com-20100511105012-b2t7wvz6mu6bll74
        parent: marko.makela@oracle.com-20100505123901-xjxu93h1xnbkfkq0
        committer: Marko Mäkelä <marko.makela@oracle.com>
        branch nick: mysql-5.1-innodb
        timestamp: Tue 2010-05-11 13:53:08 +0300
        message:
          Merge a patch from Facebook to fix Bug #53290
      
          commit e759bc64eb5c5eed4f75677ad67246797d486460
          Author: Ryan Mack
          Date:   3 days ago
      
              Bugfix for 53290, fast unique index creation fails on duplicate null values
      
              Summary:
              Bug in the fast index creation code incorrectly considers null
              values to be duplicates during block merging.  Innodb policy is that
              multiple null values are allowed in a unique index.  Null duplicates
              were correctly ignored while sorting individual blocks and with slow
              index creation.
      
              Test Plan:
              mtr, including new test, load dbs using deferred index creation
      
              License:
              Copyright (C) 2009-2010 Facebook, Inc.  All Rights Reserved.
      
              Dual licensed under BSD license and GPLv2.
      
              Redistribution and use in source and binary forms, with or without
              modification, are permitted provided that the following conditions are met:
              1. Redistributions of source code must retain the above copyright notice,
                 this list of conditions and the following disclaimer.
              2. Redistributions in binary form must reproduce the above copyright notice,
                 this list of conditions and the following disclaimer in the documentation
                 and/or other materials provided with the distribution.
      
              THIS SOFTWARE IS PROVIDED BY FACEBOOK, INC. ``AS IS'' AND ANY EXPRESS OR
              IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
              MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
              EVENT SHALL FACEBOOK, INC. BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
              SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
              PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
              OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
              WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
              OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
              ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
      
              This program is free software; you can redistribute it and/or modify it
              under the terms of the GNU General Public License as published by the Free
              Software Foundation; version 2 of the License.
      
              This program is distributed in the hope that it will be useful, but WITHOUT
              ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
              FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
              more details.
      
              You should have received a copy of the GNU General Public License along with
              this program; if not, write to the Free Software Foundation, Inc., 59 Temple
              Place, Suite 330, Boston, MA  02111-1307  USA
            ------------------------------------------------------------
            revno: 3453.2.1
            revision-id: marko.makela@oracle.com-20100505123901-xjxu93h1xnbkfkq0
            parent: marko.makela@oracle.com-20100505120555-ukoq1gklpheslrxs
            committer: Marko Mäkelä <marko.makela@oracle.com>
            branch nick: 5.1-innodb
            timestamp: Wed 2010-05-05 15:39:01 +0300
            message:
              Merge a contribution from Ryan Mack at Facebook:
      
              Bugfix for 53290, fast unique index creation fails on duplicate null values
      
                  Summary:
                  Bug in the fast index creation code incorrectly considers null
                  values to be duplicates during block merging.  Innodb policy is that
                  multiple null values are allowed in a unique index.  Null duplicates
                  were correctly ignored while sorting individual blocks and with slow
                  index creation.
      
                  Test Plan:
                  mtr, including new test, load dbs using deferred index creation
      
                  DiffCamp Revision: 110840
                  Reviewed By: mcallaghan
                  CC: mcallaghan, mysql-devel@lists
                  Revert Plan:
                  OK
      8079d0d6
    • Marko Mäkelä's avatar
      Merge from mysql-5.1-innodb: · dc322344
      Marko Mäkelä authored
        ------------------------------------------------------------
        revno: 3458
        revision-id: marko.makela@oracle.com-20100511105012-b2t7wvz6mu6bll74
        parent: marko.makela@oracle.com-20100511104910-nim8kgguawpis7zo
        committer: Marko Mäkelä <marko.makela@oracle.com>
        branch nick: mysql-5.1-innodb
        timestamp: Tue 2010-05-11 13:50:12 +0300
        message:
          Do not demand that buf_page_t be fully initialized on 64-bit systems.
          There may be padding before buf_page_t::zip. (Bug #53307)
      dc322344
    • Marko Mäkelä's avatar
      Merge from mysql-5.1-innodb: · dca77d3f
      Marko Mäkelä authored
        ------------------------------------------------------------
        revno: 3457
        revision-id: marko.makela@oracle.com-20100511104910-nim8kgguawpis7zo
        parent: marko.makela@oracle.com-20100511104500-c6kzd0bg5s42p8e9
        committer: Marko Mäkelä <marko.makela@oracle.com>
        branch nick: mysql-5.1-innodb
        timestamp: Tue 2010-05-11 13:49:10 +0300
        message:
          btr_page_split_and_insert(): Add an assertion
          suggested by Sunny Bains when reviewing Bug #52964.
      dca77d3f
    • Marko Mäkelä's avatar
      Merge from mysql-5.1-innodb: · 3d9c6280
      Marko Mäkelä authored
        ------------------------------------------------------------
        revno: 3456
        revision-id: marko.makela@oracle.com-20100511104500-c6kzd0bg5s42p8e9
        parent: vasil.dimov@oracle.com-20100510132852-cz457uqvj8iiy9mm
        committer: Marko Mäkelä <marko.makela@oracle.com>
        branch nick: mysql-5.1-innodb2
        timestamp: Tue 2010-05-11 13:45:00 +0300
        message:
          Remove a stray expression. Spotted by Sunny Bains.
      3d9c6280
    • Vasil Dimov's avatar
      218d9e36
    • Vasil Dimov's avatar
      Merge mysql-trunk into mysql-trunk-innodb · a25ea422
      Vasil Dimov authored
      a25ea422
    • Sunny Bains's avatar
      Add missing ';'. · 658ce612
      Sunny Bains authored
      658ce612
    • Sunny Bains's avatar
      Fix for bug#53541. We need to check whether the slot has been freed or not · f77390bd
      Sunny Bains authored
      before trying to access the transaction instance.
      
      rb://336
      f77390bd
    • Sunny Bains's avatar
      Second part of the fix for bug#53499. We decrement the active thread count · e50bf39e
      Sunny Bains authored
      when the purge thread completes by calling srv_suspend_thread().
      e50bf39e
  7. 10 May, 2010 4 commits
  8. 07 May, 2010 4 commits
  9. 05 May, 2010 1 commit
    • Marko Mäkelä's avatar
      Merge from mysql-5.1-innodb: · b7ee1e64
      Marko Mäkelä authored
        ------------------------------------------------------------
        revno: 3449
        revision-id: marko.makela@oracle.com-20100505104425-39y6qbffgotrhck2
        parent: marko.makela@oracle.com-20100505104001-883pqiepo384qr5h
        committer: Marko Mäkelä <marko.makela@oracle.com>
        branch nick: 5.1-innodb
        timestamp: Wed 2010-05-05 13:44:25 +0300
        message:
          Factor out innodb_multi_update.test from innodb.test
      b7ee1e64