September 2009 - developers - lists.mariadb.org

[Maria-developers] [Branch ~maria-captains/maria/5.1] Rev 2736: Fix some test failures found during RPM package building:
by noreply＠launchpad.net 25 Sep '09

25 Sep '09

------------------------------------------------------------ revno: 2736 committer: knielsen(a)knielsen-hq.org branch nick: work-5.1-release timestamp: Fri 2009-09-25 16:38:02 +0200 message: Fix some test failures found during RPM package building: - mysqlslap result file update after merge. - Fix skipping certain tests when running test suite as root, got broken somehow. modified: mysql-test/mysql-test-run.pl mysql-test/r/mysqlslap.result mysql-test/t/mysqld_option_err.test -- 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 (knielsen:2736)
by knielsen＠knielsen-hq.org 25 Sep '09

25 Sep '09

#At lp:maria 2736 knielsen(a)knielsen-hq.org 2009-09-25 Fix some test failures found during RPM package building: - mysqlslap result file update after merge. - Fix skipping certain tests when running test suite as root, got broken somehow. modified: mysql-test/mysql-test-run.pl mysql-test/r/mysqlslap.result mysql-test/t/mysqld_option_err.test per-file messages: mysql-test/mysql-test-run.pl Somehow skipping tests when running as root got broken. The mysqltest if() no longer seems to accept YES as a true value, so use 1 for true value instead. mysql-test/r/mysqlslap.result Result file update after change in engine behaviour of mysqlslap. mysql-test/t/mysqld_option_err.test This test does not work when run as root. === modified file 'mysql-test/mysql-test-run.pl' --- a/mysql-test/mysql-test-run.pl 2009-09-25 08:56:53 +0000 +++ b/mysql-test/mysql-test-run.pl 2009-09-25 14:38:02 +0000 @@ -2288,7 +2288,7 @@ sub check_running_as_root () { { mtr_warning("running this script as _root_ will cause some " . "tests to be skipped"); - $ENV{'MYSQL_TEST_ROOT'}= "YES"; + $ENV{'MYSQL_TEST_ROOT'}= "1"; } chmod(oct("0755"), $test_file); === modified file 'mysql-test/r/mysqlslap.result' --- a/mysql-test/r/mysqlslap.result 2007-12-20 20:32:16 +0000 +++ b/mysql-test/r/mysqlslap.result 2009-09-25 14:38:02 +0000 @@ -122,8 +122,7 @@ DROP SCHEMA IF EXISTS `mysqlslap`; DROP SCHEMA IF EXISTS `mysqlslap`; CREATE SCHEMA `mysqlslap`; use mysqlslap; -set storage_engine=`heap`; -CREATE TABLE t1 (id int, name varchar(64)); +CREATE TABLE t1 (id int, name varchar(64)) Engine = heap; create table t2(foo1 varchar(32), foo2 varchar(32)); INSERT INTO t1 VALUES (1, 'This is a test'); insert into t2 values ('test', 'test2'); @@ -133,8 +132,7 @@ DROP SCHEMA IF EXISTS `mysqlslap`; DROP SCHEMA IF EXISTS `mysqlslap`; CREATE SCHEMA `mysqlslap`; use mysqlslap; -set storage_engine=`myisam`; -CREATE TABLE t1 (id int, name varchar(64)); +CREATE TABLE t1 (id int, name varchar(64)) Engine = myisam; create table t2(foo1 varchar(32), foo2 varchar(32)); INSERT INTO t1 VALUES (1, 'This is a test'); insert into t2 values ('test', 'test2'); @@ -144,8 +142,7 @@ DROP SCHEMA IF EXISTS `mysqlslap`; DROP SCHEMA IF EXISTS `mysqlslap`; CREATE SCHEMA `mysqlslap`; use mysqlslap; -set storage_engine=`heap`; -CREATE TABLE t1 (id int, name varchar(64)); +CREATE TABLE t1 (id int, name varchar(64)) Engine = heap; create table t2(foo1 varchar(32), foo2 varchar(32)); INSERT INTO t1 VALUES (1, 'This is a test'); insert into t2 values ('test', 'test2'); @@ -157,8 +154,7 @@ DROP SCHEMA IF EXISTS `mysqlslap`; DROP SCHEMA IF EXISTS `mysqlslap`; CREATE SCHEMA `mysqlslap`; use mysqlslap; -set storage_engine=`myisam`; -CREATE TABLE t1 (id int, name varchar(64)); +CREATE TABLE t1 (id int, name varchar(64)) Engine = myisam; create table t2(foo1 varchar(32), foo2 varchar(32)); INSERT INTO t1 VALUES (1, 'This is a test'); insert into t2 values ('test', 'test2'); @@ -170,8 +166,7 @@ DROP SCHEMA IF EXISTS `mysqlslap`; DROP SCHEMA IF EXISTS `mysqlslap`; CREATE SCHEMA `mysqlslap`; use mysqlslap; -set storage_engine=`heap`; -CREATE TABLE t1 (id int, name varchar(64)); +CREATE TABLE t1 (id int, name varchar(64)) Engine = heap; create table t2(foo1 varchar(32), foo2 varchar(32)); INSERT INTO t1 VALUES (1, 'This is a test'); insert into t2 values ('test', 'test2'); @@ -196,8 +191,7 @@ DROP SCHEMA IF EXISTS `mysqlslap`; DROP SCHEMA IF EXISTS `mysqlslap`; CREATE SCHEMA `mysqlslap`; use mysqlslap; -set storage_engine=`myisam`; -CREATE TABLE t1 (id int, name varchar(64)); +CREATE TABLE t1 (id int, name varchar(64)) Engine = myisam; create table t2(foo1 varchar(32), foo2 varchar(32)); INSERT INTO t1 VALUES (1, 'This is a test'); insert into t2 values ('test', 'test2'); === modified file 'mysql-test/t/mysqld_option_err.test' --- a/mysql-test/t/mysqld_option_err.test 2009-09-03 13:05:02 +0000 +++ b/mysql-test/t/mysqld_option_err.test 2009-09-25 14:38:02 +0000 @@ -10,6 +10,9 @@ --source include/not_embedded.inc +# mysqld refuses to run as root normally. +-- source include/not_as_root.inc + # We have not run (and do not need) bootstrap of the server. We just # give it a dummy data directory (for log files etc).

1 0

[Maria-developers] [Branch ~maria-captains/maria/5.1] Rev 2735: Merge MySQL-5.1.38 and XtraDB-7 into MariaDB.
by noreply＠launchpad.net 25 Sep '09

25 Sep '09

