1. 24 Jun, 2010 5 commits
    • Alexey Kopytov's avatar
      Automerge. · 77676a0f
      Alexey Kopytov authored
      77676a0f
    • Alexey Kopytov's avatar
      Automerge. · 4b030562
      Alexey Kopytov authored
      4b030562
    • Ramil Kalimullin's avatar
      Automerge. · 4d58d1f1
      Ramil Kalimullin authored
      4d58d1f1
    • Ramil Kalimullin's avatar
      a95e7ee0
    • Ramil Kalimullin's avatar
      Fix for bug #54459: Assertion failed: param.sort_length, · 4e872863
      Ramil Kalimullin authored
      file .\filesort.cc, line 149 (part II)
      
      Problem: the server didn't disregard sort order 
      for some zero length tuples.
      
      Fix: skip sort order in such a case 
      (zero length NOT NULL string functions).
      
      
      mysql-test/r/select.result:
        Fix for bug #54459: Assertion failed: param.sort_length, 
        file .\filesort.cc, line 149 (part II)
          - test result.
      mysql-test/t/select.test:
        Fix for bug #54459: Assertion failed: param.sort_length, 
        file .\filesort.cc, line 149 (part II)
          - test case.
      sql/sql_select.cc:
        Fix for bug #54459: Assertion failed: param.sort_length, 
        file .\filesort.cc, line 149 (part II)
          - disregard sort order for zero length NOT NULL string functions
        along with zero length NOT NULL fields.
      4e872863
  2. 22 Jun, 2010 4 commits
    • Alexey Kopytov's avatar
      Bug#54477: Crash on IN / CASE with NULL arguments · 0e656039
      Alexey Kopytov authored
      Incorrect handling of NULL arguments could lead to a crash on
      the IN or CASE operations when either NULL arguments were
      passed explicitly as arguments (IN) or implicitly generated by
      the WITH ROLLUP modifier (both IN and CASE).
      
      Item_func_case::find_item() assumed all necessary comparators
      to be instantiated in fix_length_and_dec(). However, in the
      presence of WITH ROLLUP modifier, arguments could be
      substituted with an Item_null leading to an "unexpected"
      STRING_RESULT comparator being invoked.
      
      In addition to the problem identical to the above,
      Item_func_in::val_int() could crash even with explicitly passed
      NULL arguments due to an optimization in fix_length_and_dec()
      leading to NULL arguments being ignored during comparators
      creation.
      
      
      mysql-test/r/func_in.result:
        Test cases for bug#54477.
      mysql-test/t/func_in.test:
        Test cases for bug#54477.
      sql/item_cmpfunc.cc:
        Added additional checks for Item_nulls in 
        Item_func_case::find_item() and Item_func_in::val_int().
      0e656039
    • Vasil Dimov's avatar
      Merge mysql-trunk -> mysql-trunk-merge · ea73b23e
      Vasil Dimov authored
      ea73b23e
    • Alexander Nozdrin's avatar
      Auto-merge from mysql-trunk-bugfixing. · a96267c1
      Alexander Nozdrin authored
      a96267c1
    • Magne Mahre's avatar
      Post-push fixups for WL#5349 · 7657ee10
      Magne Mahre authored
      
      mysql-test/suite/perfschema/t/no_threads-master.opt:
        Innodb will start multiple threads, which is
        not compatible with --one-thread.   Disable
        innodb to be able to run the test case.
      7657ee10
  3. 21 Jun, 2010 6 commits
  4. 20 Jun, 2010 1 commit
    • Magne Mahre's avatar
      Post-push fixup for WL#5349 · 240afacf
      Magne Mahre authored
      InnoDB came in a new version "simultanously" with the
      commit.  This patch is a minor change to the new innodb
      regression test suite. 
      240afacf
  5. 18 Jun, 2010 3 commits
    • Ramil Kalimullin's avatar
      Fix for bug #54393: crash and/or valgrind errors in · 5088fb13
      Ramil Kalimullin authored
      mysql_client_binlog_statement
      
      Problem: server may read from unassigned memory performing
      "wrong" BINLOG queries.
      
      Fix: never read from unassigned memory.
      
      
      mysql-test/suite/binlog/r/binlog_base64_flag.result:
        Fix for bug #54393: crash and/or valgrind errors in
        mysql_client_binlog_statement
          - test result.
      mysql-test/suite/binlog/t/binlog_base64_flag.test:
        Fix for bug #54393: crash and/or valgrind errors in
        mysql_client_binlog_statement
          - test case.
      sql/sql_binlog.cc:
        Fix for bug #54393: crash and/or valgrind errors in
        mysql_client_binlog_statement
          - coded_len should not count trailing '/0';
          - never read from unassigned memory.
      5088fb13
    • Daniel Fischer's avatar
      merge · 073943cd
      Daniel Fischer authored
      073943cd
    • Joerg Bruehe's avatar
      Automerge from parent copy. · e194e983
      Joerg Bruehe authored
      e194e983
  6. 17 Jun, 2010 19 commits
  7. 16 Jun, 2010 2 commits