1. 29 Dec, 2008 2 commits
    • Sergey Glukhov's avatar
      5.0-bugteam->5.1-bugteam merge · 7d2256e4
      Sergey Glukhov authored
      7d2256e4
    • Sergey Glukhov's avatar
      Bug#41131 "Questions" fails to increment - ignores statements instead stored procs(5.0 ver) · 397a36c7
      Sergey Glukhov authored
      Added global status variable 'Queries' which represents
      total amount of queries executed by server including
      statements executed by SPs.
      note: It's old behaviour of 'Questions' variable.
      
      
      mysql-test/r/status.result:
        test result
      mysql-test/t/status.test:
        test case
      sql/mysqld.cc:
        Added global status variable 'Queries' which represents
        total amount of queries executed by server including
        statements executed by SPs.
        note: It's old behaviour of 'Questions' variable.
      sql/sql_show.cc:
        Added global status variable 'Queries' which represents
        total amount of queries executed by server including
        statements executed by SPs.
        note: It's old behaviour of 'Questions' variable.
      sql/structs.h:
        Added global status variable 'Queries' which represents
        total amount of queries executed by server including
        statements executed by SPs.
        note: It's old behaviour of 'Questions' variable.
      397a36c7
  2. 24 Dec, 2008 8 commits
  3. 23 Dec, 2008 7 commits
    • Sergey Glukhov's avatar
      Bug#40104 regression with table names? · 71154d32
      Sergey Glukhov authored
      On Winodws FN_DEVCHAR is ':' symbol.
      There is a check in mysql_create_table_no_lock() func
      on FN_DEVCHAR presence but this code is obsolete and
      unnecessary. So the fix is to remove unnecessary code.
      
      
      mysql-test/r/create.result:
        test result
      mysql-test/t/create.test:
        test case
      sql/sql_table.cc:
        On Winodws FN_DEVCHAR is ':' symbol.
        There is a check in mysql_create_table_no_lock() func
        on FN_DEVCHAR presence but this code is obsolete and
        unnecessary. So the fix is to remove unnecessary code.
      71154d32
    • Sergey Glukhov's avatar
      5.0-bugteam->5.1-bugteam merge · f1bcbf16
      Sergey Glukhov authored
      f1bcbf16
    • Sergey Glukhov's avatar
      Bug#41079 information_schema.schema_privileges is limited to 7680 records. · 5f8ed9c9
      Sergey Glukhov authored
      The problem is that we cannot insert new record into memory table
      when table size exceeds max memory table size.
      The fix is to use schema_table_store_record() function which
      converts memory table into MyISAM in case of table size exceeding.
      
      Note:
      There is no test case for this bug, the reason is that
      1. The code  that was added already is checked(i.e. works) with existing tests
      2. Correct work of schema_table_store_record() is checked with other test cases
         (information_schema tests)
      So new code is fully covered with existing test cases.
      
      
      sql/mysql_priv.h:
        make schema_table_store_record() function global
      sql/sql_acl.cc:
        The problem is that we cannot insert new record into memory table
        when table size exceeds max memory table size.
        The fix is to use schema_table_store_record() function which
        converts memory table into MyISAM in case of table size exceeding.
      sql/sql_show.cc:
        make schema_table_store_record() function global
      5f8ed9c9
    • Sergey Glukhov's avatar
      5.0-bugteam->5.1-bugteam merge · 806f7242
      Sergey Glukhov authored
      806f7242
    • Sergey Glukhov's avatar
      Bug#37575 UCASE fails on monthname · 43ee0f9f
      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
      43ee0f9f
    • Sergey Petrunia's avatar
      04af51d1
    • Sergey Vojtovich's avatar
      Merge. · 27508a84
      Sergey Vojtovich authored
      27508a84
  4. 22 Dec, 2008 1 commit
  5. 19 Dec, 2008 7 commits
    • Matthias Leich's avatar
      Merge into actual tree · 2c043733
      Matthias Leich authored
      2c043733
    • Sergey Petrunia's avatar
      BUG#40974: Incorrect query results when using clause evaluated using range check · 8cecb71d
      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
      8cecb71d
    • Davi Arnaut's avatar
      Merge before pushing. · f82c8c69
      Davi Arnaut authored
      f82c8c69
    • Davi Arnaut's avatar
      Bug#41612: resolve_stack_dump does not decode 5.1 stack trace · 3bdbfd70
      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.
      3bdbfd70
    • Matthias Leich's avatar
      Merge into GCA tree · 9ce7403c
      Matthias Leich authored
      9ce7403c
    • Timothy Smith's avatar
      Auto-merge from 5.1-bugteam · 19891fe9
      Timothy Smith authored
      19891fe9
    • Timothy Smith's avatar
      Disable part of innodb-autoinc.test, because the MySQL server asserts when · 86ac31ab
      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).
      86ac31ab
  6. 18 Dec, 2008 1 commit
  7. 17 Dec, 2008 6 commits
    • Sergey Glukhov's avatar
      automerge · d0da0a69
      Sergey Glukhov authored
      d0da0a69
    • Sergey Glukhov's avatar
      Bug#29263 disabled storage engines omitted in SHOW ENGINES · a2cda446
      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
      a2cda446
    • Horst Hunger's avatar
      due to merge · 55de64fa
      Horst Hunger authored
      55de64fa
    • Horst Hunger's avatar
    • Sergey Vojtovich's avatar
      BUG#39746 - Debug flag breaks struct definition · 00406870
      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.
      00406870
    • Sergey Glukhov's avatar
      Bug#24289 Status Variable "Questions" gets wrong values with Stored Routines(for 5.1) · 0b732275
      Sergey Glukhov authored
      mysql-test/r/myisampack.result:
        result fix
      mysql-test/t/myisampack.test:
        test case fix
      0b732275
  8. 16 Dec, 2008 5 commits
    • Matthias Leich's avatar
      Fix for Bug#39854 events_scheduling fails sporadically on pushbuild · 6a582054
      Matthias Leich authored
      Detail:
      - Choose the solution that was already in place (before last fix)
        for 6.0
      - minor cleanup in comments
      6a582054
    • Mattias Jonsson's avatar
      merge · 5a05ea39
      Mattias Jonsson authored
      5a05ea39
    • Davi Arnaut's avatar
      Fix warnings and bug spotted by gcc-4.3. · 36792ff5
      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.
      36792ff5
    • Mattias Jonsson's avatar
      merge · 40ec2207
      Mattias Jonsson authored
      40ec2207
    • Mattias Jonsson's avatar
      post push fix for bug#40595 · dd80cfb6
      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
      dd80cfb6
  9. 15 Dec, 2008 3 commits