Merge authors: <Dao-Gang.Qu(a)sun.com> Aleksandr Kuzminsky (akuzminsky) Alexander Barkov <bar(a)mysql.com> Alexander Nozdrin <alik(a)sun.com> Alexey Botchkov <holyfoot(a)mysql.com>... ------------------------------------------------------------ revno: 2735 [merge] committer: knielsen(a)knielsen-hq.org branch nick: work-5.1-release timestamp: Fri 2009-09-25 10:56:53 +0200 message: Merge MySQL-5.1.38 and XtraDB-7 into MariaDB. Merge Percona microsec_process patch. Includes lots of after-merge fixes, Windows fixes, and other misc. small fixes. removed: cmd-line-utils/libedit/README cmd-line-utils/libedit/filecomplete.c cmd-line-utils/libedit/filecomplete.h mysql-test/include/count_sessions.inc mysql-test/include/diff_tables.inc mysql-test/include/wait_for_status_var.inc mysql-test/include/wait_show_condition.inc mysql-test/include/wait_until_count_sessions.inc mysql-test/r/innodb_bug42419.result mysql-test/suite/funcs_1/datadict/charset_collation.inc mysql-test/suite/funcs_1/r/charset_collation_1.result mysql-test/suite/funcs_1/r/charset_collation_2.result mysql-test/suite/funcs_1/r/charset_collation_3.result mysql-test/suite/funcs_1/t/charset_collation_1.test mysql-test/suite/funcs_1/t/charset_collation_2.test mysql-test/suite/funcs_1/t/charset_collation_3.test mysql-test/suite/funcs_1/t/ndb_storedproc_06.tes mysql-test/suite/funcs_1/t/ndb_storedproc_08.tes mysql-test/suite/rpl/t/rpl_000015-slave.sh mysql-test/t/innodb_bug42419.test sql/mysql_priv.h.pp added: cmd-line-utils/libedit/README cmd-line-utils/libedit/filecomplete.c cmd-line-utils/libedit/filecomplete.h mysql-test/extra/rpl_tests/rpl_get_master_version_and_clock.test mysql-test/include/count_sessions.inc mysql-test/include/diff_master_slave.inc mysql-test/include/diff_tables.inc mysql-test/include/kill_query.inc mysql-test/include/kill_query_and_diff_master_slave.inc mysql-test/include/mysqldump.inc mysql-test/include/no_valgrind_without_big.inc mysql-test/include/wait_for_slave_io_error.inc mysql-test/include/wait_for_status_var.inc mysql-test/include/wait_show_condition.inc mysql-test/include/wait_until_count_sessions.inc mysql-test/r/bug40113.result mysql-test/r/bug46080.result mysql-test/r/ctype_gbk_binlog.result mysql-test/r/innodb_bug21704.result mysql-test/r/innodb_bug40565.result mysql-test/r/innodb_bug42101-nonzero.result mysql-test/r/innodb_bug42101.result mysql-test/r/innodb_bug42419.result mysql-test/r/innodb_bug45357.result mysql-test/r/log_tables_debug.result mysql-test/r/myisam_crash_before_flush_keys.result mysql-test/r/myisam_debug.result mysql-test/r/mysql-bug45236.result mysql-test/r/mysqldump_restore.result mysql-test/r/parser_not_embedded.result mysql-test/r/partition_not_embedded.result mysql-test/r/partition_rename_longfilename.result mysql-test/r/sp-fib.result mysql-test/std_data/bug37631.MYD mysql-test/std_data/bug37631.MYI mysql-test/std_data/bug37631.frm mysql-test/suite/binlog/r/binlog_incident.result mysql-test/suite/binlog/r/binlog_row_mysqlbinlog_db_filter.result mysql-test/suite/binlog/r/binlog_stm_unsafe_warning.result mysql-test/suite/binlog/r/binlog_tbl_metadata.result mysql-test/suite/binlog/t/binlog_incident-master.opt mysql-test/suite/binlog/t/binlog_incident.test mysql-test/suite/binlog/t/binlog_row_mysqlbinlog_db_filter.test mysql-test/suite/binlog/t/binlog_stm_unsafe_warning-master.opt mysql-test/suite/binlog/t/binlog_stm_unsafe_warning.test mysql-test/suite/binlog/t/binlog_tbl_metadata.test mysql-test/suite/bugs/r/rpl_bug38205.result mysql-test/suite/bugs/t/rpl_bug38205.test mysql-test/suite/funcs_1/r/charset_collation.result mysql-test/suite/funcs_1/t/charset_collation.test mysql-test/suite/ibmdb2i/ mysql-test/suite/ibmdb2i/include/ mysql-test/suite/ibmdb2i/include/have_i54.inc mysql-test/suite/ibmdb2i/include/have_i61.inc mysql-test/suite/ibmdb2i/include/have_ibmdb2i.inc mysql-test/suite/ibmdb2i/r/ mysql-test/suite/ibmdb2i/r/ibmdb2i_bug_44020.result mysql-test/suite/ibmdb2i/r/ibmdb2i_bug_44025.result mysql-test/suite/ibmdb2i/r/ibmdb2i_bug_44232.result mysql-test/suite/ibmdb2i/r/ibmdb2i_bug_44610.result mysql-test/suite/ibmdb2i/r/ibmdb2i_bug_45196.result mysql-test/suite/ibmdb2i/r/ibmdb2i_bug_45793.result mysql-test/suite/ibmdb2i/r/ibmdb2i_bug_45983.result mysql-test/suite/ibmdb2i/r/ibmdb2i_collations.result mysql-test/suite/ibmdb2i/t/ mysql-test/suite/ibmdb2i/t/ibmdb2i_bug_44020.test mysql-test/suite/ibmdb2i/t/ibmdb2i_bug_44025.test mysql-test/suite/ibmdb2i/t/ibmdb2i_bug_44232.test mysql-test/suite/ibmdb2i/t/ibmdb2i_bug_44610.test mysql-test/suite/ibmdb2i/t/ibmdb2i_bug_45196.test mysql-test/suite/ibmdb2i/t/ibmdb2i_bug_45793.test mysql-test/suite/ibmdb2i/t/ibmdb2i_bug_45983.test mysql-test/suite/ibmdb2i/t/ibmdb2i_collations.test mysql-test/suite/innodb/ mysql-test/suite/innodb/include/ mysql-test/suite/innodb/include/have_innodb_plugin.inc mysql-test/suite/innodb/include/innodb-index.inc mysql-test/suite/innodb/r/ mysql-test/suite/innodb/r/innodb-analyze.result mysql-test/suite/innodb/r/innodb-index.result mysql-test/suite/innodb/r/innodb-index_ucs2.result mysql-test/suite/innodb/r/innodb-timeout.result mysql-test/suite/innodb/r/innodb-use-sys-malloc.result mysql-test/suite/innodb/r/innodb-zip.result mysql-test/suite/innodb/r/innodb_bug36169.result mysql-test/suite/innodb/r/innodb_bug36172.result mysql-test/suite/innodb/r/innodb_bug40360.result mysql-test/suite/innodb/r/innodb_bug41904.result mysql-test/suite/innodb/r/innodb_bug44032.result mysql-test/suite/innodb/r/innodb_file_format.result mysql-test/suite/innodb/r/innodb_information_schema.result mysql-test/suite/innodb/t/ mysql-test/suite/innodb/t/disabled.def mysql-test/suite/innodb/t/innodb-analyze.test mysql-test/suite/innodb/t/innodb-index.test mysql-test/suite/innodb/t/innodb-index_ucs2.test mysql-test/suite/innodb/t/innodb-timeout.test mysql-test/suite/innodb/t/innodb-use-sys-malloc-master.opt mysql-test/suite/innodb/t/innodb-use-sys-malloc.test mysql-test/suite/innodb/t/innodb-zip.test mysql-test/suite/innodb/t/innodb_bug36169.test mysql-test/suite/innodb/t/innodb_bug36172.test mysql-test/suite/innodb/t/innodb_bug40360.test mysql-test/suite/innodb/t/innodb_bug41904.test mysql-test/suite/innodb/t/innodb_bug44032.test mysql-test/suite/innodb/t/innodb_file_format.test mysql-test/suite/innodb/t/innodb_information_schema.test mysql-test/suite/rpl/r/rpl_begin_commit_rollback.result mysql-test/suite/rpl/r/rpl_binlog_max_cache_size.result mysql-test/suite/rpl/r/rpl_bug38694.result mysql-test/suite/rpl/r/rpl_concurrency_error.result mysql-test/suite/rpl/r/rpl_get_master_version_and_clock.result mysql-test/suite/rpl/r/rpl_init_slave_errors.result mysql-test/suite/rpl/r/rpl_killed_ddl.result mysql-test/suite/rpl/r/rpl_name_const.result mysql-test/suite/rpl/t/rpl_begin_commit_rollback-slave.opt mysql-test/suite/rpl/t/rpl_begin_commit_rollback.test mysql-test/suite/rpl/t/rpl_binlog_max_cache_size-master.opt mysql-test/suite/rpl/t/rpl_binlog_max_cache_size.test mysql-test/suite/rpl/t/rpl_bug38694-slave.opt mysql-test/suite/rpl/t/rpl_bug38694.test mysql-test/suite/rpl/t/rpl_concurrency_error-master.opt mysql-test/suite/rpl/t/rpl_concurrency_error.test mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test mysql-test/suite/rpl/t/rpl_init_slave_errors.test mysql-test/suite/rpl/t/rpl_killed_ddl-master.opt mysql-test/suite/rpl/t/rpl_killed_ddl.test mysql-test/suite/rpl/t/rpl_name_const.test mysql-test/suite/rpl/t/rpl_start_stop_slave-slave.opt mysql-test/t/bug40113-master.opt mysql-test/t/bug40113.test mysql-test/t/bug46080-master.opt mysql-test/t/bug46080.test mysql-test/t/ctype_gbk_binlog.test mysql-test/t/innodb_bug21704.test mysql-test/t/innodb_bug40565.test mysql-test/t/innodb_bug42101-nonzero-master.opt mysql-test/t/innodb_bug42101-nonzero.test mysql-test/t/innodb_bug42101.test mysql-test/t/innodb_bug42419.test mysql-test/t/innodb_bug45357.test mysql-test/t/log_tables_debug.test mysql-test/t/myisam_crash_before_flush_keys-master.opt mysql-test/t/myisam_crash_before_flush_keys.test mysql-test/t/myisam_debug.test mysql-test/t/mysql-bug45236.test mysql-test/t/mysqldump_restore.test mysql-test/t/parser_not_embedded.test mysql-test/t/partition_not_embedded.test mysql-test/t/partition_rename_longfilename.test mysql-test/t/sp-fib.test storage/innobase/include/fsp0types.h storage/innodb_plugin/ storage/innodb_plugin/CMakeLists.txt storage/innodb_plugin/COPYING storage/innodb_plugin/COPYING.Google storage/innodb_plugin/COPYING.Percona storage/innodb_plugin/COPYING.Sun_Microsystems storage/innodb_plugin/ChangeLog storage/innodb_plugin/Doxyfile storage/innodb_plugin/Makefile.am storage/innodb_plugin/README storage/innodb_plugin/btr/ storage/innodb_plugin/btr/btr0btr.c storage/innodb_plugin/btr/btr0cur.c storage/innodb_plugin/btr/btr0pcur.c storage/innodb_plugin/btr/btr0sea.c storage/innodb_plugin/buf/ storage/innodb_plugin/buf/buf0buddy.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/compile-innodb storage/innodb_plugin/compile-innodb-debug storage/innodb_plugin/data/ storage/innodb_plugin/data/data0data.c storage/innodb_plugin/data/data0type.c storage/innodb_plugin/dict/ storage/innodb_plugin/dict/dict0boot.c storage/innodb_plugin/dict/dict0crea.c storage/innodb_plugin/dict/dict0dict.c storage/innodb_plugin/dict/dict0load.c storage/innodb_plugin/dict/dict0mem.c storage/innodb_plugin/dyn/ storage/innodb_plugin/dyn/dyn0dyn.c storage/innodb_plugin/eval/ storage/innodb_plugin/eval/eval0eval.c storage/innodb_plugin/eval/eval0proc.c storage/innodb_plugin/fil/ storage/innodb_plugin/fil/fil0fil.c storage/innodb_plugin/fsp/ storage/innodb_plugin/fsp/fsp0fsp.c storage/innodb_plugin/fut/ storage/innodb_plugin/fut/fut0fut.c storage/innodb_plugin/fut/fut0lst.c storage/innodb_plugin/ha/ storage/innodb_plugin/ha/ha0ha.c storage/innodb_plugin/ha/ha0storage.c storage/innodb_plugin/ha/hash0hash.c storage/innodb_plugin/ha_innodb.def storage/innodb_plugin/handler/ storage/innodb_plugin/handler/ha_innodb.cc storage/innodb_plugin/handler/ha_innodb.h storage/innodb_plugin/handler/handler0alter.cc storage/innodb_plugin/handler/handler0vars.h storage/innodb_plugin/handler/i_s.cc storage/innodb_plugin/handler/i_s.h storage/innodb_plugin/handler/mysql_addons.cc storage/innodb_plugin/handler/win_delay_loader.cc storage/innodb_plugin/ibuf/ storage/innodb_plugin/ibuf/ibuf0ibuf.c storage/innodb_plugin/include/ storage/innodb_plugin/include/btr0btr.h storage/innodb_plugin/include/btr0btr.ic storage/innodb_plugin/include/btr0cur.h storage/innodb_plugin/include/btr0cur.ic storage/innodb_plugin/include/btr0pcur.h storage/innodb_plugin/include/btr0pcur.ic storage/innodb_plugin/include/btr0sea.h storage/innodb_plugin/include/btr0sea.ic storage/innodb_plugin/include/btr0types.h storage/innodb_plugin/include/buf0buddy.h storage/innodb_plugin/include/buf0buddy.ic storage/innodb_plugin/include/buf0buf.h storage/innodb_plugin/include/buf0buf.ic storage/innodb_plugin/include/buf0flu.h storage/innodb_plugin/include/buf0flu.ic storage/innodb_plugin/include/buf0lru.h storage/innodb_plugin/include/buf0lru.ic storage/innodb_plugin/include/buf0rea.h storage/innodb_plugin/include/buf0types.h storage/innodb_plugin/include/data0data.h storage/innodb_plugin/include/data0data.ic storage/innodb_plugin/include/data0type.h storage/innodb_plugin/include/data0type.ic storage/innodb_plugin/include/data0types.h storage/innodb_plugin/include/db0err.h storage/innodb_plugin/include/dict0boot.h storage/innodb_plugin/include/dict0boot.ic storage/innodb_plugin/include/dict0crea.h storage/innodb_plugin/include/dict0crea.ic storage/innodb_plugin/include/dict0dict.h storage/innodb_plugin/include/dict0dict.ic storage/innodb_plugin/include/dict0load.h storage/innodb_plugin/include/dict0load.ic storage/innodb_plugin/include/dict0mem.h storage/innodb_plugin/include/dict0mem.ic storage/innodb_plugin/include/dict0types.h storage/innodb_plugin/include/dyn0dyn.h storage/innodb_plugin/include/dyn0dyn.ic storage/innodb_plugin/include/eval0eval.h storage/innodb_plugin/include/eval0eval.ic storage/innodb_plugin/include/eval0proc.h storage/innodb_plugin/include/eval0proc.ic storage/innodb_plugin/include/fil0fil.h storage/innodb_plugin/include/fsp0fsp.h storage/innodb_plugin/include/fsp0fsp.ic storage/innodb_plugin/include/fsp0types.h storage/innodb_plugin/include/fut0fut.h storage/innodb_plugin/include/fut0fut.ic storage/innodb_plugin/include/fut0lst.h storage/innodb_plugin/include/fut0lst.ic storage/innodb_plugin/include/ha0ha.h storage/innodb_plugin/include/ha0ha.ic storage/innodb_plugin/include/ha0storage.h storage/innodb_plugin/include/ha0storage.ic storage/innodb_plugin/include/ha_prototypes.h storage/innodb_plugin/include/handler0alter.h storage/innodb_plugin/include/hash0hash.h storage/innodb_plugin/include/hash0hash.ic storage/innodb_plugin/include/ibuf0ibuf.h storage/innodb_plugin/include/ibuf0ibuf.ic storage/innodb_plugin/include/ibuf0types.h storage/innodb_plugin/include/lock0iter.h storage/innodb_plugin/include/lock0lock.h storage/innodb_plugin/include/lock0lock.ic storage/innodb_plugin/include/lock0priv.h storage/innodb_plugin/include/lock0priv.ic storage/innodb_plugin/include/lock0types.h storage/innodb_plugin/include/log0log.h storage/innodb_plugin/include/log0log.ic storage/innodb_plugin/include/log0recv.h storage/innodb_plugin/include/log0recv.ic storage/innodb_plugin/include/mach0data.h storage/innodb_plugin/include/mach0data.ic storage/innodb_plugin/include/mem0dbg.h storage/innodb_plugin/include/mem0dbg.ic storage/innodb_plugin/include/mem0mem.h storage/innodb_plugin/include/mem0mem.ic storage/innodb_plugin/include/mem0pool.h storage/innodb_plugin/include/mem0pool.ic storage/innodb_plugin/include/mtr0log.h storage/innodb_plugin/include/mtr0log.ic storage/innodb_plugin/include/mtr0mtr.h storage/innodb_plugin/include/mtr0mtr.ic storage/innodb_plugin/include/mtr0types.h storage/innodb_plugin/include/mysql_addons.h storage/innodb_plugin/include/os0file.h storage/innodb_plugin/include/os0proc.h storage/innodb_plugin/include/os0proc.ic storage/innodb_plugin/include/os0sync.h storage/innodb_plugin/include/os0sync.ic storage/innodb_plugin/include/os0thread.h storage/innodb_plugin/include/os0thread.ic storage/innodb_plugin/include/page0cur.h storage/innodb_plugin/include/page0cur.ic storage/innodb_plugin/include/page0page.h storage/innodb_plugin/include/page0page.ic storage/innodb_plugin/include/page0types.h storage/innodb_plugin/include/page0zip.h storage/innodb_plugin/include/page0zip.ic storage/innodb_plugin/include/pars0grm.h storage/innodb_plugin/include/pars0opt.h storage/innodb_plugin/include/pars0opt.ic storage/innodb_plugin/include/pars0pars.h storage/innodb_plugin/include/pars0pars.ic storage/innodb_plugin/include/pars0sym.h storage/innodb_plugin/include/pars0sym.ic storage/innodb_plugin/include/pars0types.h storage/innodb_plugin/include/que0que.h storage/innodb_plugin/include/que0que.ic storage/innodb_plugin/include/que0types.h storage/innodb_plugin/include/read0read.h storage/innodb_plugin/include/read0read.ic storage/innodb_plugin/include/read0types.h storage/innodb_plugin/include/rem0cmp.h storage/innodb_plugin/include/rem0cmp.ic storage/innodb_plugin/include/rem0rec.h storage/innodb_plugin/include/rem0rec.ic storage/innodb_plugin/include/rem0types.h storage/innodb_plugin/include/row0ext.h storage/innodb_plugin/include/row0ext.ic storage/innodb_plugin/include/row0ins.h storage/innodb_plugin/include/row0ins.ic storage/innodb_plugin/include/row0merge.h storage/innodb_plugin/include/row0mysql.h storage/innodb_plugin/include/row0mysql.ic storage/innodb_plugin/include/row0purge.h storage/innodb_plugin/include/row0purge.ic storage/innodb_plugin/include/row0row.h storage/innodb_plugin/include/row0row.ic storage/innodb_plugin/include/row0sel.h storage/innodb_plugin/include/row0sel.ic storage/innodb_plugin/include/row0types.h storage/innodb_plugin/include/row0uins.h storage/innodb_plugin/include/row0uins.ic storage/innodb_plugin/include/row0umod.h storage/innodb_plugin/include/row0umod.ic storage/innodb_plugin/include/row0undo.h storage/innodb_plugin/include/row0undo.ic storage/innodb_plugin/include/row0upd.h storage/innodb_plugin/include/row0upd.ic storage/innodb_plugin/include/row0vers.h storage/innodb_plugin/include/row0vers.ic storage/innodb_plugin/include/srv0que.h storage/innodb_plugin/include/srv0srv.h storage/innodb_plugin/include/srv0srv.ic storage/innodb_plugin/include/srv0start.h storage/innodb_plugin/include/sync0arr.h storage/innodb_plugin/include/sync0arr.ic storage/innodb_plugin/include/sync0rw.h storage/innodb_plugin/include/sync0rw.ic storage/innodb_plugin/include/sync0sync.h storage/innodb_plugin/include/sync0sync.ic storage/innodb_plugin/include/sync0types.h storage/innodb_plugin/include/thr0loc.h storage/innodb_plugin/include/thr0loc.ic storage/innodb_plugin/include/trx0i_s.h storage/innodb_plugin/include/trx0purge.h storage/innodb_plugin/include/trx0purge.ic storage/innodb_plugin/include/trx0rec.h storage/innodb_plugin/include/trx0rec.ic storage/innodb_plugin/include/trx0roll.h storage/innodb_plugin/include/trx0roll.ic storage/innodb_plugin/include/trx0rseg.h storage/innodb_plugin/include/trx0rseg.ic storage/innodb_plugin/include/trx0sys.h storage/innodb_plugin/include/trx0sys.ic storage/innodb_plugin/include/trx0trx.h storage/innodb_plugin/include/trx0trx.ic storage/innodb_plugin/include/trx0types.h storage/innodb_plugin/include/trx0undo.h storage/innodb_plugin/include/trx0undo.ic storage/innodb_plugin/include/trx0xa.h storage/innodb_plugin/include/univ.i storage/innodb_plugin/include/usr0sess.h storage/innodb_plugin/include/usr0sess.ic storage/innodb_plugin/include/usr0types.h storage/innodb_plugin/include/ut0auxconf.h storage/innodb_plugin/include/ut0byte.h storage/innodb_plugin/include/ut0byte.ic storage/innodb_plugin/include/ut0dbg.h storage/innodb_plugin/include/ut0list.h storage/innodb_plugin/include/ut0list.ic storage/innodb_plugin/include/ut0lst.h storage/innodb_plugin/include/ut0mem.h storage/innodb_plugin/include/ut0mem.ic storage/innodb_plugin/include/ut0rnd.h storage/innodb_plugin/include/ut0rnd.ic storage/innodb_plugin/include/ut0sort.h storage/innodb_plugin/include/ut0ut.h storage/innodb_plugin/include/ut0ut.ic storage/innodb_plugin/include/ut0vec.h storage/innodb_plugin/include/ut0vec.ic storage/innodb_plugin/include/ut0wqueue.h storage/innodb_plugin/lock/ storage/innodb_plugin/lock/lock0iter.c storage/innodb_plugin/lock/lock0lock.c storage/innodb_plugin/log/ storage/innodb_plugin/log/log0log.c storage/innodb_plugin/log/log0recv.c storage/innodb_plugin/mach/ storage/innodb_plugin/mach/mach0data.c storage/innodb_plugin/mem/ storage/innodb_plugin/mem/mem0dbg.c storage/innodb_plugin/mem/mem0mem.c storage/innodb_plugin/mem/mem0pool.c storage/innodb_plugin/mtr/ storage/innodb_plugin/mtr/mtr0log.c storage/innodb_plugin/mtr/mtr0mtr.c storage/innodb_plugin/mysql-test/ storage/innodb_plugin/mysql-test/ctype_innodb_like.inc storage/innodb_plugin/mysql-test/have_innodb.inc storage/innodb_plugin/mysql-test/innodb-analyze.result storage/innodb_plugin/mysql-test/innodb-analyze.test storage/innodb_plugin/mysql-test/innodb-autoinc.result storage/innodb_plugin/mysql-test/innodb-autoinc.test storage/innodb_plugin/mysql-test/innodb-index.inc storage/innodb_plugin/mysql-test/innodb-index.result storage/innodb_plugin/mysql-test/innodb-index.test storage/innodb_plugin/mysql-test/innodb-index_ucs2.result storage/innodb_plugin/mysql-test/innodb-index_ucs2.test storage/innodb_plugin/mysql-test/innodb-lock.result storage/innodb_plugin/mysql-test/innodb-lock.test storage/innodb_plugin/mysql-test/innodb-master.opt storage/innodb_plugin/mysql-test/innodb-replace.result storage/innodb_plugin/mysql-test/innodb-replace.test storage/innodb_plugin/mysql-test/innodb-semi-consistent-master.opt storage/innodb_plugin/mysql-test/innodb-semi-consistent.result storage/innodb_plugin/mysql-test/innodb-semi-consistent.test storage/innodb_plugin/mysql-test/innodb-timeout.result storage/innodb_plugin/mysql-test/innodb-timeout.test storage/innodb_plugin/mysql-test/innodb-use-sys-malloc-master.opt storage/innodb_plugin/mysql-test/innodb-use-sys-malloc.result storage/innodb_plugin/mysql-test/innodb-use-sys-malloc.test storage/innodb_plugin/mysql-test/innodb-zip.result storage/innodb_plugin/mysql-test/innodb-zip.test storage/innodb_plugin/mysql-test/innodb.result storage/innodb_plugin/mysql-test/innodb.test storage/innodb_plugin/mysql-test/innodb_bug21704.result storage/innodb_plugin/mysql-test/innodb_bug21704.test storage/innodb_plugin/mysql-test/innodb_bug34053.result storage/innodb_plugin/mysql-test/innodb_bug34053.test storage/innodb_plugin/mysql-test/innodb_bug34300.result storage/innodb_plugin/mysql-test/innodb_bug34300.test storage/innodb_plugin/mysql-test/innodb_bug35220.result storage/innodb_plugin/mysql-test/innodb_bug35220.test storage/innodb_plugin/mysql-test/innodb_bug36169.result storage/innodb_plugin/mysql-test/innodb_bug36169.test storage/innodb_plugin/mysql-test/innodb_bug36172.result storage/innodb_plugin/mysql-test/innodb_bug36172.test storage/innodb_plugin/mysql-test/innodb_bug40360.result storage/innodb_plugin/mysql-test/innodb_bug40360.test storage/innodb_plugin/mysql-test/innodb_bug40565.result storage/innodb_plugin/mysql-test/innodb_bug40565.test storage/innodb_plugin/mysql-test/innodb_bug41904.result storage/innodb_plugin/mysql-test/innodb_bug41904.test storage/innodb_plugin/mysql-test/innodb_bug42101-nonzero-master.opt storage/innodb_plugin/mysql-test/innodb_bug42101-nonzero.result storage/innodb_plugin/mysql-test/innodb_bug42101-nonzero.test storage/innodb_plugin/mysql-test/innodb_bug42101.result storage/innodb_plugin/mysql-test/innodb_bug42101.test storage/innodb_plugin/mysql-test/innodb_bug44032.result storage/innodb_plugin/mysql-test/innodb_bug44032.test storage/innodb_plugin/mysql-test/innodb_bug45357.result storage/innodb_plugin/mysql-test/innodb_bug45357.test storage/innodb_plugin/mysql-test/innodb_file_format.result storage/innodb_plugin/mysql-test/innodb_file_format.test storage/innodb_plugin/mysql-test/innodb_information_schema.result storage/innodb_plugin/mysql-test/innodb_information_schema.test storage/innodb_plugin/mysql-test/innodb_trx_weight.inc storage/innodb_plugin/mysql-test/innodb_trx_weight.result storage/innodb_plugin/mysql-test/innodb_trx_weight.test storage/innodb_plugin/mysql-test/patches/ storage/innodb_plugin/mysql-test/patches/README storage/innodb_plugin/mysql-test/patches/index_merge_innodb-explain.diff storage/innodb_plugin/mysql-test/patches/information_schema.diff storage/innodb_plugin/mysql-test/patches/innodb-index.diff storage/innodb_plugin/mysql-test/patches/innodb_file_per_table.diff storage/innodb_plugin/mysql-test/patches/innodb_lock_wait_timeout.diff storage/innodb_plugin/mysql-test/patches/innodb_thread_concurrency_basic.diff storage/innodb_plugin/mysql-test/patches/partition_innodb.diff storage/innodb_plugin/os/ storage/innodb_plugin/os/os0file.c storage/innodb_plugin/os/os0proc.c storage/innodb_plugin/os/os0sync.c storage/innodb_plugin/os/os0thread.c storage/innodb_plugin/page/ storage/innodb_plugin/page/page0cur.c storage/innodb_plugin/page/page0page.c storage/innodb_plugin/page/page0zip.c storage/innodb_plugin/pars/ storage/innodb_plugin/pars/lexyy.c storage/innodb_plugin/pars/make_bison.sh storage/innodb_plugin/pars/make_flex.sh storage/innodb_plugin/pars/pars0grm.c storage/innodb_plugin/pars/pars0grm.y storage/innodb_plugin/pars/pars0lex.l storage/innodb_plugin/pars/pars0opt.c storage/innodb_plugin/pars/pars0pars.c storage/innodb_plugin/pars/pars0sym.c storage/innodb_plugin/plug.in storage/innodb_plugin/que/ storage/innodb_plugin/que/que0que.c storage/innodb_plugin/read/ storage/innodb_plugin/read/read0read.c storage/innodb_plugin/rem/ storage/innodb_plugin/rem/rem0cmp.c storage/innodb_plugin/rem/rem0rec.c storage/innodb_plugin/row/ storage/innodb_plugin/row/row0ext.c storage/innodb_plugin/row/row0ins.c storage/innodb_plugin/row/row0merge.c storage/innodb_plugin/row/row0mysql.c storage/innodb_plugin/row/row0purge.c storage/innodb_plugin/row/row0row.c storage/innodb_plugin/row/row0sel.c storage/innodb_plugin/row/row0uins.c storage/innodb_plugin/row/row0umod.c storage/innodb_plugin/row/row0undo.c storage/innodb_plugin/row/row0upd.c storage/innodb_plugin/row/row0vers.c storage/innodb_plugin/scripts/ storage/innodb_plugin/scripts/install_innodb_plugins.sql storage/innodb_plugin/scripts/install_innodb_plugins_win.sql storage/innodb_plugin/setup.sh storage/innodb_plugin/srv/ storage/innodb_plugin/srv/srv0que.c storage/innodb_plugin/srv/srv0srv.c storage/innodb_plugin/srv/srv0start.c storage/innodb_plugin/sync/ storage/innodb_plugin/sync/sync0arr.c storage/innodb_plugin/sync/sync0rw.c storage/innodb_plugin/sync/sync0sync.c storage/innodb_plugin/thr/ storage/innodb_plugin/thr/thr0loc.c storage/innodb_plugin/trx/ storage/innodb_plugin/trx/trx0i_s.c storage/innodb_plugin/trx/trx0purge.c storage/innodb_plugin/trx/trx0rec.c storage/innodb_plugin/trx/trx0roll.c storage/innodb_plugin/trx/trx0rseg.c storage/innodb_plugin/trx/trx0sys.c storage/innodb_plugin/trx/trx0trx.c storage/innodb_plugin/trx/trx0undo.c storage/innodb_plugin/usr/ storage/innodb_plugin/usr/usr0sess.c storage/innodb_plugin/ut/ storage/innodb_plugin/ut/ut0auxconf_atomic_pthread_t_gcc.c storage/innodb_plugin/ut/ut0auxconf_atomic_pthread_t_solaris.c storage/innodb_plugin/ut/ut0auxconf_have_solaris_atomics.c storage/innodb_plugin/ut/ut0auxconf_pause.c storage/innodb_plugin/ut/ut0auxconf_sizeof_pthread_t.c storage/innodb_plugin/ut/ut0byte.c storage/innodb_plugin/ut/ut0dbg.c storage/innodb_plugin/ut/ut0list.c storage/innodb_plugin/ut/ut0mem.c storage/innodb_plugin/ut/ut0rnd.c storage/innodb_plugin/ut/ut0ut.c storage/innodb_plugin/ut/ut0vec.c storage/innodb_plugin/ut/ut0wqueue.c storage/innodb_plugin/win-plugin/ storage/innodb_plugin/win-plugin/README storage/innodb_plugin/win-plugin/win-plugin.diff storage/mysql_storage_engine.cmake win/create_def_file.js modified: BUILD/SETUP.sh BUILD/check-cpu CMakeLists.txt Docs/INSTALL-BINARY INSTALL-SOURCE INSTALL-WIN-SOURCE README client/Makefile.am client/mysql.cc client/mysql_upgrade.c client/mysqladmin.cc client/mysqlbinlog.cc client/mysqlcheck.c client/mysqldump.c client/mysqlimport.c client/mysqlshow.c client/mysqlslap.c client/mysqltest.cc cmd-line-utils/libedit/readline/readline.h cmd-line-utils/libedit/term.c cmd-line-utils/readline/Makefile.am cmd-line-utils/readline/bind.c cmd-line-utils/readline/complete.c cmd-line-utils/readline/display.c cmd-line-utils/readline/histexpand.c cmd-line-utils/readline/histfile.c cmd-line-utils/readline/history.h cmd-line-utils/readline/input.c cmd-line-utils/readline/isearch.c cmd-line-utils/readline/kill.c cmd-line-utils/readline/macro.c cmd-line-utils/readline/mbutil.c cmd-line-utils/readline/misc.c cmd-line-utils/readline/nls.c cmd-line-utils/readline/readline.h cmd-line-utils/readline/rlprivate.h cmd-line-utils/readline/rltty.c cmd-line-utils/readline/search.c cmd-line-utils/readline/terminal.c cmd-line-utils/readline/text.c cmd-line-utils/readline/tilde.c cmd-line-utils/readline/undo.c cmd-line-utils/readline/util.c cmd-line-utils/readline/vi_mode.c config/ac-macros/misc.m4 config/ac-macros/readline.m4 configure.in dbug/user.r extra/innochecksum.c extra/perror.c extra/yassl/src/handshake.cpp extra/yassl/taocrypt/include/modes.hpp extra/yassl/taocrypt/src/asn.cpp include/config-netware.h include/config-win.h include/hash.h include/m_ctype.h include/my_base.h include/my_global.h include/my_sys.h include/myisamchk.h include/myisammrg.h include/mysql/plugin.h include/thr_lock.h include/violite.h libmysql/CMakeLists.txt libmysql/Makefile.am libmysql/Makefile.shared libmysqld/CMakeLists.txt libmysqld/Makefile.am libmysqld/emb_qcache.h libmysqld/lib_sql.cc man/Makefile.am man/comp_err.1 man/innochecksum.1 man/make_win_bin_dist.1 man/msql2mysql.1 man/my_print_defaults.1 man/myisam_ftdump.1 man/myisamchk.1 man/myisamlog.1 man/myisampack.1 man/mysql-stress-test.pl.1 man/mysql-test-run.pl.1 man/mysql.1 man/mysql.server.1 man/mysql_client_test.1 man/mysql_config.1 man/mysql_convert_table_format.1 man/mysql_find_rows.1 man/mysql_fix_extensions.1 man/mysql_fix_privilege_tables.1 man/mysql_install_db.1 man/mysql_secure_installation.1 man/mysql_setpermission.1 man/mysql_tzinfo_to_sql.1 man/mysql_upgrade.1 man/mysql_waitpid.1 man/mysql_zap.1 man/mysqlaccess.1 man/mysqladmin.1 man/mysqlbinlog.1 man/mysqlbug.1 man/mysqlcheck.1 man/mysqld.8 man/mysqld_multi.1 man/mysqld_safe.1 man/mysqldump.1 man/mysqldumpslow.1 man/mysqlhotcopy.1 man/mysqlimport.1 man/mysqlmanager.8 man/mysqlshow.1 man/mysqlslap.1 man/mysqltest.1 man/ndbd.8 man/ndbd_redo_log_reader.1 man/ndbmtd.8 man/perror.1 man/replace.1 man/resolve_stack_dump.1 man/resolveip.1 mysql-test/Makefile.am mysql-test/collections/default.daily mysql-test/collections/default.experimental mysql-test/collections/default.push mysql-test/extra/binlog_tests/binlog.test mysql-test/extra/rpl_tests/rpl_deadlock.test mysql-test/extra/rpl_tests/rpl_reset_slave.test mysql-test/include/commit.inc mysql-test/include/concurrent.inc mysql-test/include/grant_cache.inc mysql-test/include/handler.inc mysql-test/include/index_merge1.inc mysql-test/include/mix1.inc mysql-test/include/mtr_check.sql mysql-test/include/mtr_warnings.sql mysql-test/include/query_cache.inc mysql-test/lib/My/CoreDump.pm mysql-test/lib/My/File/Path.pm mysql-test/lib/My/SafeProcess.pm mysql-test/lib/My/SafeProcess/Base.pm mysql-test/lib/My/SafeProcess/Makefile.am mysql-test/lib/My/SafeProcess/safe_process.cc mysql-test/lib/My/SafeProcess/safe_process_win.cc mysql-test/lib/mtr_cases.pm mysql-test/lib/mtr_process.pl mysql-test/lib/mtr_report.pm mysql-test/lib/mtr_unique.pm mysql-test/mysql-test-run.pl mysql-test/r/cast.result mysql-test/r/commit_1innodb.result mysql-test/r/concurrent_innodb_safelog.result mysql-test/r/concurrent_innodb_unsafelog.result mysql-test/r/consistent_snapshot.result mysql-test/r/count_distinct3.result mysql-test/r/create.result mysql-test/r/ctype_cp932_binlog_row.result mysql-test/r/ctype_cp932_binlog_stm.result mysql-test/r/ctype_euckr.result mysql-test/r/ctype_ldml.result mysql-test/r/ctype_recoding.result mysql-test/r/ctype_sjis.result mysql-test/r/ddl_i18n_koi8r.result mysql-test/r/ddl_i18n_utf8.result mysql-test/r/derived.result mysql-test/r/distinct.result mysql-test/r/fulltext.result mysql-test/r/func_compress.result mysql-test/r/func_concat.result mysql-test/r/func_crypt.result mysql-test/r/func_des_encrypt.result mysql-test/r/func_encrypt.result mysql-test/r/func_in.result mysql-test/r/func_math.result mysql-test/r/func_misc.result mysql-test/r/func_set.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/grant_cache_no_prot.result mysql-test/r/grant_cache_ps_prot.result mysql-test/r/group_min_max.result mysql-test/r/handler_innodb.result mysql-test/r/handler_myisam.result mysql-test/r/heap_btree.result mysql-test/r/index_merge_myisam.result mysql-test/r/information_schema.result mysql-test/r/information_schema_db.result mysql-test/r/init_file.result mysql-test/r/innodb-semi-consistent.result mysql-test/r/innodb.result mysql-test/r/innodb_mysql.result mysql-test/r/insert.result mysql-test/r/insert_select.result mysql-test/r/lock_multi.result mysql-test/r/merge.result mysql-test/r/myisam.result mysql-test/r/myisampack.result mysql-test/r/mysql.result mysql-test/r/mysqlbinlog.result mysql-test/r/mysqlbinlog_row_big.result mysql-test/r/mysqlcheck.result mysql-test/r/mysqldump.result mysql-test/r/mysqltest.result mysql-test/r/not_embedded_server.result mysql-test/r/openssl_1.result mysql-test/r/order_by.result mysql-test/r/outfile_loaddata.result mysql-test/r/parser.result mysql-test/r/partition.result mysql-test/r/partition_csv.result mysql-test/r/partition_mgm.result mysql-test/r/ps_1general.result mysql-test/r/query_cache_debug.result mysql-test/r/repair.result mysql-test/r/select.result mysql-test/r/shm.result mysql-test/r/sp-error.result mysql-test/r/sp.result mysql-test/r/sp_notembedded.result mysql-test/r/sql_mode.result mysql-test/r/status.result mysql-test/r/subselect.result mysql-test/r/subselect3.result mysql-test/r/table_elim.result mysql-test/r/trigger.result mysql-test/r/trigger_notembedded.result mysql-test/r/type_newdecimal.result mysql-test/r/type_time.result mysql-test/r/union.result mysql-test/r/upgrade.result mysql-test/r/user_var.result mysql-test/r/varbinary.result mysql-test/r/variables-notembedded.result mysql-test/r/variables.result mysql-test/r/view.result mysql-test/r/xa.result mysql-test/r/xml.result mysql-test/std_data/init_file.dat mysql-test/suite/binlog/r/binlog_database.result mysql-test/suite/binlog/r/binlog_innodb.result mysql-test/suite/binlog/r/binlog_innodb_row.result mysql-test/suite/binlog/r/binlog_multi_engine.result mysql-test/suite/binlog/r/binlog_row_binlog.result mysql-test/suite/binlog/r/binlog_row_ctype_ucs.result mysql-test/suite/binlog/r/binlog_row_insert_select.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_mix_innodb_myisam.result mysql-test/suite/binlog/r/binlog_stm_ps.result mysql-test/suite/binlog/r/binlog_stm_row.result mysql-test/suite/binlog/r/binlog_unsafe.result mysql-test/suite/binlog/t/binlog_unsafe.test mysql-test/suite/funcs_1/datadict/is_key_column_usage.inc mysql-test/suite/funcs_1/datadict/is_routines.inc mysql-test/suite/funcs_1/datadict/is_schemata.inc mysql-test/suite/funcs_1/datadict/is_tables.inc mysql-test/suite/funcs_1/datadict/is_triggers.inc mysql-test/suite/funcs_1/datadict/is_views.inc mysql-test/suite/funcs_1/datadict/processlist_priv.inc mysql-test/suite/funcs_1/datadict/statistics.inc mysql-test/suite/funcs_1/datadict/table_constraints.inc mysql-test/suite/funcs_1/datadict/tables.inc mysql-test/suite/funcs_1/datadict/tables1.inc mysql-test/suite/funcs_1/r/is_columns_is_embedded.result mysql-test/suite/funcs_1/r/is_columns_myisam_embedded.result mysql-test/suite/funcs_1/r/is_columns_mysql_embedded.result mysql-test/suite/funcs_1/r/is_routines.result mysql-test/suite/funcs_1/r/storedproc.result mysql-test/suite/funcs_1/storedproc/storedproc_06.inc mysql-test/suite/funcs_1/storedproc/storedproc_10.inc mysql-test/suite/funcs_1/t/disabled.def mysql-test/suite/funcs_1/t/is_basics_mixed.test mysql-test/suite/funcs_1/t/is_column_privileges.test mysql-test/suite/funcs_1/t/is_column_privileges_is_mysql_test.test mysql-test/suite/funcs_1/t/is_columns.test mysql-test/suite/funcs_1/t/is_schema_privileges.test mysql-test/suite/funcs_1/t/is_schema_privileges_is_mysql_test.test mysql-test/suite/funcs_1/t/is_schemata_is_mysql_test.test mysql-test/suite/funcs_1/t/is_statistics.test mysql-test/suite/funcs_1/t/is_table_constraints.test mysql-test/suite/funcs_1/t/is_table_privileges.test mysql-test/suite/funcs_1/t/is_user_privileges.test mysql-test/suite/funcs_1/t/myisam_views.test mysql-test/suite/funcs_1/t/storedproc.test mysql-test/suite/funcs_1/triggers/triggers_03.inc mysql-test/suite/funcs_1/triggers/triggers_03e_columns.inc mysql-test/suite/funcs_1/triggers/triggers_03e_db_level.inc mysql-test/suite/funcs_1/triggers/triggers_03e_db_table_mix.inc mysql-test/suite/funcs_1/triggers/triggers_03e_definer.inc mysql-test/suite/funcs_1/triggers/triggers_03e_global_db_mix.inc mysql-test/suite/funcs_1/triggers/triggers_03e_prepare.inc mysql-test/suite/funcs_1/triggers/triggers_03e_table_level.inc mysql-test/suite/funcs_1/triggers/triggers_03e_transaction.inc mysql-test/suite/funcs_1/triggers/triggers_0407.inc mysql-test/suite/funcs_1/triggers/triggers_08.inc mysql-test/suite/funcs_2/charset/charset_master.test mysql-test/suite/maria/r/maria3.result mysql-test/suite/ndb/my.cnf mysql-test/suite/ndb/r/ndb_binlog_format.result mysql-test/suite/ndb_team/r/rpl_ndb_mix_innodb.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_syntax_innodb.result mysql-test/suite/parts/r/partition_syntax_myisam.result mysql-test/suite/rpl/include/rpl_mixed_ddl.inc mysql-test/suite/rpl/r/rpl_binlog_grant.result mysql-test/suite/rpl/r/rpl_bug33931.result mysql-test/suite/rpl/r/rpl_deadlock_innodb.result mysql-test/suite/rpl/r/rpl_idempotency.result mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result mysql-test/suite/rpl/r/rpl_rbr_to_sbr.result mysql-test/suite/rpl/r/rpl_row_basic_11bugs.result mysql-test/suite/rpl/r/rpl_row_create_table.result mysql-test/suite/rpl/r/rpl_row_log.result mysql-test/suite/rpl/r/rpl_row_log_innodb.result mysql-test/suite/rpl/r/rpl_row_reset_slave.result mysql-test/suite/rpl/r/rpl_sf.result mysql-test/suite/rpl/r/rpl_skip_error.result mysql-test/suite/rpl/r/rpl_slave_load_tmpdir_not_exist.result mysql-test/suite/rpl/r/rpl_slave_skip.result mysql-test/suite/rpl/r/rpl_start_stop_slave.result mysql-test/suite/rpl/r/rpl_stm_loadfile.result mysql-test/suite/rpl/r/rpl_stm_reset_slave.result mysql-test/suite/rpl/r/rpl_temp_table_mix_row.result mysql-test/suite/rpl/r/rpl_temporary.result mysql-test/suite/rpl/r/rpl_udf.result mysql-test/suite/rpl/t/disabled.def mysql-test/suite/rpl/t/rpl_binlog_corruption.test mysql-test/suite/rpl/t/rpl_bug33931.test mysql-test/suite/rpl/t/rpl_do_grant.test mysql-test/suite/rpl/t/rpl_idempotency.test mysql-test/suite/rpl/t/rpl_incident.test mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test mysql-test/suite/rpl/t/rpl_sf.test mysql-test/suite/rpl/t/rpl_skip_error.test mysql-test/suite/rpl/t/rpl_slave_load_tmpdir_not_exist.test mysql-test/suite/rpl/t/rpl_sp.test mysql-test/suite/rpl/t/rpl_start_stop_slave.test mysql-test/suite/rpl/t/rpl_temp_table_mix_row.test mysql-test/suite/rpl/t/rpl_temporary.test mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result mysql-test/suite/rpl_ndb/r/rpl_ndb_stm_innodb.result mysql-test/suite/rpl_ndb/t/disabled.def mysql-test/suite/rpl_ndb/t/rpl_ndb_2other-slave.opt mysql-test/suite/sys_vars/r/binlog_cache_size_basic_64.result mysql-test/suite/sys_vars/r/bulk_insert_buffer_size_basic_64.result mysql-test/suite/sys_vars/r/delayed_insert_limit_basic_64.result mysql-test/suite/sys_vars/r/delayed_queue_size_basic_64.result mysql-test/suite/sys_vars/r/innodb_data_home_dir_basic.result mysql-test/suite/sys_vars/r/innodb_flush_method_basic.result mysql-test/suite/sys_vars/r/join_buffer_size_basic_64.result mysql-test/suite/sys_vars/r/key_buffer_size_basic_64.result mysql-test/suite/sys_vars/r/log_warnings_basic_64.result mysql-test/suite/sys_vars/r/max_binlog_cache_size_basic_64.result mysql-test/suite/sys_vars/r/max_connect_errors_basic_64.result mysql-test/suite/sys_vars/r/max_heap_table_size_basic_64.result mysql-test/suite/sys_vars/r/max_seeks_for_key_basic_64.result mysql-test/suite/sys_vars/r/max_tmp_tables_basic_64.result mysql-test/suite/sys_vars/r/max_write_lock_count_basic_64.result mysql-test/suite/sys_vars/r/min_examined_row_limit_basic_64.result mysql-test/suite/sys_vars/r/multi_range_count_basic_64.result mysql-test/suite/sys_vars/r/myisam_max_sort_file_size_basic_64.result mysql-test/suite/sys_vars/r/myisam_repair_threads_basic_64.result mysql-test/suite/sys_vars/r/myisam_sort_buffer_size_basic_64.result mysql-test/suite/sys_vars/r/net_retry_count_basic_64.result mysql-test/suite/sys_vars/r/query_alloc_block_size_basic_64.result mysql-test/suite/sys_vars/r/query_cache_limit_basic_64.result mysql-test/suite/sys_vars/r/query_cache_min_res_unit_basic_64.result mysql-test/suite/sys_vars/r/query_cache_size_basic_64.result mysql-test/suite/sys_vars/r/query_prealloc_size_basic_64.result mysql-test/suite/sys_vars/r/range_alloc_block_size_basic_64.result mysql-test/suite/sys_vars/r/rpl_init_slave_func.result mysql-test/suite/sys_vars/r/rpl_recovery_rank_basic_64.result mysql-test/suite/sys_vars/r/slave_transaction_retries_basic_64.result mysql-test/suite/sys_vars/r/ssl_capath_basic.result mysql-test/suite/sys_vars/r/ssl_cipher_basic.result mysql-test/suite/sys_vars/r/sync_binlog_basic_64.result mysql-test/suite/sys_vars/r/transaction_alloc_block_size_basic_64.result mysql-test/suite/sys_vars/r/transaction_prealloc_size_basic_64.result mysql-test/suite/sys_vars/r/wait_timeout_basic_64.result mysql-test/suite/sys_vars/t/innodb_data_home_dir_basic.test mysql-test/suite/sys_vars/t/innodb_flush_method_basic.test mysql-test/suite/sys_vars/t/ssl_capath_basic.test mysql-test/suite/sys_vars/t/ssl_cipher_basic.test mysql-test/t/archive_bitfield.test mysql-test/t/cast.test mysql-test/t/client_xml.test mysql-test/t/connect.test mysql-test/t/consistent_snapshot.test mysql-test/t/count_distinct3.test mysql-test/t/create.test mysql-test/t/csv.test mysql-test/t/ctype_cp932_binlog_stm.test mysql-test/t/ctype_euckr.test mysql-test/t/ctype_ldml.test mysql-test/t/ctype_sjis.test mysql-test/t/ddl_i18n_koi8r.test mysql-test/t/ddl_i18n_utf8.test mysql-test/t/derived.test mysql-test/t/disabled.def mysql-test/t/drop.test mysql-test/t/events_grant.test mysql-test/t/events_stress.test mysql-test/t/events_trans_notembedded.test mysql-test/t/fix_priv_tables.test mysql-test/t/flush.test mysql-test/t/fulltext.test mysql-test/t/func_compress.test mysql-test/t/func_concat.test mysql-test/t/func_crypt.test mysql-test/t/func_des_encrypt.test mysql-test/t/func_encrypt.test mysql-test/t/func_in.test mysql-test/t/func_math.test mysql-test/t/func_misc.test mysql-test/t/func_set.test mysql-test/t/func_str.test mysql-test/t/gis-rtree.test mysql-test/t/gis.test mysql-test/t/grant.test mysql-test/t/group_min_max.test mysql-test/t/heap_btree.test mysql-test/t/information_schema.test mysql-test/t/information_schema_db.test mysql-test/t/init_file.test mysql-test/t/innodb-semi-consistent.test mysql-test/t/innodb-use-sys-malloc.test mysql-test/t/innodb.test mysql-test/t/innodb_mysql.test mysql-test/t/innodb_notembedded.test mysql-test/t/innodb_xtradb_bug317074.test mysql-test/t/insert.test mysql-test/t/insert_select.test mysql-test/t/lock_multi.test mysql-test/t/lowercase_fs_off.test mysql-test/t/merge.test mysql-test/t/multi_update2.test mysql-test/t/myisam.test mysql-test/t/myisampack.test mysql-test/t/mysql.test mysql-test/t/mysql_upgrade.test mysql-test/t/mysqlbinlog.test mysql-test/t/mysqlbinlog_row_big.test mysql-test/t/mysqlcheck.test mysql-test/t/mysqldump.test mysql-test/t/mysqltest.test mysql-test/t/not_embedded_server.test mysql-test/t/openssl_1.test mysql-test/t/order_by.test mysql-test/t/outfile_loaddata.test mysql-test/t/parser.test mysql-test/t/partition.test mysql-test/t/partition_csv.test mysql-test/t/partition_mgm.test mysql-test/t/plugin.test mysql-test/t/plugin_load-master.opt mysql-test/t/ps_1general.test mysql-test/t/query_cache_debug.test mysql-test/t/select.test mysql-test/t/shm.test mysql-test/t/sp-error.test mysql-test/t/sp.test mysql-test/t/sp_notembedded.test mysql-test/t/sp_trans_log.test mysql-test/t/sql_mode.test mysql-test/t/status.test mysql-test/t/subselect.test mysql-test/t/subselect3.test mysql-test/t/table_elim.test mysql-test/t/trigger.test mysql-test/t/trigger_notembedded.test mysql-test/t/type_newdecimal.test mysql-test/t/type_time.test mysql-test/t/union.test mysql-test/t/upgrade.test mysql-test/t/user_var.test mysql-test/t/variables-big.test mysql-test/t/variables-notembedded-master.opt mysql-test/t/variables.test mysql-test/t/view.test mysql-test/t/xa.test mysql-test/t/xml.test mysql-test/valgrind.supp mysys/Makefile.am mysys/array.c mysys/charset.c mysys/hash.c mysys/mf_format.c mysys/mf_getdate.c mysys/mf_iocache2.c mysys/mf_keycache.c mysys/my_getopt.c mysys/my_handler_errors.h mysys/my_init.c scripts/fill_help_tables.sql scripts/make_binary_distribution.sh scripts/make_win_bin_dist scripts/mysql_convert_table_format.sh scripts/mysql_find_rows.sh scripts/mysql_fix_extensions.sh scripts/mysql_setpermission.sh scripts/mysql_zap.sh scripts/mysqlaccess.sh scripts/mysqld_multi.sh scripts/mysqld_safe.sh scripts/mysqldumpslow.sh scripts/mysqlhotcopy.sh sql-bench/README* sql-bench/as3ap.sh sql-bench/bench-count-distinct.sh sql-bench/bench-init.pl.sh sql-bench/compare-results.sh sql-bench/copy-db.sh sql-bench/crash-me.sh sql-bench/innotest1.sh sql-bench/innotest1a.sh sql-bench/innotest1b.sh sql-bench/innotest2.sh sql-bench/innotest2a.sh sql-bench/innotest2b.sh sql-bench/run-all-tests.sh sql-bench/server-cfg.sh sql-bench/test-ATIS.sh sql-bench/test-alter-table.sh sql-bench/test-big-tables.sh sql-bench/test-connect.sh sql-bench/test-create.sh sql-bench/test-insert.sh sql-bench/test-select.sh sql-bench/test-transactions.sh sql-bench/test-wisconsin.sh sql-common/client.c sql/CMakeLists.txt sql/Makefile.am sql/event_data_objects.cc sql/event_scheduler.cc sql/events.cc sql/field.cc sql/ha_ndbcluster.cc sql/ha_ndbcluster_binlog.cc sql/ha_partition.cc sql/handler.cc sql/handler.h sql/item.cc sql/item.h sql/item_func.cc sql/item_func.h sql/item_geofunc.cc sql/item_strfunc.cc sql/item_strfunc.h sql/item_subselect.cc sql/item_sum.cc sql/item_xmlfunc.cc sql/lex.h sql/log.cc sql/log.h sql/log_event.cc sql/log_event.h sql/my_decimal.h sql/mysql_priv.h sql/mysqld.cc sql/net_serv.cc sql/opt_range.cc sql/opt_table_elimination.cc sql/parse_file.cc sql/parse_file.h sql/password.c sql/protocol.cc sql/protocol.h sql/rpl_filter.cc sql/rpl_reporting.cc sql/rpl_reporting.h sql/rpl_rli.cc sql/scheduler.cc sql/set_var.cc sql/share/errmsg.txt sql/slave.cc sql/slave.h sql/sp.cc sql/sp.h sql/sp_head.cc sql/sp_head.h sql/sp_pcontext.cc sql/sp_pcontext.h sql/spatial.h sql/sql_acl.cc sql/sql_acl.h sql/sql_base.cc sql/sql_cache.cc sql/sql_cache.h sql/sql_class.cc sql/sql_class.h sql/sql_connect.cc sql/sql_crypt.cc sql/sql_crypt.h sql/sql_db.cc sql/sql_delete.cc sql/sql_derived.cc sql/sql_handler.cc sql/sql_insert.cc sql/sql_lex.cc sql/sql_lex.h sql/sql_list.h sql/sql_load.cc sql/sql_parse.cc sql/sql_partition.cc sql/sql_plugin.cc sql/sql_plugin.h sql/sql_prepare.cc sql/sql_rename.cc sql/sql_repl.cc sql/sql_select.cc sql/sql_show.cc sql/sql_string.cc sql/sql_string.h sql/sql_table.cc sql/sql_test.cc sql/sql_union.cc sql/sql_update.cc sql/sql_view.cc sql/sql_view.h sql/sql_yacc.yy sql/structs.h sql/table.cc sql/table.h sql/thr_malloc.cc sql/unireg.cc sql/unireg.h storage/Makefile.am storage/archive/CMakeLists.txt storage/archive/ha_archive.cc storage/blackhole/CMakeLists.txt storage/csv/CMakeLists.txt storage/example/CMakeLists.txt storage/federated/CMakeLists.txt storage/federated/ha_federated.cc storage/heap/CMakeLists.txt storage/heap/ha_heap.cc storage/heap/ha_heap.h storage/ibmdb2i/db2i_charsetSupport.cc storage/ibmdb2i/db2i_collationSupport.cc storage/ibmdb2i/db2i_conversion.cc storage/ibmdb2i/db2i_errors.cc storage/ibmdb2i/db2i_errors.h storage/ibmdb2i/db2i_misc.h storage/ibmdb2i/db2i_myconv.h storage/ibmdb2i/db2i_rir.cc storage/ibmdb2i/ha_ibmdb2i.cc storage/ibmdb2i/ha_ibmdb2i.h storage/innobase/CMakeLists.txt storage/innobase/Makefile.am storage/innobase/btr/btr0cur.c storage/innobase/dict/dict0dict.c storage/innobase/fil/fil0fil.c storage/innobase/handler/ha_innodb.cc storage/innobase/ibuf/ibuf0ibuf.c storage/innobase/include/fsp0fsp.h storage/innobase/include/mtr0log.ic storage/innobase/include/row0mysql.h storage/innobase/include/srv0srv.h storage/innobase/include/trx0rseg.ic storage/innobase/include/trx0sys.h storage/innobase/include/trx0sys.ic storage/innobase/include/trx0trx.h storage/innobase/include/trx0trx.ic storage/innobase/lock/lock0lock.c storage/innobase/page/page0cur.c storage/innobase/row/row0mysql.c storage/innobase/row/row0sel.c storage/innobase/srv/srv0srv.c storage/innobase/trx/trx0purge.c storage/innobase/trx/trx0rec.c storage/innobase/trx/trx0sys.c storage/innobase/trx/trx0trx.c storage/innobase/trx/trx0undo.c storage/maria/CMakeLists.txt storage/maria/ha_maria.cc storage/myisam/CMakeLists.txt* storage/myisam/ft_boolean_search.c storage/myisam/ha_myisam.cc storage/myisam/ha_myisam.h storage/myisam/mi_close.c storage/myisam/mi_delete.c storage/myisam/mi_dynrec.c storage/myisam/mi_open.c storage/myisam/mi_packrec.c storage/myisam/mi_write.c storage/myisam/myisamchk.c storage/myisammrg/CMakeLists.txt storage/myisammrg/ha_myisammrg.cc storage/myisammrg/ha_myisammrg.h storage/myisammrg/myrg_info.c storage/myisammrg/myrg_open.c storage/ndb/src/kernel/blocks/backup/read.cpp storage/ndb/src/mgmsrv/Makefile.am storage/ndb/test/run-test/Makefile.am storage/ndb/tools/restore/consumer_restore.cpp storage/ndb/tools/restore/consumer_restorem.cpp storage/xtradb/CMakeLists.txt storage/xtradb/btr/btr0cur.c storage/xtradb/buf/buf0flu.c storage/xtradb/handler/ha_innodb.cc storage/xtradb/handler/handler0vars.h storage/xtradb/handler/i_s.cc storage/xtradb/include/row0mysql.h storage/xtradb/include/srv0srv.h storage/xtradb/include/trx0trx.h storage/xtradb/include/trx0trx.ic storage/xtradb/lock/lock0lock.c storage/xtradb/plug.in storage/xtradb/row/row0mysql.c storage/xtradb/row/row0sel.c storage/xtradb/srv/srv0srv.c storage/xtradb/srv/srv0start.c storage/xtradb/trx/trx0trx.c strings/ctype-cp932.c strings/ctype-euc_kr.c strings/ctype-sjis.c strings/ctype-uca.c strings/decimal.c support-files/build-tags support-files/my-huge.cnf.sh support-files/my-innodb-heavy-4G.cnf.sh support-files/my-large.cnf.sh support-files/my-medium.cnf.sh support-files/my-small.cnf.sh support-files/mysql.server.sh support-files/mysql.spec.sh tests/Makefile.am tests/grant.pl* tests/mysql_client_test.c vio/viosocket.c vio/viosslfactories.c win/Makefile.am win/configure.js The size of the diff (353877 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] bzr commit into MariaDB 5.1, with Maria 1.5:maria branch (igor:2755)
by Igor Babaev 25 Sep '09

