1. 29 Oct, 2008 1 commit
  2. 27 Oct, 2008 10 commits
    • Alexey Botchkov's avatar
      merging · 8b1f501c
      Alexey Botchkov authored
      8b1f501c
    • Evgeny Potemkin's avatar
      Merged fix for the bug#37870. · 6e0c62fd
      Evgeny Potemkin authored
      6e0c62fd
    • Evgeny Potemkin's avatar
      Corrected fix for the bug#37870. · 545e4c58
      Evgeny Potemkin authored
      545e4c58
    • Alexey Botchkov's avatar
      Bug#39102 valgrind build does not compile in realpath, which make DATA/INDEX DIR fail · 6ca7e5c5
      Alexey Botchkov authored
          #ifdef HAVE_purify removed
      
      per-file comments:
        mysql-test/t/partition_not_windows.test
      Bug#39102 valgrind build does not compile in realpath, which make DATA/INDEX DIR fail 
          test reenabled
      
        mysys/my_symlink.c
      Bug#39102 valgrind build does not compile in realpath, which make DATA/INDEX DIR fail 
        superfluous ifdef removed, comments fixed
      6ca7e5c5
    • Sergey Glukhov's avatar
      automerge · caa73f22
      Sergey Glukhov authored
      caa73f22
    • Evgeny Potemkin's avatar
      Merged fix for the bug#37870. · fbb6efeb
      Evgeny Potemkin authored
      fbb6efeb
    • Sergey Glukhov's avatar
      5.0-bugteam->5.1-bugteam merge(bug#39040) · 903c4dcf
      Sergey Glukhov authored
      903c4dcf
    • Sergey Glukhov's avatar
      Bug#39040 valgrind errors/crash when creating views with binlog logging enabled · 380f1a84
      Sergey Glukhov authored
      A string buffers which were included in the 'view' data structure
      were allocated on the stack, causing an invalid pointer when used
      after the function returned.
      The fix: use copy of values for view->md5 & view->queries
      
      
      mysql-test/r/view.result:
        test result
      mysql-test/t/view.test:
        test case
      sql/sql_view.cc:
        A string buffers which were included in the 'view' data structure
        were allocated on the stack, causing an invalid pointer when used
        after the function returned.
        The fix: use copy of values for view->md5 & view->queries
      380f1a84
    • Evgeny Potemkin's avatar
      Bug#37870: Usage of uninitialized value caused failed assertion. · e27e5607
      Evgeny Potemkin authored
            
      The convert_constant_item function converts a constant to integer using
      field for condition like 'field = a_constant'. When the convert_constant_item
      is called for a subquery the outer select is already being executed, so
      convert_constant_item saves field's value to prevent its corruption.
      For EXPLAIN field's value isn't initialized thus when convert_constant_item
      tries to restore saved value it fails assertion.
            
      Now the convert_constant_item doesn't save/restore field's value
      for EXPLAIN.
      
      
      mysql-test/r/explain.result:
        Added a test case for the bug#37870.
      mysql-test/t/explain.test:
        Added a test case for the bug#37870.
      sql/item_cmpfunc.cc:
        Bug#37870: Usage of uninitialized value caused failed assertion.
        Now the convert_constant_item doesn't save/restore field's value
        for EXPLAIN.
      e27e5607
    • V Narayanan's avatar
      Bug#39571 abi_check Does not create all prerequisites · 8d108cb5
      V Narayanan authored
      The abi_check target instroduced as part of WL#4380 verifies
      changes to mysql.h. mysql.h in turn includes mysql_version.h.
      mysql_version.h is a file that is generated during the configure
      phase. We must ensure that mysql_version.h is cleaned only during
      distclean and not during clean.
      
      include/Makefile.am:
        This file contains the following changes
        
        1) Moves the cleaning of mysql_version.h from the clean
           phase to the distclean phase.
        
        2) Removes mysql_version.h.in from noinst_HEADERS, this
           entry was reduntant since by virtue of inclusion of
           mysql_version.h mysql_version.h.in is already included.
      8d108cb5
  3. 26 Oct, 2008 3 commits
  4. 24 Oct, 2008 5 commits
    • Davi Arnaut's avatar
      d4438c99
    • Davi Arnaut's avatar
      Merge from mysql-5.0-bugteam into mysql-5.1-bugteam · 463c837c
      Davi Arnaut authored
      mysql-test/r/partition_not_windows.result:
        Update warning number due to new errors appearing earlier
        in the list.
      mysql-test/r/partition_symlink.result:
        Update warning number due to new errors appearing earlier
        in the list.
      mysql-test/r/symlink.result:
        Update warning number due to new errors appearing earlier
        in the list.
      463c837c
    • Ramil Kalimullin's avatar
      Fix for bug#23113: Different behavior on altering ENUM fields between 5.0 and 5.1 · 256f41ed
      Ramil Kalimullin authored
      Problem: mysqld doesn't detect that enum data must be reinserted performing
      'ALTER TABLE' in some cases.
      
      Fix: reinsert data altering an enum field if enum values are changed.
      
      
      mysql-test/r/alter_table.result:
        Fix for bug#23113: Different behavior on altering ENUM fields between 5.0 and 5.1
          - test result.
      mysql-test/t/alter_table.test:
        Fix for bug#23113: Different behavior on altering ENUM fields between 5.0 and 5.1
          - test case.
      sql/field.cc:
        Fix for bug#23113: Different behavior on altering ENUM fields between 5.0 and 5.1
          - Field_enum::is_equal() introduced, which is called to detect that a field
        is changing by 'ALTER TABLE'.
      sql/field.h:
        Fix for bug#23113: Different behavior on altering ENUM fields between 5.0 and 5.1
          - Field_enum::is_equal() introduced, which is called to detect that a field
        is changing by 'ALTER TABLE'.
      256f41ed
    • Sergey Petrunia's avatar
      Merge · d5202ddd
      Sergey Petrunia authored
      d5202ddd
    • Sergey Petrunia's avatar
      BUG#38072: Wrong result: HAVING not observed in a query with aggregate · 844797c4
      Sergey Petrunia authored
      - Make send_row_on_empty_set() return FALSE when simplify_cond() has found out
        that HAVING is always FALSE
      re-committing to put the fix into 5.0 and 5.1
      
      mysql-test/r/group_by.result:
        BUG#38072: Wrong result: HAVING not observed in a query with aggregate
        - Testcase
      mysql-test/t/group_by.test:
        BUG#38072: Wrong result: HAVING not observed in a query with aggregate
        - Testcase
      sql/sql_select.h:
        BUG#38072: Wrong result: HAVING not observed in a query with aggregate
        - Make send_row_on_empty_set() return FALSE when simplify_cond() has found out
          that HAVING is always FALSE
      844797c4
  5. 23 Oct, 2008 8 commits
  6. 22 Oct, 2008 2 commits
  7. 21 Oct, 2008 11 commits
    • Davi Arnaut's avatar
      Merge post-merge fix from mysql-5.0-bugteam. · aafe26f4
      Davi Arnaut authored
      aafe26f4
    • Davi Arnaut's avatar
      Post-merge fix: drop table at the end of test. · 07b7261a
      Davi Arnaut authored
      mysql-test/r/xa.result:
        Update test case result.
      mysql-test/t/xa.test:
        Drop table used for test.
      07b7261a
    • Davi Arnaut's avatar
      Merge Bug#28323 to mysql-5.1.29-rc · d7263d2a
      Davi Arnaut authored
      d7263d2a
    • Davi Arnaut's avatar
      Bug#28323: Server crashed in xid cache operations · 41dd7b6b
      Davi Arnaut authored
      The problem was that the server did not robustly handle a
      unilateral roll back issued by the Resource Manager (RM)
      due to a resource deadlock within the transaction branch.
      By not acknowledging the roll back, the server (TM) would
      eventually corrupt the XA transaction state and crash.
      
      The solution is to mark the transaction as rollback-only
      if the RM indicates that it rolled back its branch of the
      transaction.
      
      mysql-test/r/xa.result:
        Add test case result for Bug#28323
      mysql-test/t/xa.test:
        Add test case for Bug#28323
      sql/handler.cc:
        Reset XID only at the end of the global transaction.
      sql/share/errmsg.txt:
        Add new error codes.
      sql/sql_class.h:
        Remember the error reported by the Resource Manager.
      sql/sql_parse.cc:
        Rollback the transaction if the Resource Manager reported
        a error and rolled back its branch of the transaction.
      41dd7b6b
    • Davi Arnaut's avatar
      Bug#28323: Server crashed in xid cache operations · 9ad8d644
      Davi Arnaut authored
      The problem was that the server did not robustly handle a
      unilateral roll back issued by the Resource Manager (RM)
      due to a resource deadlock within the transaction branch.
      By not acknowledging the roll back, the server (TM) would
      eventually corrupt the XA transaction state and crash.
      
      The solution is to mark the transaction as rollback-only
      if the RM indicates that it rolled back its branch of the
      transaction.
      
      mysql-test/r/xa.result:
        Add test case result for Bug#28323
      mysql-test/t/xa.test:
        Add test case for Bug#28323
      sql/handler.cc:
        Reset XID only at the end of the global transaction.
      sql/share/errmsg.txt:
        Add new error codes.
      sql/sql_class.h:
        Remember the error reported by the Resource Manager.
      sql/sql_parse.cc:
        Rollback the transaction if the Resource Manager reported
        a error and rolled back its branch of the transaction.
      9ad8d644
    • unknown's avatar
      Merge from mysql-5.0.70-release · 4927d707
      unknown authored
      4927d707
    • Kristofer Pettersson's avatar
      Bug#39451 Debug builds broken with Sun Studio compiler · e291aab7
      Kristofer Pettersson authored
                  
      Debug builds of MySQL 5.1, 6.0 with Sun Studio 12 broke because of
      use of gcc specific feature.
                  
      The fix is to replace __FUNCTION__ with the corresponding character string
      e291aab7
    • Georgi Kodinov's avatar
      f698f0b3
    • Georgi Kodinov's avatar
      merged 5.0-bugteam -> 5.1-bugteam · 3c026690
      Georgi Kodinov authored
      3c026690
    • Kristofer Pettersson's avatar
      Merge changeset · 0e0a7011
      Kristofer Pettersson authored
      0e0a7011
    • Kristofer Pettersson's avatar
      Auto merge · 8ab6a300
      Kristofer Pettersson authored
      8ab6a300