- developers - lists.mariadb.org

[Maria-developers] [Branch ~maria-captains/maria/5.1] Rev 2771: Merge MySQL 5.1.41 into MariaDB trunk, including a number of after-merge fixes.
by noreply＠launchpad.net 02 Dec '09

02 Dec '09

Merge authors: <Dao-Gang.Qu(a)sun.com> <Li-Bing.Song(a)sun.com> Alexander Barkov <bar(a)mysql.com> Alexander Nozdrin <alik(a)sun.com> Alexey Botchkov <holyfoot(a)mysql.com>... ------------------------------------------------------------ revno: 2771 [merge] committer: knielsen(a)knielsen-hq.org branch nick: work-5.1 timestamp: Mon 2009-11-30 22:37:27 +0100 message: Merge MySQL 5.1.41 into MariaDB trunk, including a number of after-merge fixes. Also merge charset patch. removed: mysql-test/include/have_dynamic_loading.inc mysys/mf_strip.c storage/innodb_plugin/README storage/innodb_plugin/handler/handler0vars.h storage/innodb_plugin/handler/win_delay_loader.cc storage/innodb_plugin/win-plugin/ storage/innodb_plugin/win-plugin/README storage/innodb_plugin/win-plugin/win-plugin.diff added: mysql-test/extra/binlog_tests/binlog_failure_mixing_engines.test mysql-test/extra/rpl_tests/rpl_auto_increment_insert_view.test mysql-test/extra/rpl_tests/rpl_auto_increment_invoke_trigger.test mysql-test/extra/rpl_tests/rpl_autoinc_func_invokes_trigger.test mysql-test/include/have_case_insensitive_fs.inc mysql-test/include/have_debug_sync.inc mysql-test/include/have_dynamic_loading.inc mysql-test/include/have_mysql_upgrade.inc mysql-test/include/have_not_innodb_plugin.inc mysql-test/include/not_windows_embedded.inc mysql-test/lib/v1/incompatible.tests mysql-test/r/bug46760.result mysql-test/r/case_insensitive_fs.require mysql-test/r/debug_sync.result mysql-test/r/grant_lowercase_fs.result mysql-test/r/have_debug_sync.require mysql-test/r/innodb_bug44369.result mysql-test/r/innodb_bug46000.result mysql-test/r/innodb_bug47777.result mysql-test/r/locale.result mysql-test/r/lowercase_mixed_tmpdir_innodb.result mysql-test/r/not_true.require mysql-test/r/partition_innodb_builtin.result mysql-test/r/partition_innodb_plugin.result mysql-test/r/partition_open_files_limit.result mysql-test/r/sp-bugs.result mysql-test/r/subselect4.result mysql-test/std_data/binlog_transaction.000001 mysql-test/std_data/latin1.xml mysql-test/suite/binlog/r/binlog_delete_and_flush_index.result mysql-test/suite/binlog/r/binlog_mixed_failure_mixing_engines.result mysql-test/suite/binlog/r/binlog_row_failure_mixing_engines.result mysql-test/suite/binlog/r/binlog_row_mysqlbinlog_verbose.result mysql-test/suite/binlog/r/binlog_stm_do_db.result mysql-test/suite/binlog/std_data/update-full-row.binlog mysql-test/suite/binlog/std_data/update-partial-row.binlog mysql-test/suite/binlog/std_data/write-full-row.binlog mysql-test/suite/binlog/std_data/write-partial-row.binlog mysql-test/suite/binlog/t/binlog_delete_and_flush_index.test mysql-test/suite/binlog/t/binlog_mixed_failure_mixing_engines.test mysql-test/suite/binlog/t/binlog_row_failure_mixing_engines.test mysql-test/suite/binlog/t/binlog_row_mysqlbinlog_verbose.test mysql-test/suite/binlog/t/binlog_stm_do_db-master.opt mysql-test/suite/binlog/t/binlog_stm_do_db.test mysql-test/suite/federated/federated_debug-master.opt mysql-test/suite/federated/federated_debug.result mysql-test/suite/federated/federated_debug.test mysql-test/suite/innodb/r/innodb-consistent.result mysql-test/suite/innodb/r/innodb_bug44571.result mysql-test/suite/innodb/t/innodb-consistent-master.opt mysql-test/suite/innodb/t/innodb-consistent.test mysql-test/suite/innodb/t/innodb_bug44571.test mysql-test/suite/rpl/r/rpl_auto_increment_update_failure.result mysql-test/suite/rpl/r/rpl_mysql_upgrade.result mysql-test/suite/rpl/r/rpl_row_disabled_slave_key.result mysql-test/suite/rpl/t/rpl_auto_increment_update_failure.test mysql-test/suite/rpl/t/rpl_get_master_version_and_clock-slave.opt mysql-test/suite/rpl/t/rpl_mysql_upgrade.test mysql-test/suite/rpl/t/rpl_row_disabled_slave_key.test mysql-test/t/bug46760-master.opt mysql-test/t/bug46760.test mysql-test/t/debug_sync.test mysql-test/t/grant_lowercase_fs.test mysql-test/t/innodb_bug44369.test mysql-test/t/innodb_bug46000.test mysql-test/t/innodb_bug47777.test mysql-test/t/locale.test mysql-test/t/lowercase_mixed_tmpdir_innodb-master.opt mysql-test/t/lowercase_mixed_tmpdir_innodb-master.sh mysql-test/t/lowercase_mixed_tmpdir_innodb.test mysql-test/t/partition_innodb_builtin.test mysql-test/t/partition_innodb_plugin.test mysql-test/t/partition_open_files_limit-master.opt mysql-test/t/partition_open_files_limit.test mysql-test/t/sp-bugs.test mysql-test/t/status-master.opt mysql-test/t/subselect4.test sql/debug_sync.cc sql/debug_sync.h storage/innodb_plugin/mysql-test/innodb-consistent-master.opt storage/innodb_plugin/mysql-test/innodb-consistent.result storage/innodb_plugin/mysql-test/innodb-consistent.test storage/innodb_plugin/mysql-test/innodb_bug44369.result storage/innodb_plugin/mysql-test/innodb_bug44369.test storage/innodb_plugin/mysql-test/innodb_bug44571.result storage/innodb_plugin/mysql-test/innodb_bug44571.test storage/innodb_plugin/mysql-test/innodb_bug46000.result storage/innodb_plugin/mysql-test/innodb_bug46000.test storage/innodb_plugin/revert_gen.sh storage/innodb_plugin/scripts/export.sh storage/innodb_plugin/ut/ut0auxconf_have_gcc_atomics.c renamed: mysql-test/r/bug40113.result => mysql-test/r/innodb_lock_wait_timeout_1.result mysql-test/t/bug40113-master.opt => mysql-test/t/innodb_lock_wait_timeout_1-master.opt mysql-test/t/bug40113.test => mysql-test/t/innodb_lock_wait_timeout_1.test modified: .bzrignore CMakeLists.txt Makefile.am client/mysql.cc client/mysql_upgrade.c client/mysqlbinlog.cc client/mysqlcheck.c client/mysqlimport.c client/mysqlslap.c client/mysqltest.cc cmd-line-utils/readline/config_readline.h cmd-line-utils/readline/display.c configure.in extra/yassl/include/yassl_int.hpp extra/yassl/taocrypt/src/random.cpp include/m_ctype.h include/my_dbug.h include/my_sys.h include/myisamchk.h include/mysql.h include/mysql.h.pp include/violite.h libmysql/libmysql.c libmysql/libmysql.def libmysqld/CMakeLists.txt libmysqld/Makefile.am libmysqld/lib_sql.cc libmysqld/libmysqld.c libmysqld/libmysqld.def mysql-test/collections/README.experimental mysql-test/collections/default.experimental mysql-test/extra/binlog_tests/binlog.test mysql-test/extra/binlog_tests/drop_temp_table.test mysql-test/extra/rpl_tests/rpl_auto_increment.test mysql-test/extra/rpl_tests/rpl_extraSlave_Col.test mysql-test/extra/rpl_tests/rpl_failed_optimize.test mysql-test/extra/rpl_tests/rpl_loaddata.test mysql-test/extra/rpl_tests/rpl_row_sp006.test mysql-test/extra/rpl_tests/rpl_stm_000001.test mysql-test/include/check-warnings.test mysql-test/include/concurrent.inc mysql-test/include/have_example_plugin.inc mysql-test/include/have_simple_parser.inc mysql-test/include/have_udf.inc mysql-test/include/mix1.inc mysql-test/include/mtr_warnings.sql mysql-test/lib/My/ConfigFactory.pm mysql-test/lib/My/Platform.pm mysql-test/lib/My/SafeProcess/safe_kill_win.cc mysql-test/lib/My/SafeProcess/safe_process_win.cc mysql-test/lib/mtr_cases.pm mysql-test/lib/mtr_report.pm mysql-test/lib/v1/mtr_cases.pl mysql-test/mysql-stress-test.pl mysql-test/mysql-test-run.pl mysql-test/r/almost_full.result mysql-test/r/alter_table.result mysql-test/r/analyse.result mysql-test/r/archive.result mysql-test/r/bug46080.result mysql-test/r/create.result mysql-test/r/ctype_ldml.result mysql-test/r/ctype_uca.result mysql-test/r/delete.result mysql-test/r/distinct.result mysql-test/r/explain.result mysql-test/r/func_group.result mysql-test/r/func_in.result mysql-test/r/func_str.result mysql-test/r/gis-rtree.result mysql-test/r/gis.result mysql-test/r/grant.result mysql-test/r/grant3.result mysql-test/r/group_min_max.result mysql-test/r/information_schema_db.result mysql-test/r/innodb-autoinc.result mysql-test/r/innodb-index.result mysql-test/r/innodb_file_format.result mysql-test/r/innodb_mysql.result mysql-test/r/insert_select.result mysql-test/r/join.result mysql-test/r/lowercase_fs_off.result mysql-test/r/lowercase_table3.result mysql-test/r/myisam.result mysql-test/r/myisam_crash_before_flush_keys.result mysql-test/r/mysqlbinlog.result mysql-test/r/mysqltest.result mysql-test/r/olap.result mysql-test/r/order_by.result mysql-test/r/partition.result mysql-test/r/partition_csv.result mysql-test/r/partition_innodb.result mysql-test/r/partition_pruning.result mysql-test/r/ps_grant.result mysql-test/r/query_cache.result mysql-test/r/range.result mysql-test/r/select.result mysql-test/r/sp-error.result mysql-test/r/sp.result mysql-test/r/subselect.result mysql-test/r/subselect3.result mysql-test/r/system_mysql_db.result mysql-test/r/trigger_notembedded.result mysql-test/r/type_bit.result mysql-test/r/type_newdecimal.result mysql-test/r/udf.result mysql-test/r/update.result mysql-test/r/upgrade.result mysql-test/r/view_grant.result mysql-test/r/warnings.result mysql-test/r/windows.result mysql-test/r/xa.result mysql-test/std_data/Index.xml mysql-test/suite/binlog/r/binlog_killed_simulate.result mysql-test/suite/binlog/r/binlog_row_binlog.result mysql-test/suite/binlog/r/binlog_row_drop_tmp_tbl.result mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result mysql-test/suite/binlog/r/binlog_stm_binlog.result mysql-test/suite/binlog/r/binlog_stm_blackhole.result mysql-test/suite/binlog/r/binlog_stm_drop_tmp_tbl.result mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result mysql-test/suite/binlog/t/binlog_row_mysqlbinlog_db_filter.test mysql-test/suite/binlog/t/binlog_stm_unsafe_warning.test mysql-test/suite/federated/my.cnf mysql-test/suite/funcs_1/r/is_columns_mysql.result mysql-test/suite/funcs_1/r/is_statistics.result mysql-test/suite/innodb/r/innodb-zip.result mysql-test/suite/innodb/t/innodb-zip.test mysql-test/suite/innodb/t/innodb_information_schema.test mysql-test/suite/parts/inc/partition_auto_increment.inc mysql-test/suite/parts/r/partition_auto_increment_innodb.result mysql-test/suite/parts/r/partition_auto_increment_maria.result mysql-test/suite/parts/r/partition_auto_increment_memory.result mysql-test/suite/parts/r/partition_auto_increment_myisam.result mysql-test/suite/parts/r/partition_auto_increment_ndb.result mysql-test/suite/parts/r/partition_recover_myisam.result mysql-test/suite/parts/t/partition_auto_increment_archive.test mysql-test/suite/parts/t/partition_auto_increment_blackhole.test mysql-test/suite/parts/t/partition_recover_myisam.test mysql-test/suite/pbxt/r/func_group.result mysql-test/suite/pbxt/r/grant.result mysql-test/suite/pbxt/r/group_min_max.result mysql-test/suite/pbxt/r/join_nested.result mysql-test/suite/pbxt/r/negation_elimination.result mysql-test/suite/pbxt/r/ps_grant.result mysql-test/suite/pbxt/r/skip_grants.result mysql-test/suite/pbxt/r/subselect.result mysql-test/suite/pbxt/r/view_grant.result mysql-test/suite/pbxt/t/grant.test mysql-test/suite/pbxt/t/ps_grant.test mysql-test/suite/pbxt/t/subselect.test mysql-test/suite/rpl/r/rpl_auto_increment.result mysql-test/suite/rpl/r/rpl_bug33931.result mysql-test/suite/rpl/r/rpl_do_grant.result mysql-test/suite/rpl/r/rpl_extraCol_innodb.result mysql-test/suite/rpl/r/rpl_extraCol_myisam.result mysql-test/suite/rpl/r/rpl_get_master_version_and_clock.result mysql-test/suite/rpl/r/rpl_idempotency.result mysql-test/suite/rpl/r/rpl_init_slave_errors.result mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result mysql-test/suite/rpl/r/rpl_loaddata.result mysql-test/suite/rpl/r/rpl_loaddata_fatal.result mysql-test/suite/rpl/r/rpl_loaddata_map.result mysql-test/suite/rpl/r/rpl_loaddatalocal.result mysql-test/suite/rpl/r/rpl_log_pos.result mysql-test/suite/rpl/r/rpl_packet.result mysql-test/suite/rpl/r/rpl_row_create_table.result mysql-test/suite/rpl/r/rpl_row_sp006_InnoDB.result mysql-test/suite/rpl/r/rpl_slave_load_remove_tmpfile.result mysql-test/suite/rpl/r/rpl_stm_log.result mysql-test/suite/rpl/r/rpl_temporary_errors.result mysql-test/suite/rpl/t/disabled.def mysql-test/suite/rpl/t/rpl_bug33931.test mysql-test/suite/rpl/t/rpl_do_grant.test mysql-test/suite/rpl/t/rpl_drop_temp.test mysql-test/suite/rpl/t/rpl_err_ignoredtable.test mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test mysql-test/suite/rpl/t/rpl_idempotency.test mysql-test/suite/rpl/t/rpl_init_slave_errors.test mysql-test/suite/rpl/t/rpl_loaddatalocal.test mysql-test/suite/rpl/t/rpl_log_pos.test mysql-test/suite/rpl/t/rpl_packet.test mysql-test/suite/rpl/t/rpl_slave_load_remove_tmpfile.test mysql-test/suite/rpl/t/rpl_temporary_errors.test mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_simplex.result mysql-test/suite/rpl_ndb/r/rpl_ndb_extraCol.result mysql-test/suite/rpl_ndb/r/rpl_ndb_sp006.result mysql-test/suite/rpl_ndb/t/rpl_ndb_circular.test mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_simplex.test mysql-test/t/almost_full.test mysql-test/t/alter_table.test mysql-test/t/analyse.test mysql-test/t/archive.test mysql-test/t/bug46080.test mysql-test/t/create.test mysql-test/t/ctype_ldml.test mysql-test/t/ctype_uca.test mysql-test/t/delete.test mysql-test/t/disabled.def mysql-test/t/distinct.test mysql-test/t/explain.test mysql-test/t/flush_read_lock_kill.test mysql-test/t/func_group.test mysql-test/t/func_in.test mysql-test/t/func_str.test mysql-test/t/gis-rtree.test mysql-test/t/gis.test mysql-test/t/grant3.test mysql-test/t/information_schema_db.test mysql-test/t/innodb-autoinc.test mysql-test/t/innodb-index.test mysql-test/t/innodb_bug39438.test mysql-test/t/innodb_file_format.test mysql-test/t/innodb_mysql.test mysql-test/t/insert_select.test mysql-test/t/join.test mysql-test/t/kill.test mysql-test/t/lowercase_fs_off.test mysql-test/t/lowercase_table3.test mysql-test/t/myisam-system.test mysql-test/t/myisam.test mysql-test/t/myisam_crash_before_flush_keys.test mysql-test/t/mysqlbinlog.test mysql-test/t/mysqltest.test mysql-test/t/named_pipe.test mysql-test/t/olap.test mysql-test/t/order_by.test mysql-test/t/partition.test mysql-test/t/partition_csv.test mysql-test/t/partition_innodb.test mysql-test/t/plugin.test mysql-test/t/plugin_load.test mysql-test/t/ps_not_windows.test mysql-test/t/query_cache.test mysql-test/t/range.test mysql-test/t/select.test mysql-test/t/sp-error.test mysql-test/t/sp.test mysql-test/t/subselect.test mysql-test/t/subselect3.test mysql-test/t/type_bit.test mysql-test/t/type_newdecimal.test mysql-test/t/udf.test mysql-test/t/update.test mysql-test/t/upgrade.test mysql-test/t/view_grant.test mysql-test/t/warnings.test mysql-test/t/windows.test mysql-test/t/xa.test mysql-test/valgrind.supp mysys/CMakeLists.txt mysys/Makefile.am mysys/charset-def.c mysys/hash.c mysys/mf_keycache.c mysys/my_copy.c mysys/my_getopt.c mysys/my_largepage.c mysys/my_static.c mysys/my_thr_init.c mysys/my_wincond.c mysys/thr_lock.c mysys/typelib.c regex/CMakeLists.txt scripts/make_win_bin_dist scripts/mysql_system_tables.sql scripts/mysql_system_tables_fix.sql sql-common/client.c sql-common/my_time.c sql/CMakeLists.txt sql/Makefile.am sql/event_data_objects.cc sql/events.cc sql/field.cc sql/field.h sql/ha_ndbcluster.cc sql/ha_ndbcluster_binlog.cc sql/ha_partition.cc sql/ha_partition.h sql/handler.cc sql/handler.h sql/item.cc sql/item.h sql/item_cmpfunc.cc sql/item_cmpfunc.h sql/item_func.cc sql/item_func.h sql/item_geofunc.cc sql/item_strfunc.cc sql/item_subselect.cc sql/item_sum.cc sql/item_timefunc.cc sql/item_xmlfunc.cc sql/log.cc sql/log_event.cc sql/log_event.h sql/log_event_old.cc sql/my_decimal.h sql/mysql_priv.h sql/mysqld.cc sql/opt_range.cc sql/opt_sum.cc sql/partition_info.cc sql/records.cc sql/repl_failsafe.cc sql/rpl_filter.cc sql/set_var.cc sql/set_var.h sql/share/errmsg.txt sql/slave.cc sql/slave.h sql/sp.cc sql/sp_head.cc sql/sql_acl.cc sql/sql_base.cc sql/sql_binlog.cc sql/sql_cache.cc sql/sql_class.cc sql/sql_class.h sql/sql_db.cc sql/sql_delete.cc sql/sql_handler.cc sql/sql_insert.cc sql/sql_lex.h sql/sql_load.cc sql/sql_locale.cc sql/sql_parse.cc sql/sql_partition.cc sql/sql_plugin.cc sql/sql_prepare.cc sql/sql_rename.cc sql/sql_repl.cc sql/sql_select.cc sql/sql_select.h sql/sql_show.cc sql/sql_table.cc sql/sql_tablespace.cc sql/sql_trigger.cc sql/sql_udf.cc sql/sql_update.cc sql/sql_view.cc sql/sql_yacc.yy sql/structs.h sql/table.cc sql/table.h sql/time.cc sql/udf_example.c sql/unireg.cc storage/archive/ha_archive.cc storage/blackhole/ha_blackhole.cc storage/csv/ha_tina.cc storage/federatedx/ha_federatedx.cc storage/heap/hp_write.c storage/innobase/dict/dict0dict.c storage/innobase/handler/ha_innodb.cc storage/innobase/handler/ha_innodb.h storage/innobase/os/os0proc.c storage/innobase/row/row0mysql.c storage/innodb_plugin/CMakeLists.txt storage/innodb_plugin/ChangeLog storage/innodb_plugin/Makefile.am storage/innodb_plugin/btr/btr0btr.c storage/innodb_plugin/btr/btr0sea.c storage/innodb_plugin/buf/buf0buf.c storage/innodb_plugin/buf/buf0flu.c storage/innodb_plugin/buf/buf0lru.c storage/innodb_plugin/buf/buf0rea.c storage/innodb_plugin/dict/dict0crea.c storage/innodb_plugin/dict/dict0dict.c storage/innodb_plugin/fil/fil0fil.c storage/innodb_plugin/fsp/fsp0fsp.c storage/innodb_plugin/handler/ha_innodb.cc storage/innodb_plugin/handler/ha_innodb.h storage/innodb_plugin/handler/handler0alter.cc storage/innodb_plugin/include/buf0buf.h storage/innodb_plugin/include/buf0buf.ic storage/innodb_plugin/include/buf0lru.h storage/innodb_plugin/include/buf0rea.h storage/innodb_plugin/include/buf0types.h storage/innodb_plugin/include/dict0crea.h storage/innodb_plugin/include/dict0dict.h storage/innodb_plugin/include/dict0mem.h storage/innodb_plugin/include/fsp0fsp.h storage/innodb_plugin/include/lock0lock.h storage/innodb_plugin/include/log0log.h storage/innodb_plugin/include/log0log.ic storage/innodb_plugin/include/log0recv.h storage/innodb_plugin/include/mtr0mtr.h storage/innodb_plugin/include/os0file.h storage/innodb_plugin/include/os0sync.h storage/innodb_plugin/include/page0page.h storage/innodb_plugin/include/page0page.ic storage/innodb_plugin/include/page0zip.h storage/innodb_plugin/include/rem0cmp.h storage/innodb_plugin/include/rem0rec.ic storage/innodb_plugin/include/row0ins.h storage/innodb_plugin/include/row0mysql.h storage/innodb_plugin/include/srv0srv.h storage/innodb_plugin/include/trx0rec.h storage/innodb_plugin/include/trx0rec.ic storage/innodb_plugin/include/trx0roll.h storage/innodb_plugin/include/trx0sys.ic storage/innodb_plugin/include/trx0trx.h storage/innodb_plugin/include/univ.i storage/innodb_plugin/include/ut0auxconf.h storage/innodb_plugin/include/ut0byte.h storage/innodb_plugin/include/ut0byte.ic storage/innodb_plugin/include/ut0ut.h storage/innodb_plugin/lock/lock0lock.c storage/innodb_plugin/log/log0log.c storage/innodb_plugin/log/log0recv.c storage/innodb_plugin/mem/mem0mem.c storage/innodb_plugin/mtr/mtr0mtr.c storage/innodb_plugin/mysql-test/innodb-analyze.test storage/innodb_plugin/mysql-test/innodb-zip.result storage/innodb_plugin/mysql-test/innodb-zip.test storage/innodb_plugin/mysql-test/innodb_bug34300.test storage/innodb_plugin/mysql-test/innodb_bug36169.test storage/innodb_plugin/mysql-test/innodb_bug36172.test storage/innodb_plugin/mysql-test/innodb_file_format.result storage/innodb_plugin/mysql-test/innodb_file_format.test storage/innodb_plugin/os/os0file.c storage/innodb_plugin/os/os0proc.c storage/innodb_plugin/page/page0cur.c storage/innodb_plugin/page/page0page.c storage/innodb_plugin/page/page0zip.c storage/innodb_plugin/plug.in.disabled storage/innodb_plugin/rem/rem0cmp.c storage/innodb_plugin/row/row0ins.c storage/innodb_plugin/row/row0merge.c storage/innodb_plugin/row/row0mysql.c storage/innodb_plugin/srv/srv0srv.c storage/innodb_plugin/srv/srv0start.c storage/innodb_plugin/sync/sync0rw.c storage/innodb_plugin/sync/sync0sync.c storage/innodb_plugin/thr/thr0loc.c storage/innodb_plugin/trx/trx0rec.c storage/innodb_plugin/trx/trx0roll.c storage/innodb_plugin/trx/trx0trx.c storage/innodb_plugin/ut/ut0auxconf_atomic_pthread_t_solaris.c storage/innodb_plugin/ut/ut0ut.c storage/maria/ha_maria.cc storage/myisam/ha_myisam.cc storage/myisam/mi_check.c storage/myisam/mi_search.c storage/myisam/mi_write.c storage/myisam/myisamchk.c storage/myisam/sort.c storage/myisammrg/myrg_open.c storage/mysql_storage_engine.cmake storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp storage/ndb/src/kernel/blocks/suma/Suma.cpp storage/pbxt/src/discover_xt.cc storage/xtradb/dict/dict0dict.c storage/xtradb/handler/ha_innodb.cc storage/xtradb/handler/ha_innodb.h storage/xtradb/handler/handler0alter.cc strings/ctype-mb.c strings/ctype-simple.c strings/ctype-uca.c strings/ctype-ucs2.c support-files/binary-configure.sh tests/mysql_client_test.c unittest/mysys/Makefile.am vio/vio.c vio/vio_priv.h vio/viosocket.c vio/viosslfactories.c mysql-test/r/innodb_lock_wait_timeout_1.result mysql-test/t/innodb_lock_wait_timeout_1.test The size of the diff (41758 lines) is larger than your specified limit of 5000 lines -- lp:maria https://code.launchpad.net/~maria-captains/maria/5.1 Your team Maria developers is subscribed to branch lp:maria. To unsubscribe from this branch go to https://code.launchpad.net/~maria-captains/maria/5.1/+edit-subscription.