25 Sep '09

#At lp:maria based on revid:igor@askmonty.org-20090925064243-2kf7ah4m6u25ex58 2755 Igor Babaev 2009-09-24 [merge] Merge modified: mysql-test/r/create.result mysql-test/r/information_schema.result mysql-test/t/information_schema.test mysql-test/t/not_embedded_server.test sql/sql_show.cc === modified file 'mysql-test/r/create.result' --- a/mysql-test/r/create.result 2009-09-07 20:50:10 +0000 +++ b/mysql-test/r/create.result 2009-09-23 11:03:47 +0000 @@ -1749,7 +1749,8 @@ t1 CREATE TABLE `t1` ( `COMMAND` varchar(16) NOT NULL DEFAULT '', `TIME` int(7) NOT NULL DEFAULT '0', `STATE` varchar(64) DEFAULT NULL, - `INFO` longtext + `INFO` longtext, + `TIME_MS` decimal(22,3) NOT NULL DEFAULT '0.000' ) DEFAULT CHARSET=utf8 drop table t1; create temporary table t1 like information_schema.processlist; @@ -1763,7 +1764,8 @@ t1 CREATE TEMPORARY TABLE `t1` ( `COMMAND` varchar(16) NOT NULL DEFAULT '', `TIME` int(7) NOT NULL DEFAULT '0', `STATE` varchar(64) DEFAULT NULL, - `INFO` longtext + `INFO` longtext, + `TIME_MS` decimal(22,3) NOT NULL DEFAULT '0.000' ) DEFAULT CHARSET=utf8 drop table t1; create table t1 like information_schema.character_sets; === modified file 'mysql-test/r/information_schema.result' --- a/mysql-test/r/information_schema.result 2009-09-07 20:50:10 +0000 +++ b/mysql-test/r/information_schema.result 2009-09-23 11:03:47 +0000 @@ -1380,6 +1380,17 @@ select user,db from information_schema.p user db user3148 test drop user user3148@localhost; +SELECT 'other connection here' AS who; +who +other connection here +SELECT IF(`time` > 0, 'OK', `time`) AS time_low, +IF(`time` < 1000, 'OK', `time`) AS time_high, +IF(time_ms > 900, 'OK', time_ms) AS time_ms_low, +IF(time_ms < 1000000, 'OK', time_ms) AS time_ms_high +FROM INFORMATION_SCHEMA.PROCESSLIST +WHERE ID=@tid; +time_low time_high time_ms_low time_ms_high +OK OK OK OK DROP TABLE IF EXISTS server_status; DROP EVENT IF EXISTS event_status; SET GLOBAL event_scheduler=1; @@ -1602,8 +1613,7 @@ CREATE_OPTIONS key_block_size=1 DROP TABLE t1; SET TIMESTAMP=@@TIMESTAMP + 10000000; -SELECT 'OK' AS TEST_RESULT FROM INFORMATION_SCHEMA.PROCESSLIST WHERE time < 0; +SELECT 'NOT_OK' AS TEST_RESULT FROM INFORMATION_SCHEMA.PROCESSLIST WHERE time < 0; TEST_RESULT -OK SET TIMESTAMP=DEFAULT; End of 5.1 tests. === modified file 'mysql-test/t/information_schema.test' --- a/mysql-test/t/information_schema.test 2009-09-07 20:50:10 +0000 +++ b/mysql-test/t/information_schema.test 2009-09-23 11:03:47 +0000 @@ -1099,6 +1099,25 @@ disconnect con3148; drop user user3148@localhost; # +# `time` and `time_ms` columns of INFORMATION_SCHEMA.PROCESSLIST. +# +connect (pslistcon,localhost,root,,test); +let $ID= `select connection_id()`; +SELECT 'other connection here' AS who; +connection default; +sleep 1; +--disable_query_log +eval SET @tid=$ID; +--enable_query_log +SELECT IF(`time` > 0, 'OK', `time`) AS time_low, + IF(`time` < 1000, 'OK', `time`) AS time_high, + IF(time_ms > 900, 'OK', time_ms) AS time_ms_low, + IF(time_ms < 1000000, 'OK', time_ms) AS time_ms_high + FROM INFORMATION_SCHEMA.PROCESSLIST + WHERE ID=@tid; +disconnect pslistcon; + +# # Bug#26174 Server Crash: INSERT ... SELECT ... FROM I_S.GLOBAL_STATUS # in Event (see also openssl_1.test) # @@ -1352,9 +1371,16 @@ DROP TABLE t1; # Bug #22047: Time in SHOW PROCESSLIST for SQL thread in replication seems # to become negative # +# Note that at the time of writing, MariaDB differs in behaviour from MySQL on +# the `time` column. In MySQL this changes depending on the setting of +# @TIMESTAMP, which is contrary to the documented (and sensible) behaviour. +# In MariaDB, the `time` column is independent of @TIMESTAMP. +# (The rationale for this is to keep `time` and `time_ms` consistent; +# @TIMESTAMP has no microsecond precision). +# SET TIMESTAMP=@@TIMESTAMP + 10000000; -SELECT 'OK' AS TEST_RESULT FROM INFORMATION_SCHEMA.PROCESSLIST WHERE time < 0; +SELECT 'NOT_OK' AS TEST_RESULT FROM INFORMATION_SCHEMA.PROCESSLIST WHERE time < 0; SET TIMESTAMP=DEFAULT; --echo End of 5.1 tests. === modified file 'mysql-test/t/not_embedded_server.test' --- a/mysql-test/t/not_embedded_server.test 2009-04-30 10:29:19 +0000 +++ b/mysql-test/t/not_embedded_server.test 2009-09-23 11:03:47 +0000 @@ -32,7 +32,7 @@ select 1; ## End of 4.1 tests # #prepare stmt1 from ' SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST WHERE COMMAND!=\'Daemon\' '; -#--replace_column 1 number 6 time 3 localhost +#--replace_column 1 number 6 time 3 localhost 9 time_ms #execute stmt1; #deallocate prepare stmt1; === modified file 'sql/sql_show.cc' --- a/sql/sql_show.cc 2009-09-15 10:46:35 +0000 +++ b/sql/sql_show.cc 2009-09-23 11:03:47 +0000 @@ -1819,7 +1819,7 @@ int fill_schema_processlist(THD* thd, TA TABLE *table= tables->table; CHARSET_INFO *cs= system_charset_info; char *user; - time_t now= my_time(0); + ulonglong unow= my_micro_time(); DBUG_ENTER("fill_process_list"); user= thd->security_ctx->master_access & PROCESS_ACL ? @@ -1877,8 +1877,8 @@ int fill_schema_processlist(THD* thd, TA table->field[4]->store(command_name[tmp->command].str, command_name[tmp->command].length, cs); /* MYSQL_TIME */ - table->field[5]->store((longlong)(tmp->start_time ? - now - tmp->start_time : 0), FALSE); + const ulonglong utime= tmp->start_utime ? unow - tmp->start_utime : 0; + table->field[5]->store(utime / 1000000, TRUE); /* STATE */ #ifndef EMBEDDED_LIBRARY val= (char*) (tmp->locked ? "Locked" : @@ -1912,6 +1912,9 @@ int fill_schema_processlist(THD* thd, TA table->field[7]->set_notnull(); } + /* TIME_MS */ + table->field[8]->store((double)(utime / 1000.0)); + if (schema_table_store_record(thd, table)) { VOID(pthread_mutex_unlock(&LOCK_thread_count)); @@ -5542,7 +5545,7 @@ ST_SCHEMA_TABLE *get_schema_table(enum e into it two numbers, based on modulus of base-10 numbers. In the ones position is the number of decimals. Tens position is unused. In the hundreds and thousands position is a two-digit decimal number representing - length. Encode this value with (decimals*100)+length , where + length. Encode this value with (length*100)+decimals , where 0<decimals<10 and 0<=length<100 . @param @@ -6557,6 +6560,8 @@ ST_FIELD_INFO processlist_fields_info[]= {"STATE", 64, MYSQL_TYPE_STRING, 0, 1, "State", SKIP_OPEN_TABLE}, {"INFO", PROCESS_LIST_INFO_WIDTH, MYSQL_TYPE_STRING, 0, 1, "Info", SKIP_OPEN_TABLE}, + {"TIME_MS", 100 * (MY_INT64_NUM_DECIMAL_DIGITS + 1) + 3, MYSQL_TYPE_DECIMAL, + 0, 0, "Time_ms", SKIP_OPEN_TABLE}, {0, 0, MYSQL_TYPE_STRING, 0, 0, 0, SKIP_OPEN_TABLE} };

