1. 02 Jun, 2009 8 commits
  2. 01 Jun, 2009 5 commits
    • Alexey Kopytov's avatar
      Automerge. · 13f7a81b
      Alexey Kopytov authored
      13f7a81b
    • Alexey Kopytov's avatar
      Automerge. · 00c56963
      Alexey Kopytov authored
      00c56963
    • Alexey Kopytov's avatar
      Automerge. · 87879894
      Alexey Kopytov authored
      87879894
    • Alexey Kopytov's avatar
      Manual merge. · bdcce95f
      Alexey Kopytov authored
      bdcce95f
    • Narayanan V's avatar
      Bug#45197 cp1250 character set with IBMDB2I generates 2027 error · 88805901
      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.
      88805901
  3. 31 May, 2009 6 commits
  4. 30 May, 2009 2 commits
    • Davi Arnaut's avatar
      MySQL 5.0 backport of Chad Miller's patch for Bug#34309: · 0c3439c5
      Davi Arnaut authored
      Bug#34309: '_PC' macro redefinition
      
      For reasons that are now a mystery, we had defined a CPP symbol to
      help ancient compilers work better (in some way that's lost to history).
      This interferes with at least one modern compiler.
      
      Now, don't define the _PC symbol.  Those other underscore-leading
      symbols are suspect also, but at least the names aren't inscrutable.
      Let's leave them for now.
      0c3439c5
    • He Zhenxing's avatar
      BUG#41948 Query_log_event constructor needlessly contorted · 0793eec0
      He Zhenxing authored
      Make the caller of Query_log_event, Execute_load_log_event
      constructors and THD::binlog_query to provide the error code
      instead of having the constructors to figure out the error code.
      0793eec0
  5. 29 May, 2009 10 commits
    • Tatiana A. Nurnberg's avatar
      auto-merge · 81eb3383
      Tatiana A. Nurnberg authored
      81eb3383
    • Tatiana A. Nurnberg's avatar
      auto-merge · d5b22e16
      Tatiana A. Nurnberg authored
      d5b22e16
    • Tatiana A. Nurnberg's avatar
      auto-merge · 41abbf9b
      Tatiana A. Nurnberg authored
      41abbf9b
    • Kristofer Pettersson's avatar
      Automerge · 049f998f
      Kristofer Pettersson authored
      049f998f
    • Kristofer Pettersson's avatar
      Automerge · dc4feaa4
      Kristofer Pettersson authored
      dc4feaa4
    • Tatiana A. Nurnberg's avatar
      Bug#39200: optimize table does not recognize ROW_FORMAT=COMPRESSED · 7b4c6979
      Tatiana A. Nurnberg authored
      When doing ALTER TABLE, we forgot to point out that we actually have
      ROW_FORMAT information (from the original table), so we dropped to
      "sensible defaults". This affects both ALTER TABLE and OPTIMIZE TABLE
      which may fall back on ALTER TABLE for InnoDB.
      
      We now flag that we do indeed know the row-type, thereby preserving
      compression-type etc.
      
      No .test in 5.1 since we'd need a reasonable new plugin from InnoDB to
      show this properly; in higher versions, maria can demonstrate this.
      7b4c6979
    • Alexey Kopytov's avatar
      Automerge · f1fb5aa2
      Alexey Kopytov authored
      f1fb5aa2
    • Kristofer Pettersson's avatar
      Bug#44658 Create procedure makes server crash when user does not have ALL privilege · a6455554
      Kristofer Pettersson authored
      MySQL crashes if a user without proper privileges attempts to create a procedure.
      
      The crash happens because more than one error state is pushed onto the Diagnostic
      area. In this particular case the user is denied to implicitly create a new user
      account with the implicitly granted privileges ALTER- and EXECUTE ROUTINE.
      
      The new account is needed if the original user account contained a host mask.
      A user account with a host mask is a distinct user account in this context.
      An alternative would be to first get the most permissive user account which
      include the current user connection and then assign privileges to that
      account. This behavior change is considered out of scope for this bug patch.
      
      The implicit assignment of privileges when a user creates a stored routine is a
      considered to be a feature for user convenience and as such it is not
      a critical operation. Any failure to complete this operation is thus considered
      non-fatal (an error becomes a warning).
      
      The patch back ports a stack implementation of the internal error handler interface.
      This enables the use of multiple error handlers so that it is possible to intercept
      and cancel errors thrown by lower layers. This is needed as a error handler already
      is used in the call stack emitting the errors which needs to be converted.
      a6455554
    • Narayanan V's avatar
      merging with mysql-5.1-bugteam tree · 90939fc5
      Narayanan V authored
      90939fc5
    • Narayanan V's avatar
      Bug#44811 Tests with utf8 charset fail with ibmdb2i on 64bit MySQL · 5a644923
      Narayanan V authored
      wmemset was being used to fill the row buffers.
      wmemset was intended  to  fill the buffer with
      16-bit UCS2 pad values.  However,  the  64-bit
      version of wmemset uses 32-bit wide characters
      and thus filled the buffer incorrectly. In some
      cases, the null  byte  map would be overwritten,
      causing ctype_utf8.test and ibmdb2i_rir.test to
      fail, giving the error message CPF5035.
      
      This patch eliminates the use of wmemset to fill
      the row buffer. wmemset has  been  replaced with
      memset16, which always  fills  memory with 16-bit
      values.
      5a644923
  6. 28 May, 2009 5 commits
  7. 27 May, 2009 4 commits