1. 27 Mar, 2009 2 commits
    • He Zhenxing's avatar
      BUG#37145 Killing a statement doing DDL may log binlog event with error code 1053 · 11cd6177
      He Zhenxing authored
      When the thread executing a DDL was killed after finished its
      execution but before writing the binlog event, the error code in
      the binlog event could be set wrongly to ER_SERVER_SHUTDOWN or
      ER_QUERY_INTERRUPTED.
      
      This patch fixed the problem by ignoring the kill status when
      constructing the event for DDL statements.
      
      This patch also included the following changes in order to
      provide the test case.
      
       1) modified mysqltest to support variable for connection command
      
       2) modified mysql-test-run.pl, add new variable MYSQL_SLAVE to
          run mysql client against the slave mysqld.
      11cd6177
    • Leonard Zhou's avatar
      Merge · 7a9d2322
      Leonard Zhou authored
      7a9d2322
  2. 26 Mar, 2009 2 commits
    • Davi Arnaut's avatar
      Bug#33899: Deadlock in mysql_real_query with shared memory connections · 22e706bd
      Davi Arnaut authored
      The problem is that the read and write methods of the shared
      memory transport (protocol) didn't react to asynchronous close
      events, which could lead to a lock up as the client would wait
      (until time out) for a server response that will never come.
      
      The solution is to also wait for close events while waiting
      for I/O from or to the server.
      
      mysql-test/r/shm.result:
        Add test case result for Bug#33899
      mysql-test/t/shm.test:
        Add test case for Bug#33899
      vio/viosocket.c:
        Also wait for close events.
      22e706bd
    • Leonard Zhou's avatar
      BUG#35515 Aliases of variables in binary log are ignored with NAME_CONST. · 201ed147
      Leonard Zhou authored
            
      When add an aliase name after NAME_CONST, the aliase name will be overwrite.
            
      NAME_CONST will re-set the field's name only if there isn't an aliase in the
      function fix-fields().
      If there is an aliase, NAME_CONST doesn't re-set the field's name and keeps the old
      name.
      
      mysql-test/r/func_misc.result:
        Test result.
      mysql-test/r/rpl_name_const.result:
        Test case.
      mysql-test/t/func_misc.test:
        Add NAME_CONST test.
      mysql-test/t/rpl_name_const.test:
        Test result.
      sql/item.cc:
        Re-set field's name if the name is autogenerated, that mean without aliase.
      201ed147
  3. 25 Mar, 2009 5 commits
    • Alexey Kopytov's avatar
      Automerge. · 9aaa4aa5
      Alexey Kopytov authored
      9aaa4aa5
    • Chad MILLER's avatar
      bf9140da
    • Satya B's avatar
      merge to 5.0-bugteam · 29d514b0
      Satya B authored
      29d514b0
    • Satya B's avatar
      Fix for BUG#41541 - Valgrind warnings on packed MyISAM table · 2005f53c
      Satya B authored
                  
      After the table is compressed by the myisampack utility,
      opening the table by the server produces valgrind warnings.
            
      This happens because when we try to read a record into the buffer
      we alway assume that the remaining buffer to read is always equal 
      to word size(4 or 8 or 2 bytes) we read. Sometimes we have 
      remaining buffer size less than word size and trying to read the 
      entire word size will end up in valgrind errors.
                  
      Fixed by reading byte by byte when we detect the remaining buffer 
      size is less than the word size.
      
      myisam/mi_packrec.c:
        Fixed fill_buffer() to read byte by byte when the remaining 
        buffer size is less than word size.
      mysql-test/r/myisampack.result:
        Result file for BUG#41541
      mysql-test/t/myisampack.test:
        Testcase for BUG#41541
      2005f53c
    • Leonard Zhou's avatar
      Fix the test case error in PB. · 1aee9058
      Leonard Zhou authored
      1aee9058
  4. 24 Mar, 2009 5 commits
    • Alexey Kopytov's avatar
      Automerge. · 7db610db
      Alexey Kopytov authored
      7db610db
    • Alexey Kopytov's avatar
      Fix for bug #43801: mysql.test takes too long, fails due to · 808a99e9
      Alexey Kopytov authored
                          expired timeout on debx86-b in PB 
      
      Moved the resource-intensive test case for bug #41486 into 
      a separate test file to reduce execution time for mysql.test. 
      
      
      mysql-test/include/wait_until_disconnected.inc:
        Used in mysql-bug41486.test.
      mysql-test/r/mysql-bug41486.result:
        Moved the resource-intensive test case for bug #41486 into 
        a separate test file to reduce execution time for mysql.test.
      mysql-test/r/mysql.result:
        Moved the resource-intensive test case for bug #41486 into 
        a separate test file to reduce execution time for mysql.test.
      mysql-test/t/mysql-bug41486.test:
        Moved the resource-intensive test case for bug #41486 into 
        a separate test file to reduce execution time for mysql.test.
      mysql-test/t/mysql.test:
        Moved the resource-intensive test case for bug #41486 into 
        a separate test file to reduce execution time for mysql.test.
      808a99e9
    • Alexey Kopytov's avatar
      Fix for bug #42965: isinf() on 32bit x86 with gcc 4.3 can · cc58cded
      Alexey Kopytov authored
                          produce incorrect results for ROUND() 
      
      Added a workaround and a configure check to test whether 
      isinf() is affected by the GCC bug #39228. 
             
      Since no code in MySQL server is currently affected by that 
      bug, the patch is actually a safeguard for possible future 
      code modifications. No test cases or changelog entries are 
      needed. 
      
      
      configure.in:
        Added a configure check to test whether isinf() is safe to use
        in C code.
      include/my_global.h:
        Added a workaround for GCC bug #39228.
      cc58cded
    • Leonard Zhou's avatar
      Merge · 612ffe79
      Leonard Zhou authored
      612ffe79
    • Leonard Zhou's avatar
      BUG#41719 delayed INSERT into timestamp col needs set time_zone for concurrent binlogging · 9c3cbc04
      Leonard Zhou authored
      When do 'insert delayed' operation, the time_zone info doesn't be keeped in the row info.
      So when we do insert sometime later, time_zone didn't write into binlog.
      This will cause wrong result for timestamp column in slave.
      
      Our solution is that adding time_zone info with the delayed-row and
      restoring time_zone from row-info when execute that row in the furture by another thread.
      So we can write correct time_zone info into binlog and got correct result in slave.
      
      
      mysql-test/r/rpl_timezone.result:
        Test result
      mysql-test/t/rpl_timezone.test:
        Add test for bug#41719
      sql/sql_insert.cc:
        Add time_zone info in the delayed-row and restore time_zone when execute the row in the furture by another thread.
      9c3cbc04
  5. 23 Mar, 2009 5 commits
    • Matthias Leich's avatar
      Merge of fixes into actual tree · 34593b0d
      Matthias Leich authored
      34593b0d
    • Matthias Leich's avatar
      Fix for Bug#43015 and Bug#43065 · ba68d82a
      Matthias Leich authored
         Details for Bug#43015 main.lock_multi: Weak code (sleeps etc.)
         -------------------------------------------------------------
         - The fix for bug 42003 already removed a lot of the weaknesses mentioned.
         - Tests showed that there are unfortunately no improvements of this tests
           in MySQL 5.1 which could be ported back to 5.0.
         - Remove a superfluous "--sleep 1" around line 195
      
         Details for Bug#43065 main.lock_multi: This test is too big if the disk is slow
         -------------------------------------------------------------------------------
         - move the subtests for the bugs 38499 and 36691 into separate scripts
         - runtime under excessive parallel I/O load after applying the fix
           lock_multi           [ pass ]          22887
           lock_multi_bug38499  [ pass ]         536926
           lock_multi_bug38691  [ pass ]         258498
      ba68d82a
    • Sergey Glukhov's avatar
      remove compiler warnings · 28d822e6
      Sergey Glukhov authored
      28d822e6
    • Tatiana A. Nurnberg's avatar
      auto-merge · 3311d7b8
      Tatiana A. Nurnberg authored
      3311d7b8
    • Tatiana A. Nurnberg's avatar
      Bug#43254: SQL_SELECT_LIMIT=0 crashes command line client · 0263793d
      Tatiana A. Nurnberg authored
      When asking what database is selected, client expected
      to *always* get an answer from the server.
      
      We now handle failure more gracefully.
      
      See comments in ticket for a discussion of what happens,
      and how things interlock.
      
      
      client/mysql.cc:
        Handle empty result-sets gracefully, as opposed
        to just result sets with n>0 items that may themselves
        be empty.
      0263793d
  6. 20 Mar, 2009 1 commit
  7. 19 Mar, 2009 12 commits
    • Davi Arnaut's avatar
      Bug#43461: invalid comparison with string literal in default.c · 2d77ca39
      Davi Arnaut authored
      Don't compare string literals as it results in unspecified behavior.
      
      mysys/default.c:
        Test for a empty string.
      2d77ca39
    • Ignacio Galarza's avatar
      auto-merge · bb1dbe17
      Ignacio Galarza authored
      bb1dbe17
    • Bernt M. Johnsen's avatar
      Bug#43329 merge from 5.0 GCA-branch · cc159d47
      Bernt M. Johnsen authored
      cc159d47
    • Ignacio Galarza's avatar
      auto-merge · fd47377a
      Ignacio Galarza authored
      fd47377a
    • Staale Smedseng's avatar
      Bug #42502 huge memory leak possible with timezone · 96ccd903
      Staale Smedseng authored
      functions
            
      Unknown timezone specifications are properly rejected
      by the server, but are copied into tz_storage before
      rejection, and hence is retained until end of server 
      life. With sufficiently large bogus timezone specs, 
      it is easy to exhaust system memory.
            
      Allocation of memory for a copy of the timezone
      name is delayed until after verification of validity,
      at the cost of a memcpy of the timezone info. This 
      only happens once, future lookups will hit the cached
      structure.
      96ccd903
    • Alexey Kopytov's avatar
      Automerge. · 27e7da48
      Alexey Kopytov authored
      27e7da48
    • Alexey Kopytov's avatar
      Fixed test failures in 5.1/6.0 introduced by the patch · 326cb98b
      Alexey Kopytov authored
      for bug #41486. Session max_allowed_packet is read-only
      as of MySQL 5.1.31. In addition, the global variable
      now has no effect on the current session.
      326cb98b
    • Sergey Glukhov's avatar
      automerge · 162f96be
      Sergey Glukhov authored
      162f96be
    • Sergey Glukhov's avatar
      Bug#41268 Help Text for \c is misleading in client command line interface · 97ab8b97
      Sergey Glukhov authored
      fixed help message
      
      
      client/mysql.cc:
        fixed help message
      97ab8b97
    • Satya B's avatar
      merge to 5.0-bugteam · 97dc0534
      Satya B authored
      97dc0534
    • Sergey Glukhov's avatar
      Bug#41627 Illegal mix of collations in LEAST / GREATEST / CASE · 49f6675c
      Sergey Glukhov authored
      Don't throw an error after checking the first and the second arguments.
      Continue with checking the third and higher arguments and if some of
      them is stronger according to coercibility rules,
      then this argument's collation is set as result collation.
      
      
      mysql-test/r/ctype_collate.result:
        test result
      mysql-test/t/ctype_collate.test:
        test case
      sql/item.cc:
        Don't throw an error after checking the first and the second arguments.
        Continue with checking the third and higher arguments and if some of
        them is stronger according to coercibility rules,
        then this argument's collation is set as result collation.
      49f6675c
    • Satya B's avatar
      Fix for BUG#21360 - mysqldump error on federated tables · b696ba1f
      Satya B authored
                              
      When loading dump created by mysqldump tool an error is
      thrown saying storage engine for the table doesn't have 
      an option.
                              
      mysqldump tries to re-insert the data into the federated
      table which causes the error. Since the data is already
      available on the remote server, mysqldump shouldn't try
      to dump the data again for FEDERATED tables.
                              
      As stated in the bug page, it can be considered similar
      to the MERGE ENGINE with "view only" nature.
                              
      Fixed by adding the "FEDERATED ENGINE" to the exception
      list to ignore the data.
      
      client/mysqldump.c:
        Fixed check_if_ignore_table() to ignore FEDERATED engine
        when dumping the table data.
      mysql-test/r/federated.result:
        Result file for BUG#21360
      mysql-test/t/federated.test:
        Testcase for BUG#21360
      b696ba1f
  8. 18 Mar, 2009 3 commits
    • Bernt M. Johnsen's avatar
      Bug#43329 prepared for commit on 5.0 · b944a179
      Bernt M. Johnsen authored
      b944a179
    • Alexey Kopytov's avatar
      Automerge. · 9da759e8
      Alexey Kopytov authored
      9da759e8
    • Alexey Kopytov's avatar
      Fix for bug#41486: extra character appears in BLOB for every · e7feb6f7
      Alexey Kopytov authored
                         ~40Mb after mysqldump/import 
              
      When the input string exceeds the maximum allowed size for the 
      internal buffer, batch_readline() returns a truncated string. 
      Since there was no way for a caller to determine whether the 
      string was truncated or not, the command line client assumed 
      batch_readline() to always return the whole input string and 
      appended a newline character. This resulted in garbled data 
      when importing dumps containing strings longer than the 
      maximum input buffer size. 
        
      Fixed by adding a flag to the batch_readline() interface to 
      signal a truncated string to the caller. 
        
      Other minor problems fixed during patch implementation: 
       
      - The maximum allowed buffer size for batch_readline() was set 
      up depending on the client's max_allowed_packet value. It does 
      not actully make any sense, as those variables are not 
      related. The input buffer size limit is now always set to 1 
      MB. 
        
      - fill_buffer() did not always set the EOF flag. 
       
      - The input buffer could actually grow twice as the specified 
      limit due to insufficient checks in intern_read_line(). 
      
      client/my_readline.h:
        Changed the interface of batch_readline().
      client/mysql.cc:
        Honor the truncated flag returned by batch_readline() and do  
        not append the newline character if it was set. Since we can't 
        change the interfaces for readline()/fgets() used in the  
        interactive mode, always assume the returned string was not  
        truncated. In addition, always set the batch_readline()  
        internal buffer to 1 MB, independently from the client's  
        max_allowed_packet.
      client/readline.cc:
        Added the 'truncated' argument do batch_readline() to signal 
        truncated string to a caller. 
        Fixed fill_buffer() to set the EOF flag correctly. 
        Fixed checks in intern_read_line() to not allow the internal  
        buffer grow past the specified limit.
      mysql-test/r/mysql.result:
        Added a test case for bug #41486.
      mysql-test/t/mysql.test:
        Added a test case for bug #41486.
      e7feb6f7
  9. 17 Mar, 2009 1 commit
  10. 15 Mar, 2009 1 commit
  11. 13 Mar, 2009 1 commit
    • Georgi Kodinov's avatar
      Bug #22047 : Time in SHOW PROCESSLIST for SQL thread in replication · c46f872e
      Georgi Kodinov authored
      seems to become negative
      
      THD::start_time has a dual meaning : it's either the time since the process
      entered a given state or is the transaction time returned by e.g. NOW().
      This causes problems, as sometimes THD::start_time may be set to a value
      that is correct and needed when used as a base for NOW(), but these times
      may be arbitrary (SET @@timestamp) or non-local (coming from the master 
      through the replication feed).
      If one such non-local time is set there's no way to return a correct value
      for e.g. SHOW PROCESSLIST or SELECT ... FROM INFORMATION_SCHEMA.PROCESSLIST.
      Fixed by making the Time column in SHOW PROCESSLIST SIGNED LONG instead of 
      UNSIGNED LONG and doing the correct conversions.
            
      Note that no reliable test suite can be constructed, since it would require
      knowing the local time and can't be achieved by the means of the current test
      suite.
      
      sql/sql_show.cc:
        Bug #22047: make the Time in SHOW PROCESSLIST LONG from 
        LONG UNSIGNED
      c46f872e
  12. 12 Mar, 2009 1 commit
  13. 11 Mar, 2009 1 commit
    • Timothy Smith's avatar
      Bug #32625: Make test type_bit_innodb more robust · 7c738cff
      Timothy Smith authored
      Since there is more than one duplicate value in the table, when adding the
      unique index it is not deterministic which value will be reported as causing a
      problem.  Replace the reported value with '' so that it doesn't affect the
      results.
      7c738cff