1 0

[Maria-developers] bzr commit into MariaDB 5.1, with Maria 1.5:maria branch (igor:2754)
by Igor Babaev 25 Sep '09

25 Sep '09

#At lp:maria based on revid:igor@askmonty.org-20090920030226-xxh7a4i3gre9rqhe 2754 Igor Babaev 2009-09-24 Took care of mysql test suite failures on Windows. modified: mysql-test/suite/rpl/t/rpl_binlog_corruption.test mysql-test/suite/rpl/t/rpl_killed_ddl.test vio/viosocket.c per-file messages: mysql-test/suite/rpl/t/rpl_binlog_corruption.test Disabled the test for Windows (see bug #47639) mysql-test/suite/rpl/t/rpl_killed_ddl.test Disabled the test for Windows (see bug #47638) vio/viosocket.c Added an implementation of vio_poll_read for Windows. Winsock does not support the poll function. So the existing generic implementation of vio_poll_read could not be used for Windows. === modified file 'mysql-test/suite/rpl/t/rpl_binlog_corruption.test' --- a/mysql-test/suite/rpl/t/rpl_binlog_corruption.test 2009-04-15 11:43:17 +0000 +++ b/mysql-test/suite/rpl/t/rpl_binlog_corruption.test 2009-09-25 06:42:43 +0000 @@ -15,6 +15,9 @@ # BUG#31793: log event corruption causes crash # BUG#40482: server/mysqlbinlog crashes when reading invalid Incident_log_event +# Temporarily disabled on Windows due to bug #47639 +--source include/not_windows.inc + source include/have_log_bin.inc; # BUG#40482 only manifested itself in debug-compiled binaries. source include/have_debug.inc; === modified file 'mysql-test/suite/rpl/t/rpl_killed_ddl.test' --- a/mysql-test/suite/rpl/t/rpl_killed_ddl.test 2009-04-08 23:42:51 +0000 +++ b/mysql-test/suite/rpl/t/rpl_killed_ddl.test 2009-09-25 06:42:43 +0000 @@ -31,6 +31,9 @@ # - BUG#25705 # - BUG#44171 +# Temporarily disabled on Windows due to bug #47638 +--source include/not_windows.inc + source include/have_debug.inc; source include/master-slave.inc; === modified file 'vio/viosocket.c' --- a/vio/viosocket.c 2009-09-07 20:50:10 +0000 +++ b/vio/viosocket.c 2009-09-25 06:42:43 +0000 @@ -361,7 +361,20 @@ void vio_in_addr(Vio *vio, struct in_add my_bool vio_poll_read(Vio *vio,uint timeout) { #ifndef HAVE_POLL +#if __WIN__ + int res; + struct fd_set fds; + struct timeval tv; + DBUG_ENTER("vio_poll"); + fds.fd_count= 1; + fds.fd_array[0]= vio->sd; + tv.tv_sec= timeout; + tv.tv_usec= 0; + res= select(1, &fds, NULL, NULL, &tv) ? 0 : 1; + DBUG_RETURN(res); +#else return 0; +#endif #else struct pollfd fds; int res;

