1. 26 Jun, 2007 3 commits
    • unknown's avatar
      Merge olga.mysql.com:/home/igor/mysql-5.0-opt · 39ef7a53
      unknown authored
      into  olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug29087
      
      
      39ef7a53
    • unknown's avatar
      Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 69f82e25
      unknown authored
      into  magare.gmz:/home/kgeorge/mysql/autopush/B29154-5.0-opt
      
      
      69f82e25
    • unknown's avatar
      Fixed bug #29087. This bug manifested itself for queries that performed · 0127c1a3
      unknown authored
      a lookup into a BINARY index by a key ended with spaces. It caused
      an assertion abort for a debug version and wrong results for non-debug
      versions.
      
      The problem occurred because the function _mi_pack_key stripped off 
      the trailing spaces from binary search keys while the function _mi_make_key
      did not do it when keys were inserted into the index.
      
      Now the function _mi_pack_key does not remove the trailing spaces from
      search keys if they are of the binary type.
      
      
      mysql-test/r/binary.result:
        Added a test case for bug #29087.
      mysql-test/t/binary.test:
        Added a test case for bug #29087.
      0127c1a3
  2. 25 Jun, 2007 5 commits
    • unknown's avatar
      Merge gleb.loc:/home/uchum/work/bk/4.1-opt · 637d9f1c
      unknown authored
      into  gleb.loc:/home/uchum/work/bk/5.0-opt
      
      
      637d9f1c
    • unknown's avatar
      Merge gleb.loc:/home/uchum/work/bk/5.0 · fb12c686
      unknown authored
      into  gleb.loc:/home/uchum/work/bk/5.0-opt
      
      
      fb12c686
    • unknown's avatar
      Merge gleb.loc:/home/uchum/work/bk/4.1 · be684dc0
      unknown authored
      into  gleb.loc:/home/uchum/work/bk/4.1-opt
      
      
      be684dc0
    • unknown's avatar
      Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 4ea2eb4a
      unknown authored
      into  magare.gmz:/home/kgeorge/mysql/autopush/B29154-5.0-opt
      
      
      4ea2eb4a
    • unknown's avatar
      Bug #29154: LOCK TABLES is not atomic when >1 InnoDB tables are locked · 39459397
      unknown authored
        LOCK TABLES takes a list of tables to lock. It may lock several 
        tables successfully and then encounter a tables that it can't lock, 
        e.g. because it's locked. In such case it needs to undo the locks on
        the already locked tables. And it does that. But it has also notified
        the relevant table storage engine handlers that they should lock.
        The only reliable way to ensure that the table handlers will give up
        their locks is to end the transaction. This is what UNLOCK TABLE 
        does : it ends the transaction if there were locked tables by LOCK 
        tables.
        It is possible to end the transaction when the lock fails in 
        LOCK TABLES because LOCK TABLES ends the transaction at its start 
        already. 
        Fixed by ending (again) the transaction when LOCK TABLES fails to
        lock a table.
      
      
      mysql-test/r/innodb_mysql.result:
        Bug #29154: test case
      mysql-test/t/innodb_mysql.test:
        Bug #29154: test case
      sql/sql_parse.cc:
        Bug #29154: end the trasaction at a failing 
        LOCK TABLES so the handler can free its locks.
      39459397
  3. 24 Jun, 2007 3 commits
    • unknown's avatar
      Merge olga.mysql.com:/home/igor/mysql-5.0-opt · f30db309
      unknown authored
      into  olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug25602
      
      
      sql/sql_select.cc:
        Auto merged
      f30db309
    • unknown's avatar
      Merge gleb.loc:/home/uchum/work/bk/5.0 · fec835f1
      unknown authored
      into  gleb.loc:/home/uchum/work/bk/5.0-opt
      
      
      sql/log_event.cc:
        Auto merged
      fec835f1
    • unknown's avatar
      Fixed bug #25602. A query with DISTINCT in the select list to which · e009b764
      unknown authored
      the loose scan optimization for grouping queries was applied returned 
      a wrong result set when the query was used with the SQL_BIG_RESULT
      option.
      
      The SQL_BIG_RESULT option forces to use sorting algorithm for grouping
      queries instead of employing a suitable index. The current loose scan
      optimization is applied only for one table queries when the suitable
      index is covering. It does not make sense to use sort algorithm in this
      case. However the create_sort_index function does not take into account
      the possible choice of the loose scan to implement the DISTINCT operator
      which makes sorting unnecessary. Moreover the current implementation of
      the loose scan for queries with distinct assumes that sorting will
      never happen. Thus in this case create_sort_index should not call
      the function filesort.
      
      
      mysql-test/r/group_min_max.result:
        Added a test case for bug #25602.
      mysql-test/t/group_min_max.test:
        Added a test case for bug #25602.
      e009b764
  4. 23 Jun, 2007 3 commits
    • unknown's avatar
      Merge gleb.loc:/home/uchum/work/bk/4.1-opt · b462e06e
      unknown authored
      into  gleb.loc:/home/uchum/work/bk/5.0-opt
      
      
      b462e06e
    • unknown's avatar
      Merge gleb.loc:/home/uchum/work/bk/5.0-opt-29095 · d37471b4
      unknown authored
      into  gleb.loc:/home/uchum/work/bk/5.0-opt
      
      
      d37471b4
    • unknown's avatar
      Fixed bug #29095. · 1bab1ddc
      unknown authored
      INSERT into table from SELECT from the same table
      with ORDER BY and LIMIT was inserting other data
      than sole SELECT ... ORDER BY ... LIMIT returns.
      
      One part of the patch for bug #9676 improperly pushed
      LIMIT to temporary table in the presence of the ORDER BY
      clause.
      That part has been removed.
      
      
      sql/sql_select.cc:
        Fixed bug #29095.
        One part of the patch for bug #9676 improperly pushed
        LIMIT to temporary table in the presence of the ORDER BY
        clause.
        That part has been removed.
      mysql-test/t/insert_select.test:
        Expanded the test case for bug #9676.
        Created a test case for bug #29095.
      mysql-test/r/insert_select.result:
        Expanded the test case for bug #9676.
        Created a test case for bug #29095.
      1bab1ddc
  5. 22 Jun, 2007 9 commits
    • unknown's avatar
      Merge trift2.:/MySQL/M50/mysql-5.0 · 8541b56c
      unknown authored
      into  trift2.:/MySQL/M50/push-5.0
      
      
      8541b56c
    • unknown's avatar
      Add the "nist" suite to the "test-bt" target, · 054201f4
      unknown authored
      to be run only if it is available on the machine.
      
      
      054201f4
    • unknown's avatar
      Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · f3940eba
      unknown authored
      into  magare.gmz:/home/kgeorge/mysql/autopush/B28400-5.0-opt
      
      
      f3940eba
    • unknown's avatar
      Bug #27383: Crash in test "mysql_client_test" · fe036d98
      unknown authored
      The C optimizer may decide that data access operations
      through pointer of different type are not related to 
      the original data (strict aliasing).
      This is what happens in fetch_long_with_conversion(),
      when called as part of mysql_stmt_fetch() : it tries 
      to check for truncation errors by first storing float
      (and other types of data) into a char * buffer and then 
      accesses them through a float pointer.
      This is done to prevent the effects of excess precision
      when using FPU registers.
      However the doublestore() macro converts a double pointer
      to an union pointer. This violates the strict aliasing rule.
      Fixed by making the intermediary variables volatile (
      to not re-introduce the excess precision bug) and using
      the intermediary value instead of the char * buffer.
      Note that there can be loss of precision for both signed
      and unsigned 64 bit integers converted to double and back,
      so the check must stay there (even for compatibility 
      reasons).
      Based on the excellent analysis in bug 28400.
      
      
      libmysql/libmysql.c:
        Bug #27383: avoid pointer aliasing problems while 
        not re-violating the Intel FPU gcc bug.
      fe036d98
    • unknown's avatar
      Merge trift2.:/MySQL/M50/mysql-5.0 · bdc32139
      unknown authored
      into  trift2.:/MySQL/M50/push-5.0
      
      
      bdc32139
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint · f0dbd310
      unknown authored
      into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/50
      
      
      f0dbd310
    • unknown's avatar
      Merge bk@192.168.21.1:mysql-5.0-opt · e434a5ca
      unknown authored
      into  mysql.com:/home/hf/work/28839/my50-28839
      
      
      e434a5ca
    • unknown's avatar
      rpl_skip_error.test fixed · cb606a66
      unknown authored
      
      mysql-test/r/rpl_skip_error.result:
        test result fixed
      mysql-test/t/rpl_skip_error.test:
        inconsistent column results hidden
      cb606a66
    • unknown's avatar
      Bug #29138 'kill' fails in pushbuild · 37344c68
      unknown authored
      The reason the "reap;" succeeds unexpectedly is because the query was completing(almost always) and the network buffer was big enough to store the query result (sometimes) on Windows, meaning the response was completely sent before the server thread could be killed.
      
      Therefore we use a much longer running query that doesn't have a chance to fully complete before the reap happens, testing the kill properly.
      
      
      mysql-test/r/kill.result:
        We use a much longer running query that doesn't have a chance to fully complete before the reap happens.
      mysql-test/t/kill.test:
        We use a much longer running query that doesn't have a chance to fully complete before the reap happens.
      37344c68
  6. 21 Jun, 2007 17 commits
    • unknown's avatar
      Merge olga.mysql.com:/home/igor/mysql-5.0-opt · 19446015
      unknown authored
      into  olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug29104
      
      
      sql/item.cc:
        Auto merged
      19446015
    • unknown's avatar
      Merge maint1.mysql.com:/data/localhome/tsmith/bk/maint/41 · 8ddf61d3
      unknown authored
      into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/50
      
      
      8ddf61d3
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0-rpl · fc7f407a
      unknown authored
      into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/50
      
      
      mysql-test/t/innodb.test:
        Auto merged
      mysql-test/r/innodb.result:
        Manual merge
      fc7f407a
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1-rpl · 6ac33675
      unknown authored
      into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/41
      
      
      6ac33675
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 2e8357b4
      unknown authored
      into  amd64.(none):/src/bug27029/my50-bug27029
      
      
      myisam/sort.c:
        Auto merged
      2e8357b4
    • unknown's avatar
      Bug#27029 alter table ... enable keys crashes mysqld on large table · c3e4b61c
      unknown authored
      - When creating an index for the sort, the number of rows plus 1 is used 
      to allocate a buffer.  In this test case, the number of rows 4294967295 
      is the max value of an unsigned integer, so when 1 was added to it, a 
      buffer of size 0 was allocated causing the crash.
      - Create new test suite for this bug's test suite as per QA.
      
      
      myisam/sort.c:
        Bug#27029 alter table ... enable keys crashes mysqld on large table
        - Check to make sure the value of records is < UINT_MAX32 to avoid a 
        false positive on the remaining condition.
      mysql-test/suite/large_tests/README.TXT:
        Bug#27029 alter table ... enable keys crashes mysqld on large table
        - New testsuite for large tests.
        - Added mtr hint for potential testers.
      mysql-test/suite/large_tests/r/alter_table.result:
        Bug#27029 alter table ... enable keys crashes mysqld on large table
        - New testsuite for large tests.
        - Added results for bug.
      mysql-test/suite/large_tests/t/alter_table.test:
        Bug#27029 alter table ... enable keys crashes mysqld on large table
        - New testsuite for large tests.
        - Added test for bug.
      c3e4b61c
    • unknown's avatar
      Merge maint1.mysql.com:/data/localhome/tsmith/bk/50 · 0e99d690
      unknown authored
      into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/50
      
      
      configure.in:
        Auto merged
      0e99d690
    • unknown's avatar
      Merge mysql.com:/nfsdisk1/lars/bk/mysql-5.0 · 12e1a9df
      unknown authored
      into  mysql.com:/nfsdisk1/lars/bk/mysql-5.0-rpl
      
      
      12e1a9df
    • unknown's avatar
      Test fix · 8b3c5753
      unknown authored
      8b3c5753
    • unknown's avatar
      e0e739b6
    • unknown's avatar
      Merge pilot.(none):/data/msvensson/mysql/bug28769/my50-bug28769 · 022ee2b0
      unknown authored
      into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
      
      
      022ee2b0
    • unknown's avatar
      Merge pilot.(none):/data/msvensson/mysql/bug28742/my50-bug28742 · f3954ba1
      unknown authored
      into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      f3954ba1
    • unknown's avatar
      Merge bk@192.168.21.1:mysql-5.0-opt · f77d4168
      unknown authored
      into  mysql.com:/home/hf/work/28839/my50-28839
      
      
      f77d4168
    • unknown's avatar
      rpl_skip_error test fixed · 4cd1b2d3
      unknown authored
      
      mysql-test/r/rpl_skip_error.result:
        result fixed
      mysql-test/t/rpl_skip_error.test:
        master port dependency eliminated
      4cd1b2d3
    • unknown's avatar
      Merge trift2.:/MySQL/M50/mysql-5.0 · 0b00e829
      unknown authored
      into  trift2.:/MySQL/M50/push-5.0
      
      
      0b00e829
    • unknown's avatar
      Merge bk@192.168.21.1:mysql-5.0-opt · 8c353de9
      unknown authored
      into  mysql.com:/home/hf/work/28839/my50-28839
      
      
      sql/log_event.cc:
        Auto merged
      8c353de9
    • unknown's avatar
      Bug#24924: shared-memory-base-name that is too long causes buffer overflow · 4d9cc3db
      unknown authored
      long shared-memory-base-names could overflow a static internal buffer
      and thus crash mysqld and various clients.  change both to dynamic
      buffers, show everything but overflowing those buffers still works.
      
      The test case for this would pretty much amount to
      mysqld --shared-memory-base-name=HeyMrBaseNameXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX --shared-memory=1 &
      mysqladmin --no-defaults --shared-memory-base-name=HeyMrBaseNameXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX shutdown
      
      Unfortunately, we can't just use an .opt file for the
      server. The .opt file is used at start-up, before any
      include in the actual test can tell mysqltest to skip
      this one on non-Windows. As a result, such a test would
      break on unices.
      
      Fixing mysql-test-run.pl to export full path for master
      and slave would enable us to start a server from within
      the test which is ugly and, what's more, doesn't work as
      the server blocks (mysqltest offers no fire-and-forget
      fork-and-exec), and mysqladmin never gets run.
      
      Making the test rpl_windows_shm or some such so we can
      is beyond ugly. As is introducing another file-name based
      special case (run "win*.test" only when on Windows). As is
      (yuck) coding half the test into mtr (as in, having it
      hand out a customized environment conductive to the shm-
      thing on Win only).
      
      Situation is exacerbated by the fact that .sh is not
      necessary run as expected on Win.
      
      In short, it's just not worth it. No test-case until we
      have a new-and-improved test framework.
      
      
      sql-common/client.c:
        Bug#24924: shared-memory-base-name that is too long causes buffer overflow
        
        compose shared memory name in dynamic rather than static buffer to prevent
        overflows (clients)
      sql/mysqld.cc:
        Bug#24924: shared-memory-base-name that is too long causes buffer overflow
        
        compose shared memory name in dynamic rather than static buffer to prevent
        overflows (server)
      4d9cc3db