1. 15 Sep, 2009 8 commits
  2. 14 Sep, 2009 2 commits
  3. 12 Sep, 2009 1 commit
  4. 11 Sep, 2009 2 commits
    • unknown's avatar
      After-merge fix for MySQL 5.1.38 merge into MariaDB. · 829c6099
      unknown authored
      Due to a bugfix for enum options in MariaDB, my_getopt parses enums into an ulong.
      However, some new code from MySQL was written to assume enums take an uint.
      
      Fix by using the correct type.
      
      (The new MySQL code in addition had an implicit assumption that my_bool and uint were
      compatible; remove this assumption).
      829c6099
    • unknown's avatar
      After-merge fixes for merge of MySQL-5.1.38. · 66a1902a
      unknown authored
      mysql-test/r/innodb.result:
        Fix wrong merge of result file conflicts.
      mysql-test/t/bug46080-master.opt:
        Fix memory limit to take into account extra storage engines in MariaDB.
      mysql-test/t/innodb.test:
        Add comment clarifying tricky --replace_result.
      sql/sql_select.cc:
        Restore fix of Bug#34374, accudentally lost during MySQL 5.1.38 merge.
      support-files/build-tags:
        Fix missing -R option for bzr, accidentally lost in MySQL-5.1.38 merge.
      66a1902a
  5. 10 Sep, 2009 2 commits
  6. 09 Sep, 2009 3 commits
  7. 08 Sep, 2009 2 commits
  8. 07 Sep, 2009 3 commits
  9. 06 Sep, 2009 1 commit
  10. 04 Sep, 2009 2 commits
    • unknown's avatar
      Merge. · fb820d2c
      unknown authored
       - PBXT fixes.
       - MBug#423035 fix.
       - Compiler warning fixes.
      fb820d2c
    • unknown's avatar
      PBXT fixes. · 554748cc
      unknown authored
       - Silence a compiler warning.
       - Don't build pbms object files now that we disabled pbms.
      
      
      storage/pbxt/src/Makefile.am:
        We disabled PBMS, so don't build it.
      storage/pbxt/src/datalog_xt.cc:
        Silence a warning about signed/unsigned comparison.
      554748cc
  11. 03 Sep, 2009 5 commits
    • Michael Widenius's avatar
      Updated documentation files to reflect MariaDB and not the Maria storage engine or MySQL · f417c043
      Michael Widenius authored
      Added (rewritten) patch from Percona to get extended statistics in slow.log:
      - Added handling of 'set' variables to set_var.cc. Changed sql_mode to use this
      - Added extra logging to slow log of 'Thread_id, Schema, Query Cache hit, Rows sent and Rows examined'
      - Added optional logging to slow log, through log_slow_verbosity, of query plan statistics
      - Added new user variables log_slow_rate_limit, log_slow_verbosity, log_slow_filter
      - Added log-slow-file as synonym for 'slow-log-file', as most slow-log variables starts with 'log-slow'
      - Added log-slow-time as synonym for long-query-time
      Some trivial MyISAM optimizations:
      - In prepare for drop, flush key blocks
      - Don't call mi_lock_database if my_disable_locking is used
      ******
      Automatic merge with trunc
      ******
      Updated documentation files to reflect MariaDB and not the Maria storage engine or MySQL
      Added (rewritten) patch from Percona to get extended statistics in slow.log:
      - Added handling of 'set' variables to set_var.cc. Changed sql_mode to use this
      - Added extra logging to slow log of 'Thread_id, Schema, Query Cache hit, Rows sent and Rows examined'
      - Added optional logging to slow log, through log_slow_verbosity, of query plan statistics
      - Added new user variables log_slow_rate_limit, log_slow_verbosity, log_slow_filter
      - Added log-slow-file as synonym for 'slow-log-file', as most slow-log variables starts with 'log-slow'
      - Added log-slow-time as synonym for long-query-time
      Some trivial MyISAM optimizations:
      - In prepare for drop, flush key blocks
      - Don't call mi_lock_database if my_disable_locking is used
      
      
      KNOWN_BUGS.txt:
        Updated file to reflect MariaDB and not the Maria storage engine
        ******
        Updated file to reflect MariaDB and not the Maria storage engine
      README:
        Updated file to reflect MariaDB
        ******
        Updated file to reflect MariaDB
      mysql-test/r/log_slow.result:
        Test new options for slow query log
        ******
        Test new options for slow query log
      mysql-test/r/variables.result:
        Updated result (old version cut of things at 79 characters)
        ******
        Updated result (old version cut of things at 79 characters)
      mysql-test/t/log_slow.test:
        Test new options for slow query log
        ******
        Test new options for slow query log
      sql/Makefile.am:
        Added log_slow.h
        ******
        Added log_slow.h
      sql/event_data_objects.cc:
        Removed not needed test for enable_slow_log (is done when the flag is tested elsewhere)
        ******
        Removed not needed test for enable_slow_log (is done when the flag is tested elsewhere)
      sql/events.cc:
        Use the general make_set() function instead of 'symbolic_mode_representation'
        ******
        Use the general make_set() function instead of 'symbolic_mode_representation'
      sql/filesort.cc:
        Added status for used query plans
        ******
        Added status for used query plans
      sql/log.cc:
        Reset counters if no query_length (from Percona's patch; Not sure if needed, but can do no harm)
        Added extra logging to slow log of 'Thread_id, Schema, Query Cache hit, Rows sent and Rows examined'
        Added optional logging to slow log, through log_slow_verbosity, of query plan statistics
        Fixed wrong test of error condition
        ******
        Reset counters if no query_length (from Percona's patch; Not sure if needed, but can do no harm)
        Added extra logging to slow log of 'Thread_id, Schema, Query Cache hit, Rows sent and Rows examined'
        Added optional logging to slow log, through log_slow_verbosity, of query plan statistics
        Fixed wrong test of error condition
      sql/log_slow.h:
        Defines and variables for log_slow_verbosity and log_slow_filter
        ******
        Defines and variables for log_slow_verbosity and log_slow_filter
      sql/mysql_priv.h:
        Include log_slow.h
        ******
        Include log_slow.h
      sql/mysqld.cc:
        Added new user variables log_slow_rate_limit, log_slow_verbosity, log_slow_filter
        Added log-slow-file as synonym for 'slow-log-file', as most slow-log variables starts with 'log-slow'
        Added log-slow-time as synonym for long-query-time
        Added note that one should use log-slow-filter instead of log-slow-admin-statements
        Updated comment from 'slow_query_log_file'
        
        
        ******
        Added new user variables log_slow_rate_limit, log_slow_verbosity, log_slow_filter
        Added log-slow-file as synonym for 'slow-log-file', as most slow-log variables starts with 'log-slow'
        Added log-slow-time as synonym for long-query-time
        Added note that one should use log-slow-filter instead of log-slow-admin-statements
        Updated comment from 'slow_query_log_file'
      sql/set_var.cc:
        Added long_slow_time as synonym for long_query_time
        Added new user variables log_slow_rate_limit, log_slow_verbosity, log_slow_filter
        dded handling of 'set' variables to set_var.cc. Changed sql_mode to use this
        ******
        Added long_slow_time as synonym for long_query_time
        Added new user variables log_slow_rate_limit, log_slow_verbosity, log_slow_filter
        dded handling of 'set' variables to set_var.cc. Changed sql_mode to use this
      sql/set_var.h:
        - Added handling of 'set' variables. Changed sql_mode to use this
        ******
        - Added handling of 'set' variables. Changed sql_mode to use this
      sql/slave.cc:
        Use global filter also for slaves
        ******
        Use global filter also for slaves
      sql/sp_head.cc:
        Simplify saving of general_slow_log state
        Use the general make_set() function instead of 'symbolic_mode_representation'
        
        ******
        Simplify saving of general_slow_log state
        Use the general make_set() function instead of 'symbolic_mode_representation'
      sql/sql_cache.cc:
        Added status for used query plans
        ******
        Added status for used query plans
      sql/sql_class.cc:
        Remember/restore query_plan_flags over complex statements
        ******
        Remember/restore query_plan_flags over complex statements
      sql/sql_class.h:
        Added variables to handle extended slow log statistics
        ******
        Added variables to handle extended slow log statistics
      sql/sql_parse.cc:
        Added status for used query plans
        Added test for filtering slow_query_log
        ******
        Added status for used query plans
        Added test for filtering slow_query_log
      sql/sql_select.cc:
        Added status for used query plans
        ******
        Added status for used query plans
      sql/sql_show.cc:
        Use the general make_set() function instead of 'symbolic_mode_representation'
        ******
        Use the general make_set() function instead of 'symbolic_mode_representation'
      sql/strfunc.cc:
        Report first error (not last) if something is wrong in a set
        Removed compiler warning
        ******
        Report first error (not last) if something is wrong in a set
        Removed compiler warning
      storage/myisam/mi_extra.c:
        In prepare for drop, flush key blocks (speed optimization)
        ******
        In prepare for drop, flush key blocks (speed optimization)
      storage/myisam/mi_locking.c:
        Don't call mi_lock_database if my_disable_locking is used (speed optimization)
        ******
        Don't call mi_lock_database if my_disable_locking is used (speed optimization)
      f417c043
    • Michael Widenius's avatar
      Updated documentation files to reflect MariaDB and not the Maria storage engine or MySQL · cd3047fc
      Michael Widenius authored
      Added (rewritten) patch from Percona to get extended statistics in slow.log:
      - Added handling of 'set' variables to set_var.cc. Changed sql_mode to use this
      - Added extra logging to slow log of 'Thread_id, Schema, Query Cache hit, Rows sent and Rows examined'
      - Added optional logging to slow log, through log_slow_verbosity, of query plan statistics
      - Added new user variables log_slow_rate_limit, log_slow_verbosity, log_slow_filter
      - Added log-slow-file as synonym for 'slow-log-file', as most slow-log variables starts with 'log-slow'
      - Added log-slow-time as synonym for long-query-time
      Some trivial MyISAM optimizations:
      - In prepare for drop, flush key blocks
      - Don't call mi_lock_database if my_disable_locking is used
      
      KNOWN_BUGS.txt:
        Updated file to reflect MariaDB and not the Maria storage engine
      README:
        Updated file to reflect MariaDB
      mysql-test/r/log_slow.result:
        Test new options for slow query log
      mysql-test/r/variables.result:
        Updated result (old version cut of things at 79 characters)
      mysql-test/t/log_slow.test:
        Test new options for slow query log
      sql/Makefile.am:
        Added log_slow.h
      sql/event_data_objects.cc:
        Removed not needed test for enable_slow_log (is done when the flag is tested elsewhere)
      sql/events.cc:
        Use the general make_set() function instead of 'symbolic_mode_representation'
      sql/filesort.cc:
        Added status for used query plans
      sql/log.cc:
        Reset counters if no query_length (from Percona's patch; Not sure if needed, but can do no harm)
        Added extra logging to slow log of 'Thread_id, Schema, Query Cache hit, Rows sent and Rows examined'
        Added optional logging to slow log, through log_slow_verbosity, of query plan statistics
        Fixed wrong test of error condition
      sql/log_slow.h:
        Defines and variables for log_slow_verbosity and log_slow_filter
      sql/mysql_priv.h:
        Include log_slow.h
      sql/mysqld.cc:
        Added new user variables log_slow_rate_limit, log_slow_verbosity, log_slow_filter
        Added log-slow-file as synonym for 'slow-log-file', as most slow-log variables starts with 'log-slow'
        Added log-slow-time as synonym for long-query-time
        Added note that one should use log-slow-filter instead of log-slow-admin-statements
        Updated comment from 'slow_query_log_file'
      sql/set_var.cc:
        Added long_slow_time as synonym for long_query_time
        Added new user variables log_slow_rate_limit, log_slow_verbosity, log_slow_filter
        dded handling of 'set' variables to set_var.cc. Changed sql_mode to use this
      sql/set_var.h:
        - Added handling of 'set' variables. Changed sql_mode to use this
      sql/slave.cc:
        Use global filter also for slaves
      sql/sp_head.cc:
        Simplify saving of general_slow_log state
        Use the general make_set() function instead of 'symbolic_mode_representation'
      sql/sql_cache.cc:
        Added status for used query plans
      sql/sql_class.cc:
        Remember/restore query_plan_flags over complex statements
      sql/sql_class.h:
        Added variables to handle extended slow log statistics
      sql/sql_parse.cc:
        Added status for used query plans
        Added test for filtering slow_query_log
      sql/sql_select.cc:
        Added status for used query plans
      sql/sql_show.cc:
        Use the general make_set() function instead of 'symbolic_mode_representation'
      sql/strfunc.cc:
        Report first error (not last) if something is wrong in a set
        Removed compiler warning
      storage/myisam/mi_extra.c:
        In prepare for drop, flush key blocks (speed optimization)
      storage/myisam/mi_locking.c:
        Don't call mi_lock_database if my_disable_locking is used (speed optimization)
      cd3047fc
    • unknown's avatar
      Fix most Compiler warnings seen in buildbot. · 592379fc
      unknown authored
      Add suppressions for a few warnings that cannot be meaningfully fixed by
      MariaDB developers.
      
      Changes for XtraDB, PBXT, and YaSSL also submitted upstream.
      
      Also add a `ccfilter` wrapper that can be used to filter out suppressed warnings in a
      local build (to check that new warnings are not introduced).
      
      
      client/mysqlbinlog.cc:
        Fix compiler warnings.
      config/ac-macros/misc.m4:
        Fix wrong naming, autoconfig requires _cv_ in cached names.
      extra/yassl/include/yassl_int.hpp:
        Fix compiler warnings.
      extra/yassl/src/handshake.cpp:
        Fix compiler warnings.
      extra/yassl/src/yassl_imp.cpp:
        Fix compiler warnings.
      extra/yassl/src/yassl_int.cpp:
        Fix compiler warnings.
      extra/yassl/taocrypt/include/modes.hpp:
        Fix compiler warnings.
      extra/yassl/taocrypt/src/asn.cpp:
        Fix compiler warnings.
      mysys/my_compress.c:
        Fix compiler warnings.
      sql/mysqld.cc:
        Fix compiler warnings.
      sql/strfunc.cc:
        Fix compiler warnings.
      storage/pbxt/src/discover_xt.cc:
        Fix compiler warnings.
      storage/xtradb/fil/fil0fil.c:
        Fix compiler warnings.
      storage/xtradb/mtr/mtr0mtr.c:
        Fix compiler warnings.
      storage/xtradb/srv/srv0srv.c:
        Fix compiler warnings.
      storage/xtradb/srv/srv0start.c:
        Fix compiler warnings.
      strings/decimal.c:
        Fix compiler warnings.
      support-files/ccfilter:
        Add helper for suppressing compiler warnings in local developer source tree.
            
        Allows to check for not introducing new warnings into Buildbot without having to actually
        run the build through Buildbot.
      support-files/compiler_warnings.supp:
        Suppress a few warnings that cannot be meaningfully fixed in source code.
      592379fc
    • unknown's avatar
      MBug#423035: error in parsing enum value for plugin variable in mysqld command-line option · 03db11cf
      unknown authored
      Fix parsing of invalid plugin enum option value.
      
      Previous patch to fix plugin enum option parsing on big-endian introduced another bug due
      to incorrect comparison of unsigned value. This would cause an incorrect value to be
      parsed as value 0.
      
      See also MySQL Bug#41010 and Bug#32034.
      
      
      mysql-test/mysql-test-run.pl:
        Add a facility for test case to run the mysqld binary (to test that invalid startup options
        are rejected correctly).
      mysql-test/r/mysqld_option_err.result:
        Add a test case to check that invalid startup options for mysqld are rejected.
        This is needed to test MBug#423035.
        Also add a few other similar tests, as this was completely untested before this patch.
      mysql-test/t/mysqld_option_err.test:
        Add a test case to check that invalid startup options for mysqld are rejected.
        This is needed to test MBug#423035.
        Also add a few other similar tests, as this was completely untested before this patch.
      mysys/my_getopt.c:
        Fix parsing of invalid plugin enum option value.
      03db11cf
    • Paul McCullagh's avatar
      Fixed a bug that caused MySQL to crash on shutdown, if startup fails due to an... · f58512d8
      Paul McCullagh authored
      Fixed a bug that caused MySQL to crash on shutdown, if startup fails due to an incorrect command line parameter
      f58512d8
  12. 02 Sep, 2009 2 commits
  13. 01 Sep, 2009 5 commits
    • Sergey Petrunya's avatar
      Merge · 2656709a
      Sergey Petrunya authored
      2656709a
    • Sergey Petrunya's avatar
      Merge · 34d901c0
      Sergey Petrunya authored
      34d901c0
    • Sergey Petrunya's avatar
      MWL#17: Table elimination · 24c2fea6
      Sergey Petrunya authored
      - Address review feedback R4: better comments, formatting
      
      24c2fea6
    • Sergey Petrunya's avatar
      Trivial fixes for windows compile failures · d841ea23
      Sergey Petrunya authored
      - Add strmov_overlapp.c where it's needed
      - Add libevent where it is required
      - Fix typo in unittest/mysys/waiting_threads-t.c
      - fix xtradb C language source so that they have variable declarations before
        any operators, as it is (or was?) required in C.
      
      libmysql/CMakeLists.txt:
        - Add strmov_overlapp.c where it's needed
      sql/CMakeLists.txt:
        - Add strmov_overlapp.c where it's needed
        - Add libevent where it is required
      storage/xtradb/btr/btr0cur.c:
        - fix xtradb C language source so that they have variable declarations before
          any operators, as it is (or was?) required in C.
      storage/xtradb/buf/buf0buddy.c:
        - fix xtradb C language source so that they have variable declarations before
          any operators, as it is (or was?) required in C.
      storage/xtradb/buf/buf0flu.c:
        - fix xtradb C language source so that they have variable declarations before
          any operators, as it is (or was?) required in C.
      storage/xtradb/fil/fil0fil.c:
        - fix xtradb C language source so that they have variable declarations before
          any operators, as it is (or was?) required in C.
      storage/xtradb/handler/i_s.cc:
        - fix xtradb C language source so that they have variable declarations before
          any operators, as it is (or was?) required in C.
      storage/xtradb/srv/srv0srv.c:
        - fix xtradb C language source so that they have variable declarations before
          any operators, as it is (or was?) required in C.
      strings/CMakeLists.txt:
        - Add strmov_overlapp.c where it's needed
      unittest/mysys/waiting_threads-t.c:
        - Fix typo in unittest/mysys/waiting_threads-t.c
      d841ea23
    • Jonathan Perkin's avatar
  14. 31 Aug, 2009 2 commits
    • Sergey Petrunya's avatar
      MWL#17: Table-elimination · d762bf21
      Sergey Petrunya authored
      - Addressing review feedback, generation 4.
      
      include/my_global.h:
        Make ALIGN_PTR's action correspond to that of ALIGN_SIZE
      sql/item.cc:
        MWL#17: Table-elimination
        - Review feedback: function renames, better comments
      sql/item.h:
        MWL#17: Table-elimination
        - Review feedback: function renames, better comments
      sql/item_cmpfunc.cc:
        MWL#17: Table-elimination
        - Review feedback: function renames, better comments
      sql/item_subselect.cc:
        MWL#17: Table-elimination
        - Review feedback: function renames, better comments
      sql/item_subselect.h:
        MWL#17: Table-elimination
        - Review feedback: function renames, better comments
      sql/opt_table_elimination.cc:
        MWL#17: Table-elimination
        - Addressing review feedback, generation 4: abstract everything in case
          we would need to change it for something else in the future.
      sql/sql_list.h:
        MWL#17: Table-elimination
        - Introduce exchange_sort(List<T> ...) template function
      sql/sql_select.cc:
        MWL#17: Table-elimination
        - Review feedback: function renames, better comments
      d762bf21
    • unknown's avatar
      Merge Paul's maria-pbxt-rc2 branch into MariaDB. · 177f0249
      unknown authored
      Includes disabling PBMS (per Paul's recommendation) and test file fixes.
      Signed-off-by: default avatarKristian Nielsen <knielsen@knielsen-hq.org>
      177f0249