1 0

[Maria-developers] [Branch ~maria-captains/maria/5.1] Rev 2770: Fixes after comments from last push:
by noreply＠launchpad.net 02 Dec '09

02 Dec '09

------------------------------------------------------------ revno: 2770 committer: Michael Widenius <monty(a)askmonty.org> branch nick: maria-5.1 timestamp: Mon 2009-11-30 15:36:06 +0200 message: Fixes after comments from last push: - Removed some not needed casts - Change plugin.h to be 'binary compatible' with old versions - Added mysql_ft_size_t typedef to plugin.h to make it trivial to change string lengths to size_t on next ABI change - Made some fixes suggested by Kristian to make things more portable and future safe (when it comes to strict aliasing) modified: include/ft_global.h include/mysql/plugin.h include/mysql/plugin.h.pp mysql-test/t/information_schema.test sql/sp_head.cc sql/sql_select.cc sql/table.cc storage/maria/ma_ft_boolean_search.c storage/maria/ma_ft_nlq_search.c storage/maria/ma_ft_parser.c storage/maria/ma_ftdefs.h storage/maria/maria_ftdump.c storage/myisam/ft_boolean_search.c storage/myisam/ft_nlq_search.c storage/myisam/ft_parser.c storage/myisam/myisam_ftdump.c -- lp:maria https://code.launchpad.net/~maria-captains/maria/5.1 Your team Maria developers is subscribed to branch lp:maria. To unsubscribe from this branch go to https://code.launchpad.net/~maria-captains/maria/5.1/+edit-subscription.