1 0

[Maria-developers] [Branch ~maria-captains/maria/5.1] Rev 2734: merge
by noreply＠launchpad.net 24 Sep '09

24 Sep '09

Merge authors: Oleksandr "Sanja" Byelkin (sanja-byelkin) ------------------------------------------------------------ revno: 2734 [merge] committer: sanja(a)askmonty.org branch nick: work-maria-5.1-mysql-test-run-merge timestamp: Thu 2009-09-24 15:49:39 +0300 message: merge modified: mysql-test/lib/mtr_misc.pl mysql-test/mysql-test-run.pl -- 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] Rev 2734: merge in file:///Users/bell/maria/bzr/work-maria-5.1-mysql-test-run-merge/
by sanja＠askmonty.org 24 Sep '09

24 Sep '09

At file:///Users/bell/maria/bzr/work-maria-5.1-mysql-test-run-merge/ ------------------------------------------------------------ revno: 2734 [merge] revision-id: sanja(a)askmonty.org-20090924124939-nwi2kr48x0as70n8 parent: hakan(a)askmonty.org-20090918193250-imuhuvjq1n21b01n parent: sanja(a)askmonty.org-20090924121915-k4ooompd72l2hkn5 committer: sanja(a)askmonty.org branch nick: work-maria-5.1-mysql-test-run-merge timestamp: Thu 2009-09-24 15:49:39 +0300 message: merge modified: mysql-test/lib/mtr_misc.pl sp1f-mtr_misc.pl-20041230152647-z3fkxvkkqfydzuwdmzjgkfo3tyetnp3a mysql-test/mysql-test-run.pl sp1f-mysqltestrun.pl-20041230152716-xjnn5ndv4rr4by6ijmj5a4ysubxc7qh3 === modified file 'mysql-test/lib/mtr_misc.pl' --- a/mysql-test/lib/mtr_misc.pl 2009-02-19 09:01:25 +0000 +++ b/mysql-test/lib/mtr_misc.pl 2009-09-24 12:19:15 +0000 @@ -174,4 +174,24 @@ select(undef, undef, undef, ($millis/1000)); } +sub mtr_wait_lock_file { + die "usage: mtr_wait_lock_file(path_to_file, keep_alive)" unless @_ == 2; + my ($file, $keep_alive)= @_; + my $waited= 0; + my $msg_counter= $keep_alive; + + while ( -e $file) + { + if ($keep_alive && !$msg_counter) + { + print "\n-STOPPED- [pass] ".$keep_alive."\n"; + $msg_counter= $keep_alive; + } + mtr_milli_sleep(1000); + $waited= 1; + $msg_counter--; + } + return ($waited); +} + 1; === modified file 'mysql-test/mysql-test-run.pl' --- a/mysql-test/mysql-test-run.pl 2009-09-04 07:45:34 +0000 +++ b/mysql-test/mysql-test-run.pl 2009-09-24 12:49:39 +0000 @@ -253,6 +253,11 @@ my $opt_parallel= $ENV{MTR_PARALLEL} || 1; +# lock file to stop tests +my $opt_stop_file= $ENV{MTR_STOP_FILE}; +# print messages when test suite is stopped (for buildbot) +my $opt_stop_keep_alive= $ENV{MTR_STOP_KEEP_ALIVE}; + select(STDOUT); $| = 1; # Automatically flush STDOUT @@ -451,6 +456,15 @@ my $s= IO::Select->new(); $s->add($server); while (1) { + if ($opt_stop_file) + { + if (mtr_wait_lock_file($opt_stop_file, $opt_stop_keep_alive)) + { + # We were waiting so restart timer process + $suite_timeout_proc->kill(); + $suite_timeout_proc= My::SafeProcess->timer(suite_timeout()); + } + } my @ready = $s->can_read(1); # Wake up once every second foreach my $sock (@ready) { if ($sock == $server) { @@ -933,6 +947,8 @@ 'warnings!' => \$opt_warnings, 'timestamp' => \&report_option, 'timediff' => \&report_option, + 'stop-file=s' => \$opt_stop_file, + 'stop-keep-alive=i' => \$opt_stop_keep_alive, 'help|h' => \$opt_usage, 'list-options' => \$opt_list_options, @@ -5409,6 +5425,14 @@ warnings Scan the log files for warnings. Use --nowarnings to turn off. + stop-file=file (also MTR_STOP_FILE environment variable) if this + file detected mysql test will not start new tests + until the file will be removed. + stop-keep-alive=sec (also MTR_STOP_KEEP_ALIVE environment variable) + works with stop-file, print messages every sec + seconds when mysql test is waiting to removing + the file (for buildbot) + sleep=SECONDS Passed to mysqltest, will be used as fixed sleep time debug-sync-timeout=NUM Set default timeout for WAIT_FOR debug sync actions. Disable facility with NUM=0.

