1. 01 Dec, 2011 1 commit
    • Michael Widenius's avatar
      Fixed that --with-libedit --without-readline works · dad13229
      Michael Widenius authored
      Fixed buildbot failures (compiler warnings, failing tests)
      
      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
      configure.in:
        Fixed that --with-libedit --without-readline works
      mysql-test/suite/innodb_plugin/t/innodb_misc1.test:
        Fixed test that failed when characterset was missing
      dad13229
  2. 30 Nov, 2011 4 commits
    • Michael Widenius's avatar
      Fixed compiler warning and errors · 6378bdbf
      Michael Widenius authored
      mysql-test/suite/funcs_1/t/is_engines_federated.test:
        Corrected path
      storage/xtradb/fil/fil0fil.c:
        Fixed compiler warning
      6378bdbf
    • Michael Widenius's avatar
      Fixed compiler warnings and other bugs found by buildbot. · 692fcba4
      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
      692fcba4
    • Sergei Golubchik's avatar
      test both federated and federatedX in the federated suite. · ca5b1b54
      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
      ca5b1b54
    • unknown's avatar
      Cherrypick into XtraDB: Bug#13002783 PARTIALLY UNINITIALIZED CASCADE UPDATE VECTOR · be505e3e
      unknown authored
      We merged the test case for this into MariaDB 5.1, but the fix
      was not yet part of XtraDB.
      be505e3e
  3. 29 Nov, 2011 3 commits
    • Michael Widenius's avatar
      Fixed compiler warnings · 47575bd0
      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
      47575bd0
    • Michael Widenius's avatar
      Fixed that maria-recover works as expected. · a19f4e3a
      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
      a19f4e3a
    • Vladislav Vaintroub's avatar
  4. 24 Nov, 2011 2 commits
    • Michael Widenius's avatar
      Fixed that one can use --maria-recover=backup,force · 1670845c
      Michael Widenius authored
      (Before we only allowed one option)
      1670845c
    • Michael Widenius's avatar
      Fixes for build failuers found by buildbot · d26aefb0
      Michael Widenius authored
      mysql-test/mysql-test-run.pl:
        Rename MYSQLD -> MYSQLD_SIMPLE_CMD to avoid conflict with new MYSQLD variable from MySQL 5.1
      mysql-test/r/innodb_file_format.result:
        Remove old duplicated test
      mysql-test/suite/pbxt/r/endspace.result:
        Update test to last version
      mysql-test/suite/pbxt/r/heap.result:
        Removed heap test (not part of pbxt)
      mysql-test/suite/pbxt/r/select_safe.result:
        Updated results after error message change
      mysql-test/suite/pbxt/r/view_grant.result:
        Removed view test (not part of pbxt)
      mysql-test/suite/pbxt/t/endspace.test:
        Update test to last version
      mysql-test/suite/pbxt/t/heap.test:
        Removed heap test (not part of pbxt)
      mysql-test/suite/pbxt/t/view_grant.test:
        Removed view test (not part of pbxt)
      mysql-test/t/innodb_file_format.test:
        Remove old duplicated test
      mysql-test/t/mysqld_option_err.test:
        Use renamed variable
      sql/my_decimal.h:
        Fixed wrong define
      storage/maria/ma_loghandler.c:
        Fixed compiler warning
      d26aefb0
  5. 23 Nov, 2011 2 commits
  6. 21 Nov, 2011 5 commits
  7. 18 Nov, 2011 2 commits
  8. 16 Nov, 2011 1 commit
  9. 13 Nov, 2011 1 commit
  10. 12 Nov, 2011 2 commits
  11. 10 Nov, 2011 2 commits
    • Marko Mäkelä's avatar
      Bug #12842206 INNODB LOCKING REGRESSION FOR INSERT IGNORE: Add a test case. · 8c886b3b
      Marko Mäkelä authored
      The bug was accidentally fixed by fixing
      Bug#11759688 52020: InnoDB can still deadlock on just INSERT...ON DUPLICATE KEY
      a.k.a. the reintroduction of
      Bug#7975 deadlock without any locking, simple select and update
      8c886b3b
    • Marko Mäkelä's avatar
      Bug#11759688 52020: InnoDB can still deadlock on just INSERT...ON DUPLICATE KEY · a0a51251
      Marko Mäkelä authored
      a.k.a. Bug#7975 deadlock without any locking, simple select and update
      
      Bug#7975 was reintroduced when the storage engine API was made
      pluggable in MySQL 5.1. Instead of looking at thd->lex directly, we
      rely on handler::extra(). But, we were looking at the wrong extra()
      flag, and we were ignoring the TRX_DUP_REPLACE flag in places where we
      should obey it.
      
      innodb_replace.test: Add tests for hopefully all affected statement
      types, so that bug should never ever resurface. This kind of tests
      should have been added when fixing Bug#7975 in MySQL 5.0.3 in the
      first place.
      
      rb:806 approved by Sunny Bains
      a0a51251
  12. 08 Nov, 2011 2 commits
    • Sergei Golubchik's avatar
      typos fixed · 04f3ecf6
      Sergei Golubchik authored
      (thanks viva64.com)
      04f3ecf6
    • Marko Mäkelä's avatar
      Bug#13358468 ASSERTION FAILURE IN BTR_PCUR_GET_BLOCK · 77eb01b8
      Marko Mäkelä authored
      btr_pcur_restore_position_func(): When the cursor was positioned at
      the tree infimum or supremum, initialize pos_state and latch_mode. The
      assertion failed, because pos_state was BTR_PCUR_WAS_POSITIONED.  In
      the test failure of WL#5874, the purge thread attempted to restore the
      cursor position on the infimum record (the clustered index was empty).
      
      btr_pcur_detach(), btr_pcur_is_detached(): Unused functions, remove.
      
      rb:804 approved by Inaam Rana
      77eb01b8
  13. 07 Nov, 2011 1 commit
  14. 01 Nov, 2011 1 commit
  15. 31 Oct, 2011 1 commit
  16. 29 Oct, 2011 1 commit
  17. 28 Oct, 2011 1 commit
  18. 27 Oct, 2011 2 commits
  19. 26 Oct, 2011 5 commits
  20. 25 Oct, 2011 1 commit