1. 21 Mar, 2007 1 commit
  2. 18 Mar, 2007 1 commit
  3. 17 Mar, 2007 3 commits
  4. 16 Mar, 2007 4 commits
    • unknown's avatar
      Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-arch · fc7020b0
      unknown authored
      into  zim.(none):/home/bk/mysql-5.1-arch
      
      fc7020b0
    • unknown's avatar
      The pthread() support was not working. Once I fixed use-thread in a previous... · 5709fe42
      unknown authored
      The pthread() support was not working. Once I fixed use-thread in a previous push I realized that the pthread/windows code was not working. I've replaced the fork/thread design with a pure pthread design using condition timers and broadcast.
      
      Ramification, UNIX now uses thread, support for slaves had to be dropped and there is no need for the --use-threads flag.
      Added --concurrency=0 option so that it will start at 1 and keep going up until something bad happens :)
      
      
      client/client_priv.h:
        Dead option removed
      client/mysqlslap.c:
        Removed lock code, replaced with posix thread code.
      mysql-test/mysql-test-run.pl:
        Removed dead option
      mysql-test/t/mysqlslap.test:
        Removed dead option
      5709fe42
    • unknown's avatar
      Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 · ea545949
      unknown authored
      into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
      
      ea545949
    • unknown's avatar
      Correctly report load type. · 2b47a7d2
      unknown authored
      Updated engine to also handle create options
      Secondary indexes can now be generated (aka the test PeterZ thoughts!)
      
      
      client/client_priv.h:
        Option for generating secondary indexes
      client/mysqlslap.c:
        Option for generating secondary index operations. 
        Cleaned up memory allocation that was wasteful.
        Engine options are now possible
        Correctly report test type.
      mysql-test/t/mysqlslap.test:
        Additional test for secondary indexes
      sql/authors.h:
        Updated for Patrick
      2b47a7d2
  5. 15 Mar, 2007 11 commits
    • unknown's avatar
      Merge trift2.:/MySQL/M50/mysql-5.0 · 2cfed8e5
      unknown authored
      into  trift2.:/MySQL/M51/mysql-5.1
      
      
      configure.in:
        Null-merge, a 5.00 version change does not affect 5.1
      2cfed8e5
    • unknown's avatar
      Merge mysql.com:/home/svoj/devel/bk/mysql-5.0-engines · a6a13e84
      unknown authored
      into  mysql.com:/home/svoj/devel/bk/mysql-5.1-engines
      
      a6a13e84
    • 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 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-5.0-bg25966-2 · 46c92021
      unknown authored
      into  mockturtle.local:/home/dlenev/src/mysql-5.1-bg25966
      
      
      sql/mysqld.cc:
        Auto merged
      sql/sp_head.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      46c92021
    • 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
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines · 3a9a9df8
      unknown authored
      into  mockturtle.local:/home/dlenev/src/mysql-5.1-bg25966
      
      3a9a9df8
  6. 14 Mar, 2007 13 commits
  7. 13 Mar, 2007 7 commits
    • unknown's avatar
      Removed tabs. · b7b0406b
      unknown authored
      b7b0406b
    • unknown's avatar
      Added comment, and fixed test. · aaec044e
      unknown authored
      
      client/mysqlslap.c:
        Comment added (and extended if() so that I didn't have to keep looking at it to make sure it was right).
      aaec044e
    • unknown's avatar
      Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.1-engines · 0a0dd81d
      unknown authored
      into  blade08.mysql.com:/data0/istruewing/autopush/mysql-5.1-bug25460
      
      0a0dd81d
    • unknown's avatar
      Bug#25460 - High concurrency MyISAM access causes severe mysqld crash. · ec34f88c
      unknown authored
      The previous two patches for this bug worked together so that
      no permanent table was memory mapped. The first patch tried to
      avoid mapping while a table is in use. It allowed mapping only
      if there was exactly one lock on the table, assuming that the
      calling thread owned it. During mi_open(), a different call to
      memory mapping was coded, which did not have this limitation.
      
      The second patch tried to remove the code duplication and just
      called mi_extra() from mi_open() an thus inherited the limitation.
      But on open, a thread does not have a lock on the table...
      
      A possible solution would be to check for zero or one lock.
      But since I learned that it is safe to memory map a file while
      normal file I/O is done on it, I removed the restriction altogether
      and allow to memory map while a table is in use.
      
      No test case. I do not see a chance to verify with the test suite
      which kind of I/O is used on a table.
      
      
      storage/myisam/mi_extra.c:
        Bug#25460 - High concurrency MyISAM access causes severe mysqld crash.
        Allow to memory map while table is in use.
      ec34f88c
    • unknown's avatar
      Merge mysql.com:/home/svoj/devel/mysql/BUG26881/mysql-5.0-engines · 1335dd05
      unknown authored
      into  mysql.com:/home/svoj/devel/mysql/BUG26881/mysql-5.1-engines
      
      
      mysql-test/r/merge.result:
        Auto merged
      mysql-test/t/merge.test:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      storage/myisam/ha_myisam.cc:
        Auto merged
      storage/myisam/mi_create.c:
        Auto merged
      1335dd05
    • 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