1. 22 Feb, 2010 3 commits
    • Bjorn Munch's avatar
      merge from 5.1-mtr · aae3c0fc
      Bjorn Munch authored
      aae3c0fc
    • Staale Smedseng's avatar
      Bug #43414 Parenthesis (and other) warnings compiling · 01995d1b
      Staale Smedseng authored
      MySQL with gcc 4.3.2
            
      This is the final patch in the context of this bug. 
      
      cmd-line-utils/readline/rlmbutil.h:
        Changed in a previous patch, reverted by a backport.
      cmd-line-utils/readline/text.c:
        Static var initialization.
      extra/yassl/include/yassl_error.hpp:
        SetErrorString handles errors outside of the YasslError
        enum.
      extra/yassl/src/ssl.cpp:
        SetErrorString handles errors outside of the YasslError
        enum.
      extra/yassl/src/yassl_error.cpp:
        SetErrorString handles errors outside of the YasslError
        enum.
      01995d1b
    • Tatiana A. Nurnberg's avatar
      auto-merge · d5db06e8
      Tatiana A. Nurnberg authored
      d5db06e8
  2. 20 Feb, 2010 2 commits
  3. 19 Feb, 2010 3 commits
    • Tatiana A. Nurnberg's avatar
      manual merge · c9c45cae
      Tatiana A. Nurnberg authored
      c9c45cae
    • Tatiana A. Nurnberg's avatar
      Bug#49487: crash with explain extended and group_concat in a derived table · 09a58105
      Tatiana A. Nurnberg authored
      When EXPLAIN EXTENDED tries to print column names, it checks whether the
      referenced table is CONST (in which case, the column's value rather than
      its name will be printed). If no proper table is reference (i.e. because
      a derived table was used that has since gone out of scope), this will fail
      spectacularly.
      
      This ports an equivalent of the fix for Bug 43354.
      
      mysql-test/r/func_gconcat.result:
        Show that EXPLAIN EXTENDED on a GROUP_CONCAT() on a derived table
        no longer crashes the server.
      mysql-test/t/func_gconcat.test:
        Show that EXPLAIN EXTENDED on a GROUP_CONCAT() on a derived table
        no longer crashes the server.
      sql/item_sum.cc:
        Do not de-ref what cannot be, that is, temp-tables that have gone away.
        This is of questionable utility anyway, since our deref has the sole
        purpose of checking whether the table is const (in which case, we'll
        substitute the column with its value in EXPLAIN EXTENDED - that is all).
      09a58105
    • Bjorn Munch's avatar
  4. 18 Feb, 2010 2 commits
    • Tatiana A. Nurnberg's avatar
      Bug#48525: trigger changes "Column 'id' cannot be null" behaviour · 4169e9f3
      Tatiana A. Nurnberg authored
      CHECK_FIELD_IGNORE was treated as CHECK_FIELD_ERROR_FOR_NULL;
      UPDATE...SET...NULL on NOT NULL fields behaved differently after
      a trigger.
      
      Now distinguishes between IGNORE and ERROR_FOR_NULL and save/restores
      check-field options.
      
      mysql-test/r/trigger.result:
        Show that UPDATE...SET...NULL on NOT NULL columns doesn't behave differently
        when run after a trigger.
      mysql-test/t/trigger.test:
        Show that UPDATE...SET...NULL on NOT NULL columns doesn't behave differently
        when run after a trigger.
      sql/field_conv.cc:
        CHECK_FIELD_IGNORE was treated as CHECK_FIELD_ERROR_FOR_NULL.
        Distinguish between the two.
      sql/sp_head.cc:
        raise error as needed
      sql/sql_class.cc:
        Save and restore check-fields options.
      sql/sql_class.h:
        Make room so we can save check-fields options.
      sql/sql_insert.cc:
        raise error as needed
      4169e9f3
    • Georgi Kodinov's avatar
      Bug #51049: main.bug39022 fails in mysql-trunk-merge · e828bad0
      Georgi Kodinov authored
      Fixed the test to behave correctly with ps-protocol
      and binlog format row.
      e828bad0
  5. 17 Feb, 2010 7 commits
    • unknown's avatar
      Merge from mysql-5.1.44-release · 24092069
      unknown authored
      24092069
    • unknown's avatar
      configure.in · 370fc6b1
      unknown authored
       - Changes to the banner text
       - Use older AC_PROG_LIBTOOL (Bug#51009)
      
      scripts/mysql_install_db.sh
       - Changes to banner text
      370fc6b1
    • Bjorn Munch's avatar
      Bug #51135 Please increase the maximum number of connections allowed in mysqltest · 8b58b291
      Bjorn Munch authored
      Added --max-connections= argument to mysqltest and mtr
      Small fix to first patch: forgot to check before free'ing connections array
      8b58b291
    • Sergey Glukhov's avatar
      automerge · 4a161134
      Sergey Glukhov authored
      4a161134
    • Sergey Glukhov's avatar
      Bug#33717 INSERT...(default) fails for enum. Crashes CSV tables, loads spaces for MyISAM · 4263eda4
      Sergey Glukhov authored
      Table corruption happens during table reading in ha_tina::find_current_row() func.
      Field::store() method returns error(true) if stored value is 0.
      The fix:
      added special case for enum type which correctly processes 0 value.
      Additional fix:
      INSERT...(default) and INSERT...() have the same behaviour now for enum type.
      
      
      mysql-test/r/csv.result:
        test result
      mysql-test/r/default.result:
        result fix
      mysql-test/t/csv.test:
        test case
      sql/item.cc:
        Changes:
        do not print warning for 'enum' type if there is no default value.
        set default value.
      storage/csv/ha_tina.cc:
        Table corruption happens during table reading in ha_tina::find_current_row() func.
        Field::store() method returns error(true) if stored value is 0.
        The fix:
        added special case for enum type which correctly processes 0 value.
      4263eda4
    • Bjorn Munch's avatar
      Bug #44054 MTR2: --no-reorder does not prevent reordering · b23c85dc
      Bjorn Munch authored
      Some logic would group by suite always
      Disable this if using --noreorder
      Also fix getting array from collect_one_suite() in this case
      Amended according to previous comment
      b23c85dc
    • Joerg Bruehe's avatar
      Fix a bug in the RPM spec file: · b52ce895
      Joerg Bruehe authored
      A "%define" is no shell command, so it must not be the
      only line in the "then" or "else" branch of an "if".
      
      Add a ':' line to make the branch non-empty.
      b52ce895
  6. 16 Feb, 2010 4 commits
    • Mattias Jonsson's avatar
      post push fix for bug#42438, did not compile on non debug, · 49cf869e
      Mattias Jonsson authored
      due to ifdef of include file
      
      sql/sql_table.cc:
        removed if defined since DEBUG_SYNC macro is defined in that
        include file.
      49cf869e
    • Sergey Glukhov's avatar
      automerge · 775d7322
      Sergey Glukhov authored
      775d7322
    • Sergey Glukhov's avatar
      Bug#50591 bit(31) causes Duplicate entry '1-NULL' for key 'group_key' · 108bae28
      Sergey Glukhov authored
      The problem is that during temporary table creation uneven bits
      are not taken into account for hidden fields. It leads to incorrect
      calculation&allocation of null bytes size for table record. And
      if grouped value is null we set wrong bit for this value(see end_update()).
      Fixed by adding separate calculation of uneven bit for hidden fields.
      
      
      mysql-test/r/type_bit.result:
        test case
      mysql-test/t/type_bit.test:
        test case
      sql/sql_select.cc:
        added separate calculation of uneven bit for hidden fields
      108bae28
    • Mattias Jonsson's avatar
      merge · 8982c354
      Mattias Jonsson authored
      8982c354
  7. 15 Feb, 2010 1 commit
  8. 14 Feb, 2010 1 commit
  9. 13 Feb, 2010 1 commit
    • Davi Arnaut's avatar
      Bug#50624: crash in check_table_access during call procedure · 0088b0e3
      Davi Arnaut authored
      This bug is just one facet of stored routines not being able to
      detect changes in meta-data (WL#4179). This particular problem
      can be triggered within a single session due to the improper
      management of the pre-locking list if the view is expanded after
      the pre-locking list is calculated.
      
      Since the overall solution for the meta-data detection issue is
      planned for a later release, for now a workaround is used to
      fix this particular aspect that only involves a single session.
      The workaround is to flush the thread-local stored routine cache
      every time a view is created or modified, causing locally cached
      routines to be re-evaluated upon invocation.
      
      mysql-test/r/sp-bugs.result:
        Add test case result for Bug#50624.
      mysql-test/t/sp-bugs.test:
        Add test case for Bug#50624.
      sql/sp_cache.cc:
        Update function description.
      sql/sql_view.cc:
        Invalidate the SP cache if a view is being created or modified.
      0088b0e3
  10. 12 Feb, 2010 2 commits
  11. 11 Feb, 2010 4 commits
  12. 10 Feb, 2010 2 commits
    • Luis Soares's avatar
      2b65abbc
    • Sergey Glukhov's avatar
      Bug#45195 valgrind warnings about uninitialized values in store_record_in_cache() · 0752d62f
      Sergey Glukhov authored
      The problem becomes apparent only if HAVE_purify is undefined.
      It related to the part of code placed in open_table_from_share() fuction
      where we initialize record buffer only if HAVE_purify is enabled.
      So in case of HAVE_purify=OFF record buffer is not initialized
      on open table stage.
      Next we read key, find NULL value and update appropriate null bit
      but do not update record buffer. After that the record is stored
      in the join cache(store_record_in_cache). For CHAR fields we
      strip trailing spaces and in our case this procedure uses
      uninitialized record buffer.
      The fix is to skip stripping space procedure in case of null values
      for CHAR fields(partially based on 6.0 JOIN_CACHE implementation).
      
      
      mysql-test/r/join.result:
        test case
      mysql-test/t/join.test:
        test case
      sql/field.cc:
        code updated according to new CACHE_FIELD struct
      sql/sql_select.cc:
        code updated according to new CACHE_FIELD struct
      sql/sql_select.h:
        CACHE_FIELD struct:
        added new fields: Field *field, uint type;
        removed fields: Field_blob *blob_field, bool strip;
      0752d62f
  13. 09 Feb, 2010 6 commits
    • Bjorn Munch's avatar
      Bug #50618 Please allow 'sleep $variable' in mtr · 18beb3c7
      Bjorn Munch authored
      Made mtr's sleep function understand $variables
      A few fixes since previous patch, added tests
      18beb3c7
    • Sergey Vojtovich's avatar
    • Sergey Vojtovich's avatar
      5d0012ec
    • Sergey Vojtovich's avatar
      50265b9f
    • Magne Mahre's avatar
      Bug#47974 'TYPE=storage_engine' is deprecated and will be · 2b012a3e
      Magne Mahre authored
                removed in MySQL 6.0
      
      CREATE TABLE... TYPE= returns the warning "The syntax 
      'TYPE=storage_engine' is deprecated and will be removed in 
      MySQL 6.0. Please use 'ENGINE=storage_engine' instead" 
      
      This syntax is deprecated already from version 5.4.4, so
      the message has been changed.
      
      In addition, the deprecation macro was changed to reflect
      the ServerPT decision not to include version number in the
      warning message.
      
      A number of test result files have been changed as a
      consequence of the change in the deprecation macro.
      2b012a3e
    • Sergey Vojtovich's avatar
      BUG#49902 - SELECT returns incorrect results · b586bed7
      Sergey Vojtovich authored
      Queries optimized with GROUP_MIN_MAX didn't cleanup KEYREAD
      optimization properly. As a result subsequent queries may
      return incomplete rows (fields are initialized to default
      values).
      
      mysql-test/r/group_min_max.result:
        A test case for BUG#49902.
      mysql-test/t/group_min_max.test:
        A test case for BUG#49902.
      sql/opt_range.cc:
        Refactor of KEYREAD optimization switch so that KEYREAD
        handler state is in sync with st_table::key_read flag.
        
        All SQL code is supposed to switch KEYREAD optimization
        via st_table::set_keyread().
      sql/opt_sum.cc:
        Refactor of KEYREAD optimization switch so that KEYREAD
        handler state is in sync with st_table::key_read flag.
        
        All SQL code is supposed to switch KEYREAD optimization
        via st_table::set_keyread().
      sql/sql_select.cc:
        Refactor of KEYREAD optimization switch so that KEYREAD
        handler state is in sync with st_table::key_read flag.
        
        All SQL code is supposed to switch KEYREAD optimization
        via st_table::set_keyread().
      sql/sql_update.cc:
        Refactor of KEYREAD optimization switch so that KEYREAD
        handler state is in sync with st_table::key_read flag.
        
        All SQL code is supposed to switch KEYREAD optimization
        via st_table::set_keyread().
      sql/table.cc:
        Refactor of KEYREAD optimization switch so that KEYREAD
        handler state is in sync with st_table::key_read flag.
        
        All SQL code is supposed to switch KEYREAD optimization
        via st_table::set_keyread().
      sql/table.h:
        Refactor of KEYREAD optimization switch so that KEYREAD
        handler state is in sync with st_table::key_read flag.
        
        All SQL code is supposed to switch KEYREAD optimization
        via st_table::set_keyread().
      b586bed7
  14. 08 Feb, 2010 2 commits