1. 26 Jun, 2010 1 commit
  2. 25 Jun, 2010 4 commits
    • Georgi Kodinov's avatar
      merge · dbd40508
      Georgi Kodinov authored
      dbd40508
    • Georgi Kodinov's avatar
      merge · 8fc01031
      Georgi Kodinov authored
      8fc01031
    • Sergey Glukhov's avatar
      5.1-bugteam->trunk-merge merge · 68c5b544
      Sergey Glukhov authored
      68c5b544
    • Sergey Glukhov's avatar
      Bug#54422 query with = 'variables' · 2a86768e
      Sergey Glukhov authored
      During creation of the table list of
      processed tables hidden I_S table 'VARIABLES'
      is erroneously added into the table list.
      it leads to ER_UNKNOWN_TABLE error in
      TABLE_LIST::add_table_to_list() function.
      The fix is to skip addition of hidden I_S
      tables into the table list.
      
      
      mysql-test/r/information_schema.result:
        test case
      mysql-test/t/information_schema.test:
        test case
      sql/sql_show.cc:
        The fix is to skip addition of hidden I_S
        tables into the table list.
      2a86768e
  3. 24 Jun, 2010 13 commits
  4. 23 Jun, 2010 2 commits
  5. 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
  6. 21 Jun, 2010 6 commits
  7. 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
  8. 19 Jun, 2010 1 commit
    • Ramil Kalimullin's avatar
      Fix for bug #54575: crash when joining tables with unique set column · 1614c3c1
      Ramil Kalimullin authored
      Problem: a flaw (derefencing a NULL pointer) in the LIKE optimization
      code may lead to a server crash in some rare cases.
      
      Fix: check the pointer before its dereferencing.
      
      
      mysql-test/r/func_like.result:
        Fix for bug #54575: crash when joining tables with unique set column
          - test result.
      mysql-test/t/func_like.test:
        Fix for bug #54575: crash when joining tables with unique set column
          - test case.
      sql/item_cmpfunc.cc:
        Fix for bug #54575: crash when joining tables with unique set column
          - check res2 buffer pointer before its dereferencing 
        as it may be NULL in some cases.
      1614c3c1
  9. 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
  10. 17 Jun, 2010 5 commits
    • Magne Mahre's avatar
      WL#5349 Change default storage engine to InnoDB · 32b7e60e
      Magne Mahre authored
      The default storage engine is changed from MyISAM to
      InnoDB, in all builds except for the embedded server.
      
      In addition, the following system variables are 
      changed:
      
        * innodb_file_per_table is enabled
        * innodb_strict_mode is enabled
        * innodb_file_format_name_update is changed
          to 'Barracuda'
      
      The test suite is changed so that tests that do not
      explicitly include the have_innodb.inc are run with
      --default-storage-engine=MyISAM.  This is to ease the
      transition, so that most regression tests are run
      with the same engine as before.
      
      Some tests are disabled for the embedded server
      regression test, as the output of certain statements
      will be different that for the regular server
      (i.e SELECT @@default_storage_engine).  This is to
      ease transition.
      
      
      
      mysql-test/mysql-test-run.pl:
        The regression test suite now adds a
        --default-storage-engine=MyISAM for all non-innodb 
        tests.  This behaviour can be controlled by the
        default-myisam switch in mysql-test-run
      mysql-test/t/bootstrap-master.opt:
        The bootstrap test can only be run without InnoDB
        as it starts several mysqld instances on the same
        datadir. This is possible with MyISAM, but not
        with InnoDB.
      storage/innobase/CMakeLists.txt:
        Build InnoDB per default
      storage/innobase/handler/ha_innodb.cc:
        Change default values for system variables
        
          Enable file_per_table
          Enable strict_mode
          Upgrade default file format to Barracuda
      32b7e60e
    • Joerg Bruehe's avatar
      Bug#54590 "make_binary_distribution" fails because a command · 2b1c5a63
      Joerg Bruehe authored
      line exceeds the limit
      
      Merge the fix into "trunk-bugfixing".
      2b1c5a63
    • Joerg Bruehe's avatar
      Bug#54590 "make_binary_distribution" fails because a command · df7aff65
      Joerg Bruehe authored
      line exceeds the limit
      
      Upmerge the fix from 5.1 to 5.5 ("trunk").
      df7aff65
    • Joerg Bruehe's avatar
      Bug#54590 "make_binary_distribution" fails because a command · 10d0786c
      Joerg Bruehe authored
      line exceeds the limit
      
      Upmerge the fix from 5.0 to 5.1
      10d0786c
    • Joerg Bruehe's avatar
      Bug#54590 "make_binary_distribution" fails because a command · 609e65ba
      Joerg Bruehe authored
                 line exceeds the limit
      
      The number and/or names of our files for the main test suite
      (contents of "mysql-test/t/") now exceeds the command line
      length limit on AIX.
      Solve the problem by using separate "cp" commands for the
      various file name extensions.
      609e65ba