1. 21 Mar, 2007 6 commits
  2. 20 Mar, 2007 4 commits
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/50-work · 43848796
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
      
      
      ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        Auto merged
      ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
        Auto merged
      ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
        Auto merged
      ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
        Auto merged
      ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
        Auto merged
      ndb/src/mgmsrv/ConfigInfo.cpp:
        Auto merged
      ndb/test/ndbapi/testNodeRestart.cpp:
        Auto merged
      ndb/test/run-test/daily-basic-tests.txt:
        Auto merged
      ndb/test/src/UtilTransactions.cpp:
        Auto merged
      43848796
    • unknown's avatar
      ndb - bug#27283 (wl2325-5.0) · 26afc93a
      unknown authored
          Handle race condtition between MASTER_GCPCONF and execGCP_NODEFINISH
      
      
      ndb/src/kernel/blocks/ERROR_codes.txt:
        new error codes
      ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        Handle race condtition between MASTER_GCPCONF and execGCP_NODEFINISH
      ndb/test/ndbapi/testNodeRestart.cpp:
        testcase
      ndb/test/run-test/daily-basic-tests.txt:
        testcase
      26afc93a
    • unknown's avatar
      ndb - bug#27291 · 54edcb18
      unknown authored
        Fix correct min-value for LockPagesInMemory
      
      
      ndb/src/mgmsrv/ConfigInfo.cpp:
        Fix correct min-value
      54edcb18
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 1dd19f0c
      unknown authored
      into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
      
      
      1dd19f0c
  3. 19 Mar, 2007 3 commits
    • unknown's avatar
      sql_insert.cc: · 3798a7d5
      unknown authored
        Removed wrong fix for the bug#27006.
        The bug was added by the fix for the bug#19978 and fixed by Monty on 2007/02/21.
      trigger.test, trigger.result:
        Corrected test case for the bug#27006.
      
      
      sql/sql_insert.cc:
        Removed wrong fix for the bug#27006.
        The bug was added by the fix for the bug#19978 and fixed by Monty on 2007/02/21.
      mysql-test/t/trigger.test:
        Corrected test case for the bug#27006.
      mysql-test/r/trigger.result:
        Corrected test case for the bug#27006.
      3798a7d5
    • unknown's avatar
      Merge poseidon.:/home/tomas/mysql-5.0 · f8a071d3
      unknown authored
      into  poseidon.:/home/tomas/mysql-5.0-ndb
      
      
      f8a071d3
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb · 307a5859
      unknown authored
      into  poseidon.:/home/tomas/mysql-5.0-ndb
      
      
      307a5859
  4. 16 Mar, 2007 9 commits
    • unknown's avatar
      Bug#27006: AFTER UPDATE triggers not fired with INSERT ... ON DUPLICATE KEY · 6d93f150
      unknown authored
      UPDATE if the row wasn't actually changed.
      
      This bug was caused by fix for bug#19978. It causes AFTER UPDATE triggers
      not firing if a row wasn't actually changed by the update part of the
      INSERT .. ON DUPLICATE KEY UPDATE.
      
      Now triggers are always fired if a row is touched by the INSERT ... ON
      DUPLICATE KEY UPDATE.
      
      
      sql/sql_insert.cc:
        Bug#27006: AFTER UPDATE triggers not fired with INSERT ... ON DUPLICATE KEY
        UPDATE if the row wasn't actually changed.
        Now triggers are always fired if a row is touched by the INSERT ... ON
        DUPLICATE KEY UPDATE.
      mysql-test/r/trigger.result:
        Added a test case for the bug#27006: AFTER UPDATE triggers not fired with INSERT ... ON DUPLICATE KEY
        UPDATE if the row wasn't actually changed.
      mysql-test/t/trigger.test:
        Added a test case for the bug#27006: AFTER UPDATE triggers not fired with INSERT ... ON DUPLICATE KEY
        UPDATE if the row wasn't actually changed.
      6d93f150
    • unknown's avatar
      Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 43b9ff1b
      unknown authored
      into  magare.gmz:/home/kgeorge/mysql/autopush/B26261-5.0-opt
      
      
      sql/mysql_priv.h:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_prepare.cc:
        Auto merged
      mysql-test/r/insert_update.result:
        SCCS merged
      mysql-test/t/insert_update.test:
        SCCS merged
      43b9ff1b
    • unknown's avatar
      Bug #26261: · 2e8e78a4
      unknown authored
       INSERT uses query_id to verify what fields are
       mentioned in the fields list of the INSERT command.
       However the check for that is made after the 
       ON DUPLICATE KEY is processed. This causes all
       the fields mentioned in ON DUPLICATE KEY to be 
       considered as mentioned in the fields list of 
       INSERT.
       Moved the check up, right after processing the
       fields list.
      
      
      mysql-test/r/insert_update.result:
        Bug #26261: test case
      mysql-test/t/insert_update.test:
        Bug #26261: test case
      sql/mysql_priv.h:
        Bug #26261: moved the check inside mysql_prepare_insert
      sql/sql_insert.cc:
        Bug #26261: move the check inside mysql_prepare_insert
        before setting up the ON DUPLICATE KEY part
      sql/sql_prepare.cc:
        Bug #26261: moved the check inside mysql_prepare_insert
      2e8e78a4
    • unknown's avatar
      Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 1a259b88
      unknown authored
      into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt
      
      
      1a259b88
    • unknown's avatar
      Bug#26285 selecting information_schema crahes server · a51b7686
      unknown authored
      The crash happens when 'skip-grant-tables' is enabled.
      We skip the filling of I_S privilege tables 
      if acl_cache is not initialized.
      
      
      mysql-test/r/skip_grants.result:
        test result
      mysql-test/t/skip_grants.test:
        test case
      sql/sql_acl.cc:
        skip filling of I_S privilege tables
        if acl_cache is not initialized
      a51b7686
    • unknown's avatar
      Merge bk@192.168.21.1:mysql-5.0-opt · 6b428e85
      unknown authored
      into  mysql.com:/home/hf/work/mrg/mysql-5.0-opt
      
      
      6b428e85
    • unknown's avatar
      Merge bk@192.168.21.1:mysql-5.0 · 173dc70d
      unknown authored
      into  mysql.com:/home/hf/work/mrg/mysql-5.0-opt
      
      
      sql/sql_parse.cc:
        Auto merged
      173dc70d
    • unknown's avatar
      Merge dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.0/mysql-5.0 · 02af7a84
      unknown authored
      into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.0/mysql-5.0-ndb-merge
      
      
      02af7a84
    • unknown's avatar
      Merge dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.0/mysql-5.0-ndb · 91a88d10
      unknown authored
      into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.0/mysql-5.0-ndb-bj-merge
      
      
      ndb/src/mgmclient/CommandInterpreter.cpp:
        Auto merged
      ndb/src/mgmsrv/ConfigInfo.cpp:
        Auto merged
      ndb/src/ndbapi/NdbScanFilter.cpp:
        Auto merged
      91a88d10
  5. 15 Mar, 2007 12 commits
    • unknown's avatar
      Raise version number after cloning 5.0.38 · 0d31e0f3
      unknown authored
      0d31e0f3
    • unknown's avatar
      Merge mysql.com:/home/svoj/devel/bk/mysql-4.1-engines · 19ab799d
      unknown authored
      into  mysql.com:/home/svoj/devel/bk/mysql-5.0-engines
      
      
      19ab799d
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · c6ab94bd
      unknown authored
      into  moonbone.local:/mnt/gentoo64/work/27033-bug-5.0-opt-mysql
      
      
      c6ab94bd
    • unknown's avatar
      Bug#27033: 0 as LAST_INSERT_ID() after INSERT .. ON DUPLICATE if rows were · 542f18a3
      unknown authored
      touched but not actually changed.
      
      The LAST_INSERT_ID() is reset to 0 if no rows were inserted or changed.
      This is the case when an INSERT ... ON DUPLICATE KEY UPDATE updates a row
      with the same values as the row contains.
      
      Now the LAST_INSERT_ID() values is reset to 0 only if there were no rows
      successfully inserted or touched.
      The new 'touched' field is added to the COPY_INFO structure. It holds the
      number of rows that were touched no matter whether they were actually
      changed or not.
      
      
      sql/sql_class.h:
        Bug#27033: 0 as LAST_INSERT_ID() after INSERT .. ON DUPLICATE if rows were
        touched but not actually changed.
        
        The new 'touched' field is added to the COPY_INFO structure. It holds the
        number of rows that were touched no matter whether they were actually
        changed or not.
      mysql-test/r/insert_update.result:
        Added a test case for the bug#27033: 0 as LAST_INSERT_ID() after INSERT .. ON DUPLICATE if rows were
        touched but not actually changed.
      mysql-test/t/insert_update.test:
        Added a test case for the bug#27033: 0 as LAST_INSERT_ID() after INSERT .. ON DUPLICATE if rows were
        touched but not actually changed.
      sql/sql_insert.cc:
        Bug#27033: 0 as LAST_INSERT_ID() after INSERT .. ON DUPLICATE if rows were
        touched but not actually changed.
        
        Now the LAST_INSERT_ID() values is reset to 0 only if there were no rows
        successfully inserted or touched.
      542f18a3
    • unknown's avatar
      Merge mysql.com:/home/hf/work/26833/my50-26833 · 34c55867
      unknown authored
      into  mysql.com:/home/hf/work/mrg/mysql-5.0-opt
      
      
      sql/sql_parse.cc:
        Auto merged
      34c55867
    • unknown's avatar
      Merge bk@192.168.21.1:mysql-5.0 · b6515184
      unknown authored
      into  mysql.com:/home/hf/work/mrg/mysql-5.0-opt
      
      
      mysql-test/r/gis-rtree.result:
        Auto merged
      b6515184
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 39333ba7
      unknown authored
      into  mockturtle.local:/home/dlenev/src/mysql-4.1-merge
      
      
      39333ba7
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 6f47415f
      unknown authored
      into  mockturtle.local:/home/dlenev/src/mysql-5.0-merge
      
      
      6f47415f
    • unknown's avatar
      ndb - fix bug in UtilTransactions::compare · 970d515c
      unknown authored
        reset rowcount on temporary error during scan of base table
      
      
      970d515c
    • unknown's avatar
      Merge mockturtle.local:/home/dlenev/src/mysql-4.1-bg25966 · 04e727c7
      unknown authored
      into  mockturtle.local:/home/dlenev/src/mysql-5.0-bg25966-2
      
      
      sql/mysqld.cc:
        Auto merged
      04e727c7
    • unknown's avatar
      Fix for bug #25966 "2MB per second endless memory consumption after LOCK · cdd2a2e4
      unknown authored
      TABLE ... WRITE".
      
      Memory and CPU hogging occured when connection which had to wait for table
      lock was serviced by thread which previously serviced connection that was
      killed (note that connections can reuse threads if thread cache is enabled).
      One possible scenario which exposed this problem was when thread which
      provided binlog dump to replication slave was implicitly/automatically
      killed when the same slave reconnected and started pulling data through
      different thread/connection.
      The problem also occured when one killed particular query in connection
      (using KILL QUERY) and later this connection had to wait for some table
      lock.
      
      This problem was caused by the fact that thread-specific mysys_var::abort
      variable, which indicates that waiting operations on mysys layer should
      be aborted (this includes waiting for table locks), was set by kill
      operation but was never reset back. So this value was "inherited" by the
      following statements or even other connections (which reused the same
      physical thread). Such discrepancy between this variable and THD::killed
      flag broke logic on SQL-layer and caused CPU and memory hogging.
      
      This patch tries to fix this problem by properly resetting this member.
      
      There is no test-case associated with this patch since it is hard to test
      for memory/CPU hogging conditions in our test-suite.
      
      
      sql/mysqld.cc:
        We should not forget to reset THD::mysys_var::abort after kill operation
        if we are going to use thread to which this operation was applied for
        handling of other connections.
      sql/sp_head.cc:
        We should not forget to reset THD::mysys_var::abort after kill operation
        if we are going to use thread to which this operation was applied for
        handling of further statements.
      sql/sql_parse.cc:
        We should not forget to reset THD::mysys_var::abort after kill operation
        if we are going to use thread to which this operation was applied for
        handling of further statements.
      cdd2a2e4
    • unknown's avatar
      Fix for bug #25966 "2MB per second endless memory consumption after LOCK · db1d2f64
      unknown authored
      TABLE ... WRITE".
      
      CPU hogging occured when connection which had to wait for table lock was
      serviced by thread which previously serviced connection that was killed
      (note that connections can reuse threads if thread cache is enabled).
      One possible scenario which exposed this problem was when thread which
      provided binlog dump to replication slave was implicitly/automatically
      killed when the same slave reconnected and started pulling data through
      different thread/connection.
      In 5.* versions memory hogging was added to CPU hogging. Moreover in
      those versions the problem also occured when one killed particular query
      in connection (using KILL QUERY) and later this connection had to wait for
      some table lock.
      
      This problem was caused by the fact that thread-specific mysys_var::abort
      variable, which indicates that waiting operations on mysys layer should
      be aborted (this includes waiting for table locks), was set by kill
      operation but was never reset back. So this value was "inherited" by the
      following statements or even other connections (which reused the same
      physical thread). Such discrepancy between this variable and THD::killed
      flag broke logic on SQL-layer and caused CPU and memory hogging.
      
      This patch tries to fix this problem by properly resetting this member.
      
      There is no test-case associated with this patch since it is hard to test
      for memory/CPU hogging conditions in our test-suite.
      
      
      sql/mysqld.cc:
        We should not forget to reset THD::mysys_var::abort after kill operation
        if we are going to use thread to which this operation was applied for
        handling of other connections.
      db1d2f64
  6. 14 Mar, 2007 6 commits