1 0

[Maria-developers] Rev 2724: Ability to stop mysql-test-run.pl temporary (useful for them who run buildbot slave on thier work computers) in file:///Users/bell/maria/bzr/work-maria-5.1/
by sanja＠askmonty.org 24 Sep '09

24 Sep '09

At file:///Users/bell/maria/bzr/work-maria-5.1/ ------------------------------------------------------------ revno: 2724 revision-id: sanja(a)askmonty.org-20090924121915-k4ooompd72l2hkn5 parent: psergey(a)askmonty.org-20090901115954-nge2brzh3akkmtlz committer: sanja(a)askmonty.org branch nick: work-maria-5.1 timestamp: Thu 2009-09-24 15:19:15 +0300 message: Ability to stop mysql-test-run.pl temporary (useful for them who run buildbot slave on thier work computers) === modified file 'mysql-test/lib/mtr_misc.pl' --- a/mysql-test/lib/mtr_misc.pl 2009-02-19 09:01:25 +0000 +++ b/mysql-test/lib/mtr_misc.pl 2009-09-24 12:19:15 +0000 @@ -174,4 +174,24 @@ select(undef, undef, undef, ($millis/1000)); } +sub mtr_wait_lock_file { + die "usage: mtr_wait_lock_file(path_to_file, keep_alive)" unless @_ == 2; + my ($file, $keep_alive)= @_; + my $waited= 0; + my $msg_counter= $keep_alive; + + while ( -e $file) + { + if ($keep_alive && !$msg_counter) + { + print "\n-STOPPED- [pass] ".$keep_alive."\n"; + $msg_counter= $keep_alive; + } + mtr_milli_sleep(1000); + $waited= 1; + $msg_counter--; + } + return ($waited); +} + 1; === modified file 'mysql-test/mysql-test-run.pl' --- a/mysql-test/mysql-test-run.pl 2009-06-22 08:06:35 +0000 +++ b/mysql-test/mysql-test-run.pl 2009-09-24 12:19:15 +0000 @@ -252,6 +252,11 @@ my $opt_parallel= $ENV{MTR_PARALLEL} || 1; +# lock file to stop tests +my $opt_stop_file= $ENV{MTR_STOP_FILE}; +# print messages when test suite is stopped (for buildbot) +my $opt_stop_keep_alive= $ENV{MTR_STOP_KEEP_ALIVE}; + select(STDOUT); $| = 1; # Automatically flush STDOUT @@ -450,6 +455,15 @@ my $s= IO::Select->new(); $s->add($server); while (1) { + if ($opt_stop_file) + { + if (mtr_wait_lock_file($opt_stop_file, $opt_stop_keep_alive)) + { + # We were waiting so restart timer process + $suite_timeout_proc->kill(); + $suite_timeout_proc= My::SafeProcess->timer(suite_timeout()); + } + } my @ready = $s->can_read(1); # Wake up once every second foreach my $sock (@ready) { if ($sock == $server) { @@ -931,6 +945,8 @@ 'warnings!' => \$opt_warnings, 'timestamp' => \&report_option, 'timediff' => \&report_option, + 'stop-file=s' => \$opt_stop_file, + 'stop-keep-alive=i' => \$opt_stop_keep_alive, 'help|h' => \$opt_usage, 'list-options' => \$opt_list_options, @@ -5392,6 +5408,14 @@ warnings Scan the log files for warnings. Use --nowarnings to turn off. + stop-file=file (also MTR_STOP_FILE environment variable) if this + file detected mysql test will not start new tests + until the file will be removed. + stop-keep-alive=sec (also MTR_STOP_KEEP_ALIVE environment variable) + works with stop-file, print messages every sec + seconds when mysql test is waiting to removing + the file (for buildbot) + sleep=SECONDS Passed to mysqltest, will be used as fixed sleep time debug-sync-timeout=NUM Set default timeout for WAIT_FOR debug sync actions. Disable facility with NUM=0.

