1. 03 Sep, 2010 4 commits
    • Michael Widenius's avatar
      544cdf76
    • Michael Widenius's avatar
      Enable archive tables to work with mysql_upgrade / repair · 9f855602
      Michael Widenius authored
      Made long file names from previous patch shorter
      
      mysql-test/r/archive.result:
        Added testing of repair (for upgrade) of 5.0 tables.
      mysql-test/std_data/archive_5_0.ARM:
        Archive table created in MySQL 5.0
      mysql-test/std_data/archive_5_0.ARZ:
        Archive table created in MySQL 5.0
      mysql-test/std_data/archive_5_0.frm:
        Archive table created in MySQL 5.0
      mysql-test/std_data/long_table_name.MYD:
        Made long file names shorter
      mysql-test/std_data/long_table_name.MYI:
        Made long file names shorter
      mysql-test/std_data/long_table_name.frm:
        Made long file names shorter
      mysql-test/t/archive.test:
        Added testing of repair (for upgrade) of 5.0 tables.
      sql/sql_table.cc:
        Allow recreate to open crashed tables.
      sql/table.cc:
        Fix error message if storage engine doesn't exists.
      storage/archive/azio.c:
        Reset status values in case archive is of old versions
      storage/archive/ha_archive.cc:
        Fix to allow one to open old versions of table during repair
        Reset status variables for old version tables
        If the the table is of old version, force upgrade with ALTER TABLE when doing repair
      storage/archive/ha_archive.h:
        Added variables to detect old versions
      9f855602
    • Michael Widenius's avatar
      Fix that one can run mysql_upgrade with long table names · a4fff491
      Michael Widenius authored
      Fall back to use ALTER TABLE for engines that doesn't support REPAIR when doing repair for upgrade.
      Nicer output from mysql_upgrade and mysql_check
      Updated all arrays that used NAME_LEN to use SAFE_NAME_LEN to ensure that we don't break things accidently as names can now have a #mysql50# prefix.
      
      client/mysql_upgrade.c:
        If we are using verbose, also run mysqlcheck in verbose mode.
      client/mysqlcheck.c:
        Add more information if running in verbose mode
        Print 'Needs upgrade' instead of complex error if table needs to be upgraded
        Don't write connect information if verbose is not 2 or above
      mysql-test/r/drop.result:
        Updated test and results as we now support full table names
      mysql-test/r/grant.result:
        Now you get a correct error message if using #mysql with paths
      mysql-test/r/show_check.result:
        Update results as table names can temporarly be bigger than NAME_LEN (during upgrade)
      mysql-test/r/upgrade.result:
        Test upgrade for long table names.
      mysql-test/suite/funcs_1/r/is_tables_is.result:
        Updated old test result (had note been updated in a while)
      mysql-test/t/drop.test:
        Updated test and results as we now support full table names
      mysql-test/t/grant.test:
        Now you get a correct error message if using #mysql with paths
      mysql-test/t/upgrade.test:
        Test upgrade for long table names.
      sql/ha_partition.cc:
        NAME_LEN -> SAFE_NAME_LEN
      sql/item.cc:
        NAME_LEN -> SAFE_NAME_LEN
      sql/log_event.cc:
        NAME_LEN -> SAFE_NAME_LEN
      sql/mysql_priv.h:
        Added SAFE_NAME_LEN
      sql/rpl_filter.cc:
        NAME_LEN -> SAFE_NAME_LEN
      sql/sp.cc:
        NAME_LEN -> SAFE_NAME_LEN
      sql/sp_head.cc:
        NAME_LEN -> SAFE_NAME_LEN
      sql/sql_acl.cc:
        NAME_LEN -> SAFE_NAME_LEN
      sql/sql_base.cc:
        NAME_LEN -> SAFE_NAME_LEN
      sql/sql_connect.cc:
        NAME_LEN -> SAFE_NAME_LEN
      sql/sql_parse.cc:
        NAME_LEN -> SAFE_NAME_LEN
      sql/sql_prepare.cc:
        NAME_LEN -> SAFE_NAME_LEN
      sql/sql_select.cc:
        NAME_LEN -> SAFE_NAME_LEN
      sql/sql_show.cc:
        NAME_LEN -> SAFE_NAME_LEN
        Enlarge table names for SHOW TABLES to also include optional #mysql50#
      sql/sql_table.cc:
        Fall back to use ALTER TABLE for engines that doesn't support REPAIR when doing repair for upgrade.
      sql/sql_trigger.cc:
        NAME_LEN -> SAFE_NAME_LEN
      sql/sql_udf.cc:
        NAME_LEN -> SAFE_NAME_LEN
      sql/sql_view.cc:
        NAME_LEN -> SAFE_NAME_LEN
      sql/table.cc:
        Fixed check_table_name() to not count #mysql50# as part of name
        If #mysql50# is part of the name, don't allow path characters in name.
      a4fff491
    • Michael Widenius's avatar
      Fixed bugs (mostly on sparc) that caused crashes in mysql-test-run · ee5551e6
      Michael Widenius authored
      sql/item_sum.cc:
        Fixed alignment problem that caused crases on sparc. (ORDER needs an aligment of 8 as it includes longlongs)
      storage/federatedx/ha_federatedx.cc:
        Fixed crash on sparc as 'pos' is not aligned on 4/8.
      storage/maria/ma_page.c:
        Removed wrong assert
      ee5551e6
  2. 30 Aug, 2010 1 commit
  3. 28 Aug, 2010 3 commits
    • Michael Widenius's avatar
      Fixed build & test failures in buildbot · 7b91240b
      Michael Widenius authored
      mysql-test/t/bug46080-master.opt:
        Lower limits to be able to run tests
      regex/main.c:
        Fixed compiler warnings
      storage/maria/ma_key_recover.c:
        Fixed compiler warnings
      storage/maria/ma_recovery.c:
        Fixed compiler warnings
      storage/maria/ma_unique.c:
        Fixed compiler warnings
      strings/ctype-uca.c:
        Added comment
      strings/xml.c:
        Fixed compiler warnings
      support-files/compiler_warnings.supp:
        Added suppressions for windows
      unittest/strings/strings-t.c:
        Added ifdef to fix compilation failure when compiling without UCA
      7b91240b
    • Michael Widenius's avatar
      Automatic merge · 85a78999
      Michael Widenius authored
      85a78999
    • Michael Widenius's avatar
      Fixed failing tests · 89d9105d
      Michael Widenius authored
      mysql-test/suite/binlog/t/binlog_row_binlog.test:
        Don't run test if utf8_unicode_ci is not available
      mysql-test/suite/binlog/t/binlog_stm_binlog.test:
        Don't run test if utf8_unicode_ci is not available
      mysql-test/suite/funcs_1/r/is_columns_is.result:
        Update result
      mysql-test/suite/innodb/t/innodb_misc1.test:
        Don't run test if utf8_unicode_ci is not available
      mysql-test/suite/innodb/t/innodb_mysql.test:
        Don't run test if utf8_unicode_ci is not available
      89d9105d
  4. 27 Aug, 2010 3 commits
    • Sergei Golubchik's avatar
      use the correct path separator on windows. · e86aeaee
      Sergei Golubchik authored
      remove duplicates from the --plugin-load list.
      $ENV{TERM} can be undefined (on Windows)
      e86aeaee
    • Michael Widenius's avatar
      Automerge · 156832f0
      Michael Widenius authored
      156832f0
    • Michael Widenius's avatar
      Merge with MySQL 5.1.50 · ad6d95d3
      Michael Widenius authored
      - Changed to still use bcmp() in certain cases becasue
        - Faster for short unaligneed strings than memcmp()
        - Bettern when using valgrind
      - Changed to use my_sprintf() instead of sprintf() to get higher portability for old systems
      - Changed code to use MariaDB version of select->skip_record()
      - Removed -%::SCCS/s.% from Makefile.am:s to remove automake warnings
      ad6d95d3
  5. 25 Aug, 2010 1 commit
    • Sergei Golubchik's avatar
      mtr changes: · 9bc9855c
      Sergei Golubchik authored
      * expanding unknown env variable does not abort mtr
      * have_archive, blackhole, innodb - preload the corresponding engine
      * all options from .opt files get equal treatment, all are searched for special options,
        not only -{master,slave}.opt as before (which ignored suite.opt and --mysqld=...)
      * --plugin-load gets special treatment too - all instances are merged into one
      * federated test fixed to preload federated
      9bc9855c
  6. 24 Aug, 2010 8 commits
    • Michael Widenius's avatar
      Fixed typo in last push (sorry about that) · 1aa3b02c
      Michael Widenius authored
      - Need to get autopush to work to avoid bad pushes like this....
      1aa3b02c
    • Michael Widenius's avatar
      Fixed failing test · b9b6ffe7
      Michael Widenius authored
      Increased default buffers to speed up maria_chk
      
      mysql-test/suite/maria/r/maria3.result:
        Fixed failing test
      storage/maria/maria_chk.c:
        Increase default page_buffer_size
      storage/maria/maria_def.h:
        Increased default sort buffer size for maria_chk.
      b9b6ffe7
    • Michael Widenius's avatar
      Automatic merge · a8267117
      Michael Widenius authored
      Fixed compiler warning
      
      client/mysql.cc:
        Fixed compiler warning
      include/my_global.h:
        Fixed typo
      storage/maria/ha_maria.cc:
        Merge
      a8267117
    • Michael Widenius's avatar
      Increase some very old limits. · 31f66e55
      Michael Widenius authored
      This will give a smoother experience when using the Aria engine by those that are using default limits
      without still causing a notable problem for desktop users.
      31f66e55
    • Michael Widenius's avatar
      Automatic merge · 918b25ec
      Michael Widenius authored
      918b25ec
    • Michael Widenius's avatar
      Automatic merge with main 5.1 · 190ed5a2
      Michael Widenius authored
      190ed5a2
    • Michael Widenius's avatar
      Fix of LP#616253 Crash in _ma_bitmap_set_full_page_bits on Aria recovery · ecf95c6e
      Michael Widenius authored
      The bug was based on wrong undo data in recovery file and not enough checking of bad data.
      
      sql/sql_select.h:
        Added comment
      storage/maria/ma_blockrec.c:
        - Removed wrong sanity checks (didn't work for UNDO records)
        - More sanity checks and DBUG_ASSERT
        - More DBUG_ENTER and DBUG_PRINT
        - Removed filler blocks in extent_to_bitmap_blocks() as it caused problems in write_block_record().
          This was the main cause of the bug.
          (This change can make records generated by UNDO slightly smaller than original record, which we have to fix
          by correcting row_pos.length before calling write_block_record())
        - Fixed some problems in write_block_record() while doing UNDO.
        - Store header_length without TRANSID_SIZE into recovery log (as UNDO entires doesn't have TRANSID_SIZE)
        - Mark table crashed if something goes wrong during UNDO
      storage/maria/maria_def.h:
        Added header_length
      ecf95c6e
    • Sergei Golubchik's avatar
      ced63539
  7. 23 Aug, 2010 2 commits
    • Michael Widenius's avatar
      Trivial fixes, more safe DBUG_ASSERT()'s and some more DBUG_ · 53310c6e
      Michael Widenius authored
      - CTRL-C now aborts 'source' commands in mysql client
      - Fix that thread id's are removed in convert-debug-for-diff.sh
      
      
      client/mysql.cc:
        CTRL-C now aborts 'source' commands
      scripts/convert-debug-for-diff.sh:
        Fix expression to remove thread id
      storage/maria/ha_maria.cc:
        Don't call DBUG_ASSERT() when we kill a query during REPAIR / ALTER TABLE
      storage/maria/ma_bitmap.c:
        Added DBUG_ASSERT() if we call _ma_bitmap_set_full_page_bits()
      storage/maria/ma_key_recover.c:
        Don't do an assert if table is marked crashed.
      storage/maria/ma_recovery.c:
        Added DBUG_ENTER
      53310c6e
    • Michael Widenius's avatar
      Fix for LP#612894 Some aggregate functions (such as MIN MAX) work incorrectly... · b6fe4713
      Michael Widenius authored
      Fix for LP#612894 Some aggregate functions (such as MIN MAX) work incorrectly in subqueries after getting NULL value
      
      
      mysql-test/r/group_by.result:
        Added test that showed problems that no_rows_in_results() didn't work for expressions
      mysql-test/r/subselect4.result:
        Test case for LP#612894
      mysql-test/t/group_by.test:
        Added test that showed problems that no_rows_in_results() didn't work for expressions
      mysql-test/t/subselect4.test:
        Test case for LP#612894
      sql/item.h:
        Added restore_to_before_no_rows_in_result()
        Added function processor for no_rows_in_results() and restore_to_before_no_rows_in_results() to ensure it works with functions
        Fix that above functions are handled by Item_ref()
      sql/item_func.h:
        Ensure that no_rows_in_results() and restore_to_before_no_rows_in_result() are called for all function arguments
      sql/item_sum.cc:
        Added restore_to_before_no_rows_in_result() to restore settings after Item_sum_hybrid::no_rows_in_result() was called.
        This is needed to handle the case where we have made 'make_const()' on the item in opt_sum(), but the item will be reused again in a sub query.
        Ignore multiple calls to no_rows_in_result() as Item_ref is calling it twice.
      sql/item_sum.h:
        Added restore_to_before_no_rows_in_result();
      sql/sql_select.cc:
        Added reset of no_rows_in_result() for JOIN::reinit()
      sql/sql_select.h:
        Added marker if no_rows_in_result() is called.
      b6fe4713
  8. 20 Aug, 2010 3 commits
    • Michael Widenius's avatar
      Fixed compilation failure and added some new suppressions · 096666fc
      Michael Widenius authored
      storage/maria/ma_blockrec.c:
        Fixed compilation failure
      support-files/compiler_warnings.supp:
        Added suppressions for pbxt
      096666fc
    • Michael Widenius's avatar
    • Michael Widenius's avatar
      Fixed valgrind errors and compiler warnings discovered by buildbot · 6ab5a8ac
      Michael Widenius authored
      More DBUG_ASSERT() to discover errors earlier
      More checking of BLOCK structures in Aria.
      Fixed crashing bug in Aria when doing UPDATE of several records in same block when doing table scan.
      
      storage/federatedx/ha_federatedx.cc:
        Added missing delete_dynamic(); This fixes the valgrind warnings about lost memory discovered by buildbot.
      storage/maria/ma_blockrec.c:
        Added debugging helper function _ma_print_block_info() to print block structure.
        Changed arguments to _ma_print_directory() so it can be called by _ma_print_block_info()
        check_directory() now also checks that empty_space on block is calculated correctly.
        Added some local variables to get more information about what happend when things crash.
        Fixed crashing bug when doing UPDATE of several records in same block when doing table scan.
      storage/maria/ma_key_recover.c:
        Simple optimization (don't call bmove_upp() if not needed); This could happen during page split.
      storage/maria/ma_recovery.c:
        Fixed compiler warning
      storage/maria/ma_test2.c:
        Run test without syncing to disk. (Not needed for this test)
      storage/maria/ma_write.c:
        More comments.
        Added DBUG_ASSERT() to find wrong log entires, like the one reported at LP#616344, during log file creation.
      storage/maria/unittest/ma_test_recovery.pl:
        Added extra -s to maria_chk to get it more silent.
        This fixes that ma_test_all.sh works again.
      6ab5a8ac
  9. 18 Aug, 2010 1 commit
    • Michael Widenius's avatar
      Added verbose mode to recovery · 909e4eb0
      Michael Widenius authored
      More DBUG
      Added convert-debug-for-diff
      Added missing (from last push) federated test case
      
      .bzrignore:
        Ignore generated files
      mysql-test/README:
        Updated documentation for --extern
      mysql-test/suite/federated/federated_bug_32426.result:
        Added test for federatedx
      mysql-test/suite/federated/federated_bug_32426.test:
        Added test for federatedx
      scripts/Makefile.am:
        Added convert-debug-for-diff
      scripts/convert-debug-for-diff.sh:
        Added script for converting
      sql/log.cc:
        Added DBUG
      sql/mysqld.cc:
        Added DBUG
      storage/maria/ma_recovery.c:
        If verbose, write dirty pages (for debugging)
      storage/maria/ma_static.c:
        Added verbose mode to recovery
      storage/maria/maria_def.h:
        Added verbose mode to recovery
      storage/maria/maria_read_log.c:
        Added verbose mode to recovery
      909e4eb0
  10. 17 Aug, 2010 1 commit
    • Sergei Golubchik's avatar
      generalization of mtr to support suite.pm extensions: · 8da7be63
      Sergei Golubchik authored
      * no automatic --loose-skip-innodb added by mtr based on the test name.
        instead loose-skip-innodb is now in the default_mysqld.cnf
      * have_innodb_plugin.inc is changed to give a verbose "skip" message
        (instead of "require: true")
      * My::Suite class. It's support in mtr, and everywhere
      * support for suite.pm
      * when sorting tests, take combinations into account
      * support for SUITENAME_COMBINATIONS
      * no special treatment for innodb_plugin in mtr_cases.pm
      * two special pre-created config groups: ENV and OPT
      * allow option names to start from #
      * allow magic option to have an argument
      * remove dead code
      * fix @-substitution to works as expected
      * new processes take the value of $opt_verbose automatically, no need to pass it to a constructor
      * innodb_plugin suite uses suite.pm and combinations file to test as much as possible
        (innodb plugin, xtradb plugin, xtradb static - whatever available)
      * besides test-master.opt and test-slave.opt a test.opt file is also
        loaded, both for master and slave
      * .opt files for all included files are loaded too
      * progress report in the xterm titlebar
      8da7be63
  11. 14 Aug, 2010 1 commit
  12. 12 Aug, 2010 3 commits
  13. 11 Aug, 2010 2 commits
    • Michael Widenius's avatar
    • Michael Widenius's avatar
      Fixed compiler warnings from Windows compiler · 236478ce
      Michael Widenius authored
      client/mysqlcheck.c:
        Added missing casts
      client/mysqldump.c:
        Added missing casts
      client/mysqlimport.c:
        Added missing casts
      extra/my_print_defaults.c:
        Added missing casts
      mysql-test/mysql-test-run.pl:
        Added suppression for non-critical warning on windows
      storage/maria/maria_pack.c:
        Added missing casts
      storage/xtradb/buf/buf0lru.c:
        Added missing casts
      storage/xtradb/fil/fil0fil.c:
        Added missing casts
      storage/xtradb/handler/i_s.cc:
        Added extra argument to call store() function for longlong.
      storage/xtradb/srv/srv0srv.c:
        Added cast to suppress compiler warning
      support-files/compiler_warnings.supp:
        Added suppression for some non critical compiler warnings on Windows
      unittest/mytap/tap.h:
        Fixed prototypes to be same as the actual functions
      236478ce
  14. 10 Aug, 2010 4 commits
    • Michael Widenius's avatar
      Fixed LP#605798 RQG: Table corruption after Maria engine recovery - "Wrong data in bitmap" · e6cf286b
      Michael Widenius authored
      maria_chk & maria_read_log now reads block size from control file.
      
      
      
      mysql-test/suite/maria/r/maria.result:
        Updated results after trivial change of maria_chk's output
      storage/maria/ma_bitmap.c:
        More DBUG_PRINT
      storage/maria/ma_blockrec.c:
        Fixed bug that we didn't mark page full in bitmap if directory is full
      storage/maria/ma_check.c:
        Write out if directory is full for errors in bitmap
      storage/maria/ma_control_file.c:
        Don't give error for wrong block size if block size is 0
      storage/maria/maria_chk.c:
        Read block size from control file
        In case of -dvv, write also out bitmap information (good for debugging)
      storage/maria/maria_read_log.c:
        Read block size from control file
        Fixed that maria_read_log works with different page size than TRANSLOG_PAGE_SIZE
      e6cf286b
    • Michael Widenius's avatar
      Fixed typo that caused compile failure on Mac · 0f75abc4
      Michael Widenius authored
      Added straight_join to make results predicatable
      
      mysql-test/suite/pbxt/r/range.result:
        Added straight_join to make results predicatable
      mysql-test/suite/pbxt/t/range.test:
        Added straight_join to make results predicatable
      mysys/my_sync.c:
        Fixed typo
      0f75abc4
    • Sergei Golubchik's avatar
      created *-all build scripts that build with ndb · 5cde0ca7
      Sergei Golubchik authored
      (as -max scripts don't)
      5cde0ca7
    • Michael Widenius's avatar
      Fixed wrong argument to translog_write_record() that caused core dump in... · 8312aa9b
      Michael Widenius authored
      Fixed wrong argument to translog_write_record() that caused core dump in maria.maria-gis-rtree-trans and some other tests
      (Bug introduced by my last push)
      8312aa9b
  15. 09 Aug, 2010 2 commits
    • Michael Widenius's avatar
    • Michael Widenius's avatar
      Added --sync-sys=0 option for mysqld to skip sync() calls for faster testing · 12648015
      Michael Widenius authored
      Fixed LP#613418 (M)aria recovery failure: ma_key_recover.c:981: _ma_apply_redo_index: Assertion `check_page_length == page_length' failed
      
      include/my_sys.h:
        Added my_disable_sync
      mysql-test/mysql-test-run.pl:
        Added --sync-sys=0 to run test suite faster
      mysys/my_static.c:
        Added my_disable_sync
      mysys/my_sync.c:
        Added my_disable_sync
      sql/mysqld.cc:
        Added -sync-sys=0 option for mysqld to skip sync() calls for faster testing
      storage/maria/ma_key_recover.c:
        More DBUG_ASSERT()
        Added logging of KEY_OP_DEBUG to make examening of logs easier
        Fixed testing of page length in recovery to ensure we don't overwrite checksum (previous tests was too relaxed)
        Fixed bug in recovery logging of split pages which caused failure during recovery:
        - Length was not adjusted properly for pages to be split
        - Added KEY_OP_MAX_PAGELENGTH to tell recovery that page is now full length
        - This fixed LP#613418
      storage/maria/ma_key_recover.h:
        Changed prototype for ma_log_change() for KEY_OP_DEBUG
      storage/maria/ma_loghandler.h:
        Added new enums for better debugging of recovery logs
      storage/maria/ma_rt_index.c:
        Added debugging information to calls to ma_log_change()
      storage/maria/ma_write.c:
        Added debugging information to calls to ma_log_change() and ma_log_split()
      12648015
  16. 07 Aug, 2010 1 commit