1. 27 Sep, 2010 2 commits
    • Michael Widenius's avatar
      Move maria_upgrade() out of maria_init() as in standalone programs maria_data_root is not set. · f715c9c2
      Michael Widenius authored
      Fixed failing pbxt test
      
      
      include/maria.h:
        Added maria_upgrade()
      mysql-test/suite/pbxt/r/select.result:
        Don't print number of rows as this is not constant over different runs
      mysql-test/suite/pbxt/t/select.test:
        Don't print number of rows as this is not constant over different runs
      storage/maria/ha_maria.cc:
        Run maria_upgrade() before maria_init()
      storage/maria/ma_init.c:
        Move maria_upgrade() out of maria_init() as in standalone programs maria_data_root is not set.
      f715c9c2
    • Michael Widenius's avatar
      Rename control file and log files from maria_xxx to aria_xxx when upgrading from MariaDB 5.1 · 0df17892
      Michael Widenius authored
      Fix cleanup to really remove 'aria_log' files. Fixes failures in maria unit tests on some platforms.
      Fixed compiler warnings
      
      include/mysql/plugin.h:
        Changed def_val back to const, to remove compiler warnings.
      storage/maria/ma_init.c:
        Rename control file and log files from maria_xxx to aria_xxx when upgrading from MariaDB 5.1
      storage/maria/unittest/ma_maria_log_cleanup.c:
        Fix cleanup to really remove 'aria_log' files. Fixes failures in maria unit tests on some platforms.
      0df17892
  2. 21 Sep, 2010 4 commits
  3. 20 Sep, 2010 2 commits
  4. 18 Sep, 2010 1 commit
  5. 16 Sep, 2010 3 commits
  6. 15 Sep, 2010 3 commits
    • Sergei Golubchik's avatar
      oqgraph and sphinx on windows · 6467bcca
      Sergei Golubchik authored
      6467bcca
    • Michael Widenius's avatar
      Automatic merge · b4b64946
      Michael Widenius authored
      b4b64946
    • Michael Widenius's avatar
      mysqltest now gives error messages with error code for my_delete, my_rename, my_copy etc. · f4820ea6
      Michael Widenius authored
      Fixed crashing bug when doing ALTER TABLE RENAME with transactional tables.
      
      client/mysqltest.cc:
        Added errno to error message for system calls (delete, rename etc)
        Write error message for failures of system calls
      mysql-test/include/cleanup_fake_relay_log.inc:
        Disable warnings for remove_file
      mysql-test/include/diff_tables.inc:
        Disable warnings for remove_file
      mysql-test/include/maria_empty_logs.inc:
        Disable warnings for remove_file
      mysql-test/include/maria_make_snapshot.inc:
        Disable warnings for remove_file
      mysql-test/include/maria_make_snapshot_for_feeding_recovery.inc:
        Disable warnings for remove_file
      mysql-test/include/mysqlhotcopy.inc:
        Disable warnings for remove_file
      mysql-test/include/ndb_backup.inc:
        Disable warnings for remove_file
      mysql-test/include/ndb_backup_print.inc:
        Disable warnings for remove_file
      mysql-test/r/alter_table_trans.result:
        Test of crashing ALTER TABLE RENAME bug
      mysql-test/t/alter_table_trans.test:
        Test of crashing ALTER TABLE RENAME bug
      mysql-test/t/mysqltest.test:
        Disable warnings for remove_file and move_file
      mysys/my_copy.c:
        Fixed wrong error message
      sql/sql_table.cc:
        Fixed crashing bug when doing ALTER TABLE RENAME with transactional tables.
      f4820ea6
  7. 14 Sep, 2010 7 commits
  8. 13 Sep, 2010 5 commits
    • Sergei Golubchik's avatar
      merged · 617ae440
      Sergei Golubchik authored
      617ae440
    • Igor Babaev's avatar
    • Michael Widenius's avatar
      Merge · 209b6f9a
      Michael Widenius authored
      209b6f9a
    • Michael Widenius's avatar
      Fixed Aria recovery bug: · 456422a2
      Michael Widenius authored
      - When reopening table during recovery, don't set file length from file sizes as file is not flushed.
      New feature in Aria recovery:
      - Create database directory if missing.
      
      
      
      storage/maria/ma_recovery.c:
        Don't print Query: twice when running maria_read_log
        Create database directory if missing. (Needed when running maria_read_log on an empty database direcory during testing)
        More DBUG_print
        Fixed bug: When reopening table during recovery, don't set file length from file sizes as file is not flushed.
      456422a2
    • Igor Babaev's avatar
      Merge · 64244a34
      Igor Babaev authored
      64244a34
  9. 12 Sep, 2010 8 commits
  10. 11 Sep, 2010 4 commits
    • Sergei Golubchik's avatar
      fix incorrect xtradb plugin metadata. · 8da65c05
      Sergei Golubchik authored
      build innodb_plugin with *-all build scripts
      8da65c05
    • Sergei Golubchik's avatar
      merge with 5.1 · a3d80d95
      Sergei Golubchik authored
      a3d80d95
    • Igor Babaev's avatar
      Fixed bug #49600. · 577b7345
      Igor Babaev authored
      The problem could be demonstrated with an outer join of two single-row
      tables where the values of the join attributes were null. Any query
      with such a join could return a wrong result set if the where
      condition of the query was not empty. For queries with empty
      where conditions the result sets were correct.
      This was the consequence of two bugs in the code:
       - Item_equal objects for on conditions of outer joins were
         not built if the processed query had no where condition
       - the check for null values in the code that evaluated constant 
         Item_equal objects was incorrect.
      Fixed both above problems.
      Added a test case for the bug and adjusted results for some other
      test cases.
      577b7345
    • Sergei Golubchik's avatar
      to simpliy and unify the code · 966661c8
      Sergei Golubchik authored
      966661c8
  11. 10 Sep, 2010 1 commit
    • Michael Widenius's avatar
      Fix for LP#634943 "marked as crashed", "zerofilling" and "wrong data in... · b9890b05
      Michael Widenius authored
      Fix for LP#634943 "marked as crashed", "zerofilling" and "wrong data in bitmap" when recovering Aria tables
      This was an interaction of several bugs:
      - Tables marked as opened was not properly unmarked on recovery if there was not changes since checkpoint
      - zerofill of tables put wrong data in bitmap if directory for page was full
      - Tables was thought as 'moved' during recovery if they had a create_lsn bigger than the lsn in the control file.
      
      
      storage/maria/ha_maria.cc:
        If table is moved and crashed, threat it as crashed.
        (Not a related to this bug, but still good to have fixed)
      storage/maria/ma_blockrec.c:
        Make enough_free_entries_on_page() global
      storage/maria/ma_blockrec.h:
        Make enough_free_entries_on_page() global
      storage/maria/ma_check.c:
        If directory is full, mark page full. Fixes bug in zerofill
      storage/maria/ma_open.c:
        Don't marke files as MOVED during recovery if create_trid > trnman_max_trid, as this fails for tables created after checkpoint.
      storage/maria/ma_recovery.c:
        Reset open_count in file that was open during crash and was part of checkpoint.
        Fixed wrong warning of 'open count' after recovery of files that was not touched since checkpoint.
      storage/maria/maria_chk.c:
        Changed not documented option --log-dir to --logdir
        Document more of the options.
        Clean up output for --help
      storage/maria/trnman.c:
        Added DBUG_PRINT
      b9890b05