1. 19 Mar, 2009 14 commits
    • Staale Smedseng's avatar
      Merge from 5.0-bugteam · 6725f3ef
      Staale Smedseng authored
      6725f3ef
    • Staale Smedseng's avatar
      Bug #42502 huge memory leak possible with timezone · 28f4090b
      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.
      28f4090b
    • Alexey Kopytov's avatar
      Automerge. · 169bf745
      Alexey Kopytov authored
      169bf745
    • Alexey Kopytov's avatar
      Automerge. · 35f9f896
      Alexey Kopytov authored
      35f9f896
    • Alexey Kopytov's avatar
      Automerge. · a4f59d4a
      Alexey Kopytov authored
      a4f59d4a
    • Alexey Kopytov's avatar
      Automerge. · bd1bbd10
      Alexey Kopytov authored
      bd1bbd10
    • Alexey Kopytov's avatar
      Fixed test failures in 5.1/6.0 introduced by the patch · afcfe81f
      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.
      afcfe81f
    • Sergey Glukhov's avatar
      5.0-bugteam->5.1-bugteam merge · 2ea2cc02
      Sergey Glukhov authored
      2ea2cc02
    • Satya B's avatar
      Merge 5.0-bugteam to 5.1-bugteam · 5c49e6eb
      Satya B authored
      5c49e6eb
    • Sergey Glukhov's avatar
      automerge · 173ea364
      Sergey Glukhov authored
      173ea364
    • Sergey Glukhov's avatar
      Bug#41268 Help Text for \c is misleading in client command line interface · 8c7789c3
      Sergey Glukhov authored
      fixed help message
      
      
      client/mysql.cc:
        fixed help message
      8c7789c3
    • Satya B's avatar
      merge to 5.0-bugteam · 322fe741
      Satya B authored
      322fe741
    • Sergey Glukhov's avatar
      Bug#41627 Illegal mix of collations in LEAST / GREATEST / CASE · af016f72
      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.
      af016f72
    • Satya B's avatar
      Fix for BUG#21360 - mysqldump error on federated tables · cad09dab
      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
      cad09dab
  2. 18 Mar, 2009 3 commits
    • Alexey Kopytov's avatar
      Automerge. · da7dc303
      Alexey Kopytov authored
      da7dc303
    • Alexey Kopytov's avatar
      Manual merge. · 2b253395
      Alexey Kopytov authored
      2b253395
    • Alexey Kopytov's avatar
      Fix for bug#41486: extra character appears in BLOB for every · 73a7d993
      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.
      73a7d993
  3. 17 Mar, 2009 1 commit
  4. 16 Mar, 2009 1 commit
  5. 19 Mar, 2009 1 commit
  6. 18 Mar, 2009 19 commits
  7. 17 Mar, 2009 1 commit
    • Vladislav Vaintroub's avatar
      Bug #43715 Link errors when trying to link mysql_embedded.exe · 9e655bff
      Vladislav Vaintroub authored
      The reason for the error is incorrectly specified link dependencies
      for mysql_embedded, mysqltest_embedded and mysql_client_test_embedded
      in CMakeLists.txt (ADD_DEPENDENCIES should be TARGET_LINK_LIBRARIES)
      
      
      libmysqld/CMakeLists.txt:
        changed library type for libmysqld to SHARED instead of
        MODULE. MODULE in CMake notation is a shared library that 
        is used only in dlopen/dlsym/LoadLibrary scenarios.
        Hence it was impossible to use TARGET_LINK_LIBRARIES with
        a MODULE.
      libmysqld/examples/CMakeLists.txt:
        Use TARGET_LINK_LIBRARIES (instead of previously incorrectly 
        used ADD_DEPENDENCIES) to specify link dependency from libmysqld
      9e655bff