1. 19 Mar, 2009 10 commits
    • Alexey Kopytov's avatar
      Automerge. · f8be63bf
      Alexey Kopytov authored
      f8be63bf
    • Alexey Kopytov's avatar
      Automerge. · 870e2bff
      Alexey Kopytov authored
      870e2bff
    • 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
      5.0-bugteam->5.1-bugteam merge · c841d13b
      Sergey Glukhov authored
      c841d13b
    • Satya B's avatar
      Merge 5.0-bugteam to 5.1-bugteam · c2944037
      Satya B authored
      c2944037
    • 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
  2. 18 Mar, 2009 3 commits
    • Alexey Kopytov's avatar
      Automerge. · 9da759e8
      Alexey Kopytov authored
      9da759e8
    • Alexey Kopytov's avatar
      Manual merge. · beca5682
      Alexey Kopytov authored
      beca5682
    • 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
  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 5 commits
    • Vladislav Vaintroub's avatar
      Bug #43715 Link errors when trying to link mysql_embedded.exe · 1445a0c0
      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
      1445a0c0
    • Chad MILLER's avatar
      Fix indentation. tab -> spaces · e26033da
      Chad MILLER authored
      e26033da
    • Chad MILLER's avatar
      Bug#42675: Dangling pointer leads to a client crash (mysys/my_error.c \ · 5db6fb5f
      Chad MILLER authored
      	patch enclosed)
        
      One call to my_error_unregister_all() would free pointers, but leave one
      pointer to just-freed memory still assigned.  That's the bug.  Subsequent
      calls of this function would try to follow pointers into deallocated, 
      garbage memory and almost certainly SEGV.
      
      Now, after freeing a linked list, unset the initial pointer.
      5db6fb5f
    • Tatiana A. Nurnberg's avatar
      auto-merge · 10c8366b
      Tatiana A. Nurnberg authored
      10c8366b
    • Tatiana A. Nurnberg's avatar
      36446: fix Windows warning · 2572b02e
      Tatiana A. Nurnberg authored
      2572b02e