1 0

[Maria-developers] [Branch ~maria-captains/maria/5.1] Rev 2769: Automatic merge
by noreply＠launchpad.net 02 Dec '09

02 Dec '09

Merge authors: Michael Widenius (monty) ------------------------------------------------------------ revno: 2769 [merge] committer: Michael Widenius <monty(a)askmonty.org> branch nick: maria-5.1 timestamp: Mon 2009-11-30 13:13:02 +0200 message: Automatic merge modified: .bzrignore BUILD/compile-pentium client/mysql_upgrade.c cmd-line-utils/readline/config_readline.h cmd-line-utils/readline/display.c cmd-line-utils/readline/history.c cmd-line-utils/readline/rlmbutil.h cmd-line-utils/readline/text.c cmd-line-utils/readline/xmalloc.c configure.in include/mysql/plugin.h include/mysql/plugin.h.pp libmysql/libmysql.c mysql-test/t/information_schema.test mysql-test/t/not_partition.test mysys/lf_hash.c mysys/my_redel.c regex/engine.c regex/engine.ih sql/log_event.cc sql/mysqld.cc sql/scheduler.cc sql/sp_head.cc sql/sql_base.cc sql/sql_builtin.cc.in sql/sql_class.cc sql/sql_class.h sql/sql_insert.cc sql/sql_parse.cc sql/sql_select.cc sql/sql_show.cc sql/table.cc storage/maria/ha_maria.cc storage/maria/lockman.c storage/maria/ma_check.c storage/maria/ma_check_standalone.h storage/maria/ma_ft_boolean_search.c storage/maria/ma_ft_nlq_search.c storage/maria/ma_ft_parser.c storage/maria/ma_ftdefs.h storage/maria/ma_sort.c storage/maria/ma_state.c storage/maria/maria_def.h storage/maria/maria_ftdump.c storage/maria/trnman.c storage/myisam/ft_boolean_search.c storage/myisam/ft_nlq_search.c storage/myisam/ft_parser.c storage/myisam/ft_stopwords.c storage/myisam/ftdefs.h storage/myisam/ha_myisam.cc storage/myisam/mi_check.c storage/myisam/myisam_ftdump.c storage/myisam/myisamchk.c storage/myisam/myisamdef.h storage/myisam/myisamlog.c storage/myisam/sort.c storage/xtradb/fil/fil0fil.c storage/xtradb/trx/trx0i_s.c -- lp:maria https://code.launchpad.net/~maria-captains/maria/5.1 Your team Maria developers is subscribed to branch lp:maria. To unsubscribe from this branch go to https://code.launchpad.net/~maria-captains/maria/5.1/+edit-subscription.