1 0

Re: [Maria-developers] Updated (by Guest): Add a mysqlbinlog option to change the used database (36)
by Kristian Nielsen 24 Sep '09

24 Sep '09

Alexi1952 <Alexi1952(a)yandex.ru> writes: > PS. I don't know company rules, so being currently a "pre-member" of Maria (ha! I even don't know how the company is called) > I didn't send this reply to "maria-developers(a)lists.launchpad.net". If that's not right, I will do it. You are welcome to use maria-developers(a)lists.launchpad.net for anything related to development of MariaDB. We often have people also outside of Monty Program that provide insightful comments on patches or discussions that catch their interest. I've Cc:ed the list for now. (Are you a member of maria-developers@ ? If not, you should be, apply on https://launchpad.net/~maria-developers (or just let me know your Launchpad login) and I will approve you.) > > 18.09.09, 17:29, "Kristian Nielsen" <knielsen(a)knielsen-hq.org>: > >> Hi Alexi, >> Thanks for writing up the low-level design. I read it through, and have a >> couple of comments: >> > 1.3. In mysqlbinlog.cc: >> > >> > - Add { "rewrite-db", OPT_REWRITE_DB, ...} record to my_long_options: >> > - Add Rpl_filter object to mysqlbinlog.cc >> > >> > Rpl_filter* binlog_filter; >> Sharing code with similar replication options inside mysqld is a noble >> goal. However, in this case I think it is a case of "the cure is worse than >> the disease". >> The Rpl_filter class has _so_ much mysqld server internals that we do not want >> to mix into a client application. That is also why you need to do all these >> modifications in sql_list, rpl_filter, etc. >> So I think it is wrong to use the Rpl_filter class in mysqlbinlog. >> To share code between the two, I think the better method is to move out the >> needed functionality (add_db_rewrite() and get_rewrite_db()) in a separate >> class, and have both the Rpl_filter class and mysqlbinlog use that. >> Alternatively, if the shared functionality is really small (as it appears it >> might be), just duplicating the functionality may be better. > > ******************************************************************************* > Funny: in my first version I wrote my own simple list-class with add() and get() > functions (what is really needed here) and was "scarified" by SPetrunia for why > didn't I use Rpl_filter. :) His idea was that mysqlbinlog options should be Right, sharing the code is best, hence the idea to extract common functionality in a separate class. In particular, I do not like this method of Rpl_filter: bool tables_ok(const char* db, TABLE_LIST* tables); TABLE_LIST is deep deep into server internals, that is why I didn't like pulling Rpl_filter as it is now into mysqlbinlog. But actually Rpl_filter::tables_ok() seems to be the only problem of this kind in Rpl_filter. So probably we just need to move this single method out into a separate class (or existing class or static function, didn't check which would be most appropriate). That method feels misplaced in that class to me. So an Rpl_filter class without tables_ok() I see no problem with including in mysqlbinlog. That would seem to me much cleaner, and should be simple, what do you think? > processed in the same manner as for replication. > > I had two reasons for using the very Rpl_filter: > > 1. It already contains add_db_rewrite() and get_rewrite_db() functions which > are exactly what is needed. > > 2. I had in my mind WL40 ("Add a mysqlbinlog option to filter updates to > certain tables") for which also I saw needed function in Rpl_filter. Yes, I agree that these are good reasons. > But frankly speaking, I looked through Rpl_filter code not-deeply - just to > be sure that two mentioned function do what exactly I need and to get an > impression that other functions looks like appropriate for options mentioned > in WL40. I need to examine this more closely to take a final decision and/or > to continue discussing with you on this point. Nevertheless, just few notes: > > Note 1. In any case, I like the idea of a "separate class". > (But see the "objection" in Note 2 which may be applied to rpl_filter > as well). > > Note 2. Please note that, essentially, modifications touches only sql_list - > not Rpl_filter. As I noticed there several "generally used" classes > (lists is just one example) which are bound to the server context only > because of using the sql_alloc() function in new-operator(s). This > function returns MEM_ROOT pointer attached to the current thread and > because of that is "server-dependent". But why not - with the help of > just two-three #ifdef's - to make this classes server-independent? > Why not to allow sql_list to be used outside server context especially > in view of that sql_list essentially (i.e. functionally) is not server > dependent? > > Surely, I can foresee at least one reasonable objection: because these > classes strictly belong to the server "internals" and are not supposed > to be used outside. That's OK. But they can be used outside INDIRECTLY. > Thus starting to work on "embedded parser" (currently, my work is only > in embryo :) I came acrross several places where sql_alloc() is used in > the same "not-essentially-server-dependent" manner. So in my opinion, > making lists and similar classes applicable for both MYSQL_SERVER and > MYSQL_CLIENT contexts is quite reasonble in general. Yes. This is the other problem to be solved with getting Rpl_filter into mysqlbinlog (apart from the tables_ok() problem discussed above). And I agree that it _does_ make sense to have String, IList, HASH, DYNAMIC_ARRAY, etc. available in client code (and these seem to use sql_alloc, right?). So it's 'just' a matter of doing this in a good way. Maybe that is better seen in a full patch, and maybe we should ask someone (like Monty or maybe Sergei Golubchik) who has a better overview of how memory management works in the client and server code. But for now, a couple of comments: 1. Maybe some of this is already done? I would imagine at least some of the primitive data structures would be used in client code. 2. One of the crucial points is to control the lifetime of allocations. In the server there is extensive use of memroots with different lifetimes. Probably a good way would be to support memroots in client applications (don't know if/how much is already available). 3. I would like to avoid sprinkling #ifdef around the code, it should be possible to do in a cleaner way. #ifdef introduce complex dependencies when working on code, and there are already too much of that for mysqlbinlog. Though if the existing client code already depends on some #ifdef-magic we need to use it I guess. In particular related to the changes you propose: > - In rpl_filter.cc: > > Rpl_filter::Rpl_filter() : > ... > { > #ifdef MYSQL_CLIENT > init_alloc_root(&sql_list_client_mem_root, ...); > #endif > ... > } > > Rpl_filter::~Rpl_filter() > { ... > #ifdef MYSQL_CLIENT > free_root(&sql_list_client_mem_root, ...); > #endif > } This is particular feels wrong, Rpl_filter should not need to maintain a global mem_root like sql_list_client_mem_root. What if I want to use two instances of Rpl_filter? > - In sql_list.cc/h, Sql_alloc::new(size_t) and Sql_alloc::new[](size_t) > uses sql_alloc() which is THD dependent. These are to be modified > as follows: > > #ifdef MYSQL_CLIENT > extern MEM_ROOT sql_list_client_mem_root; // defined in sql_list.cc > #endif > > class Sql_alloc > { ... > static void *operator new(size_t size) throw () > { > #ifndef MYSQL_CLIENT > return sql_alloc(size); > #else > return alloc_root(&sql_list_client_mem_root, size); > #endif > } > static void *operator new[](size_t size) throw () > { > #ifndef MYSQL_CLIENT > return sql_alloc(size); > #else > return alloc_root(&sql_list_client_mem_root, size); > #endif > } > ... > } > Can't we instead of this just define an alternate implementation of sql_alloc() in mysqlbinlog? Then mysqlbinlog could initialize a memroot which is used in its version of sql_alloc(). And it seems we would not need any of the above #ifdef's? In fact if you look at the end of client/mysql.cc it seems to do exactly this. (Except it does not use memroot, just malloc(). Not sure what is best in our case). What do you think? > ************************************************************************************ > This is OK: I wrote my code closely going along the code of the corresponding > Table_map_log_event constructor (just in case, I copied full text of the rewrite_db > at the end of this letter). > ************************************************************************************ Ok, great! - Kristian.

