1. 20 Aug, 2010 8 commits
    • Georgi Kodinov's avatar
      merge · bd62942e
      Georgi Kodinov authored
      bd62942e
    • Georgi Kodinov's avatar
      merge · a54c3dd5
      Georgi Kodinov authored
      a54c3dd5
    • Georgi Kodinov's avatar
      merge · 352f2ada
      Georgi Kodinov authored
      352f2ada
    • Georgi Kodinov's avatar
      merge · bbaad888
      Georgi Kodinov authored
      bbaad888
    • Georgi Kodinov's avatar
      merge · 414e95e8
      Georgi Kodinov authored
      414e95e8
    • Georgi Kodinov's avatar
      merge · f1517f48
      Georgi Kodinov authored
      f1517f48
    • Georgi Kodinov's avatar
      merge · f2adff5d
      Georgi Kodinov authored
      f2adff5d
    • Georgi Kodinov's avatar
      Bug #55826: create table .. select crashes with when · 3b36a677
      Georgi Kodinov authored
        KILL_BAD_DATA is returned
      
      Two problems discovered with the LEAST()/GREATEST() 
      functions:
      1. The check for a null value should happen even 
      after the second call to val_str() in the args. This is
      important because two subsequent calls to the same
      Item::val_str() may yield different results.
      Fixed by checking for NULL value before dereferencing
      the string result.
      
      2. While looping over the arguments and evaluating them 
      the loop should stop if there was an error evaluating so far
      or the statement was killed. Fixed by checking for error
      and bailing out.
      3b36a677
  2. 19 Aug, 2010 4 commits
  3. 18 Aug, 2010 2 commits
    • 's avatar
      The patch is 5.1 part of the worklog. It is for 5.1 only. · b37c8a7a
      authored
      So null merge.
      b37c8a7a
    • 's avatar
      WL#5370 Keep forward-compatibility when changing · b766a51f
      authored
              'CREATE TABLE IF NOT EXISTS ... SELECT' behaviour
      BUG#55474, BUG#55499, BUG#55598, BUG#55616 and BUG#55777 are fixed
      in this patch too.
      
      This is the 5.1 part.
      It implements:
      - if the table exists, binlog two events: CREATE TABLE IF NOT EXISTS
        and INSERT ... SELECT
      
      - Insert nothing and binlog nothing on master if the existing object
        is a view. It only generates a warning that table already exists.
      b766a51f
  4. 17 Aug, 2010 1 commit
  5. 16 Aug, 2010 6 commits
    • Georgi Kodinov's avatar
      merge · 5f211511
      Georgi Kodinov authored
      5f211511
    • Alexander Nozdrin's avatar
      Auto-merge from mysql-5.5. · 9c41a990
      Alexander Nozdrin authored
      9c41a990
    • Alexander Nozdrin's avatar
      Auto-merge from mysql-5.5-stage. · 2585da55
      Alexander Nozdrin authored
      2585da55
    • Sunny Bains's avatar
      Merge from -c3476 mysql-5.1-security. · 97aa1215
      Sunny Bains authored
           ------------------------------------------------------------
           revno: 3476
           committer: Sunny Bains <Sunny.Bains@Oracle.Com>
           branch nick: 5.1-security
           timestamp: Thu 2010-08-05 19:18:17 +1000
           message:
             Fix bug# 55543 - InnoDB Plugin: Signal 6: Assertion failure in file fil/fil0fil.c line 4306
      
               The bug is due to a double delete of a BLOB, once via:
      
                     rollback -> btr_cur_pessimistic_delete()
      
               and the second time via purge.
      
               The bug is in row_upd_clust_rec_by_insert(). There we relinquish ownership
               of the non-updated BLOB columns in btr_cur_mark_extern_inherited_fields()
               before building the row entry that will be inserted and whose contents will
               be logged in the UNDO log. However, we don't set the BLOB column later to
               INHERITED so that a possible rollback will not free the original row's
               non-updated BLOB entries. This is because the condition that checks for
               that is in :
      
           		    	if (node->upd_ext) {}.
      
               node->upd_ext is non-NULL only if a BLOB column was updated and that column
               is part of some key ordering (see row_upd_replace()). This results in the
               non-update BLOB columns being deleted during a rollback and subsequently by
               purge again.
      
               rb://413
      97aa1215
    • Sunny Bains's avatar
      Fix Bug #55277 - Failing assertion: auto_inc > 0 · 787f0c54
      Sunny Bains authored
      Handle overflow when reading value from SELECT MAX(C) FROM T;
      
      Call ha_innobase::info() after initializing the autoinc value
      in ha_innobase::open().
      
      Fix for both the builtin and plugin.
      
      rb://402
      
      Merge from mysql-5.1-security.
      787f0c54
    • Sunny Bains's avatar
      62aa8943
  6. 15 Aug, 2010 1 commit
  7. 13 Aug, 2010 8 commits
    • Georgi Kodinov's avatar
      Bug #55565: debug assertion when ordering by expressions with user · b6e3adf1
      Georgi Kodinov authored
      variable assignments
      
      The assert() that is firing is checking if expressions that can't be
      null return a NULL when evaluated.
      MAKEDATE() function can return NULL if the second argument is 
      less then or equal to 0. Thus its nullability depends not only on 
      the nullability of its arguments but also on their values.
      Fixed by (overoptimistically) setting MAKEDATE() to be nullable 
      despite the nullability of its arguments.
      Test added.
      Had to update one test result to reflect the metadata change.
      b6e3adf1
    • Vasil Dimov's avatar
      Manually merge a changeset from mysql-5.1-security: · bfca4bb9
      Vasil Dimov authored
        ------------------------------------------------------------
        revno: 3475
        revision-id: jimmy.yang@oracle.com-20100804103744-vbpeghipkz6pyc9z
        parent: jimmy.yang@oracle.com-20100804101133-c38qqbm0fkwn9jhc
        committer: Jimmy Yang <jimmy.yang@oracle.com>
        branch nick: mysql-5.1-security
        timestamp: Wed 2010-08-04 03:37:44 -0700
        message:
          Fix bug #54678, InnoDB, TRUNCATE, ALTER, I_S SELECT, crash or deadlock
          
          rb://399 approved by Sunny Bains
        modified:
          storage/innodb_plugin/ChangeLog 2425@16c675df-0fcb-4bc9-8058-dcc011a37293:branches%2Fzip%2FChangeLog
          storage/innodb_plugin/include/dict0dict.h 2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Finclude%2Fdict0dict.h
          storage/innodb_plugin/include/dict0dict.ic 2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Finclude%2Fdict0dict.ic
          storage/innodb_plugin/row/row0mysql.c 2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Frow%2Frow0mysql.c
      bfca4bb9
    • Vasil Dimov's avatar
      Merge mysql-5.1-security -> mysql-5.5-security up to · 865210f9
      Vasil Dimov authored
      sunny.bains@oracle.com-20100805092434-tvxxzjgqgslo14en
      
      This is a null merge of InnoDB changes which will be ported into a
      separate commits.
      865210f9
    • Vasil Dimov's avatar
      Merge mysql-5.1-security -> mysql-5.5-security up to c3473 · 6a4ec43b
      Vasil Dimov authored
      (this is a null merge)
      6a4ec43b
    • Georgi Kodinov's avatar
      merge · 2ecc81cb
      Georgi Kodinov authored
      2ecc81cb
    • Georgi Kodinov's avatar
      Bug #55615 and bug #55564 · a5575096
      Georgi Kodinov authored
      An user assignment variable expression that's 
      evaluated in a logical expression context 
      (Item::val_bool()) can be pre-calculated in a 
      temporary table for GROUP BY.
      However when the expression value is used after the
      temp table creation it was re-evaluated instead of
      being read from the temp table due to a missing 
      val_bool_result() method.
      Fixed by implementing the method.
      a5575096
    • Alexander Nozdrin's avatar
      Disable test cases due to Bug 55966. · 496e1fb4
      Alexander Nozdrin authored
      496e1fb4
    • Georgi Kodinov's avatar
      Bug #55580 : segfault in read_view_sees_trx_id · 12f7d57d
      Georgi Kodinov authored
      The server was not checking for errors generated during
      the execution of Item::val_xxx() methods when copying
      data to the group, order, or distinct temp table's row.
      Fixed by extending the copy_funcs() to return an error
      code and by checking for that error code on the places
      copy_funcs() is called. 
      Test case added.
      12f7d57d
  8. 12 Aug, 2010 3 commits
  9. 11 Aug, 2010 1 commit
  10. 12 Aug, 2010 1 commit
  11. 11 Aug, 2010 2 commits
  12. 10 Aug, 2010 3 commits