1 0

[Maria-developers] bzr commit into MariaDB 5.1, with Maria 1.5:maria branch (monty:2774)
by Michael Widenius 02 Dec '09

02 Dec '09

#At lp:maria based on revid:knielsen@knielsen-hq.org-20091201074258-sbl29hdqa39h6tgz 2774 Michael Widenius 2009-12-01 Fixed link problem when compiling without uca modified: cmd-line-utils/readline/config_readline.h strings/ctype-uca.c per-file messages: cmd-line-utils/readline/config_readline.h Add back defines needed for linux to get rid of compiler warnings, but hide them for now until we have a solution for compile failure on MacOSX strings/ctype-uca.c Always define UCA contraction functions used by ctype-mb.c === modified file 'cmd-line-utils/readline/config_readline.h' --- a/cmd-line-utils/readline/config_readline.h 2009-11-30 21:37:27 +0000 +++ b/cmd-line-utils/readline/config_readline.h 2009-12-01 16:09:02 +0000 @@ -7,6 +7,13 @@ # include <config.h> #endif +#ifdef NOT_YET /* causes problem on MacOSX */ +/* to get wcwidth() defined */ +#define _XOPEN_SOURCE 600 +#define _XOPEN_SOURCE_EXTENDED +#define _XOPEN_ +#endif + /* Ultrix botches type-ahead when switching from canonical to non-canonical mode, at least through version 4.3 === modified file 'strings/ctype-uca.c' --- a/strings/ctype-uca.c 2009-11-30 12:42:24 +0000 +++ b/strings/ctype-uca.c 2009-12-01 16:09:02 +0000 @@ -36,6 +36,12 @@ #include "m_string.h" #include "m_ctype.h" + +#define MY_UCA_CNT_FLAG_SIZE 4096 +#define MY_UCA_CNT_FLAG_MASK 4095 +#define MY_UCA_CNT_HEAD 1 +#define MY_UCA_CNT_TAIL 2 + #ifdef HAVE_UCA_COLLATIONS #define MY_UCA_NPAGES 256 @@ -6756,16 +6762,6 @@ typedef struct my_uca_scanner_handler_st static uint16 nochar[]= {0,0}; - -#define MY_UCA_CNT_FLAG_SIZE 4096 -#define MY_UCA_CNT_FLAG_MASK 4095 - -#define MY_UCA_CNT_HEAD 1 -#define MY_UCA_CNT_TAIL 2 - - - - /********** Helper functions to handle contraction ************/ @@ -6836,85 +6832,6 @@ my_uca_alloc_contractions(CHARSET_INFO * return 0; } - -/** - Check if UCA data has contractions (public version) - - @cs Pointer to CHARSET_INFO data - @retval 0 - no contraction, 1 - have contractions. -*/ - -my_bool -my_uca_have_contractions(CHARSET_INFO *cs) -{ - return cs->contractions != NULL; -} - - -/** - Check if a character can be contraction head - - @cs Pointer to CHARSET_INFO data - @wc Code point - - @retval 0 - cannot be contraction head - @retval 1 - can be contraction head -*/ - -my_bool -my_uca_can_be_contraction_head(CHARSET_INFO *cs, my_wc_t wc) -{ - return cs->contractions->flags[wc & MY_UCA_CNT_FLAG_MASK] & MY_UCA_CNT_HEAD; -} - - -/** - Check if a character can be contraction tail - - @cs Pointer to CHARSET_INFO data - @wc Code point - - @retval 0 - cannot be contraction tail - @retval 1 - can be contraction tail -*/ - -my_bool -my_uca_can_be_contraction_tail(CHARSET_INFO *cs, my_wc_t wc) -{ - return cs->contractions->flags[wc & MY_UCA_CNT_FLAG_MASK] & MY_UCA_CNT_TAIL; -} - - -/** - Find a contraction and return its weight array - - @cs Pointer to CHARSET data - @wc1 First character - @wc2 Second character - - @return Weight array - @retval NULL - no contraction found - @retval ptr - contraction weight array -*/ - -uint16 * -my_uca_contraction2_weight(CHARSET_INFO *cs, my_wc_t wc1, my_wc_t wc2) -{ - MY_CONTRACTIONS *list= cs->contractions; - MY_CONTRACTION *c, *last; - for (c= list->item, last= &list->item[list->nitems]; c < last; c++) - { - if (c->ch[0] == wc1 && c->ch[1] == wc2) - { - return c->weight; - } - } - return NULL; -} - - - - #ifdef HAVE_CHARSET_ucs2 /* Initialize collation weight scanner @@ -9607,3 +9524,78 @@ CHARSET_INFO my_charset_utf8_croatian_uc #endif /* HAVE_CHARSET_utf8 */ #endif /* HAVE_UCA_COLLATIONS */ + +/** + Check if UCA data has contractions (public version) + + @cs Pointer to CHARSET_INFO data + @retval 0 - no contraction, 1 - have contractions. +*/ + +my_bool +my_uca_have_contractions(CHARSET_INFO *cs) +{ + return cs->contractions != NULL; +} + +/** + Check if a character can be contraction head + + @cs Pointer to CHARSET_INFO data + @wc Code point + + @retval 0 - cannot be contraction head + @retval 1 - can be contraction head +*/ + +my_bool +my_uca_can_be_contraction_head(CHARSET_INFO *cs, my_wc_t wc) +{ + return cs->contractions->flags[wc & MY_UCA_CNT_FLAG_MASK] & MY_UCA_CNT_HEAD; +} + + +/** + Check if a character can be contraction tail + + @cs Pointer to CHARSET_INFO data + @wc Code point + + @retval 0 - cannot be contraction tail + @retval 1 - can be contraction tail +*/ + +my_bool +my_uca_can_be_contraction_tail(CHARSET_INFO *cs, my_wc_t wc) +{ + return cs->contractions->flags[wc & MY_UCA_CNT_FLAG_MASK] & MY_UCA_CNT_TAIL; +} + + +/** + Find a contraction and return its weight array + + @cs Pointer to CHARSET data + @wc1 First character + @wc2 Second character + + @return Weight array + @retval NULL - no contraction found + @retval ptr - contraction weight array +*/ + +uint16 * +my_uca_contraction2_weight(CHARSET_INFO *cs, my_wc_t wc1, my_wc_t wc2) +{ + MY_CONTRACTIONS *list= cs->contractions; + MY_CONTRACTION *c, *last; + for (c= list->item, last= &list->item[list->nitems]; c < last; c++) + { + if (c->ch[0] == wc1 && c->ch[1] == wc2) + { + return c->weight; + } + } + return NULL; +} +