2 3

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

23 Sep '09

#At lp:maria 2754 knielsen(a)knielsen-hq.org 2009-09-23 Merge Percona microsec_process patch into MariaDB. This adds a TIME_MS column to SHOW FULL PROCESSLIST and INFORMATION_SCHEMA.PROCESSLIST that works like the TIME column, but in units of milliseconds with microsecond precision. Note that this also changes behaviour of the existing TIME column. In the MySQL server, the TIME column changes when a thread sets @TIMESTAMP. This is contrary to documentation and also potentially confusing, so could in any case be considered a bug. With this patch, to ensure consistency between TIME and TIME_MS, setting @TIMESTAMP has no effect on either value. Add a test case for the TIME and TIME_MS columns. Update existing test cases for changed behaviour. Author: Percona Signed-off-by: Kristian Nielsen <knielsen(a)knielsen-hq.org> modified: mysql-test/r/create.result mysql-test/r/information_schema.result mysql-test/t/information_schema.test mysql-test/t/not_embedded_server.test sql/sql_show.cc per-file messages: mysql-test/r/create.result Result file update. mysql-test/r/information_schema.result Add test case. Result file update (changed behaviour). mysql-test/t/information_schema.test Add test case. Adjust test case for changed behaviour. mysql-test/t/not_embedded_server.test Update (commented-out) test case for newly added column. sql/sql_show.cc Merge Percona microsec_process patch into MariaDB. === modified file 'mysql-test/r/create.result' --- a/mysql-test/r/create.result 2009-09-07 20:50:10 +0000 +++ b/mysql-test/r/create.result 2009-09-23 11:03:47 +0000 @@ -1749,7 +1749,8 @@ t1 CREATE TABLE `t1` ( `COMMAND` varchar(16) NOT NULL DEFAULT '', `TIME` int(7) NOT NULL DEFAULT '0', `STATE` varchar(64) DEFAULT NULL, - `INFO` longtext + `INFO` longtext, + `TIME_MS` decimal(22,3) NOT NULL DEFAULT '0.000' ) DEFAULT CHARSET=utf8 drop table t1; create temporary table t1 like information_schema.processlist; @@ -1763,7 +1764,8 @@ t1 CREATE TEMPORARY TABLE `t1` ( `COMMAND` varchar(16) NOT NULL DEFAULT '', `TIME` int(7) NOT NULL DEFAULT '0', `STATE` varchar(64) DEFAULT NULL, - `INFO` longtext + `INFO` longtext, + `TIME_MS` decimal(22,3) NOT NULL DEFAULT '0.000' ) DEFAULT CHARSET=utf8 drop table t1; create table t1 like information_schema.character_sets; === modified file 'mysql-test/r/information_schema.result' --- a/mysql-test/r/information_schema.result 2009-09-07 20:50:10 +0000 +++ b/mysql-test/r/information_schema.result 2009-09-23 11:03:47 +0000 @@ -1380,6 +1380,17 @@ select user,db from information_schema.p user db user3148 test drop user user3148@localhost; +SELECT 'other connection here' AS who; +who +other connection here +SELECT IF(`time` > 0, 'OK', `time`) AS time_low, +IF(`time` < 1000, 'OK', `time`) AS time_high, +IF(time_ms > 900, 'OK', time_ms) AS time_ms_low, +IF(time_ms < 1000000, 'OK', time_ms) AS time_ms_high +FROM INFORMATION_SCHEMA.PROCESSLIST +WHERE ID=@tid; +time_low time_high time_ms_low time_ms_high +OK OK OK OK DROP TABLE IF EXISTS server_status; DROP EVENT IF EXISTS event_status; SET GLOBAL event_scheduler=1; @@ -1602,8 +1613,7 @@ CREATE_OPTIONS key_block_size=1 DROP TABLE t1; SET TIMESTAMP=@@TIMESTAMP + 10000000; -SELECT 'OK' AS TEST_RESULT FROM INFORMATION_SCHEMA.PROCESSLIST WHERE time < 0; +SELECT 'NOT_OK' AS TEST_RESULT FROM INFORMATION_SCHEMA.PROCESSLIST WHERE time < 0; TEST_RESULT -OK SET TIMESTAMP=DEFAULT; End of 5.1 tests. === modified file 'mysql-test/t/information_schema.test' --- a/mysql-test/t/information_schema.test 2009-09-07 20:50:10 +0000 +++ b/mysql-test/t/information_schema.test 2009-09-23 11:03:47 +0000 @@ -1099,6 +1099,25 @@ disconnect con3148; drop user user3148@localhost; # +# `time` and `time_ms` columns of INFORMATION_SCHEMA.PROCESSLIST. +# +connect (pslistcon,localhost,root,,test); +let $ID= `select connection_id()`; +SELECT 'other connection here' AS who; +connection default; +sleep 1; +--disable_query_log +eval SET @tid=$ID; +--enable_query_log +SELECT IF(`time` > 0, 'OK', `time`) AS time_low, + IF(`time` < 1000, 'OK', `time`) AS time_high, + IF(time_ms > 900, 'OK', time_ms) AS time_ms_low, + IF(time_ms < 1000000, 'OK', time_ms) AS time_ms_high + FROM INFORMATION_SCHEMA.PROCESSLIST + WHERE ID=@tid; +disconnect pslistcon; + +# # Bug#26174 Server Crash: INSERT ... SELECT ... FROM I_S.GLOBAL_STATUS # in Event (see also openssl_1.test) # @@ -1352,9 +1371,16 @@ DROP TABLE t1; # Bug #22047: Time in SHOW PROCESSLIST for SQL thread in replication seems # to become negative # +# Note that at the time of writing, MariaDB differs in behaviour from MySQL on +# the `time` column. In MySQL this changes depending on the setting of +# @TIMESTAMP, which is contrary to the documented (and sensible) behaviour. +# In MariaDB, the `time` column is independent of @TIMESTAMP. +# (The rationale for this is to keep `time` and `time_ms` consistent; +# @TIMESTAMP has no microsecond precision). +# SET TIMESTAMP=@@TIMESTAMP + 10000000; -SELECT 'OK' AS TEST_RESULT FROM INFORMATION_SCHEMA.PROCESSLIST WHERE time < 0; +SELECT 'NOT_OK' AS TEST_RESULT FROM INFORMATION_SCHEMA.PROCESSLIST WHERE time < 0; SET TIMESTAMP=DEFAULT; --echo End of 5.1 tests. === modified file 'mysql-test/t/not_embedded_server.test' --- a/mysql-test/t/not_embedded_server.test 2009-04-30 10:29:19 +0000 +++ b/mysql-test/t/not_embedded_server.test 2009-09-23 11:03:47 +0000 @@ -32,7 +32,7 @@ select 1; ## End of 4.1 tests # #prepare stmt1 from ' SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST WHERE COMMAND!=\'Daemon\' '; -#--replace_column 1 number 6 time 3 localhost +#--replace_column 1 number 6 time 3 localhost 9 time_ms #execute stmt1; #deallocate prepare stmt1; === modified file 'sql/sql_show.cc' --- a/sql/sql_show.cc 2009-09-15 10:46:35 +0000 +++ b/sql/sql_show.cc 2009-09-23 11:03:47 +0000 @@ -1819,7 +1819,7 @@ int fill_schema_processlist(THD* thd, TA TABLE *table= tables->table; CHARSET_INFO *cs= system_charset_info; char *user; - time_t now= my_time(0); + ulonglong unow= my_micro_time(); DBUG_ENTER("fill_process_list"); user= thd->security_ctx->master_access & PROCESS_ACL ? @@ -1877,8 +1877,8 @@ int fill_schema_processlist(THD* thd, TA table->field[4]->store(command_name[tmp->command].str, command_name[tmp->command].length, cs); /* MYSQL_TIME */ - table->field[5]->store((longlong)(tmp->start_time ? - now - tmp->start_time : 0), FALSE); + const ulonglong utime= tmp->start_utime ? unow - tmp->start_utime : 0; + table->field[5]->store(utime / 1000000, TRUE); /* STATE */ #ifndef EMBEDDED_LIBRARY val= (char*) (tmp->locked ? "Locked" : @@ -1912,6 +1912,9 @@ int fill_schema_processlist(THD* thd, TA table->field[7]->set_notnull(); } + /* TIME_MS */ + table->field[8]->store((double)(utime / 1000.0)); + if (schema_table_store_record(thd, table)) { VOID(pthread_mutex_unlock(&LOCK_thread_count)); @@ -5542,7 +5545,7 @@ ST_SCHEMA_TABLE *get_schema_table(enum e into it two numbers, based on modulus of base-10 numbers. In the ones position is the number of decimals. Tens position is unused. In the hundreds and thousands position is a two-digit decimal number representing - length. Encode this value with (decimals*100)+length , where + length. Encode this value with (length*100)+decimals , where 0<decimals<10 and 0<=length<100 . @param @@ -6557,6 +6560,8 @@ ST_FIELD_INFO processlist_fields_info[]= {"STATE", 64, MYSQL_TYPE_STRING, 0, 1, "State", SKIP_OPEN_TABLE}, {"INFO", PROCESS_LIST_INFO_WIDTH, MYSQL_TYPE_STRING, 0, 1, "Info", SKIP_OPEN_TABLE}, + {"TIME_MS", 100 * (MY_INT64_NUM_DECIMAL_DIGITS + 1) + 3, MYSQL_TYPE_DECIMAL, + 0, 0, "Time_ms", SKIP_OPEN_TABLE}, {0, 0, MYSQL_TYPE_STRING, 0, 0, 0, SKIP_OPEN_TABLE} };

1 0