1. 05 Nov, 2008 2 commits
    • Evgeny Potemkin's avatar
      Merged fix for the bug#37870. · 8d75510e
      Evgeny Potemkin authored
      8d75510e
    • Evgeny Potemkin's avatar
      Bug#37870: Usage of uninitialized value caused failed assertion. · 3c49cb07
      Evgeny Potemkin authored
      The convert_constant_item function converts a constant to integer using
      field for condition like 'field = a_constant'. In some cases the
      convert_constant_item is called for a subquery when outer select is already
      being executed, so convert_constant_item saves field's value to prevent its
      corruption. For EXPLAIN and at the prepare phase field's value isn't
      initialized yet, 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 if it's
      haven't been read yet. Outer constant values are always saved.
      
      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 if it's
        haven't been read yet. Outer constant values are always saved.
      3c49cb07
  2. 04 Nov, 2008 10 commits
    • Matthias Leich's avatar
      Merge of bug fix into actual tree · 50baafeb
      Matthias Leich authored
      50baafeb
    • Mattias Jonsson's avatar
      merge · c8ee385d
      Mattias Jonsson authored
      c8ee385d
    • Matthias Leich's avatar
      - Fix for Bug #39848, #39863, #39978, #39569 · d2603f9a
      Matthias Leich authored
        Bug#39848 events_bugs fails sporadically on pushbuild
                  (missing rows in table event_log)
           Details: Reimplement the subtest for BUG 28924
                    - check if the number of rows within the table
                      event_log changes but don't print rows
                      because the number varies depending on
                      load on testing box
                    - shift DROP USER befor DROP EVENT
                      = Subtest fits again to old bug
                    - remove no more needed comments + variables
        Bug#39863 events_bugs fails sporadically on pushbuild 
                  (extra processes in I_S.PROCESSLIST)
           Details: Abort with appropriate message to the protocol if
                    release_lock() does not has the intended effect.
                    This cannot prevent problems caused by the probably
                    buggy release_lock() but it reveals if we had a
                    problem in this area.
        Bug#39978 main.events_bugs does not clean up
           Detail: Restore global.event_scheduler = ON at end of test
        Bug#39569 events_bugs fails sporadically on pushbuild
                  (should have failed with errno 1539)
           Detail: Set $wait_timeout to 4 instead of 2
      - Fix two instabilities (result sets pulled from processlist in
        subtest for bug 16407) which were found during tests with high
        parallel I/O load
      - Minor improvements of formatting
        Details:
        - Add comments
        - Remove tabs and trailing blanks
        - Add line breaks for better readability
      d2603f9a
    • Andrei Elkin's avatar
      bug#38230 · c618c312
      Andrei Elkin authored
      updating two test results.
      
      mysql-test/suite/rpl/r/rpl_row_basic_2myisam.result:
        results changed.
      mysql-test/suite/rpl_ndb/r/rpl_row_basic_7ndb.result:
        results changed.
      c618c312
    • Kristofer Pettersson's avatar
      Automerge · 2b3fa955
      Kristofer Pettersson authored
      2b3fa955
    • Tatiana A. Nurnberg's avatar
      Bug#39117 "plugin_load" option not documented · 3b50efc3
      Tatiana A. Nurnberg authored
      correct text describing the --plugin-load option to mysqld
      
      sql/mysqld.cc:
        correct text describing the --plugin-load option to mysqld
      3b50efc3
    • Mattias Jonsson's avatar
      merge · 460407d3
      Mattias Jonsson authored
      460407d3
    • Mattias Jonsson's avatar
      merge · 747099e3
      Mattias Jonsson authored
      747099e3
    • Mattias Jonsson's avatar
      merge · 8dd07d32
      Mattias Jonsson authored
      8dd07d32
    • Mattias Jonsson's avatar
      Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output · bb1ad9ce
      Mattias Jonsson authored
      The partitioning clause is only a very long single line, which is very
      hard to interpret for a human. This patch breaks the partitioning
      syntax into one line for the partitioning type, and one line per
      partition/subpartition.
      
      mysql-test/r/information_schema_part.result:
        Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output
        
        Updated test result due to the new partitioning clause output format.
      mysql-test/r/partition.result:
        Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output
        
        Updated test result due to the new partitioning clause output format.
      mysql-test/r/partition_archive.result:
        Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output
        
        Updated test result due to the new partitioning clause output format.
      mysql-test/r/partition_datatype.result:
        Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output
        
        Updated test result due to the new partitioning clause output format.
      mysql-test/r/partition_innodb.result:
        Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output
        
        Updated test result due to the new partitioning clause output format.
      mysql-test/r/partition_mgm.result:
        Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output
        
        Updated test result due to the new partitioning clause output format.
      mysql-test/r/partition_mgm_err.result:
        Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output
        
        Updated test result due to the new partitioning clause output format.
      mysql-test/r/partition_not_windows.result:
        Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output
        
        Updated test result due to the new partitioning clause output format.
      mysql-test/r/partition_range.result:
        Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output
        
        Updated test result due to the new partitioning clause output format.
      mysql-test/r/partition_symlink.result:
        Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output
        
        Updated test result due to the new partitioning clause output format.
      mysql-test/suite/ndb/r/ndb_partition_key.result:
        Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output
        
        Updated test result due to the new partitioning clause output format.
      mysql-test/suite/ndb/r/ndb_partition_range.result:
        Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output
        
        Updated test result due to the new partitioning clause output format.
      mysql-test/suite/ndb_team/r/ndb_dd_backuprestore.result:
        Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output
        
        Updated test result due to the new partitioning clause output format.
      mysql-test/suite/parts/inc/partition_directory.inc:
        Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output
        
        Changed partitioning clause format for verifying the new output format.
      mysql-test/suite/parts/r/ndb_dd_backuprestore.result:
        Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output
        
        Updated test result due to the new partitioning clause output format.
      mysql-test/suite/parts/r/part_supported_sql_func_innodb.result:
        Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output
        
        Updated test result due to the new partitioning clause output format.
      mysql-test/suite/parts/r/part_supported_sql_func_myisam.result:
        Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output
        
        Updated test result due to the new partitioning clause output format.
      mysql-test/suite/parts/r/part_supported_sql_func_ndb.result:
        Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output
        
        Updated test result due to the new partitioning clause output format.
      mysql-test/suite/parts/r/partition_alter1_1_2_innodb.result:
        Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output
        
        Updated test result due to the new partitioning clause output format.
      mysql-test/suite/parts/r/partition_alter1_1_2_myisam.result:
        Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output
        
        Updated test result due to the new partitioning clause output format.
      mysql-test/suite/parts/r/partition_alter1_1_innodb.result:
        Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output
        
        Updated test result due to the new partitioning clause output format.
      mysql-test/suite/parts/r/partition_alter1_1_myisam.result:
        Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output
        
        Updated test result due to the new partitioning clause output format.
      mysql-test/suite/parts/r/partition_alter1_2_innodb.result:
        Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output
        
        Updated test result due to the new partitioning clause output format.
      mysql-test/suite/parts/r/partition_alter1_2_myisam.result:
        Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output
        
        Updated test result due to the new partitioning clause output format.
      mysql-test/suite/parts/r/partition_alter2_1_innodb.result:
        Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output
        
        Updated test result due to the new partitioning clause output format.
      mysql-test/suite/parts/r/partition_alter2_1_myisam.result:
        Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output
        
        Updated test result due to the new partitioning clause output format.
      mysql-test/suite/parts/r/partition_alter2_2_innodb.result:
        Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output
        
        Updated test result due to the new partitioning clause output format.
      mysql-test/suite/parts/r/partition_alter2_2_myisam.result:
        Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output
        
        Updated test result due to the new partitioning clause output format.
      mysql-test/suite/parts/r/partition_alter3_innodb.result:
        Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output
        
        Updated test result due to the new partitioning clause output format.
      mysql-test/suite/parts/r/partition_alter3_myisam.result:
        Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output
        
        Updated test result due to the new partitioning clause output format.
      mysql-test/suite/parts/r/partition_alter4_innodb.result:
        Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output
        
        Updated test result due to the new partitioning clause output format.
      mysql-test/suite/parts/r/partition_alter4_myisam.result:
        Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output
        
        Updated test result due to the new partitioning clause output format.
      mysql-test/suite/parts/r/partition_auto_increment_archive.result:
        Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output
        
        Updated test result due to the new partitioning clause output format.
      mysql-test/suite/parts/r/partition_auto_increment_blackhole.result:
        Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output
        
        Updated test result due to the new partitioning clause output format.
      mysql-test/suite/parts/r/partition_auto_increment_innodb.result:
        Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output
        
        Updated test result due to the new partitioning clause output format.
      mysql-test/suite/parts/r/partition_auto_increment_memory.result:
        Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output
        
        Updated test result due to the new partitioning clause output format.
      mysql-test/suite/parts/r/partition_auto_increment_myisam.result:
        Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output
        
        Updated test result due to the new partitioning clause output format.
      mysql-test/suite/parts/r/partition_auto_increment_ndb.result:
        Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output
        
        Updated test result due to the new partitioning clause output format.
      mysql-test/suite/parts/r/partition_basic_innodb.result:
        Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output
        
        Updated test result due to the new partitioning clause output format.
      mysql-test/suite/parts/r/partition_basic_myisam.result:
        Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output
        
        Updated test result due to the new partitioning clause output format.
      mysql-test/suite/parts/r/partition_basic_symlink_innodb.result:
        Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output
        
        Updated test result due to the new partitioning clause output format.
      mysql-test/suite/parts/r/partition_basic_symlink_myisam.result:
        Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output
        
        Updated test result due to the new partitioning clause output format.
      mysql-test/suite/parts/r/partition_bit_innodb.result:
        Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output
        
        Updated test result due to the new partitioning clause output format.
      mysql-test/suite/parts/r/partition_bit_myisam.result:
        Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output
        
        Updated test result due to the new partitioning clause output format.
      mysql-test/suite/parts/r/partition_bit_ndb.result:
        Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output
        
        Updated test result due to the new partitioning clause output format.
      mysql-test/suite/parts/r/partition_char_innodb.result:
        Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output
        
        Updated test result due to the new partitioning clause output format.
      mysql-test/suite/parts/r/partition_char_myisam.result:
        Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output
        
        Updated test result due to the new partitioning clause output format.
      mysql-test/suite/parts/r/partition_datetime_innodb.result:
        Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output
        
        Updated test result due to the new partitioning clause output format.
      mysql-test/suite/parts/r/partition_datetime_myisam.result:
        Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output
        
        Updated test result due to the new partitioning clause output format.
      mysql-test/suite/parts/r/partition_decimal_innodb.result:
        Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output
        
        Updated test result due to the new partitioning clause output format.
      mysql-test/suite/parts/r/partition_decimal_myisam.result:
        Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output
        
        Updated test result due to the new partitioning clause output format.
      mysql-test/suite/parts/r/partition_engine_innodb.result:
        Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output
        
        Updated test result due to the new partitioning clause output format.
      mysql-test/suite/parts/r/partition_engine_myisam.result:
        Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output
        
        Updated test result due to the new partitioning clause output format.
      mysql-test/suite/parts/r/partition_engine_ndb.result:
        Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output
        
        Updated test result due to the new partitioning clause output format.
      mysql-test/suite/parts/r/partition_float_innodb.result:
        Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output
        
        Updated test result due to the new partitioning clause output format.
      mysql-test/suite/parts/r/partition_float_myisam.result:
        Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output
        
        Updated test result due to the new partitioning clause output format.
      mysql-test/suite/parts/r/partition_int_innodb.result:
        Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output
        
        Updated test result due to the new partitioning clause output format.
      mysql-test/suite/parts/r/partition_int_myisam.result:
        Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output
        
        Updated test result due to the new partitioning clause output format.
      mysql-test/suite/parts/r/partition_int_ndb.result:
        Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output
        
        Updated test result due to the new partitioning clause output format.
      mysql-test/suite/parts/r/partition_mgm_lc0_archive.result:
        Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output
        
        Updated test result due to the new partitioning clause output format.
      mysql-test/suite/parts/r/partition_mgm_lc0_innodb.result:
        Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output
        
        Updated test result due to the new partitioning clause output format.
      mysql-test/suite/parts/r/partition_mgm_lc0_memory.result:
        Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output
        
        Updated test result due to the new partitioning clause output format.
      mysql-test/suite/parts/r/partition_mgm_lc0_myisam.result:
        Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output
        
        Updated test result due to the new partitioning clause output format.
      mysql-test/suite/parts/r/partition_mgm_lc0_ndb.result:
        Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output
        
        Updated test result due to the new partitioning clause output format.
      mysql-test/suite/parts/r/partition_mgm_lc1_archive.result:
        Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output
        
        Updated test result due to the new partitioning clause output format.
      mysql-test/suite/parts/r/partition_mgm_lc1_innodb.result:
        Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output
        
        Updated test result due to the new partitioning clause output format.
      mysql-test/suite/parts/r/partition_mgm_lc1_memory.result:
        Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output
        
        Updated test result due to the new partitioning clause output format.
      mysql-test/suite/parts/r/partition_mgm_lc1_myisam.result:
        Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output
        
        Updated test result due to the new partitioning clause output format.
      mysql-test/suite/parts/r/partition_mgm_lc1_ndb.result:
        Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output
        
        Updated test result due to the new partitioning clause output format.
      mysql-test/suite/parts/r/partition_mgm_lc2_archive.result:
        Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output
        
        Updated test result due to the new partitioning clause output format.
      mysql-test/suite/parts/r/partition_mgm_lc2_innodb.result:
        Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output
        
        Updated test result due to the new partitioning clause output format.
      mysql-test/suite/parts/r/partition_mgm_lc2_memory.result:
        Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output
        
        Updated test result due to the new partitioning clause output format.
      mysql-test/suite/parts/r/partition_mgm_lc2_myisam.result:
        Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output
        
        Updated test result due to the new partitioning clause output format.
      mysql-test/suite/parts/r/partition_mgm_lc2_ndb.result:
        Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output
        
        Updated test result due to the new partitioning clause output format.
      mysql-test/suite/parts/r/partition_special_innodb.result:
        Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output
        
        Updated test result due to the new partitioning clause output format.
      mysql-test/suite/parts/r/partition_special_myisam.result:
        Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output
        
        Updated test result due to the new partitioning clause output format.
      mysql-test/suite/parts/r/partition_syntax_innodb.result:
        Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output
        
        Updated test result due to the new partitioning clause output format.
      mysql-test/suite/parts/r/partition_syntax_myisam.result:
        Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output
        
        Updated test result due to the new partitioning clause output format.
      mysql-test/suite/parts/r/rpl_partition.result:
        Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output
        
        Updated test result due to the new partitioning clause output format.
      mysql-test/suite/rpl/r/rpl_extraCol_innodb.result:
        Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output
        
        Updated test result due to the new partitioning clause output format.
      mysql-test/suite/rpl/r/rpl_extraCol_myisam.result:
        Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output
        
        Updated test result due to the new partitioning clause output format.
      mysql-test/suite/rpl/r/rpl_innodb_bug28430.result:
        Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output
        
        Updated test result due to the new partitioning clause output format.
      mysql-test/suite/rpl/r/rpl_row_basic_8partition.result:
        Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output
        
        Updated test result due to the new partitioning clause output format.
      mysql-test/suite/rpl_ndb/r/rpl_ndb_2innodb.result:
        Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output
        
        Updated test result due to the new partitioning clause output format.
      mysql-test/suite/rpl_ndb/r/rpl_ndb_2myisam.result:
        Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output
        
        Updated test result due to the new partitioning clause output format.
      mysql-test/suite/rpl_ndb/r/rpl_ndb_dd_partitions.result:
        Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output
        
        Updated test result due to the new partitioning clause output format.
      mysql-test/suite/rpl_ndb/r/rpl_ndb_extraCol.result:
        Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output
        
        Updated test result due to the new partitioning clause output format.
      mysql-test/suite/rpl_ndb/r/rpl_ndb_innodb2ndb.result:
        Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output
        
        Updated test result due to the new partitioning clause output format.
      mysql-test/suite/rpl_ndb/r/rpl_ndb_myisam2ndb.result:
        Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output
        
        Updated test result due to the new partitioning clause output format.
      mysql-test/t/partition.test:
        Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output
        
        Added small tests for for the new partitioning clause output format.
      mysql-test/t/partition_mgm.test:
        Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output
        
        Added small tests for for the new partitioning clause output format.
      sql/sql_partition.cc:
        Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output
        
        Changed formatting of the partitioning clause from single line into
        multiple indented lines
      sql/sql_show.cc:
        Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output
        
        Changed formatting of the partitioning clause from single line into
        multiple indented lines
      bb1ad9ce
  3. 03 Nov, 2008 6 commits
  4. 31 Oct, 2008 2 commits
  5. 30 Oct, 2008 1 commit
  6. 29 Oct, 2008 2 commits
  7. 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
  8. 26 Oct, 2008 3 commits
  9. 24 Oct, 2008 4 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