1 0

[Maria-developers] Updated (by Guest): Provide key cache statistics (58)
by worklog-noreply＠askmonty.org 01 Dec '09

01 Dec '09

----------------------------------------------------------------------- WORKLOG TASK -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- TASK...........: Provide key cache statistics CREATION DATE..: Thu, 22 Oct 2009, 12:28 SUPERVISOR.....: Bothorsen IMPLEMENTOR....: COPIES TO......: CATEGORY.......: Server-RawIdeaBin TASK ID........: 58 (http://askmonty.org/worklog/?tid=58) VERSION........: WorkLog-3.4 STATUS.........: Un-Assigned PRIORITY.......: 60 WORKED HOURS...: 0 ESTIMATE.......: 0 (hours remain) ORIG. ESTIMATE.: 0 PROGRESS NOTES: -=-=(Monty - Fri, 27 Nov 2009, 12:36)=-=- High Level Description modified. --- /tmp/wklog.58.old.15108 2009-11-27 10:36:13.000000000 +0000 +++ /tmp/wklog.58.new.15108 2009-11-27 10:36:13.000000000 +0000 @@ -1,8 +1,7 @@ -Provide the key cache -statistics available for the default cache (key blocks used, -unflushed, etc.) for all named caches. +Provide the same key cache statistics for all MyISAM key caches as we provide +for the default key cache. -Monty answers in an email: +Background: Monty answers in an email to customer: This is a much simpler task and something that is important to get done. We would have to introduce a 'show keycache statistics' command @@ -11,3 +10,44 @@ The raw coding is probably 1-2 days, but on top if this we need testing, a test environment and building of biniaries for you. Henrik/Bo and Igor will come back to you with a more exact estimate. + +----------------- +Currently we have: + +show status like "key%"; ++------------------------+-------+ +| Variable_name | Value | ++------------------------+-------+ +| Key_blocks_not_flushed | 0 | +| Key_blocks_unused | 13389 | +| Key_blocks_used | 7 | +| Key_read_requests | 22 | +| Key_reads | 7 | +| Key_write_requests | 0 | +| Key_writes | 0 | ++------------------------+-------+ + +Sergei suggested we introduce for each new key cache a set of variables prefixed +with the keycache name: + +show status like "keycache1.%"; +Which should show: + ++----------------------------------+-------+ +| Variable_name | Value | ++----------------------------------+-------+ +| keycache1.Key_blocks_not_flushed | 0 | +| keycache1.Key_blocks_unused | 13389 | +| keycache1.Key_blocks_used | 7 | +| keycache1.Key_read_requests | 22 | +| keycache1.Key_reads | 7 | +| keycache1.Key_write_requests | 0 | +| keycache1.Key_writes | 0 | ++----------------------------------+-------+ + +The task would thus to be to automatically introduce new variables when we +create a new key cache and automatically remove these variables when the cache +is deleted. + +The other option would be to add an information schema where we populate the +information schema with data from all existing key caches. DESCRIPTION: Provide the same key cache statistics for all MyISAM key caches as we provide for the default key cache. Background: Monty answers in an email to customer: This is a much simpler task and something that is important to get done. We would have to introduce a 'show keycache statistics' command that would iterate over all keycaches and provide the statistics. The raw coding is probably 1-2 days, but on top if this we need testing, a test environment and building of biniaries for you. Henrik/Bo and Igor will come back to you with a more exact estimate. ----------------- Currently we have: show status like "key%"; +------------------------+-------+ | Variable_name | Value | +------------------------+-------+ | Key_blocks_not_flushed | 0 | | Key_blocks_unused | 13389 | | Key_blocks_used | 7 | | Key_read_requests | 22 | | Key_reads | 7 | | Key_write_requests | 0 | | Key_writes | 0 | +------------------------+-------+ Sergei suggested we introduce for each new key cache a set of variables prefixed with the keycache name: show status like "keycache1.%"; Which should show: +----------------------------------+-------+ | Variable_name | Value | +----------------------------------+-------+ | keycache1.Key_blocks_not_flushed | 0 | | keycache1.Key_blocks_unused | 13389 | | keycache1.Key_blocks_used | 7 | | keycache1.Key_read_requests | 22 | | keycache1.Key_reads | 7 | | keycache1.Key_write_requests | 0 | | keycache1.Key_writes | 0 | +----------------------------------+-------+ The task would thus to be to automatically introduce new variables when we create a new key cache and automatically remove these variables when the cache is deleted. The other option would be to add an information schema where we populate the information schema with data from all existing key caches. ESTIMATED WORK TIME ESTIMATED COMPLETION DATE ----------------------------------------------------------------------- WorkLog (v3.5.9)

1 0

[Maria-developers] need maria dev team help to repro a bug
by Vladimir Kolesnikov 01 Dec '09

01 Dec '09

Hi guys, I'm working on this problem: https://bugs.launchpad.net/pbxt/+bug/489091 Unfortunately I cannot rperoduce plan diffs on the latest lp:~maria-captains/maria/5.1-merge. Is there a way to get access to any of your machines where it is reproducible. Thanks, Vladimir

2 1

[Maria-developers] Why 5.1.39 is not on launchpad?
by Sergey Petrunya 01 Dec '09

01 Dec '09

Hi! I noticed that although 5.1.39 release is done and published, it's not on launchpad: when one goes to https://launchpad.net/maria/, one - sees 5.1.38 binaries offered for download on the right of the page - "Series and milestones" chart doesn't list either 5.1.38 or 5.1.39. This may cause some confusion. Is there any reason that we don't put releases on Launchpad? BR Sergey -- Sergey Petrunia, Software Developer Monty Program AB, http://askmonty.org Blog: http://s.petrunia.net/blog

5 6

[Maria-developers] WL40: Current status & issues to discuss
by Alexi1952 01 Dec '09

01 Dec '09

Bo suggested me to publish my last WL#40 status report on the dev list. Meaning to get a feedback (critical notes, tips, suggestions, etc) I rewrote the report to make it more readable and included some thoughts for discussion. ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ WL40. Add a mysqlbinlog option to filter updates to certain tables ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Selected option : "2.5 Extend Query Events With Tables Info". 1. Extending Query Events With Tables Info 2. Example of the Extended Query Event Binary Format 3. Adding binlog-with-tables-info Option 4. How Tables Info is Formed 4.1. CREATE TABLE statement 4.2. RENAME TABLE Statement 5. TODO: Is Tables Info Enough? 6. TODO: How Renames are to be filtered? 7. Other TODO's 1. Extending Query Events With Tables Info ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Reason: to do filtering based on "*-table" options we need to have a list of all tables refered to by the query described by Query event. The Query event binary format is extended with a tables info, i.e. the list of tables involved in the query execution. More precisely, two following fields are added to the Query event header: * Query length (2 bytes). (Reason: in usual format, Query event doesn't include this field because the query is considered to extent to the end of the event what is not the case for the extended format). * Tables info length (2 bytes). Length of tables info contained in the data part of the event. and the following data is added to the Query event data part: * Tables info (tables_info_len bytes). List of 4-tuples (db_len, db, table_name_len, table_name) for each table involved in the execution of the query described by this event. db_len may be zero meaning that this is the default db. Note. In the extended format the default db is written without trailing zero which is redundant since its length is already known from the event header. 2. Example of the Extended Query Event Binary Format ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ************************ QUERY_EVENT [2] ************************ 00000294 | 2F A1 00 4B | time_when = 1258332463 00000298 | 02 | event_type = 2 00000299 | 64 00 00 00 | server_id = 100 0000029D | 75 00 00 00 | event_len = 117 000002A1 | 09 03 00 00 | log_pos = 00000309 000002A5 | 10 00 | flags = LOG_EVENT_UPDATE_TABLE_MAP_VERSION_F ------------------------ 000002A7 | 01 00 00 00 | proxy_id = 1 000002AB | C9 00 00 00 | exec_time = 201 000002AF | 04 | dbase_len = 4 000002B0 | 00 00 | error_code = 0 000002B2 | 1A 00 | status_vars_len = 26 000002B4 | 2B 00 | query_len = 43 (*) 000002B6 | 08 00 | tables_info_len = 8 (*) ------------------------ Status Variables ------------------------ 000002B8 | 00 | FLAGS2: 000002B9 | 00 40 00 00 | 0x00004000 000002BD | 01 | SQL_MODE: 000002BE | 00 00 00 00 | 0x0000000000000000 000002C2 | 00 00 00 00 | 000002C6 | 06 | CATALOG_NZ: 000002C7 | 03 | catalog_len = 3 000002C8 | 73 74 64 | catalog = "std" 000002CB | 04 | CHARSET_CODE: 000002CC | 08 00 | charset_client = 8 000002CE | 08 00 | collation_connect = 8 000002D0 | 08 00 | collation_server = 8 ------------------------ 000002D2 | 74 65 73 74 | dbase = "test" (**) 000002D6 | 52 45 4E 41 | query = "RENAME TABLE t1 TO tmp, t2 TO t1, tmp TO t2" 000002DA | 4D 45 20 54 | 000002DE | 41 42 4C 45 | 000002E2 | 20 74 31 20 | 000002E6 | 54 4F 20 74 | 000002EA | 6D 70 2C 20 | 000002EE | 74 32 20 54 | 000002F2 | 4F 20 74 31 | 000002F6 | 2C 20 74 6D | 000002FA | 70 20 54 4F | 000002FE | 20 74 32 | ------------------------ Tables info (*) ------------------------ 00000301 | 00 | dbase_len = 0 (***) 00000302 | 02 | table_len = 2 00000303 | 74 31 | table_str = "t1" 00000305 | 00 | dbase_len = 0 (***) 00000306 | 02 | table_len = 2 00000307 | 74 32 | table_str = "t2" ************************ (*) - Added to the new Query event binary format. (**) - Modified: in the new Query event binary format database name does not contain trailing zero. (***) - Database length = 0 means that it is the default database. 3. Adding binlog-with-tables-info Option ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ New --binlog-with-tables-info option is added. When set, all Query events are to be written to the extended format (with tables info). Reasons for adding the option: * Adding tables info leads binary log to grow in size what is superfluous if filtering within mysqlbinlog is not supposed to be used. * If the current implementation of the extended format will appear to have bugs switching off this option will guarantee that replication will work as before that. The option is defined as GLOBAL and read-only. Reason: * The Query events format used in the binary log can be recognized only by its length contained in the Format description event at the beginning of the binary log. Because of that, two different Query event formats can not be mixed within one binary log. 4. How Tables Info is Formed ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Forming tables info for some types of statement is not quite straightforward. Below is two examples of those "not-straightforward" cases. 4.1. CREATE TABLE statement ~~~~~~~~~~~~~~~~~~~~~~~~~~~ CREATE [TEMPORARY] TABLE [IF NOT EXISTS] t (...) CREATE [TEMPORARY] TABLE [IF NOT EXISTS] t LIKE t1 CREATE [TEMPORARY] TABLE [IF NOT EXISTS] t SELECT (t1, ..., tn) Implementation of forming tables info in this case is based on the following rules of binlogging CREATE TABLE statements: SBR. The original CREATE TABLE statement is always binlogged as is. In this case tables_info = { t }, { t, t1 }, or { t, t1, ..., tn } respectively. RBR. In case of RBR we have the following specifics of binlogging CREATE TABLE statement: * temporary tables are not binlogged; * CREATE TABLE t LIKE t1 with temporary t1 is transformed to the ordinary CREATE TABLE (...); * CREATE TABLE SELECT is always transformed to the ordinary CREATE TABLE (...) (with possible subsequent INSERT statements). So for RBR tables info is formed as follows: IF t is temporary // the statement will not be binlogged tables_info = empty IF CREATE TABLE t (...) // the statement will be binlogged as is tables_ info = {t} IF CREATE TABLE t LIKE t1 IF t1 is temporary // the statement will be binlogged as CREATE TABLE t (...) tables_info = {t} ELSE // the statement will be binlogged as is tables_info = {t, t1} IF CREATE TABLE t SELECT (t1, ..., tn) // the statement will be binlogged as CREATE TABLE (...) tables_info = {t} Note. In case of RBR, CREATE TABLE SELECT is binlogged as the following sequence of events: BEGIN: Query event CREATE TABLE: Query event INSERT's: Write row events COMMIT Query event BEGIN and COMMIT in this case are supplied with the same tables_info = {t} as the CREATE TABLE statement. Also INSERT's are preceded by the Table map event refering to the same table t. So filtering of all this events (including BEGIN and COMMIT) will be based on the same tables info and either all of them will pass the filter or all of them will be filtered out. 4.2. RENAME TABLE Statement ~~~~~~~~~~~~~~~~~~~~~~~~~~~ RENAME TABLE tl TO s1, ..., tn TO sn For this type of statements tables info is formed, roughly speaking, of tables standing left to "TO", i.e. t1, ..., tn. But including all t1, ..., tn is not always correct. Consider renaming t1 <-> t2: RENAME TABLE t1 TO tmp, t2 TO t1, tmp TO t2 Setting tables_info = ( t1, t2, tmp } is not good: mysqlbinlog being executed with do-tables = { t1, t2 } will filter this statement away because tmp does not belong to do-tables. So before adding ti to the tables_info we have to check that ti != sj for all j < i. See tables_info in the example of Section 2. 5. TODO: Is Tables Info Enough? ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Assume we run mysqlbinlog with ignore_tables = { t1 } for the following sequence of statements: (1) CREATE TABLE t1 (...); ... (2) CREATE TABLE t2 LIKE t1; ... (3) INSERT INTO t2 VALUES ...; ... In this case: (1) will be filtered away - directly stated by the ignore rules; (2) will be filtered away - can not be executed because refers to t1 (3) will be left - though can not be executed It is not good to have erroneous statements in mysqlbinlog output. We can overcome this in two ways: 1. To explain to the user that in those cases, to avoid erroneous statements, he/she should add t2 to the ignore_tables list as well. 2. To make the filtering bit clever. E.g., additionally to tables info, we may extend the Query event format with a Statement type field (BTW, see also WL#41 "Add a mysqlbinlog option to filter certain kinds of statements"). In this case, when filtering, if we reject a "CREATE TABLE t ..." statement because its LIKE or SELECT part refers to an ignored table, we add table t to the ignore_tables list ourself. 6. TODO: How Renames are to be filtered? ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Consider the RENAME TABLE statement. If we have do_tables = { t } and t is renamed to s: (1) RENAME TABLE t TO s; <smth for s> what the filter should do? Should we consider t and s to be the same table with different names so that <smth for s> is not to be filtered away (in this case during filtering process we should add s to the do_tables list - like we do it in the case of CREATE TABLE)? Or should we treat do- ignore-table rules as talking about *table names* so that --do-table=t means "do only table with name t" - then we filter <smth for s> away because it refers to the table with another name s? Note that in the last case if we rename s back to t: (2) RENAME TABLE s TO t; <smth for t> the RENAME statement will be filtered away (it renames a table which does not belong to the do_tables list) while <smth for t> will pass the filter and its subsequent execution will result with error (we can resolve this by creating a rename_list during the filtering process to trace all renamings specified by the processed events - similar to what is described in Section 4.2). Note. With the second treatment of renaming, we can do the following (looks like attractive but not sure is usefull :) <smth for t> RENAME TABLE t TO s <smth for s that can be filtered away> RENAME TABLE s TO t <smth for t> 7. Other TODO's ~~~~~~~~~~~~~~~ * Continue with forming tables_info for different types of query. * Filtering algorithm and *-table options for mysqlbinlog. Should it be "clever" or "stupid" (see Sections 5 & 6) ? * Add Statement type field to the Query event format (?) Needed for "clever' filtering and for WL#41 * Other stuff (testing, documenting, etc)

2 1

[Maria-developers] Reviewing bug reports: feature needed
by Hakan Kuecuekyilmaz 01 Dec '09

01 Dec '09

Hi all, after reviewing some MariaDB related bugs on bugs.launchpad.net/maria it occurred to me, that there is no link between the bug state "Fix Committed" and the corresponding patch, which fixed the issue. Is there a way to link a bzr patch/push to a launchpad bug report? If not, where can I do a feature request about it? Best regards, Hakan -- Hakan Küçükyılmaz, QA/Benchmark Engineer, Stuttgart/Germany Monty Program Ab, http://askmonty.org/ Skype: hakank_ Phone: +49 171 1919839

5 5

[Maria-developers] bzr commit into MariaDB 5.1, with Maria 1.5:maria branch (knielsen:2773)
by knielsen＠knielsen-hq.org 01 Dec '09

01 Dec '09

#At lp:maria 2773 knielsen(a)knielsen-hq.org 2009-12-01 [merge] Automerge Daniel's README fixes. modified: README === modified file 'README' --- a/README 2009-10-23 16:48:54 +0000 +++ b/README 2009-11-03 04:59:48 +0000 @@ -1,60 +1,57 @@ -This is a release of MariaDB, a branch of MySQL. +This is a release of MariaDB. -MariaDB is a drop-in replacement of MySQL, with more features, less -bugs and better performance. +MariaDB is designed as a drop-in replacement of MySQL(R) with more +features, new storage engines, fewer bugs, and better performance. -MariaDB is brought to you by many of the original developers of MySQL, -that now work for Monty Program Ab, and by many people in the +MariaDB is brought to you by many of the original developers of MySQL +who now work for Monty Program Ab, and by many people in the community. -MySQL, which is the base of MariaDB, is brought to you by Sun. +MySQL, which is the base of MariaDB, is a product and trademark of Sun +Microsystems, Inc. For a list of developers and other contributors, +see the Credits appendix. You can also do 'SHOW authors' to get a +list of active contributors. -License information can be found in these files: -- For GPL (free) distributions, see the COPYING file and - the EXCEPTIONS-CLIENT file. - -A description of the MariaDB project can be found at: +A description of the MariaDB project and a manual can be found at: http://askmonty.org/wiki/index.php/MariaDB - -GPLv2 Disclaimer -For the avoidance of doubt, except that if any license choice -other than GPL or LGPL is available it will apply instead, Sun -elects to use only the General Public License version 2 (GPLv2) -at this time for any software where a choice of GPL license versions -is made available with the language indicating that GPLv2 or any -later version may be used, or where a choice of which version of -the GPL is applied is otherwise unspecified. - -The differences between MariaDB and MySQL can be found at: http://askmonty.org/wiki/index.php/MariaDB_versus_MySQL +http://askmonty.org/wiki/index.php/Manual:Contents -Documentation about MySQL can be found at: -http://dev.mysql.com/doc - -For further information about MySQL documentation, see: -- The current MySQL documentation: +As MariaDB is a full replacement of MySQL, the MySQL manual at +http://dev.mysql.com/doc is generally applicable. -Some manual sections of special interest: +More help is available from the Maria Discuss mailing list +https://launchpad.net/~maria-discuss +and the #maria IRC channel on Freenode. +*************************************************************************** +NOTE: -- For a list of developers and other contributors, see the Credits - appendix. +MariaDB is specifically available only under version 2 of the GNU +General Public License (GPLv2). (I.e. Without the "any later version" +clause.) This is inherited from MySQL. Please see the README file in +the MySQL distribution for more information. -A local copy of the MySQL Reference Manual can be found in the Docs -directory in GNU Info format. You can also browse the manual online or -download it in any of several formats from -http://dev.mysql.com/doc +License information can be found in the COPYING file and the +EXCEPTIONS-CLIENT file. -************************************************************ +*************************************************************************** IMPORTANT: -Bug or error reports regarding MariaDB should be sent to +Bug and/or error reports regarding MariaDB should be submitted at https://bugs.launchpad.net/maria -Bugs in the MySQL code can also be sent to http://bugs.mysql.com + +Bugs in the MySQL code can also be submitted at http://bugs.mysql.com + *************************************************************************** + + + + +*************************************************************************** %%The following software may be included in this product: Fred Fish's Dbug Library

1 0