1. 11 Nov, 2009 2 commits
  2. 09 Nov, 2009 4 commits
    • Alexander Barkov's avatar
      d17f4d9d
    • Alexander Barkov's avatar
      # · 510844e7
      Alexander Barkov authored
      # Bug#24690 Stored functions: RETURNing UTF8 strings
      # do not return UTF8_UNICODE_CI collation
      #
      # Bug#17903: cast to char results in binary
      # Regression. The character set was not being properly initialized
      # for CAST() with a type like CHAR(2) BINARY, which resulted in
      # incorrect results or even a server crash.
      #
      
      Backporting from mysql-6.0-codebase.
      
      mysql-test/r/sp-ucs2.result:
      mysql-test/t/sp-ucs2.test:
      
        Adding tests
      
      sql/mysql_priv.h:
        Adding prototype
      
      sql/sp.cc
        Remember COLLATE clause for non-default collations
      
      sql/sql_parse.cc
        Adding a new helper function
      
      sql/sql_yacc.yy
        - Allow "CHARACTER SET cs COLLATE cl" in
          SP parameters, RETURNS, DECLARE
        - Minor reorganization for "ASCII" and "UNICODE"
          related rules, to make the code more readable,
          also to allow these aliases:
          * "VARCHAR(10) ASCII BINARY"   -> CHARACTER SET latin1 COLLATE latin1_bin
          * "VARCHAR(10) BINARY ASCII"   -> CHARACTER SET latin1 COLLATE latin1_bin
          * "VARCHAR(10) UNICODE BINARY" -> CHARACTER SET ucs2 COLLATE ucs2_bin
          * "VARCHAR(10) BINARY UNICODE" -> CHARACTER SET ucs2 COLLATE ucs2_bin
          Previously these four aliases returned the error
          "This version of MySQL does not yet support return value collation".
      
      Note:
      
         This patch allows  "VARCHAR(10) CHARACTER SET cs COLLATE cl"
         and the above four aliases.
      
         "VARCHAR(10) COLLATE cl" is still not allowed
         i.e. when COLLATE is given without CHARACTER SET.
         If we want to support this, we need an architecture decision
         which character set to use by default.
      510844e7
    • Alexander Barkov's avatar
    • Alexander Barkov's avatar
      eb852073
  3. 05 Nov, 2009 1 commit
  4. 04 Nov, 2009 1 commit
  5. 03 Nov, 2009 5 commits
    • Jonathan Perkin's avatar
      Merge to mysql-next-mr-bugfixing. · 7defb0d1
      Jonathan Perkin authored
      7defb0d1
    • Jonathan Perkin's avatar
      Additional change required for bug#46834, find the std_data directory · 1fd7c103
      Jonathan Perkin authored
      correctly in RPMs.
      1fd7c103
    • Alexey Botchkov's avatar
      Bug#41371 Select returns 1 row with condition "col is not null and col is null" · 567bf9d3
      Alexey Botchkov authored
          For application compatibility reasons  MySQL converts "<autoincrement_column> IS NULL"
          predicates to "<autoincrement_column> = LAST_INSERT_ID()" in the first SELECT following an
          INSERT regardless of whether they're top level predicates or not. This causes wrong and
          obscure results when these predicates are combined with others on the same columns. Fixed
          by only doing the transformation on a single top-level predicate if a special SQL mode is
          turned on (sql_auto_is_null).
          Also made sql_auto_is_null off by default.
      
      per-file comments:
        mysql-test/r/func_isnull.result
      Bug#41371      Select returns 1 row with condition "col is not null and col is null"
          test result updated
      
        mysql-test/t/func_isnull.test
      Bug#41371      Select returns 1 row with condition "col is not null and col is null"
          test case added
      
        sql/mysqld.cc
      Bug#41371      Select returns 1 row with condition "col is not null and col is null"
          sql_auto_is_null now is OFF by default.
      
        sql/sql_select.cc
      Bug#41371      Select returns 1 row with condition "col is not null and col is null"
          remove_eq_conds() split in two parts - one only checks the upper condition,
          the req_remove_eq_conds() recursively checks all the condition tree.
      
        mysql-test/extra/rpl_tests/rpl_insert_id.test
      Bug#41371      Select returns 1 row with condition "col is not null and col is null"
              test fixed (set the sql_auto_is_null variable)
      
        mysql-test/r/mysqlbinlog.result
      Bug#41371      Select returns 1 row with condition "col is not null and col is null"
              result updated
      
        mysql-test/r/mysqlbinlog2.result
      Bug#41371      Select returns 1 row with condition "col is not null and col is null"
              result updated
      
        mysql-test/r/odbc.result
      Bug#41371      Select returns 1 row with condition "col is not null and col is null"
              result updated
      
        mysql-test/r/query_cache.result
      Bug#41371      Select returns 1 row with condition "col is not null and col is null"
              result updated
      
        mysql-test/r/user_var-binlog.result
      Bug#41371      Select returns 1 row with condition "col is not null and col is null"
              result updated
      
        mysql-test/suite/binlog/r/binlog_row_ctype_ucs.result
      Bug#41371      Select returns 1 row with condition "col is not null and col is null"
              result updated
      
        mysql-test/suite/binlog/r/binlog_stm_ctype_ucs.result
      Bug#41371      Select returns 1 row with condition "col is not null and col is null"
              result updated
      
        mysql-test/suite/rpl/r/rpl_insert_id.result
      Bug#41371      Select returns 1 row with condition "col is not null and col is null"
              result updated
      
        mysql-test/suite/rpl/r/rpl_row_mysqlbinlog.result
      Bug#41371      Select returns 1 row with condition "col is not null and col is null"
              result updated
      
        mysql-test/suite/rpl/r/rpl_sp.result
      Bug#41371      Select returns 1 row with condition "col is not null and col is null"
              result updated
      
        mysql-test/t/odbc.test
      Bug#41371      Select returns 1 row with condition "col is not null and col is null"
              test fixed (set the sql_auto_is_null variable)
      567bf9d3
    • Vladislav Vaintroub's avatar
      merge · 40536582
      Vladislav Vaintroub authored
      40536582
    • Vladislav Vaintroub's avatar
      Bug #47423 mtr connects to wrong database · 2f075a1e
      Vladislav Vaintroub authored
      The reason for the bug is that mysqtest as well as other client tools
      running in test suite (mysqlbinlog, mysqldump) will first try to connect 
      whatever database has created shared memory with default base name 
      "MySQL" and use this. (Same effect could be seen on Unix if mtr would
      not care to calculate "port" and "socket" parameter).
            
      The fix ensures that all client tools and  running in mtr use unique  
      per-database shared memory base parameters, so there is no possibility
      to clash with already installed one. We use socket name for shared memory 
      base (it's known to be unique). This shared-memory-base is written to the
      MTR config file to the [client] and [mysqld] sections. Fix made also made 
      sure all client tools understand and correctly handle --shared-memory-base.
      Prior to this patch  it was not the case for  mysqltest, mysqlbinlog and 
      mysql_client_test.
            
      All new connections done from mtr scripts via connect() will by default 
      set shared-memory-base. And finally, there is a possibility to force 
      shared memory or pipe connection and overwrite shared memory/pipe base name
      from within mtr scripts via optional PIPE or SHM modifier. This functionality
      was manually backported from 6.0
      (original patch  http://lists.mysql.com/commits/74749)
      2f075a1e
  6. 02 Nov, 2009 3 commits
    • Vladislav Vaintroub's avatar
      merge · 616547c7
      Vladislav Vaintroub authored
      616547c7
    • Vladislav Vaintroub's avatar
      Bug#47571: idle named pipe connection is unkillable · 84301e8b
      Vladislav Vaintroub authored
      Bug#31621: Windows server hanging during shutdown using named pipes 
                 and idle connection
                  
      Problem: when idle pipe connection is forcefully closed with KILL
      statement or when the server goes down, thread that is closing connection
      would hang infinitely in CloseHandle(). The reason for the hang is that 
      named pipe operations are performed synchronously. In this mode all IOs
      on pipe are serialized, that is CloseHandle() will not abort ReadFile() 
      in another thread, but wait for ReadFile() to complete.
                  
      The fix implements asynchrnous mode for named pipes, where operation of file
      are not synchronized. Read/Write operation would fire an async IO and wait for
      either IO completion or timeout.
                  
      Note, that with this patch timeouts are properly handled for named pipes.
            
      Post-review: Win32 timeout code has been fixed for named pipes and shared
      memory. We do not store pointer to NET in vio structure, only the read and 
      write timeouts.
      84301e8b
    • Marc Alff's avatar
      Bug#9801 Views: imperfect error message · 1035de62
      Marc Alff authored
      Backport for 5.5
      
      The root cause of this bug is that the grammar for GROUP BY clauses,
      when using WITH CUBE or WITH ROLLUP, cause conflicts with the grammar
      for VIEW, when using WITH CHECK OPTION.
      
      The solution is to implement two token look ahead when parsing a WITH token,
      to disambiguate the non standard WITH CUBE and WITH ROLLUP syntaxes.
      
      Patch based on code from Marc Alff and Antony Curtis
      1035de62
  7. 31 Oct, 2009 5 commits
  8. 29 Oct, 2009 6 commits
  9. 28 Oct, 2009 4 commits
  10. 27 Oct, 2009 9 commits