1. 23 Dec, 2008 4 commits
    • Sergey Glukhov's avatar
      5.0-bugteam->5.1-bugteam merge · f42b9ad9
      Sergey Glukhov authored
      f42b9ad9
    • Sergey Glukhov's avatar
      Bug#37575 UCASE fails on monthname · c06df92a
      Sergey Glukhov authored
      The MONTHNAME/DAYNAME functions
      returns binary string, so the LOWER/UPPER functions
      are not effective on the result of MONTHNAME/DAYNAME call.  
      Character set of the MONTHNAME/DAYNAME function
      result has been changed to connection character set.
      
      
      include/m_ctype.h:
        added my_charset_repertoire function
      mysql-test/r/ctype_ucs.result:
        test result
      mysql-test/r/func_time.result:
        test result
      mysql-test/t/ctype_ucs.test:
        test case
      mysql-test/t/func_time.test:
        test case
      sql/item_timefunc.cc:
        Item_func_monthname::fix_length_and_dec and
        Item_func_dayname::fix_length_and_dec methods have been
        modified to use connection character set
      sql/item_timefunc.h:
        Item_func_monthname::fix_length_and_dec and
        Item_func_dayname::fix_length_and_dec methods have been
        modified to use connection character set
      sql/mysql_priv.h:
        added max_month_name_length, max_day_name_length fields into MY_LOCALE struct
      sql/mysqld.cc:
        The test_lc_time_sz function controls modifications
        of the locale database in debugging mode.
      sql/sql_locale.cc:
        initialization of max_month_name_length, max_day_name_length fields
      strings/ctype.c:
        added my_charset_repertoire function
      c06df92a
    • Sergey Petrunia's avatar
      cb6a7559
    • Sergey Vojtovich's avatar
      Merge. · e6390e23
      Sergey Vojtovich authored
      e6390e23
  2. 22 Dec, 2008 1 commit
  3. 19 Dec, 2008 7 commits
    • Matthias Leich's avatar
      Merge into actual tree · 09501824
      Matthias Leich authored
      09501824
    • Sergey Petrunia's avatar
      BUG#40974: Incorrect query results when using clause evaluated using range check · 7976735a
      Sergey Petrunia authored
      - QUICK_INDEX_MERGE_SELECT deinitializes its rnd_pos() scan when it reaches EOF, but we 
        need to make the deinitialization in QUICK_INDEX_MERGE_SELECT destructor also. This is because
        certain execution strategies can stop scanning without reaching EOF, then then try to do a full
        table scan on this table. Failure to deinitialize caused the full scan to use (already empty) 
        table->sort and produce zero records.
      
      mysql-test/r/index_merge.result:
        BUG#40974: Incorrect query results when using clause evaluated using range check
        - Testcase
      mysql-test/t/index_merge.test:
        BUG#40974: Incorrect query results when using clause evaluated using range check
        - Testcase
      7976735a
    • Davi Arnaut's avatar
      Merge before pushing. · f0a16318
      Davi Arnaut authored
      f0a16318
    • Davi Arnaut's avatar
      Bug#41612: resolve_stack_dump does not decode 5.1 stack trace · b4c40ac2
      Davi Arnaut authored
      resolve_stack_dump is not able to decode a stack trace produced
      by glibc's backtrace() functions. The problem is that the stack
      trace addresses are printed between brackets and the utility is
      not able to ignore the brackets.
      
      The solution is to modify resolve_stack_dump so it can recognize
      stack trace addresses surrounded by brackets. e.g. [0xdeadbeef].
      
      extra/resolve_stack_dump.c:
        Skip to after a bracket if one is present in the input.
      b4c40ac2
    • Matthias Leich's avatar
      Merge into GCA tree · da1fe251
      Matthias Leich authored
      da1fe251
    • Timothy Smith's avatar
      Auto-merge from 5.1-bugteam · 4dc447e1
      Timothy Smith authored
      4dc447e1
    • Timothy Smith's avatar
      Disable part of innodb-autoinc.test, because the MySQL server asserts when · 3f85c7f2
      Timothy Smith authored
      compiled --with-debug, due to bug 39828, "autoinc wraps around when offset and
      increment > 1".  This change should be reverted when that bug is fixed (and a
      a few other minor changes to the test as described in comments).
      3f85c7f2
  4. 18 Dec, 2008 1 commit
  5. 17 Dec, 2008 6 commits
    • Sergey Glukhov's avatar
      automerge · 8f1ce01c
      Sergey Glukhov authored
      8f1ce01c
    • Sergey Glukhov's avatar
      Bug#29263 disabled storage engines omitted in SHOW ENGINES · 75344d3d
      Sergey Glukhov authored
      Static disabled plugins|engines and dynamic plugins which installed but disabled
      are not visible in I_S PLUGINS|ENGINES tables because they are not stored into
      global plugin array.
      The fix: add such plugins|engines to plugin array with PLUGIN_IS_DISABLED status.
      I_S.ENGINES 'Transactions', 'XA', 'Savepoints' fields have NULL value in this case.
      
      
      mysql-test/r/warnings_engine_disabled.result:
        test result
      mysql-test/suite/funcs_1/r/is_columns_is.result:
        result fix
      mysql-test/suite/funcs_1/r/is_engines.result:
        result fix
      mysql-test/t/warnings_engine_disabled.test:
        test case
      sql/sql_plugin.cc:
        store disabled plugins|engines into plugin array
      sql/sql_plugin.h:
        added PLUGIN_IS_DISABLED flag
      sql/sql_show.cc:
        added filling of 'engines'&'plugins' tables with disabled engines|plugins
      75344d3d
    • Horst Hunger's avatar
      due to merge · 6200aaf4
      Horst Hunger authored
      6200aaf4
    • Horst Hunger's avatar
    • Sergey Vojtovich's avatar
      BUG#39746 - Debug flag breaks struct definition · 3a42aab8
      Sergey Vojtovich authored
                  (server crash)
      
      Altering a table with fulltext index[es] which use
      pluggable fulltext parser may cause server crash
      in debug builds.
      
      The problem was that ALTER TABLE code wrongly assigned
      fulltext parser name.
      
      Also fixed that altering a table with fulltext index[es]
      leave stale fulltext parser locks, which prevent
      fulltext parsers from being uninstalled after
      ALTER TABLE.
      
      mysql-test/include/have_simple_parser.inc:
        Added support for testing simple fulltext parser.
      mysql-test/mysql-test-run.pl:
        Added support for testing simple fulltext parser.
      mysql-test/r/fulltext_plugin.result:
        A test case for BUG#39746.
      mysql-test/r/have_simple_parser.require:
        Added support for testing simple fulltext parser.
      mysql-test/t/fulltext_plugin-master.opt:
        A test case for BUG#39746.
      mysql-test/t/fulltext_plugin.test:
        A test case for BUG#39746.
      sql/sql_table.cc:
        Fixed that alter table wrongly assigns fulltext parser
        name. parser_name member is only available during
        table creation. When we open existing table we must
        get parser_name from plugin_ref, which is handled
        by plugin_name() macro.
      sql/table.cc:
        Moved code that releases fulltext parsers into
        free_table_share(). This fixes stale fulltext parser
        locks set by ALTER TABLE, which are preventing fulltext
        parsers from being uninstalled.
      3a42aab8
    • Sergey Glukhov's avatar
      Bug#24289 Status Variable "Questions" gets wrong values with Stored Routines(for 5.1) · 952d284b
      Sergey Glukhov authored
      mysql-test/r/myisampack.result:
        result fix
      mysql-test/t/myisampack.test:
        test case fix
      952d284b
  6. 16 Dec, 2008 5 commits
    • Matthias Leich's avatar
      Fix for Bug#39854 events_scheduling fails sporadically on pushbuild · 692a8796
      Matthias Leich authored
      Detail:
      - Choose the solution that was already in place (before last fix)
        for 6.0
      - minor cleanup in comments
      692a8796
    • Mattias Jonsson's avatar
      merge · 0077ba49
      Mattias Jonsson authored
      0077ba49
    • Davi Arnaut's avatar
      Fix warnings and bug spotted by gcc-4.3. · 3ce026ec
      Davi Arnaut authored
      Related to operator precedence and associativity.
      Make the expressions as explicit as possible.
      
      sql/field.h:
        Silence gcc-4.3 warning: be more explicit.
      sql/item.cc:
        Silence gcc-4.3 warning: be more explicit.
      sql/item_sum.cc:
        Silence gcc-4.3 warning: be more explicit.
      sql/log_event.cc:
        Silence gcc-4.3 warning: be more explicit.
      sql/spatial.h:
        Silence gcc-4.3 warning: be more explicit.
      sql/sql_lex.cc:
        Silence gcc-4.3 warning: be more explicit.
      sql/table.h:
        Silence gcc-4.3 warning: be more explicit.
      storage/federated/ha_federated.cc:
        Fix operator precedence bug.
      storage/heap/ha_heap.cc:
        Silence gcc-4.3 warning: be more explicit.
      3ce026ec
    • Mattias Jonsson's avatar
      merge · 5cf57aab
      Mattias Jonsson authored
      5cf57aab
    • Mattias Jonsson's avatar
      post push fix for bug#40595 · 23d569ed
      Mattias Jonsson authored
      Addition of hander function was_semi_consistent_read
      
      mysql-test/r/partition_innodb_semi_consistent.result:
        post push fix for bug#40595
        Addition of hander function was_semi_consistent_read
        
        Added test result
      mysql-test/t/partition_innodb_semi_consistent-master.opt:
        post push fix for bug#40595
        Addition of hander function was_semi_consistent_read
        
        Added test opt file
      mysql-test/t/partition_innodb_semi_consistent.test:
        post push fix for bug#40595
        Addition of hander function was_semi_consistent_read
        
        Added test case
      sql/ha_partition.cc:
        post push fix for bug#40595
        Addition of hander function was_semi_consistent_read
        
        The lack of was_semi_consistent_read opened a regression
        for bug-31310 when useing a partitioned InnoDB table
      23d569ed
  7. 15 Dec, 2008 5 commits
  8. 14 Dec, 2008 11 commits
    • Timothy Smith's avatar
      Apply InnoDB snapshot innodb-5.1-ss2858, part 16. Fix merge mistake which · 5681a0df
      Timothy Smith authored
      resulted in a duplicate test case for bug 38231.
      5681a0df
    • Timothy Smith's avatar
      Apply InnoDB snapshot innodb-5.1-ss2858, part 15. Fixes · d29aaf89
      Timothy Smith authored
      Bug #39830: Table autoinc value not updated on first insert.
      Bug #35498: Cannot get table test/table1 auto-inccounter value in ::info
      Bug #36411: Failed to read auto-increment value from storage engine" in 5.1.24 auto-inc
      
      Detailed revision comments:
      
      r2854 | sunny | 2008-10-23 08:30:32 +0300 (Thu, 23 Oct 2008) | 13 lines
      branches/5.1: Backport changes from branches/zip r2725
      
      Simplify the autoinc initialization code. This removes the
      non-determinism related to reading the table's autoinc value for the first
      time. This change has also reduced the sizeof dict_table_t by sizeof(ibool)
      bytes because we don't need the dict_table_t::autoinc_inited field anymore.
      
      rb://16
      d29aaf89
    • Timothy Smith's avatar
      Apply InnoDB snapshot innodb-5.1-ss2858, part 14. Fixes · 5e421fb8
      Timothy Smith authored
      Bug #37788: InnoDB Plugin: AUTO_INCREMENT wrong for compressed tables
      
      (Note, this bug is not only in the plugin, the overflow checks are relevant
      for MySQL's InnoDB as well.)
      
      
      Detailed revision comments:
      
      r2852 | sunny | 2008-10-23 01:42:24 +0300 (Thu, 23 Oct 2008) | 9 lines
      branches/5.1: Backport r2724 from branches/zip
      
      Check column value against the col max value before updating the table's
      global autoinc counter value. This is part of simplifying the AUTOINC
      sub-system. We extract the type info from MySQL data structures at runtime.
      5e421fb8
    • Timothy Smith's avatar
      Apply InnoDB snapshot innodb-5.1-ss2858, part 13. Fixes · a32e0486
      Timothy Smith authored
      Bug #40224: New AUTOINC changes mask reporting of deadlock/timeout errors
      
      
      Detailed revision comments:
      
      r2849 | sunny | 2008-10-22 12:01:18 +0300 (Wed, 22 Oct 2008) | 8 lines
      branches/5.1: Return the actual error code encountered when allocating
      a new autoinc value. The change in behavior (bug) was introduced in 5.1.22
      when we introduced the new AUTOINC locking model.
      
      rb://31
      a32e0486
    • Timothy Smith's avatar
      Apply InnoDB snapshot innodb-5.1-ss2858, part 12. · 3d2d2d0c
      Timothy Smith authored
      A follow-up to fix for bug #39438.  This moves some errro messages from the
      server error log to the client, to make it easier for users (especially in
      shared hosting environment) to get info about why their statement is failing.
      
      Detailed revision comments:
      
      r2832 | vasil | 2008-10-21 10:08:30 +0300 (Tue, 21 Oct 2008) | 10 lines
      branches/5.1:
      
      In ha_innobase::info():
      
      Replace sql_print_warning() which prints to mysqld error log with
      push_warning_printf() which sends the error message to the client.
      
      Suggested by:	Marko, Sunny, Michael
      Objected by:	Inaam
      3d2d2d0c
    • Timothy Smith's avatar
      Apply InnoDB snapshot innodb-5.1-ss2858, part 11. White space changes. · 3692ae36
      Timothy Smith authored
      Detailed revision comments:
      
      r2826 | vasil | 2008-10-20 14:09:01 +0300 (Mon, 20 Oct 2008) | 5 lines
      branches/5.1:
      
      Non-functional change: use a single tab instead of 12 spaces between
      variable type and variable name.
      3692ae36
    • Timothy Smith's avatar
      Apply InnoDB snapshot innodb-5.1-ss2858, part 10. · 7cd7760d
      Timothy Smith authored
      Fix memory handling to avoid possible crash during error printout.  (Code
      review, no associated bug.)
      
      
      Detailed revision comments:
      
      r2782 | marko | 2008-10-13 14:21:02 +0300 (Mon, 13 Oct 2008) | 5 lines
      branches/5.1: Backport a fix from branches/zip r2763:
      
      row_drop_database_for_mysql(): Postpone mem_free(table_name), so that
      an error printout will not dereference freed memory.
      7cd7760d
    • Timothy Smith's avatar
      Apply InnoDB snapshot innodb-5.1-ss2858, part 9. Improve a comment. · 9f8f9715
      Timothy Smith authored
      Detailed revision comments:
      
      r2744 | marko | 2008-10-09 10:53:09 +0300 (Thu, 09 Oct 2008) | 5 lines
      branches/5.1: ha_innobase::delete_all_rows(): In response to a user asking
      <http://forums.innodb.com/read.php?4,215,215> why DELETE FROM t is not
      mapped to TRUNCATE TABLE t as it is in MyISAM, note in a comment that
      DELETE is transactional while TRUNCATE is not.
      9f8f9715
    • Timothy Smith's avatar
      Apply InnoDB snapshot innodb-5.1-2858, part 8. Fixes · 915635bb
      Timothy Smith authored
      Bug #39939: DROP TABLE/DISCARD TABLESPACE takes long time in buf_LRU_invalidate_tablespace()
      
      Detailed revision comments:
      
      r2742 | inaam | 2008-10-08 22:02:15 +0300 (Wed, 08 Oct 2008) | 11 lines
      branches/5.1:
      
      Improve implementation of buf_LRU_invalidate_tablespace by attempting
      hash index drop in batches instead of doing it one by one.
      
      Reviewed by: Heikki, Sunny, Marko
      Approved by: Heikki
      915635bb
    • Timothy Smith's avatar
      Apply InnoDB snapshot innodb-5.1-2858, part 7. · 22f6a842
      Timothy Smith authored
      A follow-up fix for Bug 38839, which exposed a pre-existing bug in the
      autoinc handling.
      
      Detailed revision comments:
      
      r2722 | sunny | 2008-10-04 02:48:04 +0300 (Sat, 04 Oct 2008) | 18 lines
      branches/5.1: This bug has always existed but was masked by other errors. The
      fix for bug# 38839 triggered this bug. When the offset and increment are > 1
      we need to calculate the next value taking into consideration the two
      variables. Previously we simply assumed they were 1 particularly offset was
      never used. MySQL does its own calculation and that's probably why it seemed
      to work in the past. We would return what we thought was the correct next
      value and then MySQL would recalculate the actual value from that and return
      it to the caller (e.g., handler::write_row()). Several new tests have been
      added that try and catch some edge cases. The tests exposed a wrap around
      error in MySQL next value calculation which was filed as bug 39828. The tests
      will need to be updated once MySQL fix that bug.
      
      One good side effect of this fix is that dict_table_t size has been
      reduced by 8 bytes because we have moved the autoinc_increment field to
      the row_prebuilt_t structure. See review-board for a detailed discussion.
      
      rb://3
      22f6a842
    • Timothy Smith's avatar
      Apply InnoDB snapshot innodb-5.1-ss2858, part 6. · e3669212
      Timothy Smith authored
      Send error message to the client when a rollback occurs when trying to get an
      autoincrement value.  This is related to the fixes for Bug#36411 and
      Bug#35498.
      
      Detailed revision comments:
      
      r2721 | sunny | 2008-10-04 02:08:23 +0300 (Sat, 04 Oct 2008) | 6 lines
      branches/5.1: We need to send the messages to the client because
      handler::get_auto_increment() doesn't allow a way to return the
      specific error for why it failed.
      
      rb://18
      e3669212