1. 01 Oct, 2008 2 commits
  2. 30 Sep, 2008 8 commits
    • Davi Arnaut's avatar
      Merge from main branch. · 37a6be75
      Davi Arnaut authored
      37a6be75
    • Davi Arnaut's avatar
      Bug#38727: BUILD/compile-solaris-* scripts should compile MySQL with libmtmalloc · 36d8535a
      Davi Arnaut authored
      Link with mtmalloc on Solaris as it is done in our release builds.
      Replace deprecated flag with the newer option as already done in
      other scripts.
      
      BUILD/compile-solaris-amd64-forte:
        Link to mtmalloc and replace deprecated flag.
      BUILD/compile-solaris-amd64-forte-debug:
        Replace deprecated flag.
      BUILD/compile-solaris-sparc:
        Link to mtmalloc.
      BUILD/compile-solaris-sparc-forte:
        Link to mtmalloc
      36d8535a
    • Patrick Crews's avatar
      automerge · e97a45fd
      Patrick Crews authored
      e97a45fd
    • Patrick Crews's avatar
      Merge 5.0 -> 5.1 · 446fd504
      Patrick Crews authored
      446fd504
    • Patrick Crews's avatar
      Automerge · 8c33da07
      Patrick Crews authored
      8c33da07
    • Gleb Shchepa's avatar
      manual merge 5.0-bugteam --> 5.1-bugteam · 0d243986
      Gleb Shchepa authored
      0d243986
    • Gleb Shchepa's avatar
      Fixed bug #17823: 'arc' directories inside database directories. · 3c9d4ea8
      Gleb Shchepa authored
      Server created "arc" directories inside database directories and
      maintained there useless copies of .frm files.
      
      Creation and renaming procedures of those copies as well as
      creation of "arc" directories has been discontinued.
      Removal procedure has been kept untouched to be able to
      cleanup existent database directories by the DROP DATABASE
      query. Also view renaming procedure has been updated to remove
      these directories.
      
      
      sql/parse_file.cc:
        Fixed bug #17823: 'arc' directories inside database directories.
        View/table creation and renaming procedures maintained
        backup copies of .frm files. Those copies are unused yet,
        so this feature was incomplete and unnecessary.
        
        1. Unwanted code has been hidden by FRM_ARCHIVE ifdefs
        (the FRM_ARCHIVE macro is not defined).
        
        2. Renaming procedure has been modified to remove obsolete
        "arc" directories.
      sql/parse_file.h:
        Fixed bug #17823: 'arc' directories inside database directories.
        The "thd" parameter has been added to the rename_in_schema_file()
        function.
      sql/sql_db.cc:
        Fixed bug #17823: 'arc' directories inside database directories.
        Scope of the mysql_rm_arc_files() function has been changed to
        global for use from the parse_file.cc file.
      sql/sql_view.cc:
        Fixed bug #17823: 'arc' directories inside database directories.
        Added the "thd" argument to rename_in_schema_file() calls.
      3c9d4ea8
    • Alexey Botchkov's avatar
      merging · b8734a1c
      Alexey Botchkov authored
      b8734a1c
  3. 29 Sep, 2008 1 commit
    • Alexey Botchkov's avatar
      Bug#37949 Crash if argument to SP is a subquery that returns more than one row · ce64a16b
      Alexey Botchkov authored
           JOIN for the subselect wasn't cleaned if we came upon an error
           during sub_select() execution. That leads to the assertion failure
           in close_thread_tables()
      
           part of the 6.0 code backported
      
      per-file comments:
        mysql-test/r/sp-error.result
      Bug#37949 Crash if argument to SP is a subquery that returns more than one row 
          test result
      
        mysql-test/t/sp-error.test
      Bug#37949 Crash if argument to SP is a subquery that returns more than one row 
          test case
      
        sql/sp_head.cc
      Bug#37949 Crash if argument to SP is a subquery that returns more than one row 
          lex->unit.cleanup() call added if not substatement
      ce64a16b
  4. 25 Sep, 2008 1 commit
  5. 23 Sep, 2008 2 commits
  6. 22 Sep, 2008 3 commits
  7. 20 Sep, 2008 5 commits
    • Kristofer Pettersson's avatar
      Merge 5.0-bugteam -> 5.1-bugteam · 153e8e7c
      Kristofer Pettersson authored
      153e8e7c
    • Kristofer Pettersson's avatar
      Automerge · 119c5aae
      Kristofer Pettersson authored
      119c5aae
    • Kristofer Pettersson's avatar
      Bug#38469 invalid memory read and/or crash with utf8 text field, stored procedure, uservar · f0352e34
      Kristofer Pettersson authored
                  
      A stored procedure involving substrings could crash the server on certain
      platforms because of invalid memory reads.
                
      During storing the new blob-field value, the cached value's address range
      overlapped that of the new field value. This caused problems when the 
      cached value storage was reallocated to provide access for a new 
      characater set representation. The patch checks the address ranges, and if
      they overlap, the new field value is copied to a new storage before it is
      converted to the new character set.
      
      
      mysql-test/r/sp.result:
        Added result set
      mysql-test/t/sp.test:
        Added test case
      sql/field.cc:
        The source and destination address ranges of a character conversion must not overlap or the 'from' address will be invalidated as the temporary value-
        object is re-allocated to fit the new character set.
      sql/field.h:
        Added comments
      f0352e34
    • Davi Arnaut's avatar
      Restore team tree name. · fa490eb9
      Davi Arnaut authored
      fa490eb9
    • Patrick Crews's avatar
      Bug#38311 Some tests use 'rm' which is not portable · 404e4b80
      Patrick Crews authored
      Substituted use of MTR's remove_file function in the tests
      Started with 5.0 tree and will clean up any offenders discovered during upmerge.
      404e4b80
  8. 18 Sep, 2008 8 commits
    • Matthias Leich's avatar
      Merge 5.0 -> 5.1 · 88ec0a0c
      Matthias Leich authored
      no conflicts, no real code changes
      88ec0a0c
    • Matthias Leich's avatar
      Merge actual tree -> local tree · 24fe7470
      Matthias Leich authored
      no conflicts
      24fe7470
    • Matthias Leich's avatar
      Merge actual bugteam tree -> local tree · 8aa1b6b0
      Matthias Leich authored
      8aa1b6b0
    • Tatiana A. Nurnberg's avatar
      auto-merge · 1f4277b4
      Tatiana A. Nurnberg authored
      1f4277b4
    • Tatiana A. Nurnberg's avatar
      manual merge · 7a40f261
      Tatiana A. Nurnberg authored
      7a40f261
    • Tatiana A. Nurnberg's avatar
      Bug#37114: sql_mode NO_BACKSLASH_ESCAPES does not work properly with LOAD DATA... · 654db75d
      Tatiana A. Nurnberg authored
      Bug#37114: sql_mode NO_BACKSLASH_ESCAPES does not work properly with LOAD DATA      Bug#37114: sql_mode NO_BACKSLASH_ESCAPES does not work properly with LOAD DATA INFILE
      
      tweaked test to make embedded server happy
      654db75d
    • Mattias Jonsson's avatar
      Bug#37803: Test "partition_alter2_innodb" exhausts resources (time and/or memory) · 84760783
      Mattias Jonsson authored
      It is a very big test and as such it takes a lot of time.
      
      Solution is to divide the test in two parts, one for testing increasing
      column size and one for decreasing size.
      
      The innodb branch does extended tests (that myisam is not) due to the
      $do_pk_tests variabel, that is the reason why the innodb branch takes
      longer.
      
      No increase of memory usage in innodb was found when analyzing, (tested
      with looping some millions time of create/drop and alter commands)
      
      The memory exhaust discovered in the test is due to mysqltest which
      stores the result in memory (result-file) and this was the biggest
      result file in the test framework, so by dividing the test into two
      parts also cuts the memory usage of mysqltest.
      
      mysql-test/suite/parts/inc/partition_alter2_1.inc:
        Bug#37803: Test "partition_alter2_innodb" exhausts resources (time and/or memory)
        
        Splitted the test into two parts (one for increasing column size
        and one for decreasing)
        
        This leads to lower test case time (to avoid test case timeout)
        and less memory consumption of mysqltest (due to smaller result file)
      mysql-test/suite/parts/inc/partition_alter2_2.inc:
        Bug#37803: Test "partition_alter2_innodb" exhausts resources (time and/or memory)
        
        Splitted the test into two parts (one for increasing column size
        and one for decreasing)
        
        This leads to lower test case time (to avoid test case timeout)
        and less memory consumption of mysqltest (due to smaller result file)
      mysql-test/suite/parts/r/partition_alter2_1_innodb.result:
        Bug#37803: Test "partition_alter2_innodb" exhausts resources (time and/or memory)
        
        Splitted the test into two parts (one for increasing column size
        and one for decreasing)
        
        This leads to lower test case time (to avoid test case timeout)
        and less memory consumption of mysqltest (due to smaller result file)
      mysql-test/suite/parts/r/partition_alter2_1_myisam.result:
        Bug#37803: Test "partition_alter2_innodb" exhausts resources (time and/or memory)
        
        Splitted the test into two parts (one for increasing column size
        and one for decreasing)
        
        This leads to lower test case time (to avoid test case timeout)
        and less memory consumption of mysqltest (due to smaller result file)
      mysql-test/suite/parts/r/partition_alter2_2_innodb.result:
        Bug#37803: Test "partition_alter2_innodb" exhausts resources (time and/or memory)
        
        Splitted the test into two parts (one for increasing column size
        and one for decreasing)
        
        This leads to lower test case time (to avoid test case timeout)
        and less memory consumption of mysqltest (due to smaller result file)
      mysql-test/suite/parts/r/partition_alter2_2_myisam.result:
        Bug#37803: Test "partition_alter2_innodb" exhausts resources (time and/or memory)
        
        Splitted the test into two parts (one for increasing column size
        and one for decreasing)
        
        This leads to lower test case time (to avoid test case timeout)
        and less memory consumption of mysqltest (due to smaller result file)
      mysql-test/suite/parts/t/disabled.def:
        Bug#37803: Test "partition_alter2_innodb" exhausts resources (time and/or memory)
        
        Removed the test completely (since it has never been supported)
      mysql-test/suite/parts/t/partition_alter2_1_innodb.test:
        Bug#37803: Test "partition_alter2_innodb" exhausts resources (time and/or memory)
        
        Splitted the test into two parts (one for increasing column size
        and one for decreasing)
        
        This leads to lower test case time (to avoid test case timeout)
        and less memory consumption of mysqltest (due to smaller result file)
      mysql-test/suite/parts/t/partition_alter2_1_myisam.test:
        Bug#37803: Test "partition_alter2_innodb" exhausts resources (time and/or memory)
        
        Splitted the test into two parts (one for increasing column size
        and one for decreasing)
        
        This leads to lower test case time (to avoid test case timeout)
        and less memory consumption of mysqltest (due to smaller result file)
      mysql-test/suite/parts/t/partition_alter2_2_innodb.test:
        Bug#37803: Test "partition_alter2_innodb" exhausts resources (time and/or memory)
        
        Splitted the test into two parts (one for increasing column size
        and one for decreasing)
        
        This leads to lower test case time (to avoid test case timeout)
        and less memory consumption of mysqltest (due to smaller result file)
      mysql-test/suite/parts/t/partition_alter2_2_myisam.test:
        Bug#37803: Test "partition_alter2_innodb" exhausts resources (time and/or memory)
        
        Splitted the test into two parts (one for increasing column size
        and one for decreasing)
        
        This leads to lower test case time (to avoid test case timeout)
        and less memory consumption of mysqltest (due to smaller result file)
      mysql-test/suite/parts/t/partition_alter2_ndb.test:
        Bug#37803: Test "partition_alter2_innodb" exhausts resources (time and/or memory)
        
        Removing test since ndb has never supported these tests
      84760783
    • Chad MILLER's avatar
      Merge Bug#37312. · cf2b5e8b
      Chad MILLER authored
      cf2b5e8b
  9. 17 Sep, 2008 4 commits
    • Tatiana A. Nurnberg's avatar
      auto-merge · c8324002
      Tatiana A. Nurnberg authored
      c8324002
    • Tatiana A. Nurnberg's avatar
      auto-merge · 8d10051b
      Tatiana A. Nurnberg authored
      8d10051b
    • Tatiana A. Nurnberg's avatar
      auto-merge · 845d7c71
      Tatiana A. Nurnberg authored
      845d7c71
    • Tatiana A. Nurnberg's avatar
      Bug#37114: sql_mode NO_BACKSLASH_ESCAPES does not work properly with LOAD DATA INFILE · 2f082d9d
      Tatiana A. Nurnberg authored
      NO_BACKSLASH_ESCAPES was not heeded in LOAD DATA INFILE
      and SELECT INTO OUTFILE.  It is now.
      
      mysql-test/r/loaddata.result:
        Show that SQL-mode NO_BACKSLASH_ESCAPES is heeded in
        INFILE/OUTFILE, and that dump/restore cycles work!
      mysql-test/t/loaddata.test:
        Show that SQL-mode NO_BACKSLASH_ESCAPES is heeded in
        INFILE/OUTFILE, and that dump/restore cycles work!
      sql/sql_class.cc:
        Add function to enquire whether ESCAPED BY was given.
        When doing SELECT...OUTFILE, use ESCAPED BY if specifically
        given; otherwise use sensible default value depending on
        SQL-mode features NO_BACKSLASH_ESCAPES.
      sql/sql_class.h:
        Add function to enquire whether ESCAPED BY was given.
      sql/sql_load.cc:
        When doing LOAD DATA INFILE, use ESCAPED BY if specifically
        given; otherwise use sensible default value depending on
        SQL-mode features NO_BACKSLASH_ESCAPES.
      2f082d9d
  10. 16 Sep, 2008 6 commits
    • Matthias Leich's avatar
      Upmerge 5.0 -> 5.1 of fix for Bug#38184 · 03703b65
      Matthias Leich authored
      03703b65
    • Matthias Leich's avatar
      Fix for Bug#38184 : main.federated fails sporadically · 635887dc
      Matthias Leich authored
      Details:
      - backport of some improvements which prevent sporadic
        failures from 5.1 to 5.0
      - @@GLOBAL.CONCURRENT_INSERT= 0 also for slave server
      - --sorted_result before all selects which have result
        sets with more than one row
      - Replace error numbers by error names
      635887dc
    • Narayanan V's avatar
      updated tree with mysql-5.1-bugteam · 53e01083
      Narayanan V authored
      53e01083
    • Vladislav Vaintroub's avatar
      merge fix from 5.0-bugteam · f6e28fd5
      Vladislav Vaintroub authored
      f6e28fd5
    • Narayanan V's avatar
      Bug#38338: REPLACE causes last_insert_id() to return an incorrect value · d714d290
      Narayanan V authored
                        
      Fix the write_record function to record auto increment
      values in a consistent way.
      
      mysql-test/r/auto_increment.result:
        Updated the test result file with the output of the
        new test case added to verify this bug.
      mysql-test/t/auto_increment.test:
        Added a new test case to verify this bug.
      sql/sql_insert.cc:
        The algorithm for the write_record function
        in sql_insert.cc is (more emphasis given to
        the parts that deal with the autogenerated values)
        
        1) If a write fails
        
           1.1) save the autogenerated value to avoid 
                thd->insert_id_for_cur_row to become 0.
        
           1.2) <logic to handle INSERT ON DUPLICATE KEY
                UPDATE and REPLACE>
        
        2) record the first successful insert id.
        
        explanation of the failure
        --------------------------
        
        As long as 1.1) was executed 2) worked fine.
        
        1.1) was always executed when REPLACE worked 
             with the last row update optimization, but
             in cases where 1.1) was not executed 2)
             would fail and would result in the autogenerated
             value not being saved.
        
        solution
        --------
        
        repeat a check for thd->insert_id_for_cur_row 
        being zero similar to 1.1) before 2) and ensure
        that the correct value is saved.
      d714d290
    • Vladislav Vaintroub's avatar
      Bug#35987 - post-review fix · a4987b44
      Vladislav Vaintroub authored
      Correct usage of strncat() in get_symbol_path()
      
      3rd parameter to strncat is changed to be count of 
      remaining bytes in the output buffer minus 1.
      
      
      a4987b44