1. 11 Dec, 2011 1 commit
    • Michael Widenius's avatar
      Merge with 5.2. · 000ffdd1
      Michael Widenius authored
      no_error handling for select (used by INSERT ... SELECT) still needs to be fixed, but I will do that in a separate commit
      000ffdd1
  2. 03 Dec, 2011 4 commits
    • Michael Widenius's avatar
      Added handler and temporary table usage to mytop · b6af3dc1
      Michael Widenius authored
      Fixed prompt on reconnect in mysql client
      
      client/mysql.cc:
        Free server_version for reconnect.
        This ensures that prompt is correct if reconnecting to a different server.
      scripts/mytop.sh:
        Added handler and temporary table usage
      b6af3dc1
    • Michael Widenius's avatar
      Merge with 5.1 · 9a5d20b0
      Michael Widenius authored
      9a5d20b0
    • Michael Widenius's avatar
      Fixed buildbot warnings · 8987f9cc
      Michael Widenius authored
      mysql-test/suite/maria/t/compat_aliases-master.opt:
        Fixed wrong limit
      storage/example/ha_example.cc:
        Fixed compiler warning
      8987f9cc
    • Michael Widenius's avatar
      Added suppressions · 2c2e74e5
      Michael Widenius authored
      Fixed feedback_plugin_send to not generate a random number of lines.
      
      
      mysql-test/t/feedback_plugin_send.test:
        Don't print more than 4 lines (sometimes there are 6 feedback lines in the log...)
      mysql-test/valgrind.supp:
        Added suppression for failure on work
      support-files/compiler_warnings.supp:
        Suppress warning from xtradb
      2c2e74e5
  3. 02 Dec, 2011 3 commits
  4. 01 Dec, 2011 10 commits
  5. 30 Nov, 2011 7 commits
    • Michael Widenius's avatar
      Merge with 5.1 · a4754d9d
      Michael Widenius authored
      a4754d9d
    • Michael Widenius's avatar
      Fixed compiler warning and errors · 62e68139
      Michael Widenius authored
      mysql-test/suite/funcs_1/t/is_engines_federated.test:
        Corrected path
      storage/xtradb/fil/fil0fil.c:
        Fixed compiler warning
      62e68139
    • Igor Babaev's avatar
      Fixed LP bug #898073. · 388a8f33
      Igor Babaev authored
      The tables from the same semi-join or outer join nest cannot use
      join buffers if in the join sequence of the query execution plan
      they are separated by a table that is planned to be joined without
      usage of a join buffer.
      388a8f33
    • Michael Widenius's avatar
      Fixed compiler warnings and other bugs found by buildbot. · 3a8e7aa8
      Michael Widenius authored
      
      client/mysqltest.cc:
        Free mutex after usage (fixes valgrind warnings in embedded server)
      mysql-test/include/gis_keys.inc:
        Fixed failure in innodb.gis_test
      mysql-test/r/gis.result:
        Updated result
      mysql-test/suite/innodb/r/innodb_gis.result:
        Updated results
      mysql-test/suite/innodb/t/innodb_bug38231.test:
        Added handling of timeouts (happend on some servers in buildbot)
      mysql-test/suite/innodb_plugin/r/innodb_gis.result:
        Updated results
      mysql-test/suite/innodb_plugin/t/innodb.test:
        Use error names instead of numbers
      mysql-test/suite/innodb_plugin/t/innodb_misc1.test:
        This test requires utf8
      mysql-test/suite/innodb_plugin/t/innodb_mysql.test:
        This test requires Xtradb
      sql/sql_base.cc:
        Don't print table names for placeholders.
      sql/sql_show.cc:
        Temporary fix:
        Save and restore db and table_name in mysqld_show_create (to get rid of valgrind warning)
        A better solution that needs to be investgated is to not change these fields in mysql_derived_prepare()
      sql/sql_view.cc:
        Fixed valgrind warning
      storage/xtradb/handler/ha_innodb.cc:
        Don't access THD directly
      3a8e7aa8
    • Sergei Golubchik's avatar
      test both federated and federatedX in the federated suite. · 751c8733
      Sergei Golubchik authored
      mysql-test/lib/My/Options.pm:
        My::Options::is_set() now matches both option names and values!
      mysql-test/lib/mtr_cases.pm:
        1. don't merge --plugin-load here, it's too early
        2. don't skip combinations that set --plugin-load just because the test needs another --plugin-load.
           Skip *only* if test's --plugin-load matches *exactly* --plugin-load of one of the combinations.
        3. if skipping all combinations but one, still assign the test to the combination
      mysql-test/mysql-test-run.pl:
        1. remove dead code - don't set variables that aren't used.
        2. bugfix: allow one-letter combination names
        3. in the command line, merge all --plugin-load options in one
      storage/federated/ha_federated.cc:
        bugfix: garbage character in the generated SELECT query
      751c8733
    • unknown's avatar
      Cherrypick into XtraDB: Bug#13002783 PARTIALLY UNINITIALIZED CASCADE UPDATE VECTOR · 6d2297e3
      unknown authored
      We merged the test case for this into MariaDB 5.1, but the fix
      was not yet part of XtraDB.
      6d2297e3
    • unknown's avatar
      Merge the fix of bug lp:825051 · d9eb5b83
      unknown authored
      d9eb5b83
  6. 29 Nov, 2011 9 commits
    • Michael Widenius's avatar
      Fixed compiler warnings · 776858b1
      Michael Widenius authored
      dbug/tests.c:
        Added __attribute__((unused)) to get rid of compiler warning
      server-tools/instance-manager/guardian.cc:
        Added __attribute__((unused)) to get rid of compiler warning
      sql/filesort.cc:
        Added __attribute__((unused)) to get rid of compiler warning
      sql/slave.cc:
        Added __attribute__((unused)) to get rid of compiler warning
      sql/sql_load.cc:
        Added __attribute__((unused)) to get rid of compiler warning
      sql/sql_table.cc:
        Added __attribute__((unused)) to get rid of compiler warning
      storage/maria/ma_blockrec.c:
        Added __attribute__((unused)) to get rid of compiler warning
      storage/maria/ma_check.c:
        Added missing cast
      storage/maria/ma_loghandler.c:
        Added __attribute__((unused)) to get rid of compiler warning
      storage/maria/ma_recovery.c:
        Added __attribute__((unused)) to get rid of compiler warning
      storage/pbxt/src/cache_xt.cc:
        Added __attribute__((unused)) to get rid of compiler warning
      storage/xtradb/fil/fil0fil.c:
        Removed not used variable
      storage/xtradb/handler/ha_innodb.cc:
        Use unused variable
      vio/viosocket.c:
        Remove usage of not used variable
      vio/viosslfactories.c:
        Added cast
      776858b1
    • unknown's avatar
    • unknown's avatar
      Fixed bug lp:825051 · 6945659c
      unknown authored
      The cause of the wrong result was that Item_ref_null_helper::get_date()
      didn't use a method of the *_result() family, and fetched the data
      for the field from the current row instead of result_field. Changed to
      use the correct *_result() method, like to all other similar methods
      of Item_ref_null_helper.
      6945659c
    • Michael Widenius's avatar
      Merge with 5.1 + fixes for build failures in 5.2 · e71cd205
      Michael Widenius authored
      cmd-line-utils/libedit/map.c:
        Fixed compiler warning
      cmd-line-utils/libedit/terminal.c:
        Fixed compiler warning
      cmd-line-utils/libedit/tty.c:
        Fixed compiler warning
      sql/sql_base.cc:
        Fixed memory leak found by valgrind
      storage/maria/compat_aliases.cc:
        Ensure that recover_alias is also a set
      storage/maria/ma_bitmap.c:
        Proper fix for compiler warning
      support-files/compiler_warnings.supp:
        Fixed compiler warning
      e71cd205
    • Michael Widenius's avatar
      Fixed that maria-recover works as expected. · 6a993f0b
      Michael Widenius authored
      - "" is now used if no option is set
      
      include/maria.h:
        Added HA_RECOVER_ANY
      storage/maria/ha_maria.cc:
        Insert of checking if maria_recover_options == 0, check if any bit is set.
        Fix maria_recover_names to match bitmap. This fixes that recover options works as expected.
      storage/maria/ha_maria.h:
        Insert of checking if maria_recover_options == 0, check if any bit is set.
      storage/maria/ma_check.c:
        Fixed wrong print
      6a993f0b
    • Alexey Botchkov's avatar
      bug 857066 Wrong result with ST_DISJOINT when using an index. · 14d8dbe2
      Alexey Botchkov authored
              DISJOINT can't be properly optimized with the RTree keys in MyISAM also.
      
      per-file comments:
        storage/myisam/rt_index.c
      bug 857066 Wrong result with ST_DISJOINT when using an index.
              don't optimize DISJOINT with the RTree keys.
      14d8dbe2
    • Vladislav Vaintroub's avatar
      Fix testcases: · 09d55451
      Vladislav Vaintroub authored
      1. main.merge fails with errno 13 in copy_file().
      
      The reason for the error is that copy_file tries to create a file with the same name as recently deleted one,
      and there is still an open handle for the deleted file.
      To fix, use my_delete_allow_opened() for MTR's delete_file. On Windows,  this renames file to unique name
      prior to deletion, and prevents EACCES errors for files opened with FILE_SHARE_DELETE.
      
      2. innodb_bug59641 
      generates warnings, after server was killed and restarted in the test case.
      The warnings are about test_suppression table (needs to be repaired, as it that was written just prior to the crash)
      Fixed by using FLUSH TABLES after populating warning suppression table.
      09d55451
    • Vladislav Vaintroub's avatar
      merge, fix Windows warnings · b33883f1
      Vladislav Vaintroub authored
      b33883f1
    • Vladislav Vaintroub's avatar
  7. 28 Nov, 2011 4 commits
    • Alexey Botchkov's avatar
      bug 857066 Wrong result with ST_DISJOINT when using an index · 1255082b
      Alexey Botchkov authored
              the ST_DISJOINT can't be properly optimized with the RTree key
              at the moment.
      
      per-file comments:
        storage/maria/ma_rt_index.c
      bug 857066 Wrong result with ST_DISJOINT when using an index
              disabled optimization for the DISJOINT case.
      1255082b
    • Sergei Golubchik's avatar
      after merge fixes · f6db6c83
      Sergei Golubchik authored
      sql/sql_base.cc:
        fix a memory leak
      storage/xtradb/handler/ha_innodb.cc:
        fix for a visual studio
      storage/xtradb/row/row0ins.c:
        valgrind complains about uninitialized variable.
        incorrect errors in the innodb.test too
      f6db6c83
    • unknown's avatar
      Fix bugs lp:833777, lp:894397 · d37faa72
      unknown authored
      Analysis:
      lp:894397 was a consequence of a prior incorrect fix of lp:833777
      which didn't take into account that even when all tables are
      constant there may be correlated conditions, and the where clause
      is not equivalent to the constant conditions.
      
      Solution:
      When there are constant tables only, evaluate only the conditions
      that reference outer fields, because the constant conditions are
      already checked, and the where clause doesn't have other conditions
      than constant ones, and outer referencing ones. The fix for
      lp:894397 also fixes lp:833777.
      d37faa72
    • unknown's avatar
      Fixed LP BUG#747278 · 8dbf7ec7
      unknown authored
      The problem was that when we have single row subquery with no rows
      Item_cache(es) which represent result row was not null and being
      requested via element_index() returned random value.
      
      The fix is setting all Item_cache(es) in NULL before executing the
      query (reset() method) which guaranty NULL value of whole query
      or its elements requested in any way if no rows was found.
      
      set_null() method was added to Item_cache to guaranty correct NULL
      value in case of reseting the cache.
      8dbf7ec7
  8. 26 Nov, 2011 2 commits