1. 02 Apr, 2012 10 commits
    • Sergei Golubchik's avatar
      merge · 97a3baef
      Sergei Golubchik authored
      97a3baef
    • Sergei Golubchik's avatar
      merge · 1c6d95f3
      Sergei Golubchik authored
      1c6d95f3
    • Michael Widenius's avatar
      Merge of compatibility fixes · d513153f
      Michael Widenius authored
      Fixed failing tests in sys_vars as we have now stricter checking of setting of variables.
      
      mysql-test/suite/sys_vars/r/innodb_adaptive_flushing_basic.result:
        One can now only assign 0 or 1 to boolean variables
      mysql-test/suite/sys_vars/r/innodb_adaptive_hash_index_basic.result:
        One can now only assign 0 or 1 to boolean variables
      mysql-test/suite/sys_vars/r/innodb_large_prefix_basic.result:
        One can now only assign 0 or 1 to boolean variables
      mysql-test/suite/sys_vars/r/innodb_random_read_ahead_basic.result:
        One can now only assign 0 or 1 to boolean variables
      mysql-test/suite/sys_vars/r/innodb_stats_on_metadata_basic.result:
        One can now only assign 0 or 1 to boolean variables
      mysql-test/suite/sys_vars/r/innodb_strict_mode_basic.result:
        One can now only assign 0 or 1 to boolean variables
      mysql-test/suite/sys_vars/r/innodb_support_xa_basic.result:
        One can now only assign 0 or 1 to boolean variables
      mysql-test/suite/sys_vars/r/innodb_table_locks_basic.result:
        One can now only assign 0 or 1 to boolean variables
      mysql-test/suite/sys_vars/r/rpl_semi_sync_master_enabled_basic.result:
        One can now only assign 0 or 1 to boolean variables
      mysql-test/suite/sys_vars/r/rpl_semi_sync_slave_enabled_basic.result:
        One can now only assign 0 or 1 to boolean variables
      mysql-test/suite/sys_vars/t/innodb_adaptive_flushing_basic.test:
        One can now only assign 0 or 1 to boolean variables
      mysql-test/suite/sys_vars/t/innodb_adaptive_hash_index_basic.test:
        One can now only assign 0 or 1 to boolean variables
      mysql-test/suite/sys_vars/t/innodb_large_prefix_basic.test:
        One can now only assign 0 or 1 to boolean variables
      mysql-test/suite/sys_vars/t/innodb_random_read_ahead_basic.test:
        One can now only assign 0 or 1 to boolean variables
      mysql-test/suite/sys_vars/t/innodb_stats_on_metadata_basic.test:
        One can now only assign 0 or 1 to boolean variables
      mysql-test/suite/sys_vars/t/innodb_strict_mode_basic.test:
        One can now only assign 0 or 1 to boolean variables
      mysql-test/suite/sys_vars/t/innodb_support_xa_basic.test:
        One can now only assign 0 or 1 to boolean variables
      mysql-test/suite/sys_vars/t/innodb_table_locks_basic.test:
        One can now only assign 0 or 1 to boolean variables
      mysys/my_getsystime.c:
        Merge + fixed bug that __NR_clock_gettime didn't work in 5.5
      d513153f
    • Michael Widenius's avatar
      automatic merge · 635598f1
      Michael Widenius authored
      635598f1
    • Michael Widenius's avatar
    • Sergei Golubchik's avatar
    • Michael Widenius's avatar
      automatic merge · ca28d5fc
      Michael Widenius authored
      ca28d5fc
    • Michael Widenius's avatar
      Fixed lp:886484 "nowatch option for mysqld (allow systemd)" · 2887bfbe
      Michael Widenius authored
      Added a --nowatch (with aliases --no-watch and --no-auto-restart) option to mysqld_safe that causes it to exit after
      spawning mysqld.  We don't need mysqld_safe to restart mysqld after a crash, because systemd can do that just fine.
      
      Based on code from Maarten Vanraes
      
      scripts/mysqld_safe.sh:
        Added option --nowatch (with aliases --no-watch and --no-auto-restart)
      2887bfbe
    • Michael Widenius's avatar
      Fixed lp:886479 "[PATCH] plugin boolean result" · 398f754b
      Michael Widenius authored
      Thanks to Maarten Vanraes for the patch
      
      
      sql/sql_plugin.cc:
        Fix plugin boolean variables to receive the value "1", not "-1", when they are set to 1.
        Aside from being bizarre, the existing behavior is unportable: machines where char is unsigned print "255" instead.
      398f754b
    • Michael Widenius's avatar
      Partial fix for lp:886476 [PATCH] disable tests · 3c0deee3
      Michael Widenius authored
      By Maarten Vanraes
      
      mysql-test/suite/innodb/r/innodb.result:
        Make result portable
      mysql-test/suite/innodb/t/innodb.test:
        Make result portable
      3c0deee3
  2. 30 Mar, 2012 9 commits
  3. 29 Mar, 2012 7 commits
  4. 28 Mar, 2012 6 commits
    • Sergei Golubchik's avatar
      5.3 merge · 867296c3
      Sergei Golubchik authored
      867296c3
    • Sergei Golubchik's avatar
      debug_sync is now a service, available to dynamically loaded plugins. · 0d5adca0
      Sergei Golubchik authored
      new make target - abi_update
      
      libservices/HOWTO:
        remove references to Makefile.am
        small tweaks
      0d5adca0
    • Michael Widenius's avatar
    • Michael Widenius's avatar
      Automatic merge · bb6cc525
      Michael Widenius authored
      bb6cc525
    • Michael Widenius's avatar
      Merge with 5.1 · 3bc932ec
      Michael Widenius authored
      3bc932ec
    • Michael Widenius's avatar
      Fixed lp:944422 "mysql_upgrade destroys Maria tables?" · 74b06493
      Michael Widenius authored
      The issue was that check/optimize/anaylze did not zerofill the table before they started to work on it.
      Added one more element to not often used function handler::auto_repair() to allow handler to decide when to auto repair.
      
      
      mysql-test/suite/maria/r/maria-autozerofill.result:
        Test case for lp:944422
      mysql-test/suite/maria/t/maria-autozerofill.test:
        Test case for lp:944422
      sql/ha_partition.cc:
        Added argument to auto_repair()
      sql/ha_partition.h:
        Added argument to auto_repair()
      sql/handler.h:
        Added argument to auto_repair()
      sql/table.cc:
        Let auto_repair() decide which errors to trigger auto-repair
      storage/archive/ha_archive.h:
        Added argument to auto_repair()
      storage/csv/ha_tina.h:
        Added argument to auto_repair()
      storage/maria/ha_maria.cc:
        Give better error & warning messages for auto-repaired tables.
      storage/maria/ha_maria.h:
        Added argument to auto_repair()
        Always auto-repair in case of moved table.
      storage/maria/ma_open.c:
        Remove special handling of HA_ERR_OLD_FILE (this is now handled in auto_repair())
      storage/myisam/ha_myisam.h:
        Added argument to auto_repair()
      74b06493
  5. 27 Mar, 2012 5 commits
  6. 26 Mar, 2012 3 commits
    • Sergey Petrunya's avatar
      Merge · ff731f39
      Sergey Petrunya authored
      ff731f39
    • Sergey Petrunya's avatar
      BUG#951283: Wrong result (missing rows) with semijoin+firstmatch, IN/ANY subquery · f2947f97
      Sergey Petrunya authored
      - The problem was with execution strategy for cases where FirstMatch's inner tables
        were interleaved with outer-uncorrelated tables.
      - I was unable to find any cases where such join orders would be practically useful,
        so fixed it by disabling them.
      f2947f97
    • Michael Widenius's avatar
      Bug fix for MySQL bug#61209 "auto_increment_offset != 1 +... · 3bfe3b5e
      Michael Widenius authored
      Bug fix for MySQL bug#61209 "auto_increment_offset != 1 + innodb_autoinc_lock_mode=1 => bulk inserts fail"
      Patch and test case by Patryk Pomykalski
      
      mysql-test/suite/innodb/r/innodb-autoinc.result:
        updated test case
      storage/innodb_plugin/handler/ha_innodb.cc:
        Fixed that we properly reserve values for auto_increment
      storage/xtradb/handler/ha_innodb.cc:
        Fixed that we properly reserve values for auto_increment
      3bfe3b5e