1. 13 Jan, 2010 2 commits
  2. 12 Jan, 2010 1 commit
  3. 11 Jan, 2010 6 commits
    • Vladislav Vaintroub's avatar
      5c871c90
    • Vladislav Vaintroub's avatar
      merge · ed40723d
      Vladislav Vaintroub authored
      ed40723d
    • Alexander Nozdrin's avatar
      Backporting revision from mysql-6.0-codebase-bugfixing. · 0f300ac6
      Alexander Nozdrin authored
      Original revision:
      ------------------------------------------------------------
      revno: 3817
      revision-id: guilhem@mysql.com-20100108092756-k0zzf4kvx9b7bh38
      parent: guilhem@mysql.com-20100107101133-hrrgcdqg508runuf
      committer: Guilhem Bichot <guilhem@mysql.com>
      branch nick: mysql-6.0-codebase-bugfixing
      timestamp: Fri 2010-01-08 10:27:56 +0100
      message:
        fix for BUG#50120 "Valgrind errors in any test, inside mysqltest"
        Problem was that as v->name[v->name_len] may be uninitialized (which is ok per se),
        it shouldn't be used in an if(). We remove this zero_the_char/restore_it logic by
        rather zero-terminating the v->name string when we create it in var_init().
      ------------------------------------------------------------
      0f300ac6
    • Alexander Nozdrin's avatar
      Backporting revision from mysql-6.0-codebase-bugfixing. · 5d61829b
      Alexander Nozdrin authored
      Original revision:
      
      ------------------------------------------------------------
      revno: 3789.1.9
      revision-id: serg@mysql.com-20091229134448-phe834ukzmi0k2e3
      parent: serg@mysql.com-20091227081418-bgfg952gzumn1k3h
      committer: Sergei Golubchik <serg@mysql.com>
      branch nick: 6.0-codebase
      timestamp: Tue 2009-12-29 14:44:48 +0100
      message:
        better fix for Bug#48758 mysqltest crashes on sys_vars.collation_server_basic in gcov builds
        
        use setenv instead of putenv
      ------------------------------------------------------------
      5d61829b
    • Vladislav Vaintroub's avatar
      Add option for specifying MYSQL build configurations. · 4c872d51
      Vladislav Vaintroub authored
      Add mysql_release.cmake intended for use by the build team (
      compile options, build settings to do MySQL releases)
      4c872d51
    • Alexander Nozdrin's avatar
      Auto-merge from mysql-next-mr. · 724caa51
      Alexander Nozdrin authored
      724caa51
  4. 09 Jan, 2010 1 commit
  5. 08 Jan, 2010 4 commits
  6. 07 Jan, 2010 1 commit
  7. 06 Jan, 2010 2 commits
  8. 07 Jan, 2010 1 commit
  9. 06 Jan, 2010 11 commits
    • Vladislav Vaintroub's avatar
      remove table formatting (squeeze many spaces into one) · 7d97174c
      Vladislav Vaintroub authored
      in mysqld--help test.
      
      When mysql is compiled with different options,columns
      might have different size (this depends on parameter 
      names and some parameters might only be available 
      when some option is switched on)
      7d97174c
    • Tor Didriksen's avatar
      Follup fix for WL#4738 · 2ac66902
      Tor Didriksen authored
      2ac66902
    • Guilhem Bichot's avatar
      Merge with latest next-mr-bugfixing · 341fc0e2
      Guilhem Bichot authored
      mysql-test/r/index_merge_myisam.result:
        @@optimizer_switch has a new flag
      mysql-test/r/mysqld--help-notwin.result:
        @@optimizer_switch has a new flag
      mysql-test/r/mysqld--help-win.result:
        @@optimizer_switch has a new flag
      mysql-test/r/optimizer_switch_eng_cond_pushdown1.result:
        Check how --engine-condition-pushdown and --optimizer-switch influence each other when used together (last wins).
      mysql-test/r/optimizer_switch_eng_cond_pushdown2.result:
        Check how --engine-condition-pushdown and --optimizer-switch influence each other when used together (last wins).
      mysql-test/suite/ndb/r/ndb_condition_pushdown.result:
        @@engine_condition_pushdown is deprecated, use @@optimizer_switch instead
      mysql-test/suite/ndb/r/ndb_gis.result:
        @@engine_condition_pushdown is deprecated, use @@optimizer_switch instead
      mysql-test/suite/ndb/r/ndb_index_unique.result:
        @@engine_condition_pushdown is deprecated, use @@optimizer_switch instead
      mysql-test/suite/ndb/t/ndb_condition_pushdown.test:
        @@engine_condition_pushdown is deprecated, use @@optimizer_switch instead
      mysql-test/suite/ndb/t/ndb_gis.test:
        @@engine_condition_pushdown is deprecated, use @@optimizer_switch instead
      mysql-test/suite/ndb/t/ndb_index_unique.test:
        @@engine_condition_pushdown is deprecated, use @@optimizer_switch instead
      mysql-test/suite/sys_vars/r/engine_condition_pushdown_basic.result:
        Setting @@engine_condition_pushdown gives a deprecation warning now.
        We test that the engine_condition_pushdown flag of @@optimizer_switch, and @@engine_condition_pushdown
        influence each other (turning the flag on/off sets the variable on/off and vice-versa).
      mysql-test/suite/sys_vars/r/optimizer_switch_basic.result:
        @@optimizer_switch has a new flag
      mysql-test/suite/sys_vars/t/engine_condition_pushdown_basic.test:
        Setting @@engine_condition_pushdown gives a deprecation warning now.
        We test that the engine_condition_pushdown flag of @@optimizer_switch, and @@engine_condition_pushdown
        influence each other (turning the flag on/off sets the variable on/off and vice-versa).
      mysql-test/t/optimizer_switch_eng_cond_pushdown1-master.opt:
        Check how --engine-condition-pushdown and --optimizer-switch influence each other when used together (last wins).
      mysql-test/t/optimizer_switch_eng_cond_pushdown1.test:
        Check how --engine-condition-pushdown and --optimizer-switch influence each other when used together (last wins).
      mysql-test/t/optimizer_switch_eng_cond_pushdown2-master.opt:
        Check how --engine-condition-pushdown and --optimizer-switch influence each other when used together (last wins).
      mysql-test/t/optimizer_switch_eng_cond_pushdown2.test:
        Check how --engine-condition-pushdown and --optimizer-switch influence each other when used together (last wins).
      sql/mysql_priv.h:
        new "engine_condition_pushdown" switch in @@optimizer_switch, on by default, like
        @@engine_condition_pushdown is on by default. Constants are ULL because optimizer_switch
        is stored in a ulonglong.
      sql/mysqld.cc:
        Making --engine-condition-pushdown and --optimizer-switch (command-line options)
        influence each other (last wins)
      sql/records.cc:
        @@engine_condition_pushdown is deprecated, use @@optimizer_switch instead
      sql/sql_select.cc:
        @@engine_condition_pushdown is deprecated, use @@optimizer_switch instead
      sql/sys_vars.cc:
        Setting @@engine_condition_pushdown now issues a deprecation message. The version for removal
        is unknown at this point so I copied it from other deprecation warnings in this file.
        Turning on/off the engine_condition_pushdown flag of @@optimizer_switch (with SET) turns on/off the @@engine_condition_pushdown variable, and vice-versa, thanks to fix_* functions.
      341fc0e2
    • Tor Didriksen's avatar
      Bug #50087 Interval arithmetic for Event_queue_element is not portable. · a0f701ec
      Tor Didriksen authored
      Subtraction of two unsigned months yielded a (very large) positive value.
      Conversion of this to a signed value was not necessarily well defined.
      
      Solution: do the subtraction on signed values.
      
      
      mysql-test/r/events_scheduling.result:
        Add test case.
      mysql-test/t/events_scheduling.test:
        Add test case.
      sql/event_data_objects.cc:
        Convert month to signed before doing the subtraction.
      a0f701ec
    • Vladislav Vaintroub's avatar
      Do not use fvisibility flag if GCC does not support it · 400f9587
      Vladislav Vaintroub authored
      (i.e if gcc version < 4)
      400f9587
    • Guilhem Bichot's avatar
      Fix for BUG#50081 "Tests: mysqld--help-notwin fails with --parallel": · ebb8574b
      Guilhem Bichot authored
      eliminate 3 more "directory path" variables from the test's output (it was already
      the case for other similar ones likes slow-query-log-file).
      ebb8574b
    • Guilhem Bichot's avatar
      WL#5197 "Move @@engine_condition_pushdown to @@optimizer_switch" · 125cf0d4
      Guilhem Bichot authored
      "set engine_condition_pushdown" is deprecated, engine condition pushdown is controlled
      by a new "set optimizer_switch=engine_condition_pushdown=on|off".
      
      mysql-test/r/index_merge_myisam.result:
        @@optimizer_switch has a new flag
      mysql-test/r/mysqld--help-notwin.result:
        @@optimizer_switch has a new flag
      mysql-test/r/mysqld--help-win.result:
        @@optimizer_switch has a new flag
      mysql-test/r/optimizer_switch_eng_cond_pushdown1.result:
        Check how --engine-condition-pushdown and --optimizer-switch influence each other when used together (last wins).
      mysql-test/r/optimizer_switch_eng_cond_pushdown2.result:
        Check how --engine-condition-pushdown and --optimizer-switch influence each other when used together (last wins).
      mysql-test/suite/ndb/r/ndb_condition_pushdown.result:
        @@engine_condition_pushdown is deprecated, use @@optimizer_switch instead
      mysql-test/suite/ndb/r/ndb_gis.result:
        @@engine_condition_pushdown is deprecated, use @@optimizer_switch instead
      mysql-test/suite/ndb/r/ndb_index_unique.result:
        @@engine_condition_pushdown is deprecated, use @@optimizer_switch instead
      mysql-test/suite/ndb/t/ndb_condition_pushdown.test:
        @@engine_condition_pushdown is deprecated, use @@optimizer_switch instead
      mysql-test/suite/ndb/t/ndb_gis.test:
        @@engine_condition_pushdown is deprecated, use @@optimizer_switch instead
      mysql-test/suite/ndb/t/ndb_index_unique.test:
        @@engine_condition_pushdown is deprecated, use @@optimizer_switch instead
      mysql-test/suite/sys_vars/r/engine_condition_pushdown_basic.result:
        Setting @@engine_condition_pushdown gives a deprecation warning now.
        We test that the engine_condition_pushdown flag of @@optimizer_switch, and @@engine_condition_pushdown
        influence each other (turning the flag on/off sets the variable on/off and vice-versa).
      mysql-test/suite/sys_vars/r/optimizer_switch_basic.result:
        @@optimizer_switch has a new flag
      mysql-test/suite/sys_vars/t/engine_condition_pushdown_basic.test:
        Setting @@engine_condition_pushdown gives a deprecation warning now.
        We test that the engine_condition_pushdown flag of @@optimizer_switch, and @@engine_condition_pushdown
        influence each other (turning the flag on/off sets the variable on/off and vice-versa).
      mysql-test/t/optimizer_switch_eng_cond_pushdown1-master.opt:
        Check how --engine-condition-pushdown and --optimizer-switch influence each other when used together (last wins).
      mysql-test/t/optimizer_switch_eng_cond_pushdown1.test:
        Check how --engine-condition-pushdown and --optimizer-switch influence each other when used together (last wins).
      mysql-test/t/optimizer_switch_eng_cond_pushdown2-master.opt:
        Check how --engine-condition-pushdown and --optimizer-switch influence each other when used together (last wins).
      mysql-test/t/optimizer_switch_eng_cond_pushdown2.test:
        Check how --engine-condition-pushdown and --optimizer-switch influence each other when used together (last wins).
      sql/mysql_priv.h:
        new "engine_condition_pushdown" switch in @@optimizer_switch, on by default, like
        @@engine_condition_pushdown is on by default. Constants are ULL because optimizer_switch
        is stored in a ulonglong.
      sql/mysqld.cc:
        Making --engine-condition-pushdown and --optimizer-switch (command-line options)
        influence each other (last wins)
      sql/records.cc:
        @@engine_condition_pushdown is deprecated, use @@optimizer_switch instead
      sql/sql_select.cc:
        @@engine_condition_pushdown is deprecated, use @@optimizer_switch instead
      sql/sys_vars.cc:
        Setting @@engine_condition_pushdown now issues a deprecation message. The version for removal
        is unknown at this point so I copied it from other deprecation warnings in this file.
        Turning on/off the engine_condition_pushdown flag of @@optimizer_switch (with SET) turns on/off the @@engine_condition_pushdown variable, and vice-versa, thanks to fix_* functions.
      125cf0d4
    • Guilhem Bichot's avatar
      fixing wrong indentation in two Makefile.am, which prevented the Anjuta IDE... · bcd5b9fd
      Guilhem Bichot authored
      fixing wrong indentation in two Makefile.am, which prevented the Anjuta IDE from parsing the MySQL tree.
      bcd5b9fd
    • Alexander Nozdrin's avatar
      Merge from bk:ysql-next-mr-bugfixing. · f471d82b
      Alexander Nozdrin authored
      f471d82b
    • Alexander Nozdrin's avatar
      Merge from mysql-next-mr. · 9fd33a06
      Alexander Nozdrin authored
      9fd33a06
    • Alexander Nozdrin's avatar
      Change version tag (to 5.5.99-m3). · 3701208a
      Alexander Nozdrin authored
      3701208a
  10. 05 Jan, 2010 5 commits
  11. 04 Jan, 2010 5 commits
    • Vladislav Vaintroub's avatar
      merge · 7db33f80
      Vladislav Vaintroub authored
      7db33f80
    • Jorgen Loland's avatar
      local merge · 9b797d06
      Jorgen Loland authored
      9b797d06
    • Jorgen Loland's avatar
      Bug#48920: COUNT DISTINCT returns 1 for NULL values when in a · 305f2e7f
      Jorgen Loland authored
                 subquery in the select list
            
      When a dependent subquery with count(distinct <col>) was 
      evaluated multiple times, the Distinct_Aggregator was reused. 
      However, the Aggregator was not reset, so when the subquery was
      evaluated for the next record in the outer select, old dependent
      info was used.
            
      The fix is to clear() the existing aggregator in 
      Item_sum::set_aggregator(). This ensures that the aggregator is
      reevaluated with the new dependent information.
      
      mysql-test/r/subselect3.result:
        Added test case for BUG#48920
      mysql-test/t/subselect3.test:
        Added test case for BUG#48920
      sql/item_sum.cc:
        If an aggregator exists when Item_sum::set_aggregator() is
        called (i.e., set_aggregator is called in a dependent
        subquery), the aggregator is reset so that the aggregator is
        reevaluated with the dependent information from the outer
        record being evaluated.
      305f2e7f
    • Alexander Nozdrin's avatar
      Auto-merge from mysql-next-mr. · cc900736
      Alexander Nozdrin authored
      cc900736
    • Alexander Nozdrin's avatar
      Auto-merge from mysql-next-mr-serg. · 8e1dc83c
      Alexander Nozdrin authored
      8e1dc83c
  12. 31 Dec, 2009 1 commit