1. 21 Mar, 2007 1 commit
  2. 19 Mar, 2007 1 commit
    • unknown's avatar
      sql_insert.cc: · a72aa6a6
      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.
      a72aa6a6
  3. 17 Mar, 2007 1 commit
  4. 16 Mar, 2007 7 commits
    • unknown's avatar
      Bug#27006: AFTER UPDATE triggers not fired with INSERT ... ON DUPLICATE KEY · 1238f850
      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.
      1238f850
    • unknown's avatar
      Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 0583358e
      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
      0583358e
    • unknown's avatar
      Bug #26261: · 6c2b21ba
      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
      6c2b21ba
    • unknown's avatar
      Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · ed685138
      unknown authored
      into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt
      
      ed685138
    • unknown's avatar
      Bug#26285 selecting information_schema crahes server · 723bac48
      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
      723bac48
    • unknown's avatar
      Merge bk@192.168.21.1:mysql-5.0-opt · 0d851a4f
      unknown authored
      into  mysql.com:/home/hf/work/mrg/mysql-5.0-opt
      
      0d851a4f
    • unknown's avatar
      Merge bk@192.168.21.1:mysql-5.0 · e09cfa30
      unknown authored
      into  mysql.com:/home/hf/work/mrg/mysql-5.0-opt
      
      
      sql/sql_parse.cc:
        Auto merged
      e09cfa30
  5. 15 Mar, 2007 11 commits
    • unknown's avatar
      Raise version number after cloning 5.0.38 · fd97548d
      unknown authored
      fd97548d
    • unknown's avatar
      Merge mysql.com:/home/svoj/devel/bk/mysql-4.1-engines · c79b1f15
      unknown authored
      into  mysql.com:/home/svoj/devel/bk/mysql-5.0-engines
      
      c79b1f15
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 1bfa0046
      unknown authored
      into  moonbone.local:/mnt/gentoo64/work/27033-bug-5.0-opt-mysql
      
      1bfa0046
    • unknown's avatar
      Bug#27033: 0 as LAST_INSERT_ID() after INSERT .. ON DUPLICATE if rows were · 5660bb85
      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.
      5660bb85
    • unknown's avatar
      Merge mysql.com:/home/hf/work/26833/my50-26833 · ddb2701d
      unknown authored
      into  mysql.com:/home/hf/work/mrg/mysql-5.0-opt
      
      
      sql/sql_parse.cc:
        Auto merged
      ddb2701d
    • unknown's avatar
      Merge bk@192.168.21.1:mysql-5.0 · 6ae76968
      unknown authored
      into  mysql.com:/home/hf/work/mrg/mysql-5.0-opt
      
      
      mysql-test/r/gis-rtree.result:
        Auto merged
      6ae76968
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 3696e9d8
      unknown authored
      into  mockturtle.local:/home/dlenev/src/mysql-4.1-merge
      
      3696e9d8
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 2cf9f7a2
      unknown authored
      into  mockturtle.local:/home/dlenev/src/mysql-5.0-merge
      
      2cf9f7a2
    • unknown's avatar
      Merge mockturtle.local:/home/dlenev/src/mysql-4.1-bg25966 · 23d9d63d
      unknown authored
      into  mockturtle.local:/home/dlenev/src/mysql-5.0-bg25966-2
      
      
      sql/mysqld.cc:
        Auto merged
      23d9d63d
    • unknown's avatar
      Fix for bug #25966 "2MB per second endless memory consumption after LOCK · 1d28a6ae
      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.
      1d28a6ae
    • unknown's avatar
      Fix for bug #25966 "2MB per second endless memory consumption after LOCK · 3dae7ac8
      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.
      3dae7ac8
  6. 14 Mar, 2007 11 commits
  7. 13 Mar, 2007 7 commits
    • unknown's avatar
      Removed tabs. · b7b0406b
      unknown authored
      b7b0406b
    • unknown's avatar
      Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 18b2a3cf
      unknown authored
      into  magare.gmz:/home/kgeorge/mysql/autopush/B26672-5.0-opt
      
      
      mysql-test/r/order_by.result:
        Auto merged
      mysql-test/t/order_by.test:
        Auto merged
      18b2a3cf
    • unknown's avatar
      Merge mysql.com:/home/svoj/devel/mysql/BUG26881/mysql-4.1-engines · e2a0109f
      unknown authored
      into  mysql.com:/home/svoj/devel/mysql/BUG26881/mysql-5.0-engines
      
      
      myisam/mi_create.c:
        Auto merged
      mysql-test/t/merge.test:
        Auto merged
      sql/ha_myisam.cc:
        Auto merged
      sql/sql_parse.cc:
        Use local.
      mysql-test/r/merge.result:
        SCCS merged
      e2a0109f
    • unknown's avatar
      BUG#26881 - Large MERGE tables report incorrect specification when no · 4d7f2c22
      unknown authored
                  differences in tables
      Certain merge tables were wrongly reported as having incorrect definition:
      - Some fields that are 1 byte long (e.g. TINYINT, CHAR(1)), might
        be internally casted (in certain cases) to a different type on a
        storage engine layer. (affects 4.1 and up)
      - If tables in a merge (and a MERGE table itself) had short VARCHAR column (less
        than 4 bytes) and at least one (but not all) tables were ALTER'ed (even to an
        identical table: ALTER TABLE xxx ENGINE=yyy), table definitions went ouf of
        sync. (affects 4.1 only)
      
      This is fixed by relaxing a check for underlying conformance and setting
      field type to FIELD_TYPE_STRING in case varchar is shorter than 4
      when a table is created.
      
      
      myisam/mi_create.c:
        Added a comment.
      mysql-test/r/merge.result:
        A test case for bug#26881.
      mysql-test/t/merge.test:
        A test case for bug#26881.
      sql/ha_myisam.cc:
        Relaxed some checks performed by check_definition():
        As comparing of fulltext keys (and key segments) is not yet implemented,
        only return an error in case one of keys is fulltext and other is not.
        Otherwise, if both keys are fulltext, accept them as is.
        
        As comparing of spatial keys (and key segments) is not yet implemented,
        only return an error in case one of keys is spatial and other is not.
        Otherwise, if both keys are spatial, accept them as is.
        
        A workaround to handle situation when field is casted from FIELD_SKIP_ZERO
        to FIELD_NORMAL. This could happen only in case field length is 1 and row
        format is fixed.
      sql/sql_parse.cc:
        When a table that has varchar field shorter than 4 is created, field type is
        set to FIELD_TYPE_VAR_STRING. Later, when a table is modified using alter
        table, field type is changed to FIELD_TYPE_STRING (see Field_string::type).
        That means HA_OPTION_PACK_RECORD flag might be lost and thus null_bit might
        be shifted by alter table, in other words alter table doesn't create 100%
        equal table definition.
        
        This is usually not a problem, since when a table is created/altered,
        definition on a storage engine layer is based on one that is passed from
        sql layer. But it is a problem for merge engine - null_bit is shifted when
        a table (merge or underlying) is altered.
        
        Set field type to FIELD_TYPE_STRING in case FIELD_TYPE_VAR_STRING is shorter
        than 4 when a table is created as it is done in Field::type.
      4d7f2c22
    • unknown's avatar
      Merge mysql.com:/home/svoj/devel/mysql/BUG26881/mysql-4.1-engines · 3f417f1a
      unknown authored
      into  mysql.com:/home/svoj/devel/mysql/BUG26881/mysql-5.0-engines
      
      3f417f1a
    • unknown's avatar
      Merge mysql.com:/home/svoj/devel/bk/mysql-5.0 · 3792a3de
      unknown authored
      into  mysql.com:/home/svoj/devel/mysql/BUG26881/mysql-5.0-engines
      
      
      myisam/rt_index.c:
        Auto merged
      sql/field.h:
        Auto merged
      3792a3de
    • unknown's avatar
      Merge mysql.com:/home/svoj/devel/bk/mysql-4.1 · e90872a4
      unknown authored
      into  mysql.com:/home/svoj/devel/mysql/BUG26881/mysql-4.1-engines
      
      e90872a4
  8. 12 Mar, 2007 1 commit