1. 06 Jun, 2009 2 commits
  2. 05 Jun, 2009 15 commits
  3. 04 Jun, 2009 9 commits
  4. 03 Jun, 2009 1 commit
  5. 02 Jun, 2009 8 commits
    • Satya B's avatar
      merge to 5.1-bugteam branch · 24800362
      Satya B authored
      24800362
    • Satya B's avatar
      Followup Fix for BUG#10206 - InnoDB: Transaction requiring Max_BinLog_Cache_size > 4GB · e60c38b3
      Satya B authored
                                   always rollsback.
      
      There is failure on pushbuild machines which are using old compilers complaining about
      ULLONG_MAX declaration. Changing this to ULONGLONG_MAX to solve the problem.
      
      sql/mysqld.cc:
        Change ULLONG_MAX to ULONGLONG_MAX for the max_binlog_cache_size option
      e60c38b3
    • Mattias Jonsson's avatar
      merge into mysql-5.1-bugteam · bcb6b8bf
      Mattias Jonsson authored
      bcb6b8bf
    • Mattias Jonsson's avatar
      Bug#32430:'show innodb status' causes errors Invalid (old?) table · d0c9d4bf
      Mattias Jonsson authored
      or database name in logs
      
      Problem was that InnoDB used filenam_to_tablename,
      which do not handle partitions (due to the '#' in
      the filename).
      
      Solution is to add a new function for explaining
      what the filename means: explain_filename.
      It expands the database, table, partition and subpartition
      parts and uses errmsg.txt for localization.
      It also converts from my_charset_filename to system_charset_info
      (i.e. human readable form for non ascii characters).
        http://lists.mysql.com/commits/70370
      
      2773 Mattias Jonsson	2009-03-25
      
      It has three different output styles.
      
      NOTE: This is the server side ONLY part (introducing the explain_filename
      function). There will be a patch for InnoDB using this function to solve
      the bug.
      
      sql/mysql_priv.h:
        Bug#32430:'show innodb status' causes errors Invalid (old?) table
        or database name in logs
        
        Added EXPLAIN_FILENAME_MAX_EXTRA_LENGTH, enum_explain_filename_mode
        and explain_filename.
      sql/share/errmsg.txt:
        Bug#32430:'show innodb status' causes errors Invalid (old?) table
        or database name in logs
        
        Added localization names for Database, Table, Partition, Subpartition
        Temporary and Renamed.
      sql/sql_table.cc:
        Bug#32430:'show innodb status' causes errors Invalid (old?) table
        or database name in logs
        
        Added explain_filename function for giving better information
        to the user about a specific table/partitions file.
      d0c9d4bf
    • Satya B's avatar
      merge to 5.1-bugteam · faab55c7
      Satya B authored
      faab55c7
    • Satya B's avatar
      merge to 5.1-bugteam tree · 4c7a91e8
      Satya B authored
      4c7a91e8
    • Sergey Glukhov's avatar
      5.0-bugteam->5.1-bugteam merge · 076b82d7
      Sergey Glukhov authored
      076b82d7
    • Sergey Glukhov's avatar
      Bug#45152 crash with round() function on longtext column in a derived table · f2910f08
      Sergey Glukhov authored
      The crash happens due to wrong max_length value which is set on
      Item_func_round::fix_length_and_dec() stage. The value is set to
      args[0]->max_length which is too big in case of LONGTEXT(LONGBLOB) fields.
      The fix is to set max_length using float_length() function.
      
      
      
      mysql-test/r/func_math.result:
        test result
      mysql-test/t/func_math.test:
        test case
      sql/item_func.cc:
        The crash happens due to wrong max_length value which is set on
        Item_func_round::fix_length_and_dec() stage. The value is set to
        args[0]->max_length which is too big in case of LONGTEXT(LONGBLOB) fields.
        The fix is to set max_length using float_length() function.
      f2910f08
  6. 01 Jun, 2009 5 commits
    • Alexey Kopytov's avatar
      Automerge. · 9604b59d
      Alexey Kopytov authored
      9604b59d
    • Alexey Kopytov's avatar
      Automerge. · a444a6c3
      Alexey Kopytov authored
      a444a6c3
    • Alexey Kopytov's avatar
      Automerge. · ab408fbe
      Alexey Kopytov authored
      ab408fbe
    • Alexey Kopytov's avatar
      Manual merge. · 23ac0119
      Alexey Kopytov authored
      23ac0119
    • Narayanan V's avatar
      Bug#45197 cp1250 character set with IBMDB2I generates 2027 error · 28231b77
      Narayanan V authored
      Running a SELECT query over an IBMDB2I table with a cp1250 character set
      was producing an error 2027 (ibmdb2i error 2027: Error converting single-byte
      sort sequence to UCS-2).
      
      The QMY_DESCRIBE_RANGE API was returning error 2027 to the storage engine
      because the CCSID used for a cp1250 column (870) does not match the CCSID
      used by the DB2 sort sequences associated with cp1250_* collations (1153).
      This was because the storage engine relies on a set of system APIs to
      determine which CCSID value most closely matches a particular MySQL
      character set. However, in the case of cp1250, the system is returning
      CCSID 870, which does not have a codepoint for the euro symbol, making it
      an incorrect match.
      
      This patch overrides the selection of a compatible CCSID to always return
      1153 for cp1250.
      
      storage/ibmdb2i/db2i_charsetSupport.cc:
        Bug#45197 cp1250 character set with IBMDB2I generates 2027 error
        
        override the selection of a compatible CCSID to
        always return 1153 for cp1250.
      28231b77