1. 10 Aug, 2010 1 commit
  2. 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 · 62b9b884
      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()
      62b9b884
  3. 07 Aug, 2010 2 commits
    • Michael Widenius's avatar
      Ensure that xtradb & InnoDB plugin compiles if valgrind is installed but not... · cbdc5dd4
      Michael Widenius authored
      Ensure that xtradb & InnoDB plugin compiles if valgrind is installed but not valgrind debug libraries
      cbdc5dd4
    • Michael Widenius's avatar
      This patch fixes LP#613408 Memory corruption with (M)aria storage engine and... · 2e46eb77
      Michael Widenius authored
      This patch fixes LP#613408  Memory corruption with (M)aria storage engine and virtual columns in MariaDB 5.2
      Fixed compiler warnings
      Disabled some tests that doesn't work on windows (uses shell tools or strange characters)
      
      
      
      client/mysqlshow.c:
        Fixed compiler warnings
      client/mysqlslap.c:
        Fixed compiler warnings
      mysql-test/mysql-test-run.pl:
        Use an error file instead of /dev/null
        (Fixes problem on Windows and the output may be usefull)
      mysql-test/suite/maria/r/maria.result:
        Test case for bug LP#613408 (not complete)
      mysql-test/suite/maria/t/maria.test:
        Test case for bug LP#613408 (not complete)
      mysql-test/suite/percona/percona_log_slow_slave_statements-and-use_global_long_query_time.test:
        This test doesn't work one windows (needs shell tools)
      mysql-test/suite/percona/percona_log_slow_slave_statements.test:
        This test doesn't work one windows (needs shell tools)
      mysql-test/suite/percona/percona_slow_query_log-control_global_slow.test:
        This test doesn't work one windows (needs shell tools)
      mysql-test/suite/percona/percona_slow_query_log-log_slow_filter.test:
        This test doesn't work one windows (needs shell tools)
      mysql-test/suite/percona/percona_slow_query_log-log_slow_verbosity.test:
        This test doesn't work one windows (needs shell tools)
      mysql-test/suite/percona/percona_slow_query_log-long_query_time.test:
        This test doesn't work one windows (needs shell tools)
      mysql-test/suite/percona/percona_slow_query_log-microseconds_in_slow_query_log.test:
        This test doesn't work one windows (needs shell tools)
      mysql-test/suite/percona/percona_slow_query_log-min_examined_row_limit.test:
        This test doesn't work one windows (needs shell tools)
      mysql-test/suite/percona/percona_slow_query_log-use_global_long_query_time.test:
        This test doesn't work one windows (needs shell tools)
      mysql-test/t/ctype_filesystem.test:
        This test doesn't work one windows (problem with character sets)
      mysql-test/t/events_time_zone.test:
        Use longer times to get predictable tests
      mysql-test/t/show_check-master.opt:
        set long query time to get more predictable tests
      storage/maria/ma_check.c:
        Restore info->s->lock_key_trees after repair.
        Disable logging to temp tables for all repair cases (safety fix)
      storage/maria/ma_state.c:
        Ensurethat info->state_start doesn't point to freed memory. (Could happen after running an internal repair to fast create indexes)
      storage/maria/trnman.c:
        Added longer comment
      2e46eb77
  4. 06 Aug, 2010 6 commits
    • Michael Widenius's avatar
      Fix build failure on windows · c7e1795a
      Michael Widenius authored
      c7e1795a
    • Michael Widenius's avatar
      Fix for LP#614265 Crash in _ma_unpin_all_pages / _ma_search on DELETE with Aria search engine · a93dea4f
      Michael Widenius authored
      Fixed compiler warnings
      
      client/mysqlslap.c:
        Fixed compiler warnings
      mysql-test/suite/maria/r/maria.result:
        Test case for LP#614265
      mysql-test/suite/maria/t/maria.test:
        Test case for LP#614265
      mysql-test/suite/pbxt/t/skip_name_resolve-master.opt:
        Ensure that we get restart before test (as test uses show processlist)
      sql/handler.cc:
        Added cloned marker if clone was called (for safety checks & debugging)
      sql/handler.h:
        Added cloned marker if clone was called (for safety checks & debugging)
      storage/maria/ha_maria.cc:
        In clone call, set file->trn if cloned file had this set. This is needed as maria_create_trn_for_mysql() and thus file->trn is never set for cloned table.
        Ensure that file->trn is properly reset after calls to repair/check/zerofill.
        Increment locked table count if file->trn is set (as we decrement this in the unlock call)
      tests/mysql_client_test.c:
        Fixed compiler warnings
      a93dea4f
    • Michael Widenius's avatar
      Fixed wrong AC_INIT · 2446139b
      Michael Widenius authored
      2446139b
    • Michael Widenius's avatar
      Fixed timing issue in test suite · 92eec337
      Michael Widenius authored
      92eec337
    • Michael Widenius's avatar
      Merge of 5.1-release · 2c35f004
      Michael Widenius authored
      2c35f004
    • Michael Widenius's avatar
      Fixed test case and compiler warnings · 9529ee64
      Michael Widenius authored
      
      mysql-test/suite/innodb_plugin/t/innodb-timeout.test:
        More time for test case
      support-files/compiler_warnings.supp:
        Ignore compiler warning
      9529ee64
  5. 05 Aug, 2010 5 commits
    • Michael Widenius's avatar
      Automatic merge · 2c291a72
      Michael Widenius authored
      2c291a72
    • Michael Widenius's avatar
      Remove not used files · dd681d75
      Michael Widenius authored
      Added option: --warning-for-wrong-transaction-id to maria_check
      
      
      mysql-test/r/innodb-use-sys-malloc.result:
        Remove not used files
      mysql-test/t/innodb-use-sys-malloc-master.opt:
        Remove not used files
      storage/maria/ma_recovery.c:
        Added support for --lsn-end
      storage/maria/ma_recovery.h:
        New prototype
      storage/maria/ma_write.c:
        Added logging of KEY_OP_CHECK for all possible keyblock splits.
        (Helps us find error in log file handling)
      storage/maria/maria_chk.c:
        Added option: --warning-for-wrong-transaction-id
        --update-status now resets open count if check succeds
      storage/maria/maria_read_log.c:
        Added option --end-lsn for only appling part of log (good for debugging)
        Changed options to use '-' instead of '_'
      dd681d75
    • Michael Widenius's avatar
      Fixed test failures · 639927e4
      Michael Widenius authored
      mysql-test/suite/funcs_1/r/is_columns_is.result:
        Update after change of comment length
      mysql-test/suite/funcs_1/r/is_engines.result:
        Update after change of comment length
      mysql-test/suite/innodb_plugin/t/disabled.def:
        Disable a test that gives valgrind warnings for xtradb
      mysql-test/suite/innodb_plugin/t/innodb_bug52745.test:
        Test requires persian collation
      639927e4
    • Michael Widenius's avatar
      Merge with 5.1-merge (new XTRADB code updated up to MySQL 5.1.47) · 30f825ad
      Michael Widenius authored
      Fixed tests cases.
      30f825ad
    • Michael Widenius's avatar
      Fixed test failures (bugs in test suite) · 2a133537
      Michael Widenius authored
      
      mysql-test/suite/percona/percona_log_slow_slave_statements.test:
        Replaced 'grep | wc -l' with 'grep -c' as output of wc -l is not portable (for example on Mac)
      mysql-test/suite/percona/percona_slow_query_log-control_global_slow.result:
        Replaced 'grep | wc -l' with 'grep -c' as output of wc -l is not portable (for example on Mac)
      mysql-test/suite/percona/percona_slow_query_log-control_global_slow.test:
        Replaced 'grep | wc -l' with 'grep -c' as output of wc -l is not portable (for example on Mac)
      mysql-test/suite/percona/percona_slow_query_log-log_slow_filter.result:
        Replaced 'grep | wc -l' with 'grep -c' as output of wc -l is not portable (for example on Mac)
      mysql-test/suite/percona/percona_slow_query_log-log_slow_filter.test:
        Replaced 'grep | wc -l' with 'grep -c' as output of wc -l is not portable (for example on Mac)
      mysql-test/suite/percona/percona_slow_query_log-log_slow_verbosity.result:
        Replaced 'grep | wc -l' with 'grep -c' as output of wc -l is not portable (for example on Mac)
      mysql-test/suite/percona/percona_slow_query_log-log_slow_verbosity.test:
        Replaced 'grep | wc -l' with 'grep -c' as output of wc -l is not portable (for example on Mac)
      mysql-test/suite/percona/percona_slow_query_log-long_query_time.result:
        Replaced 'grep | wc -l' with 'grep -c' as output of wc -l is not portable (for example on Mac)
      mysql-test/suite/percona/percona_slow_query_log-long_query_time.test:
        Replaced 'grep | wc -l' with 'grep -c' as output of wc -l is not portable (for example on Mac)
      mysql-test/suite/percona/percona_slow_query_log-microseconds_in_slow_query_log.result:
        Replaced 'grep | wc -l' with 'grep -c' as output of wc -l is not portable (for example on Mac)
      mysql-test/suite/percona/percona_slow_query_log-microseconds_in_slow_query_log.test:
        Replaced 'grep | wc -l' with 'grep -c' as output of wc -l is not portable (for example on Mac)
      mysql-test/suite/percona/percona_slow_query_log-min_examined_row_limit.result:
        Replaced 'grep | wc -l' with 'grep -c' as output of wc -l is not portable (for example on Mac)
      mysql-test/suite/percona/percona_slow_query_log-min_examined_row_limit.test:
        Replaced 'grep | wc -l' with 'grep -c' as output of wc -l is not portable (for example on Mac)
      mysql-test/suite/percona/percona_slow_query_log-use_global_long_query_time.result:
        Replaced 'grep | wc -l' with 'grep -c' as output of wc -l is not portable (for example on Mac)
      mysql-test/suite/percona/percona_slow_query_log-use_global_long_query_time.test:
        Replaced 'grep | wc -l' with 'grep -c' as output of wc -l is not portable (for example on Mac)
      mysql-test/suite/rpl/r/rpl_stm_until.result:
        Updated results
      mysql-test/suite/rpl/t/rpl_stm_until.test:
        Fixed random failure in test suite: master could be reading data from master-bin.00001 at the same time as test suite was changing it.
      2a133537
  6. 04 Aug, 2010 5 commits
    • Michael Widenius's avatar
      Fixed compiler warnings · c60f4de5
      Michael Widenius authored
      Fixed some wrong test cases
      Fixed bug in null handling in XtraDB
      
      
      extra/comp_err.c:
        Fixed compiler warnings
      extra/my_print_defaults.c:
        Fixed compiler warnings
      mysql-test/suite/binlog/t/binlog_killed.test:
        Added support for timeouts
      mysql-test/suite/funcs_1/r/is_columns_is.result:
        Updated results (INNODB_SYS_TABLES had got new column)
      scripts/mysql_install_db.sh:
        Fixed typo
      sql/mysql_priv.h:
        Removed not needed argument for compare_record()
      sql/sql_insert.cc:
        Removed not needed argument for compare_record()
      sql/sql_update.cc:
        Removed not needed argument for compare_record()
        The argument is not needed becasue we copy the full record[0] to record[1] and the comparison should work even if all columns are not read
      sql/table.cc:
        The comparison of rows is independent of HA_PARTIAL_COLUMN_READ
      storage/maria/maria_chk.c:
        Fixed compiler warnings
      storage/maria/maria_read_log.c:
        Fixed compiler warnings
      storage/myisam/myisamchk.c:
        Fixed compiler warnings
      storage/myisam/myisampack.c:
        Fixed compiler warnings
      storage/xtradb/dict/dict0load.c:
        Fixed compiler warnings
      storage/xtradb/row/row0sel.c:
        Fixed null handling in XtraDB. (See comment)
      storage/xtradb/trx/trx0sys.c:
        Fixed compiler warnings
      support-files/compiler_warnings.supp:
        Fixed compiler warnings
      c60f4de5
    • Michael Widenius's avatar
      Fixes bug when we run bcmp() on row when the storage engine hasn't filled in all fields in the row. · c52c6df5
      Michael Widenius authored
      This was triggered by innodb.innodb_multi_update, where we had a static length row without nulls and xtradb didn't fill in the delete-marker byte
      
      
      include/my_bitmap.h:
        Added prototype for bitmap_union_is_set_all()
      mysys/my_bitmap.c:
        Added function to check if union of two bit maps covers all bits.
      sql/mysql_priv.h:
        Updated protype for compare_record()
      sql/sql_insert.cc:
        Send to compare_record() flag if all fields are used.
      sql/sql_select.cc:
        Set share->null_bytes_for_compare.
      sql/sql_update.cc:
        In compare_record() don't use the fast cmp_record() (which is basically memcmp) if we don't know that all fields exists.
        Don't compare the null_bytes if there is no data there.
      sql/table.cc:
        Store in share->null_bytes_for_compare the number of bytes that has null or bit fields (but not delete marker)
        Store in can_cmp_whole_record if we can use memcmp() (assuming all rows are read) to compare rows in compare_record()
      sql/table.h:
        Added two elements in table->share to speed up checking how updated rows can be compared.
      c52c6df5
    • Michael Widenius's avatar
      Fixed some test failures after last push (failing tests and valgrind warnings) · 4fca6351
      Michael Widenius authored
      Added --strace support to mysql-test-run
      
      mysql-test/mysql-test-run.pl:
        Added support for --strace (usefull for example to check how much memory mysqld was using)
      mysql-test/suite/funcs_1/t/is_engines_innodb.test:
        Fixed test case to also work with xtradb
      mysql-test/suite/innodb_plugin/t/innodb.test:
        Don't run if we don't have the used character sets.
      mysql-test/suite/innodb_plugin/t/innodb_mysql.test:
        Don't run if we don't have the used character sets.
      sql/sql_show.cc:
        Extended comment to 160 characters to get full comment from xtradb
      storage/xtradb/handler/ha_innodb.cc:
        Fixed valgrind warning.
      4fca6351
    • unknown's avatar
      e269177b
    • unknown's avatar
      ecb4c858
  7. 03 Aug, 2010 2 commits
    • Michael Widenius's avatar
      Fixes to allow one to compile and test innodb_plugin · 9dc548b3
      Michael Widenius authored
      If one compiles innodb_plugin, then the tests in suite/innodb_plugin will use the plugin. If not and xtradb is used, the tests will use xtradb.
      
      
      
      mysql-test/include/have_innodb_plugin.inc:
        Test both for innodb_plugin and xtradb
      mysql-test/include/have_real_innodb_plugin.inc:
        Test if we are using innodb_plugin (but not xtradb)
      mysql-test/include/have_xtradb.inc:
        Test if xtradb is used
      mysql-test/lib/mtr_cases.pm:
        Enable easy testing of innodb_plugin
      mysql-test/mysql-test-run.pl:
        Added supression for difference between xtradb & innodb_plugin
      mysql-test/suite/innodb_plugin/r/innodb-index-ip.result:
        Tests from innodb-index that gave different results for innodb_plugin and xtradb
      mysql-test/suite/innodb_plugin/r/innodb-index-xb.result:
        Tests from innodb-index that gave different results for innodb_plugin and xtradb
      mysql-test/suite/innodb_plugin/r/innodb-index.result:
        Move tests away that gave different results for innodb_plugin and xtradb
      mysql-test/suite/innodb_plugin/r/innodb-ip.result:
        Tests from innodb-index that gave different results for innodb_plugin and xtradb
      mysql-test/suite/innodb_plugin/r/innodb-xb.result:
        Tests from innodb-index that gave different results for innodb_plugin and xtradb
      mysql-test/suite/innodb_plugin/r/innodb.result:
        Move tests away that gave different results for innodb_plugin and xtradb
      mysql-test/suite/innodb_plugin/r/innodb_bug21704-xb.result:
        Test result differ for xtradb
      mysql-test/suite/innodb_plugin/r/innodb_bug46000.result:
        Remove (not needed) error message not given by MariaDB
      mysql-test/suite/innodb_plugin/r/innodb_bug49164-xb.result:
        Test result differs for xtradb
      mysql-test/suite/innodb_plugin/r/innodb_bug49164.result:
        Update results
      mysql-test/suite/innodb_plugin/r/innodb_bug53591.result:
        Remove (not needed) error message not given by MariaDB
      mysql-test/suite/innodb_plugin/r/innodb_bug54679.result:
        Updated result file
      mysql-test/suite/innodb_plugin/r/innodb_mysql.result:
        Updated result file
      mysql-test/suite/innodb_plugin/t/disabled.def:
        Disable some tests that depends on newer version of XtraDB
      mysql-test/suite/innodb_plugin/t/innodb-index-ip.test:
        Tests from innodb-index that gave different results for innodb_plugin and xtradb
      mysql-test/suite/innodb_plugin/t/innodb-index-xb.test:
        Tests from innodb-index that gave different results for innodb_plugin and xtradb
      mysql-test/suite/innodb_plugin/t/innodb-index.test:
        Move tests away that gave different results for innodb_plugin and xtradb
      mysql-test/suite/innodb_plugin/t/innodb-ip.test:
        Tests from innodb-index that gave different results for innodb_plugin and xtradb
      mysql-test/suite/innodb_plugin/t/innodb-xb.test:
        Tests from innodb-index that gave different results for innodb_plugin and xtradb
      mysql-test/suite/innodb_plugin/t/innodb.test:
        Move tests away that gave different results for innodb_plugin and xtradb
      mysql-test/suite/innodb_plugin/t/innodb_bug21704-xb.test:
        Test result differ for xtradb
      mysql-test/suite/innodb_plugin/t/innodb_bug21704.test:
        Test result differ for xtradb
      mysql-test/suite/innodb_plugin/t/innodb_bug53591.test:
        Test results only makes sence for innodb_plugin (things works ok for xtradb)
      sql/sql_table.cc:
        Don't set HA_CREATE_USED_ROW_FORMAT for create table (only for update_create_info) if ROW_FORMAT is not used.
      storage/innodb_plugin/handler/ha_innodb.cc:
        Fixed wrong error message from innodb.
        This is needed as MariaDB properly handles errors from ha_index_init()
      storage/xtradb/handler/ha_innodb.cc:
        Update base information for XtraDB so that one can use informationschema.plugins to check if one is using XtraDB
      9dc548b3
    • unknown's avatar
      0c6afe17
  8. 02 Aug, 2010 4 commits
    • Michael Widenius's avatar
      Fixed warnings and build failures after last push · 06667c4a
      Michael Widenius authored
      Speed up some PBXT tests by adding begin...commit around creating of testing tables.
      
      include/my_base.h:
        Fixed wrong constant
      mysql-test/mysql-test-run.pl:
        Print MariaDB instead of MySQL
      mysql-test/r/range.result:
        Move test that required partitions to parts.optimizer
      mysql-test/suite/innodb_plugin/t/disabled.def:
        Disable test that causes valgrind warning about not released memory in xtradb
      mysql-test/suite/parts/r/optimizer.result:
        Moved from range.result
      mysql-test/suite/parts/t/optimizer.test:
        Moved from range.test
      mysql-test/suite/pbxt/r/join_nested.result:
        Updated results after optimizer changes
      mysql-test/suite/pbxt/r/renamedb.result:
        Updated test for new error message
      mysql-test/suite/pbxt/t/check.test:
        Speed up test
      mysql-test/suite/pbxt/t/count_distinct2.test:
        Speed up test
      mysql-test/suite/pbxt/t/derived.test:
        Speed up test
      mysql-test/suite/pbxt/t/renamedb.test:
        Updated test for new error message
      mysql-test/suite/rpl/r/rpl_log_pos.result:
        Updated results
      mysql-test/suite/rpl/t/rpl_log_pos.test:
        Update test to read from a position that has 'known wrong' data.
        The orignal test read a timestamp, so the error message could differ between runs.
      mysql-test/suite/rpl/t/rpl_temporary_errors.test:
        Sync to slave to make test predictable
      mysql-test/t/events_time_zone.test:
        Extend wait to make test predictable
      mysql-test/t/range.test:
        Move test that required partitions to parts.optimizer
      sql/sql_list.h:
        Fixed compiler warning
      sql/sql_load.cc:
        buffer was not freed in some error conditions
      tests/mysql_client_test.c:
        Fixed compiler warning
      06667c4a
    • Michael Widenius's avatar
      Merge with MariaDB main · 4348c880
      Michael Widenius authored
      4348c880
    • Michael Widenius's avatar
      Disable some tests that is waiting for next merge with xtradb · 97b4f672
      Michael Widenius authored
      Added 'Aria' as an alias for the Maria storage engine. Real rename is happening in 5.2
      
      sql/handler.cc:
        Added 'Aria' as an alias for the Maria storage engine.
      97b4f672
    • Michael Widenius's avatar
      Merge with MySQL 5.1.49 · e80c6f35
      Michael Widenius authored
      Fixed Bug#52005 'JOIN_TAB->dependent' may be incorrectly propageted for multilevel outer joins' in a better way (patch from Sergey Petrunya)
      e80c6f35
  9. 30 Jul, 2010 1 commit
    • Michael Widenius's avatar
      Fix for LP#602604: RQG: ma_blockrec.c:6187:... · c0fa48c4
      Michael Widenius authored
      Fix for LP#602604: RQG: ma_blockrec.c:6187: _ma_apply_redo_insert_row_head_or_tail: Assertion `0' failed on Maria engine recovery
      More DBUG_PRINT (to simplify future debugging)
      Aria: Added STATE_IN_REPAIR, which is set on start of repair. This allows us to see if 'crashed' flag was set intentionally.
      Aria: Some trivial speedup optimization
      Aria: Better warning if table was marked crashed by unfinnished repair
      
      
      mysql-test/lib/v1/mysql-test-run.pl:
        Fix so one can run RQG
      mysql-test/suite/maria/r/maria-recovery2.result:
        Update for new error message.
      mysys/stacktrace.c:
        Fixed compiler warning
      storage/maria/ha_maria.cc:
        More DBUG_PRINT
        Added STATE_IN_REPAIR flag, which is set on start of repair. This allows us to see if 'crashed' flag was set intentionally.
        Don't log query for dropping temporary table.
      storage/maria/ha_maria.h:
        Added prototype for drop_table()
      storage/maria/ma_blockrec.c:
        More DBUG_PRINT
        Make read_long_data() inline for most cases. (Trivial speedup optimization)
      storage/maria/ma_check.c:
        Better warning if table was marked crashed by unfinnished repair
      storage/maria/ma_open.c:
        More DBUG_PRINT
      storage/maria/ma_recovery.c:
        Give warning if found crashed table.
        Changed warning for tables that can't be opened.
      storage/maria/ma_recovery_util.c:
        Write warnings to DBUG file
      storage/maria/maria_chk.c:
        Added STATE_IN_REPAIR flag, which is set on start of repair. This allows us to see if 'crashed' flag was set intentionally.
      storage/maria/maria_def.h:
        Added maria_mark_in_repair(x)
      storage/maria/maria_read_log.c:
        Added option: --character-sets-dir
      storage/maria/trnman.c:
        By default set min_read_from to max value.
        This allows us to remove TRN:s from rows during recovery to get more space.
        This fixes bug LP#602604: RQG: ma_blockrec.c:6187: _ma_apply_redo_insert_row_head_or_tail: Assertion `0' failed on Maria engine recovery
      c0fa48c4
  10. 24 Jul, 2010 1 commit
  11. 23 Jul, 2010 1 commit
  12. 16 Jul, 2010 2 commits
    • Michael Widenius's avatar
      Fixed wrong error message from federatedx (which could lead to assert in DBUG code) · 11f5be5d
      Michael Widenius authored
      mysql-test/suite/federated/federated_server.result:
        Update to new error message
      mysql-test/suite/federated/federated_server.test:
        Update to new error message
      storage/federatedx/ha_federatedx.cc:
        Return real error code, not 0, as in some cases before.
      11f5be5d
    • Michael Widenius's avatar
      mysql client: Ignore --comments at start of command line. This allows one to... · 77cb9a78
      Michael Widenius authored
      mysql client: Ignore --comments at start of command line. This allows one to more easily run mysqltest tests trough the command line.
      Fixed bug: LP#603026 RQG: pagecache_read: Assertion `pageno < ((1ULL) << 40)' on OPTIMIZE TABLE of a Maria table  
      
      client/mysql.cc:
        Removed Oracle copyright from stdout, as Oracle doesn't have copyright to all code in this file.
        Ignore --comments at start of command line. This allows one to more easily run mysqltest tests trough the command line.
      mysql-test/suite/maria/r/optimize.result:
        Added test for LP#603026
      mysql-test/suite/maria/t/optimize.test:
        Added test for LP#603026
      sql/net_serv.cc:
        Removed DBUG_ASSERT(), as this code can happen during testing.
      storage/maria/ma_check.c:
        Fixed bug: LP#603026 RQG: pagecache_read: Assertion `pageno < ((1ULL) << 40)' on OPTIMIZE TABLE of a Maria table  
        The problem was duplicated memory usage with long packed keys.
      77cb9a78
  13. 09 Jul, 2010 1 commit
  14. 07 Jul, 2010 2 commits
  15. 04 Jul, 2010 1 commit
    • Vasil Dimov's avatar
      Merge mysql-5.1-innodb -> mysql-5.1-security · bfc27995
      Vasil Dimov authored
      Merge up to sunny.bains@oracle.com-20100625081841-ppulnkjk1qlazh82 .
      There are 8 more changesets in mysql-5.1-innodb, but PB2 shows a
      failure for a test added in one of them. If that is resolved quickly
      then those 8 more changesets will be merged too.
      bfc27995
  16. 02 Jul, 2010 4 commits