1. 05 Jun, 2012 1 commit
    • Michael Widenius's avatar
      Fixed build failures found by buildbot · 56ea8e9c
      Michael Widenius authored
      - Added suppression of warnings
      - Fixed some test cases
      
      
      BUILD/FINISH.sh:
        Added AM_EXTRA_MAKEFLAGS
      BUILD/SETUP.sh:
        Added option --extra-makeflags
      client/mysqldump.c:
        Added suppression
      mysql-test/r/mysql.result:
        Updated results
      mysql-test/r/mysql_upgrade.result:
        Updated results
      mysql-test/r/partition_innodb_plugin.result:
        Updated results
      mysql-test/r/partition_open_files_limit.result:
        Updated results
      mysql-test/r/symlink.result:
        Updated results
      mysql-test/suite/innodb/r/innodb-create-options.result:
        Updated results
      mysql-test/suite/innodb/t/innodb-create-options.test:
        Don't print error message (as it's varies on different system)
      mysql-test/t/mysql.test:
        Don't print error message (as it's varies on different system)
      mysql-test/t/mysql_upgrade.test:
        Fixed checking of error number
      mysql-test/t/partition_innodb_plugin.test:
        Don't print error message (as it's varies on different system)
      plugin/semisync/semisync_master.cc:
        Added suppression
      sql/ha_partition.cc:
        Added suppression
      sql/item_subselect.cc:
        Added suppression
      sql/multi_range_read.cc:
        Added suppression
      sql/sql_parse.cc:
        Added suppression
      sql/sql_select.cc:
        Added suppression
      storage/innobase/handler/ha_innodb.cc:
        Removed not used variable
      storage/maria/ma_delete.c:
        Added suppression
      storage/maria/ma_key_recover.c:
        Added suppression
      storage/maria/ma_write.c:
        Added suppression
      strings/ctype-ucs2.c:
        Added suppression
      support-files/compiler_warnings.supp:
        Added suppressions
      unittest/mysys/my_vsnprintf-t.c:
        Fixed test case with %M to also work on Solaris
      56ea8e9c
  2. 04 Jun, 2012 1 commit
  3. 31 May, 2012 2 commits
    • Michael Widenius's avatar
      Increased the version number to 10.0 · 83c02f32
      Michael Widenius authored
      - Fixed code that was not ready for a major version number > 9
      - Fixed test cases that assumed max major version number could be 9
      Updated version number for depricated options (will be removed in a later commit)
      
      VERSION:
        Version number 10.0.0
      client/mysqlbinlog.cc:
        Added support for major version numbers > 9
      cmake/mysql_version.cmake:
        Added support for version numbers that is 0
      mysql-test/r/comments.result:
        Modified test to handle version number 100000
      mysql-test/r/func_system.result:
        Modified test to handle version number 100000
      mysql-test/r/log_state.result:
        Updated depricated error message
      mysql-test/r/sp.result:
        Modified test to handle version number 100000
      mysql-test/r/subselect4.result:
        Updated depricated error message
      mysql-test/r/variables.result:
        Updated depricated error message
      mysql-test/suite/rpl/r/rpl_conditional_comments.result:
        Modified test to handle version number 100000
      mysql-test/suite/rpl/r/rpl_loaddatalocal.result:
        Modified test to handle version number 100000
      mysql-test/suite/rpl/t/rpl_conditional_comments.test:
        Modified test to handle version number 100000
      mysql-test/suite/rpl/t/rpl_loaddatalocal.test:
        Modified test to handle version number 100000
      mysql-test/suite/sys_vars/r/debug_basic.result:
        Updated depricated error message
      mysql-test/suite/sys_vars/r/engine_condition_pushdown_basic.result:
        Updated depricated error message
      mysql-test/suite/sys_vars/r/log_basic.result:
        Updated depricated error message
      mysql-test/suite/sys_vars/r/log_slow_queries_basic.result:
        Updated depricated error message
      mysql-test/suite/sys_vars/r/multi_range_count_basic.result:
        Updated depricated error message
      mysql-test/suite/sys_vars/r/rpl_recovery_rank_basic.result:
        Updated depricated error message
      mysql-test/suite/sys_vars/r/sql_big_selects_func.result:
        Updated depricated error message
      mysql-test/suite/sys_vars/r/sql_max_join_size_basic.result:
        Updated depricated error message
      mysql-test/suite/sys_vars/r/sql_max_join_size_func.result:
        Updated depricated error message
      mysql-test/t/comments.test:
        Modified test to handle version number 100000
      mysql-test/t/file_contents.test:
        Modified test to handle version number 100000
      mysql-test/t/func_system.test:
        Modified test to handle version number 100000
      mysql-test/t/parser_not_embedded.test:
        Modified test to handle version number 100000
      mysql-test/t/sp.test:
        Modified test to handle version number 100000
      sql/mysqld.cc:
        Updated version number for depricated options (will be removed in a later commit)
      sql/slave.cc:
        Modified test to handle version number 100000
        Better error messages
      sql/sql_lex.cc:
        Modified test to handle version number 100000 in comment syntax
      sql/sys_vars.cc:
        Updated version number for depricated options (will be removed in a later commit)
      83c02f32
    • Michael Widenius's avatar
      Merge with 5.5 · 59b4ee14
      Michael Widenius authored
      59b4ee14
  4. 30 May, 2012 2 commits
  5. 29 May, 2012 3 commits
    • Michael Widenius's avatar
      Added text for errno in error messages by: · aa81e025
      Michael Widenius authored
      - Adding %M my_sprintf() modifier that prints error number - system-error-text
      - Modified mysys, mysql_client and SQL error messages to use %M instead of %d
      - Added my_strerror()
      Updated handler errors to 5.6 error numbers
      Updated text for a few error messages (to match 5.6)
      Increased length of command name in error output
      
      extra/comp_err.c:
        Added support for %M
      include/my_base.h:
        Updated handler errors to 5.6 error numbers
      include/my_sys.h:
        Added my_strerror()
      libmysql/errmsg.c:
        Updated error messages to use %M
      mysql-test/r/errors.result:
        Updated result as error message have changed
      mysql-test/r/innodb_mysql_sync.result:
        Updated result with text for errno
      mysql-test/r/myisam-system.result:
        Updated result with text for errno
      mysql-test/r/myisam.result:
        Updated result as error message have changed
      mysql-test/r/myisampack.result:
        Updated result with text for errno
      mysql-test/r/mysql.result:
        Updated result with text for errno
      mysql-test/r/mysql_upgrade.result:
        Updated result with text for errno
      mysql-test/r/partition_datatype.result:
        Updated result as error message have changed
      mysql-test/r/partition_innodb_plugin.result:
        Updated result with text for errno
      mysql-test/r/ps_1general.result:
        Updated result with text for errno
      mysql-test/r/trigger.result:
        Updated result with text for errno
      mysql-test/r/type_bit.result:
        Updated result as error message have changed
      mysql-test/r/type_bit_innodb.result:
        Updated result as error message have changed
      mysql-test/r/type_blob.result:
        Updated result as error message have changed
      mysql-test/suite/archive/archive.result:
        Updated result with text for errno
      mysql-test/suite/binlog/r/binlog_index.result:
        Updated result with text for errno
      mysql-test/suite/binlog/r/binlog_ioerr.result:
        Updated result with text for errno
      mysql-test/suite/csv/csv.result:
        Updated result with text for errno
      mysql-test/suite/federated/federated_bug_35333.result:
        Updated result with text for errno
      mysql-test/suite/innodb/r/innodb-create-options.result:
        Updated result with text for errno
      mysql-test/suite/innodb/r/innodb-index.result:
        Updated result with text for errno
      mysql-test/suite/innodb/r/innodb-zip.result:
        Updated result as error message have changed
      mysql-test/suite/innodb/r/innodb.result:
        Updated result with text for errno
      mysql-test/suite/innodb/r/innodb_bug21704.result:
        Updated result with text for errno
      mysql-test/suite/innodb/r/innodb_bug46000.result:
        Updated result with text for errno
      mysql-test/suite/innodb/r/innodb_bug53591.result:
        Updated result as error message have changed
      mysql-test/suite/innodb/r/innodb_corrupt_bit.result:
        New error numbers
      mysql-test/suite/innodb/r/innodb_prefix_index_liftedlimit.result:
        Updated result as error message have changed
      mysql-test/suite/innodb/t/innodb-create-options.test:
        Added regexp to avoid system error text
      mysql-test/suite/innodb/t/innodb-zip.test:
        Added regexp to avoid system error text
      mysql-test/suite/maria/maria-recovery2.result:
        Updated supression rule
      mysql-test/suite/maria/maria-recovery2.test:
        Updated supression rule
      mysql-test/suite/maria/maria.result:
        Updated result as error message have changed
      mysql-test/suite/parts/r/partition_bit_innodb.result:
        
        Updated result as error message have changed
      mysql-test/suite/parts/r/partition_bit_myisam.result:
        
        Updated result as error message have changed
      mysql-test/suite/percona/percona_innodb_fake_changes.result:
        Updated result with text for errno
      mysql-test/suite/perfschema/r/dml_cond_instances.result:
        Updated result as error message have changed
      mysql-test/suite/perfschema/r/dml_events_waits_current.result:
        Updated result as error message have changed
      mysql-test/suite/perfschema/r/dml_events_waits_history.result:
        Updated result as error message have changed
      mysql-test/suite/perfschema/r/dml_events_waits_history_long.result:
        Updated result as error message have changed
      mysql-test/suite/perfschema/r/dml_ews_by_instance.result:
        Updated result as error message have changed
      mysql-test/suite/perfschema/r/dml_ews_by_thread_by_event_name.result:
        Updated result as error message have changed
      mysql-test/suite/perfschema/r/dml_ews_global_by_event_name.result:
        Updated result as error message have changed
      mysql-test/suite/perfschema/r/dml_file_instances.result:
        Updated result as error message have changed
      mysql-test/suite/perfschema/r/dml_file_summary_by_event_name.result:
        Updated result as error message have changed
      mysql-test/suite/perfschema/r/dml_file_summary_by_instance.result:
        Updated result as error message have changed
      mysql-test/suite/perfschema/r/dml_mutex_instances.result:
        Updated result as error message have changed
      mysql-test/suite/perfschema/r/dml_performance_timers.result:
        Updated result as error message have changed
      mysql-test/suite/perfschema/r/dml_rwlock_instances.result:
        Updated result as error message have changed
      mysql-test/suite/perfschema/r/dml_threads.result:
        Updated result as error message have changed
      mysql-test/suite/perfschema/r/misc.result:
        Updated result with text for errno
      mysql-test/suite/perfschema/r/privilege.result:
        Updated result with text for errno
      mysql-test/suite/rpl/r/rpl_EE_err.result:
        Updated result with text for errno
      mysql-test/suite/rpl/r/rpl_binlog_errors.result:
        Updated result with text for errno
      mysql-test/suite/rpl/r/rpl_drop_db.result:
        Updated result with text for errno
      mysys/errors.c:
        Updated error messages to use %M
        Changed all errors to use Errcode: consistenly
      mysys/my_handler_errors.h:
        Updated handler errors to 5.6 error numbers
      sql/share/errmsg-utf8.txt:
        Updated error messages to use %M
      sql/sys_vars.cc:
        Added error number to ER_EVENT_SET_VAR_ERROR
      strings/my_vsnprintf.c:
        Added %M my_sprintf() modifier that prints error number - system-error-text
        Simplify code
        Movied common code to function
        Removed some casts that was not necessary when reading integer/unsigned int stored in longlong
        Added my_strerror()
      unittest/mysys/my_vsnprintf-t.c:
        Added testing of %M
      aa81e025
    • Sergei Golubchik's avatar
      RPM packages should not obsolete themselves. · 32addeaf
      Sergei Golubchik authored
      Otherwise yum on fedora will not install them
      (rpm will, yum on centos and rhel will).
      32addeaf
    • Sergei Golubchik's avatar
      MDEV-293 5.5 RPMs for RHEL6/CentOS6 · 6cfb62b7
      Sergei Golubchik authored
      Build MariaDB-compat rpm by repackaging files from MariaDB-shared-5.3.*.rpm
      Or RHEL6/CentOS6 make all other MariaDB rpms depend on MariaDB-compat.
      6cfb62b7
  6. 26 May, 2012 1 commit
  7. 25 May, 2012 2 commits
  8. 23 May, 2012 1 commit
  9. 22 May, 2012 1 commit
  10. 18 May, 2012 6 commits
    • Michael Widenius's avatar
      Automatic merge · 3f4ef592
      Michael Widenius authored
      3f4ef592
    • Michael Widenius's avatar
      Fixed compile warnings · 960f6600
      Michael Widenius authored
      Fixed some mtr test problems
      
      
      
      dbug/tests.c:
        Fixed compiler warnings
      mysql-test/r/handlersocket.result:
        Fixed that plugin_license is written
      mysql-test/suite/innodb/t/innodb_bug60196.test:
        Force sorted results as it was sometimes different on windows
      mysql-test/suite/rpl/t/rpl_heartbeat_basic.test:
        Prolong test as this failed on windows
      mysql-test/t/handlersocket.test:
        Fixed that plugin_license is written
      plugin/handler_socket/handlersocket/handlersocket.cpp:
        Use maria_declare_plugin
      plugin/handler_socket/handlersocket/mysql_incl.hpp:
        Fixed compiler warning
      plugin/handler_socket/libhsclient/auto_addrinfo.hpp:
        Fixed compiler warning
      sql/handler.h:
        Fixed typo
      sql/sql_plugin.cc:
        Fixed bug that caused plugin library name twice in error message
      storage/maria/ma_checkpoint.c:
        Fixed compiler warning
      storage/maria/ma_loghandler.c:
        Fixed compiler warning
      unittest/mysys/base64-t.c:
        Fixed compiler warning
      unittest/mysys/bitmap-t.c:
        Fixed compiler warning
      unittest/mysys/my_malloc-t.c:
        Fixed compiler warning
      960f6600
    • Michael Widenius's avatar
      Fixed lp:997460 Truncate table on partitioned Aria table fails with ER_ILLEGAL_HA · d4d3ca20
      Michael Widenius authored
      Fix is done by doing an autocommit in truncate table inside Aria
      
      storage/maria/ha_maria.cc:
        Force a commit for TRUNCATE TABLE inside lock tables
        Check that we don't call TRUNCATE with concurrent inserts going on.
        Make ha_maria::implict_commit faster when we don't have Aria tables in the transaction.
        (Most of the patch is just re-indentation because I removed an if level)
      d4d3ca20
    • Vladislav Vaintroub's avatar
      32498ead
    • Igor Babaev's avatar
      Asked for sorted result from a query. · 277f7a92
      Igor Babaev authored
      277f7a92
    • Igor Babaev's avatar
  11. 17 May, 2012 4 commits
  12. 16 May, 2012 4 commits
    • Michael Widenius's avatar
      More fixes for LOCK TABLE and REPAIR/FLUSH · b1485a47
      Michael Widenius authored
      Changed HA_EXTRA_NORMAL to HA_EXTRA_NOT_USED (more clean)
      
      mysql-test/suite/maria/lock.result:
        More extensive tests of LOCK TABLE with FLUSH and REPAIR
      mysql-test/suite/maria/lock.test:
        More extensive tests of LOCK TABLE with FLUSH and REPAIR
      sql/sql_admin.cc:
        Fix that REPAIR TABLE ... USE_FRM works with LOCK TABLES
      sql/sql_base.cc:
        Ensure that transactions are closed in ARIA when doing flush
        HA_EXTRA_NORMAL -> HA_EXTRA_NOT_USED
        Don't call extra many times for a table in close_all_tables_for_name()
        Added test if table_list->table as this can happen in error situations
      sql/sql_partition.cc:
        HA_EXTRA_NORMAL -> HA_EXTRA_NOT_USED
      sql/sql_reload.cc:
        Fixed comment
      sql/sql_table.cc:
        HA_EXTRA_NORMAL -> HA_EXTRA_NOT_USED
      sql/sql_trigger.cc:
        HA_EXTRA_NORMAL -> HA_EXTRA_NOT_USED
      sql/sql_truncate.cc:
        HA_EXTRA_FORCE_REOPEN -> HA_EXTRA_PREPARE_FOR_DROP for truncate, as this speeds up truncate by not having to flush the cache to disk.
      b1485a47
    • Michael Widenius's avatar
      Fixed LP:990187 Assertion `share->reopen == 1' failed at maria_extra on ADD PARTITION · 26cc22f3
      Michael Widenius authored
      
      mysql-test/suite/maria/maria-partitioning.result:
        New test case
      mysql-test/suite/maria/maria-partitioning.test:
        New test case
      sql/sql_base.cc:
        Ignore HA_EXTRA_NORMAL for wait_while_table_is_used()
        More DBUG
      sql/sql_partition.cc:
        Don't use HA_EXTRA_FORCE_REOPEN for wait_while_table_is_used() as the table is opened multiple times (in prep_alter_part_table)
        This fixes the assert in Aria where we check if table is opened multiple times if HA_EXTRA_FORCE_REOPEN is issued
      26cc22f3
    • Michael Widenius's avatar
      Moved maria tests to suite/maria · c39da19c
      Michael Widenius authored
      c39da19c
    • Michael Widenius's avatar
      Fixed bug LP:973039 - Assertion `share->in_trans == 0' failed in maria_close... · 6d8e329c
      Michael Widenius authored
      Fixed bug LP:973039 - Assertion `share->in_trans == 0' failed in maria_close on DROP TABLE under LOCK
      - 5.5 was missing calls to ha_extra(HA_PREPARE_FOR_DROP | HA_PREPARE_FOR_RENAME);  Lost in merge 5.3 -> 5.5
      
      
      sql/sql_admin.cc:
        Updated arguments for close_all_tables_for_name
      sql/sql_base.h:
        Updated arguments for close_all_tables_for_name
      sql/sql_partition.cc:
        Updated arguments for close_all_tables_for_name
      sql/sql_table.cc:
        Updated arguments for close_all_tables_for_name
        Removed test of kill, as we have already called 'ha_extra(HA_PREPARE_FOR_DROP)' and the table may be inconsistent.
      sql/sql_trigger.cc:
        Updated arguments for close_all_tables_for_name
      sql/sql_truncate.cc:
        For truncate that is done with drop + recreate, signal that the table will be dropped.
      6d8e329c
  13. 15 May, 2012 1 commit
  14. 11 May, 2012 1 commit
  15. 21 May, 2012 2 commits
  16. 20 May, 2012 1 commit
  17. 18 May, 2012 4 commits
  18. 17 May, 2012 3 commits