- developers - lists.mariadb.org

[Maria-developers] Inventory of 3rd party GPL code in MariaDB (other than Sun)
by Henrik Ingo 13 Sep '09

13 Sep '09

Hi Related to the work I'm doing with the EU, it seems wise to conduct a review of what 3rd party code is used in MySQL/MariaDB and under what license. In other words I need to know: Things in MySQL not owned by Sun. I so far come to think of 2 modules: Readline library used in MySQL client. GPLv3 (presumably MySQL is using an earlier version under GPLv2) YaSSL for secure client server and replication connections. GPLv2 Anything else? henrik -- email: henrik.ingo(a)avoinelama.fi tel: +358-40-5697354 www: www.avoinelama.fi/~hingo book: www.openlife.cc

1 1

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

12 Sep '09

#At lp:maria 2729 knielsen(a)knielsen-hq.org 2009-09-12 Don't test innodb-use-sys-malloc under Valgrind. InnoDB does not bother to free explicitly one-time allocations at exit, so we get lots of "still reachable" warnings in Valgrind with innodb-use-sys-malloc enabled. modified: mysql-test/suite/innodb/t/innodb-use-sys-malloc.test mysql-test/t/innodb-use-sys-malloc.test === modified file 'mysql-test/suite/innodb/t/innodb-use-sys-malloc.test' --- a/mysql-test/suite/innodb/t/innodb-use-sys-malloc.test 2009-06-24 17:18:58 +0000 +++ b/mysql-test/suite/innodb/t/innodb-use-sys-malloc.test 2009-09-12 07:38:39 +0000 @@ -1,5 +1,8 @@ --source include/have_innodb.inc -- source suite/innodb/include/have_innodb_plugin.inc +# XtraDB has lots of "still reachable" memory leak warnings at shutdown when +# --innodb-use-sys-malloc +--source include/not_valgrind.inc #display current value of innodb_use_sys_malloc SELECT @@GLOBAL.innodb_use_sys_malloc; === modified file 'mysql-test/t/innodb-use-sys-malloc.test' --- a/mysql-test/t/innodb-use-sys-malloc.test 2009-06-18 12:39:21 +0000 +++ b/mysql-test/t/innodb-use-sys-malloc.test 2009-09-12 07:38:39 +0000 @@ -1,5 +1,5 @@ --source include/have_innodb.inc -# XtraDB has lots of memory leak warnings at shutdown when +# XtraDB has lots of "still reachable" memory leak warnings at shutdown when # --innodb-use-sys-malloc --source include/not_valgrind.inc

1 0

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

11 Sep '09

#At lp:maria 2728 knielsen(a)knielsen-hq.org 2009-09-11 After-merge fix for MySQL 5.1.38 merge into MariaDB. Due to a bugfix for enum options in MariaDB, my_getopt parses enums into an ulong. However, some new code from MySQL was written to assume enums take an uint. Fix by using the correct type. (The new MySQL code in addition had an implicit assumption that my_bool and uint were compatible; remove this assumption). modified: mysys/my_getopt.c sql/sql_plugin.cc === modified file 'mysys/my_getopt.c' --- a/mysys/my_getopt.c 2009-09-07 20:50:10 +0000 +++ b/mysys/my_getopt.c 2009-09-11 13:20:03 +0000 @@ -414,11 +414,17 @@ invalid value '%s'", (optp->var_type & GET_TYPE_MASK) == GET_ENUM)) { if (optend == disabled_my_option) - *((my_bool*) value)= (my_bool) 0; + if ((optp->var_type & GET_TYPE_MASK) == GET_BOOL) + *((my_bool*) value)= (my_bool) 0; + else + *((ulong*) value)= (ulong) 0; else { if (!optend) /* No argument -> enable option */ - *((my_bool*) value)= (my_bool) 1; + if ((optp->var_type & GET_TYPE_MASK) == GET_BOOL) + *((my_bool*) value)= (my_bool) 1; + else + *((ulong*) value)= (ulong) 1; else argument= optend; } === modified file 'sql/sql_plugin.cc' --- a/sql/sql_plugin.cc 2009-09-07 20:50:10 +0000 +++ b/sql/sql_plugin.cc 2009-09-11 13:20:03 +0000 @@ -2980,12 +2980,12 @@ static int construct_options(MEM_ROOT *m Allocate temporary space for the value of the tristate. This option will have a limited lifetime and is not used beyond server initialization. - GET_ENUM value is an integer. + GET_ENUM value is an ulong. */ options[0].value= options[1].value= (uchar **)alloc_root(mem_root, - sizeof(int)); - *((uint*) options[0].value)= *((uint*) options[1].value)= - (uint) options[0].def_value; + sizeof(ulong)); + *((ulong*) options[0].value)= *((ulong*) options[1].value)= + (ulong) options[0].def_value; options+= 2; @@ -3269,7 +3269,7 @@ static int test_plugin_options(MEM_ROOT Set plugin loading policy from option value. First element in the option list is always the <plugin name> option value. */ - plugin_load_policy= (enum_plugin_load_policy)*(uint*)opts[0].value; + plugin_load_policy= (enum_plugin_load_policy)*(ulong*)opts[0].value; } disable_plugin= (plugin_load_policy == PLUGIN_OFF);

1 0

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

11 Sep '09

#At lp:maria 2727 knielsen(a)knielsen-hq.org 2009-09-11 After-merge fixes for merge of MySQL-5.1.38. modified: mysql-test/r/innodb.result mysql-test/t/bug46080-master.opt mysql-test/t/innodb.test sql/sql_select.cc support-files/build-tags per-file messages: mysql-test/r/innodb.result Fix wrong merge of result file conflicts. mysql-test/t/bug46080-master.opt Fix memory limit to take into account extra storage engines in MariaDB. mysql-test/t/innodb.test Add comment clarifying tricky --replace_result. sql/sql_select.cc Restore fix of Bug#34374, accudentally lost during MySQL 5.1.38 merge. support-files/build-tags Fix missing -R option for bzr, accidentally lost in MySQL-5.1.38 merge. === modified file 'mysql-test/r/innodb.result' --- a/mysql-test/r/innodb.result 2009-09-07 20:50:10 +0000 +++ b/mysql-test/r/innodb.result 2009-09-11 11:00:53 +0000 @@ -1738,7 +1738,7 @@ count(*) drop table t1; SELECT variable_value FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_buffer_pool_pages_total'; variable_value -512 +511 SELECT variable_value FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_page_size'; variable_value 16384 @@ -1784,7 +1784,7 @@ innodb_sync_spin_loops 20 SET @old_innodb_thread_concurrency= @@global.innodb_thread_concurrency; show variables like "innodb_thread_concurrency"; Variable_name Value -innodb_thread_concurrency 8 +innodb_thread_concurrency 0 set global innodb_thread_concurrency=1001; Warnings: Warning 1292 Truncated incorrect thread_concurrency value: '1001' === modified file 'mysql-test/t/bug46080-master.opt' --- a/mysql-test/t/bug46080-master.opt 2009-07-10 12:00:34 +0000 +++ b/mysql-test/t/bug46080-master.opt 2009-09-11 11:00:53 +0000 @@ -1 +1 @@ ---skip-grant-tables --skip-name-resolve --safemalloc-mem-limit=4000000 +--skip-grant-tables --skip-name-resolve --safemalloc-mem-limit=20000000 === modified file 'mysql-test/t/innodb.test' --- a/mysql-test/t/innodb.test 2009-09-07 20:50:10 +0000 +++ b/mysql-test/t/innodb.test 2009-09-11 11:00:53 +0000 @@ -1317,6 +1317,10 @@ drop table t1; # Test for testable InnoDB status variables. This test # uses previous ones(pages_created, rows_deleted, ...). + +# InnoDB aligns the memory for the buffer pool to a page boundary. This may +# cause actual pool size to be one less than requested depending on exact +# alignment of obtained memory. --replace_result 512 511 SELECT variable_value FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_buffer_pool_pages_total'; SELECT variable_value FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_page_size'; === modified file 'sql/sql_select.cc' --- a/sql/sql_select.cc 2009-09-07 20:50:10 +0000 +++ b/sql/sql_select.cc 2009-09-11 11:00:53 +0000 @@ -3614,16 +3614,16 @@ add_ft_keys(DYNAMIC_ARRAY *keyuse_array, Item_func *arg0=(Item_func *)(func->arguments()[0]), *arg1=(Item_func *)(func->arguments()[1]); if (arg1->const_item() && - ((functype == Item_func::GE_FUNC && arg1->val_real() > 0) || - (functype == Item_func::GT_FUNC && arg1->val_real() >=0)) && arg0->type() == Item::FUNC_ITEM && - arg0->functype() == Item_func::FT_FUNC) + arg0->functype() == Item_func::FT_FUNC && + ((functype == Item_func::GE_FUNC && arg1->val_real() > 0) || + (functype == Item_func::GT_FUNC && arg1->val_real() >=0))) cond_func=(Item_func_match *) arg0; else if (arg0->const_item() && - ((functype == Item_func::LE_FUNC && arg0->val_real() > 0) || - (functype == Item_func::LT_FUNC && arg0->val_real() >=0)) && arg1->type() == Item::FUNC_ITEM && - arg1->functype() == Item_func::FT_FUNC) + arg1->functype() == Item_func::FT_FUNC && + ((functype == Item_func::LE_FUNC && arg0->val_real() > 0) || + (functype == Item_func::LT_FUNC && arg0->val_real() >=0))) cond_func=(Item_func_match *) arg1; } } === modified file 'support-files/build-tags' --- a/support-files/build-tags 2009-09-07 20:50:10 +0000 +++ b/support-files/build-tags 2009-09-11 11:00:53 +0000 @@ -4,7 +4,7 @@ rm -f TAGS filter='\.cc$\|\.c$\|\.h$\|\.yy$' list="find . -type f" -bzr root >/dev/null 2>/dev/null && list="bzr ls --from-root --kind=file --versioned" +bzr root >/dev/null 2>/dev/null && list="bzr ls --from-root -R --kind=file --versioned" $list |grep $filter |while read f; do

1 0

[Maria-developers] Rev 2726: Exclude innodb_plugin form MariaDB's max and max-no-ndb configurations and in file:///home/psergey/bzr-new/mysql-5.1-maria-contd3/
by Sergey Petrunya 10 Sep '09

10 Sep '09

At file:///home/psergey/bzr-new/mysql-5.1-maria-contd3/ ------------------------------------------------------------ revno: 2726 revision-id: psergey(a)askmonty.org-20090910081123-1hg7mxrfguchn811 parent: psergey(a)askmonty.org-20090910080750-tcyaxkh0wwpgqzad committer: Sergey Petrunya <psergey(a)askmonty.org> branch nick: mysql-5.1-maria-contd3 timestamp: Thu 2009-09-10 12:11:23 +0400 message: Exclude innodb_plugin form MariaDB's max and max-no-ndb configurations and from the default build. We have xtradb instead. === modified file 'BUILD/SETUP.sh' --- a/BUILD/SETUP.sh 2009-05-11 15:31:30 +0000 +++ b/BUILD/SETUP.sh 2009-09-10 08:11:23 +0000 @@ -153,7 +153,7 @@ base_configs="$base_configs --with-extra-charsets=complex " base_configs="$base_configs --enable-thread-safe-client " base_configs="$base_configs --with-big-tables" -base_configs="$base_configs --with-plugin-maria --with-maria-tmp-tables" +base_configs="$base_configs --with-plugin-maria --with-maria-tmp-tables --without-plugin-innodb_plugin" if test -d "$path/../cmd-line-utils/readline" then === modified file 'storage/innodb_plugin/plug.in' --- a/storage/innodb_plugin/plug.in 2009-07-30 12:42:56 +0000 +++ b/storage/innodb_plugin/plug.in 2009-09-10 08:11:23 +0000 @@ -15,7 +15,7 @@ # MYSQL_STORAGE_ENGINE(innodb_plugin,, [InnoDB Storage Engine], - [Transactional Tables using InnoDB], [max,max-no-ndb]) + [Transactional Tables using InnoDB],) MYSQL_PLUGIN_DIRECTORY(innodb_plugin, [storage/innodb_plugin]) MYSQL_PLUGIN_DYNAMIC(innodb_plugin, [ha_innodb_plugin.la]) MYSQL_PLUGIN_ACTIONS(innodb_plugin, [

2 2

[Maria-developers] Rev 2721: Merge xtradb-7 -> MariaDB in file:///home/psergey/bzr-new/mysql-5.1-maria-contd2/
by Sergey Petrunya 10 Sep '09

10 Sep '09

At file:///home/psergey/bzr-new/mysql-5.1-maria-contd2/ ------------------------------------------------------------ revno: 2721 revision-id: psergey(a)askmonty.org-20090908160458-fglojzacu8inqb9q parent: psergey(a)askmonty.org-20090907205010-tnvi4bomzq2b1eut parent: aleksandr.kuzminsky(a)percona.com-20090810223610-ssatw3bi8t3ggr5z committer: Sergey Petrunya <psergey(a)askmonty.org> branch nick: mysql-5.1-maria-contd2 timestamp: Tue 2009-09-08 20:04:58 +0400 message: Merge xtradb-7 -> MariaDB added: mysql-test.percona/ mysqltest-20081201061010-zymrrwrczns2vrex-27 mysql-test/patches/ patches-20081203050234-edoolglm28lyejuc-13 mysql-test/patches/events_stress.diff events_stress.diff-20090908160024-tii87qp66sk04a00-1 mysql-test/patches/information_schema.diff information_schema.d-20090908160027-1rc1imife37xem2d-1 mysql-test/patches/information_schema_db.diff information_schema_d-20090908160031-m7v1n1g41r1cfhif-1 mysql-test/patches/mysqlshow.diff mysqlshow.diff-20090908160036-0vxq2kivbnbugp6g-1 modified: README sp1f-readme-19700101030959-ipf4glwvob7zbr3norl5feyy3jwy3sod storage/xtradb/buf/buf0flu.c buf0flu.c-20081201061010-zymrrwrczns2vrex-50 storage/xtradb/handler/ha_innodb.cc ha_innodb.cc-20081201061010-zymrrwrczns2vrex-70 storage/xtradb/include/row0mysql.h row0mysql.h-20081201061010-zymrrwrczns2vrex-199 storage/xtradb/include/srv0srv.h srv0srv.h-20081201061010-zymrrwrczns2vrex-219 storage/xtradb/include/trx0trx.h trx0trx.h-20081201061010-zymrrwrczns2vrex-242 storage/xtradb/include/trx0trx.ic trx0trx.ic-20081201061010-zymrrwrczns2vrex-243 storage/xtradb/lock/lock0lock.c lock0lock.c-20081201061010-zymrrwrczns2vrex-269 storage/xtradb/row/row0mysql.c row0mysql.c-20081201061010-zymrrwrczns2vrex-336 storage/xtradb/row/row0sel.c row0sel.c-20081201061010-zymrrwrczns2vrex-339 storage/xtradb/srv/srv0srv.c srv0srv.c-20081201061010-zymrrwrczns2vrex-347 storage/xtradb/trx/trx0trx.c trx0trx.c-20081201061010-zymrrwrczns2vrex-359 ------------------------------------------------------------ revno: 0.6.2 revision-id: aleksandr.kuzminsky(a)percona.com-20090810223610-ssatw3bi8t3ggr5z parent: aleksandr.kuzminsky(a)percona.com-20090809070458-cjko9m35law9bx9r committer: Aleksandr Kuzminsky <aleksandr.kuzminsky(a)percona.com> branch nick: percona-xtradb timestamp: Mon 2009-08-10 22:36:10 +0000 message: sync with rev.94 modified: handler/ha_innodb.cc ha_innodb.cc-20081201061010-zymrrwrczns2vrex-70 include/srv0srv.h srv0srv.h-20081201061010-zymrrwrczns2vrex-219 srv/srv0srv.c srv0srv.c-20081201061010-zymrrwrczns2vrex-347 ------------------------------------------------------------ revno: 0.6.1 revision-id: aleksandr.kuzminsky(a)percona.com-20090809070458-cjko9m35law9bx9r parent: vadim(a)percona.com-20090626080424-i7bdmrag8piw0fc3 committer: Aleksandr Kuzminsky <aleksandr.kuzminsky(a)percona.com> branch nick: percona-xtradb timestamp: Sun 2009-08-09 07:04:58 +0000 message: sync with rev.93 modified: buf/buf0flu.c buf0flu.c-20081201061010-zymrrwrczns2vrex-50 buf/buf0rea.c buf0rea.c-20081201061010-zymrrwrczns2vrex-52 dict/dict0dict.c dict0dict.c-20081201061010-zymrrwrczns2vrex-57 handler/ha_innodb.cc ha_innodb.cc-20081201061010-zymrrwrczns2vrex-70 handler/innodb_patch_info.h innodb_patch_info.h-20081206234022-hep6ryfeacyr0572-1 include/row0mysql.h row0mysql.h-20081201061010-zymrrwrczns2vrex-199 include/srv0srv.h srv0srv.h-20081201061010-zymrrwrczns2vrex-219 include/trx0trx.h trx0trx.h-20081201061010-zymrrwrczns2vrex-242 include/trx0trx.ic trx0trx.ic-20081201061010-zymrrwrczns2vrex-243 include/univ.i univ.i-20081201061010-zymrrwrczns2vrex-248 lock/lock0lock.c lock0lock.c-20081201061010-zymrrwrczns2vrex-269 log/log0recv.c log0recv.c-20081201061010-zymrrwrczns2vrex-271 mysql-test/innodb-analyze.test innodbanalyze.test-20081203050234-edoolglm28lyejuc-6 mysql-test/innodb_xtradb_bug317074.result innodb_xtradb_bug317-20090326061054-ylrdb8libxw6u7e9-8 mysql-test/innodb_xtradb_bug317074.test innodb_xtradb_bug317-20090326061054-ylrdb8libxw6u7e9-9 mysql-test/patches/events_stress.diff events_stress.diff-20090420133118-3nkd032ighnz203p-1 mysql-test/patches/information_schema.diff information_schema.d-20081203050234-edoolglm28lyejuc-21 mysql-test/patches/information_schema_db.diff information_schema_d-20090420133118-3nkd032ighnz203p-2 mysql-test/patches/mysqlshow.diff mysqlshow.diff-20090420133118-3nkd032ighnz203p-6 row/row0mysql.c row0mysql.c-20081201061010-zymrrwrczns2vrex-336 row/row0sel.c row0sel.c-20081201061010-zymrrwrczns2vrex-339 srv/srv0srv.c srv0srv.c-20081201061010-zymrrwrczns2vrex-347 trx/trx0trx.c trx0trx.c-20081201061010-zymrrwrczns2vrex-359 Diff too large for email (1212 lines, the limit is 1000).

2 1

[Maria-developers] Rev 2723: MySQL 5.1 -> MariaDB 5.1 merge in file:///home/psergey/bzr-new/mysql-5.1-maria-contd2/
by Sergey Petrunya 10 Sep '09

10 Sep '09

At file:///home/psergey/bzr-new/mysql-5.1-maria-contd2/ ------------------------------------------------------------ revno: 2723 revision-id: psergey(a)askmonty.org-20090909210657-i1of5o03ymoozwvs parent: psergey(a)askmonty.org-20090908162138-wtd6r54dkcp4hg5a committer: Sergey Petrunya <psergey(a)askmonty.org> branch nick: mysql-5.1-maria-contd2 timestamp: Thu 2009-09-10 01:06:57 +0400 message: MySQL 5.1 -> MariaDB 5.1 merge - Post-merge fixes === modified file 'README' --- a/README 2009-09-08 16:04:58 +0000 +++ b/README 2009-09-09 21:06:57 +0000 @@ -1,47 +1,50 @@ -This is a release of MariaDB, a branch of MySQL. - -MariaDB is a drop-in replacement of MySQL, with more features, less -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 -community. - -MySQL, which is the base of MariaDB, is brought to you by Sun. +This is a release of MySQL, a dual-license SQL database server. +MySQL is brought to you by the MySQL team at Sun Microsystems, Inc. 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: -http://askmonty.org/wiki/index.php/MariaDB - -The differences between MariaDB and MySQL can be found at: -http://askmonty.org/wiki/index.php/MariaDB_versus_MySQL - -Documentation about MySQL can be found at: -http://dev.mysql.com/doc - -For further information about MySQL documentation, see: -- The current MySQL documentation: +- For commercial distributions, see the LICENSE.mysql file. + +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. + +For further information about MySQL or additional documentation, see: +- The latest information about MySQL: http://www.mysql.com +- The current MySQL documentation: http://dev.mysql.com/doc Some manual sections of special interest: +- If you are migrating from an older version of MySQL, please read the + "Upgrading from..." section first! +- To see what MySQL can do, take a look at the features section. +- For installation instructions, see the Installing and Upgrading +chapter. +- For the new features/bugfix history, see the Change History appendix. +- For the currently known bugs/misfeatures (known errors) see the +Problems + and Common Errors appendix. - For a list of developers and other contributors, see the Credits appendix. 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 +download it in any of several formats at the URL given earlier in this +file. ************************************************************ IMPORTANT: -Bug or error reports regarding MariaDB should be sent to -https://bugs.launchpad.net/maria -Bugs in the MySQL code can also be sent to http://bugs.mysql.com +Bug or error reports should be sent to http://bugs.mysql.com. + + *************************************************************************** %%The following software may be included in this product: === modified file 'mysql-test/r/innodb_mysql.result' --- a/mysql-test/r/innodb_mysql.result 2009-07-13 17:41:43 +0000 +++ b/mysql-test/r/innodb_mysql.result 2009-09-09 21:06:57 +0000 @@ -1746,7 +1746,7 @@ DROP TABLE t1; CREATE TABLE t1 (c1 DECIMAL(12,2), c2 DECIMAL(12,2), c3 DECIMAL(12,2), KEY (c3), KEY (c2, c3)) -ENGINE=InnoDB; +ENGINE=innodb; INSERT INTO t1 VALUES (1,1,1), (1,1,1), (1,1,2), (1,1,1), (1,1,2); SELECT 1 FROM (SELECT COUNT(DISTINCT c1) FROM t1 WHERE c2 IN (1, 1) AND c3 = 2 GROUP BY c2) x; === modified file 'mysql-test/suite/maria/r/maria3.result' --- a/mysql-test/suite/maria/r/maria3.result 2009-06-29 21:03:30 +0000 +++ b/mysql-test/suite/maria/r/maria3.result 2009-09-09 21:06:57 +0000 @@ -318,6 +318,7 @@ maria_sort_buffer_size 8388608 maria_stats_method nulls_unequal maria_sync_log_dir NEWFILE +maria_used_for_temp_tables ON show status like 'maria%'; Variable_name Value Maria_pagecache_blocks_not_flushed # === modified file 'sql/handler.cc' --- a/sql/handler.cc 2009-09-07 20:50:10 +0000 +++ b/sql/handler.cc 2009-09-09 21:06:57 +0000 @@ -63,7 +63,7 @@ const char *ha_row_type[] = { "", "FIXED", "DYNAMIC", "COMPRESSED", "REDUNDANT", "COMPACT", - /* Reserved to be "PAGE" in future versions */ "?", + "PAGE", "?","?","?" }; === modified file 'sql/opt_range.cc' --- a/sql/opt_range.cc 2009-09-07 20:50:10 +0000 +++ b/sql/opt_range.cc 2009-09-09 21:06:57 +0000 @@ -2243,7 +2243,7 @@ KEY *key_info; PARAM param; - if (check_stack_overrun(thd, 2*STACK_MIN_SIZE, buff)) + if (check_stack_overrun(thd, 2*STACK_MIN_SIZE + sizeof(PARAM), buff)) DBUG_RETURN(0); // Fatal error flag is set /* set up parameter that is passed to all functions */ @@ -3760,9 +3760,8 @@ DBUG_PRINT("info", ("index_merge scans cost %g", imerge_cost)); if (imerge_too_expensive || (imerge_cost > read_time) || - ((non_cpk_scan_records+cpk_scan_records >= - param->table->file->stats.records) && - read_time != DBL_MAX)) + ((non_cpk_scan_records+cpk_scan_records >= param->table->file->stats.records) && + read_time != DBL_MAX)) { /* Bail out if it is obvious that both index_merge and ROR-union will be @@ -4839,11 +4838,11 @@ { int idx; SEL_ARG **key,**end, **key_to_read= NULL; - ha_rows best_records; + ha_rows UNINIT_VAR(best_records); /* protected by key_to_read */ TRP_RANGE* read_plan= NULL; bool pk_is_clustered= param->table->file->primary_key_is_clustered(); DBUG_ENTER("get_key_scans_params"); - LINT_INIT(best_records); /* protected by key_to_read */ + /* Note that there may be trees that have type SEL_TREE::KEY but contain no key reads at all, e.g. tree for expression "key1 is not null" where key1 @@ -6440,13 +6439,6 @@ return 0; // Can't optimize this } - if ((key1->min_flag | key2->min_flag) & GEOM_FLAG) - { - key1->free_tree(); - key2->free_tree(); - return 0; // Can't optimize this - } - key1->use_count--; key2->use_count--; SEL_ARG *e1=key1->first(), *e2=key2->first(), *new_tree=0; @@ -6797,9 +6789,7 @@ SEL_ARG * SEL_ARG::insert(SEL_ARG *key) { - SEL_ARG *element,**par,*last_element; - LINT_INIT(par); - LINT_INIT(last_element); + SEL_ARG *element,**UNINIT_VAR(par),*UNINIT_VAR(last_element); for (element= this; element != &null_element ; ) { === modified file 'sql/sql_table.cc' --- a/sql/sql_table.cc 2009-09-07 20:50:10 +0000 +++ b/sql/sql_table.cc 2009-09-09 21:06:57 +0000 @@ -5951,6 +5951,8 @@ } if (!(used_fields & HA_CREATE_USED_KEY_BLOCK_SIZE)) create_info->key_block_size= table->s->key_block_size; + if (!(used_fields & HA_CREATE_USED_TRANSACTIONAL)) + create_info->transactional= table->s->transactional; if (!create_info->tablespace && create_info->storage_media != HA_SM_MEMORY) { === modified file 'sql/table.cc' --- a/sql/table.cc 2009-09-07 20:50:10 +0000 +++ b/sql/table.cc 2009-09-09 21:06:57 +0000 @@ -2491,11 +2491,8 @@ int4store(fileinfo+34,create_info->avg_row_length); fileinfo[38]= (create_info->default_table_charset ? create_info->default_table_charset->number : 0); - /* - In future versions, we will store in fileinfo[39] the values of the - TRANSACTIONAL and PAGE_CHECKSUM clauses of CREATE TABLE. - */ - fileinfo[39]= 0; + fileinfo[39]= (uchar) ((uint) create_info->transactional | + ((uint) create_info->page_checksum << 2)); fileinfo[40]= (uchar) create_info->row_type; /* Next few bytes where for RAID support */ fileinfo[41]= 0; === modified file 'storage/xtradb/handler/ha_innodb.cc' --- a/storage/xtradb/handler/ha_innodb.cc 2009-09-08 16:04:58 +0000 +++ b/storage/xtradb/handler/ha_innodb.cc 2009-09-09 21:06:57 +0000 @@ -9470,7 +9470,7 @@ There is no mechanism for updating InnoDB foreign key definitions. */ if (foreign_key_column_is_being_renamed(prebuilt, table)) { - return(COMPATIBLE_DATA_NO); + DBUG_RETURN(COMPATIBLE_DATA_NO); } /* Check that row format didn't change */

3 2

[Maria-developers] Rev 2725: Fix windows build: add strmov_overlapp.c to CMakeLists.txt in file:///home/psergey/bzr-new/mysql-5.1-maria-contd3/
by Sergey Petrunya 10 Sep '09

10 Sep '09

At file:///home/psergey/bzr-new/mysql-5.1-maria-contd3/ ------------------------------------------------------------ revno: 2725 revision-id: psergey(a)askmonty.org-20090910080750-tcyaxkh0wwpgqzad parent: psergey(a)askmonty.org-20090909215928-jd9v62cem7e2uukw committer: Sergey Petrunya <psergey(a)askmonty.org> branch nick: mysql-5.1-maria-contd3 timestamp: Thu 2009-09-10 12:07:50 +0400 message: Fix windows build: add strmov_overlapp.c to CMakeLists.txt === modified file 'libmysql/CMakeLists.txt' --- a/libmysql/CMakeLists.txt 2009-09-07 20:50:10 +0000 +++ b/libmysql/CMakeLists.txt 2009-09-10 08:07:50 +0000 @@ -94,7 +94,7 @@ ../mysys/safemalloc.c ../mysys/sha1.c ../strings/str2int.c ../strings/str_alloc.c ../strings/strcend.c ../strings/strcont.c ../strings/strend.c ../strings/strfill.c ../mysys/string.c ../strings/strinstr.c ../strings/strmake.c - ../strings/strmov.c ../strings/strnlen.c ../strings/strnmov.c ../strings/strtod.c + ../strings/strmov.c ../strings/strmov_overlapp.c ../strings/strnlen.c ../strings/strnmov.c ../strings/strtod.c ../strings/strtoll.c ../strings/strtoull.c ../strings/strxmov.c ../strings/strxnmov.c ../mysys/thr_mutex.c ../mysys/typelib.c ../vio/vio.c ../vio/viosocket.c ../vio/viossl.c ../vio/viosslfactories.c ../strings/xml.c ../mysys/mf_qsort.c === modified file 'strings/CMakeLists.txt' --- a/strings/CMakeLists.txt 2008-10-10 15:28:41 +0000 +++ b/strings/CMakeLists.txt 2009-09-10 08:07:50 +0000 @@ -23,7 +23,7 @@ ctype-latin1.c ctype-mb.c ctype-simple.c ctype-sjis.c ctype-tis620.c ctype-uca.c ctype-ucs2.c ctype-ujis.c ctype-utf8.c ctype-win1250ch.c ctype.c decimal.c int2str.c is_prefix.c llstr.c longlong2str.c my_strtoll10.c my_vsnprintf.c r_strinstr.c - str2int.c str_alloc.c strcend.c strend.c strfill.c strmake.c strmov.c strnmov.c + str2int.c str_alloc.c strcend.c strend.c strfill.c strmake.c strmov.c strmov_overlapp.c strnmov.c strtod.c strtol.c strtoll.c strtoul.c strtoull.c strxmov.c strxnmov.c xml.c my_strchr.c strcont.c strinstr.c strnlen.c strappend.c)

1 0

[Maria-developers] Rev 2726: Fix windows build: add strmov_overlapp.c to CMakeLists.txt in file:///home/psergey/bzr-new/mysql-5.1-maria-contd2/
by Sergey Petrunya 09 Sep '09

09 Sep '09

At file:///home/psergey/bzr-new/mysql-5.1-maria-contd2/ ------------------------------------------------------------ revno: 2726 revision-id: psergey(a)askmonty.org-20090909222555-h0o1cknpypnojuve parent: psergey(a)askmonty.org-20090909221538-1k8a5q1qzqdyymyw committer: Sergey Petrunya <psergey(a)askmonty.org> branch nick: mysql-5.1-maria-contd2 timestamp: Thu 2009-09-10 02:25:55 +0400 message: Fix windows build: add strmov_overlapp.c to CMakeLists.txt === modified file 'libmysql/CMakeLists.txt' --- a/libmysql/CMakeLists.txt 2009-09-07 20:50:10 +0000 +++ b/libmysql/CMakeLists.txt 2009-09-09 22:25:55 +0000 @@ -94,7 +94,7 @@ ../mysys/safemalloc.c ../mysys/sha1.c ../strings/str2int.c ../strings/str_alloc.c ../strings/strcend.c ../strings/strcont.c ../strings/strend.c ../strings/strfill.c ../mysys/string.c ../strings/strinstr.c ../strings/strmake.c - ../strings/strmov.c ../strings/strnlen.c ../strings/strnmov.c ../strings/strtod.c + ../strings/strmov.c ../strings/strmov_overlapp.c ../strings/strnlen.c ../strings/strnmov.c ../strings/strtod.c ../strings/strtoll.c ../strings/strtoull.c ../strings/strxmov.c ../strings/strxnmov.c ../mysys/thr_mutex.c ../mysys/typelib.c ../vio/vio.c ../vio/viosocket.c ../vio/viossl.c ../vio/viosslfactories.c ../strings/xml.c ../mysys/mf_qsort.c === modified file 'strings/CMakeLists.txt' --- a/strings/CMakeLists.txt 2008-10-10 15:28:41 +0000 +++ b/strings/CMakeLists.txt 2009-09-09 22:25:55 +0000 @@ -23,7 +23,7 @@ ctype-latin1.c ctype-mb.c ctype-simple.c ctype-sjis.c ctype-tis620.c ctype-uca.c ctype-ucs2.c ctype-ujis.c ctype-utf8.c ctype-win1250ch.c ctype.c decimal.c int2str.c is_prefix.c llstr.c longlong2str.c my_strtoll10.c my_vsnprintf.c r_strinstr.c - str2int.c str_alloc.c strcend.c strend.c strfill.c strmake.c strmov.c strnmov.c + str2int.c str_alloc.c strcend.c strend.c strfill.c strmake.c strmov.c strmov_overlapp.c strnmov.c strtod.c strtol.c strtoll.c strtoul.c strtoull.c strxmov.c strxnmov.c xml.c my_strchr.c strcont.c strinstr.c strnlen.c strappend.c)

1 0

[Maria-developers] Rev 2725: Apply Yasufumi's patch for MBUG#417751. in file:///home/psergey/bzr-new/mysql-5.1-maria-contd2/
by Sergey Petrunya 09 Sep '09

09 Sep '09

At file:///home/psergey/bzr-new/mysql-5.1-maria-contd2/ ------------------------------------------------------------ revno: 2725 revision-id: psergey(a)askmonty.org-20090909221538-1k8a5q1qzqdyymyw parent: psergey(a)askmonty.org-20090909215928-jd9v62cem7e2uukw committer: Sergey Petrunya <psergey(a)askmonty.org> branch nick: mysql-5.1-maria-contd2 timestamp: Thu 2009-09-10 02:15:38 +0400 message: Apply Yasufumi's patch for MBUG#417751. === modified file 'storage/xtradb/btr/btr0cur.c' --- a/storage/xtradb/btr/btr0cur.c 2009-06-25 01:43:25 +0000 +++ b/storage/xtradb/btr/btr0cur.c 2009-09-09 22:15:38 +0000 @@ -3267,6 +3267,7 @@ } while (rec != supremum) { + rec_t* next_rec; /* count recs */ if (stats_method == SRV_STATS_METHOD_IGNORE_NULLS) { n_recs++; @@ -3280,8 +3281,7 @@ n_not_nulls[j]++; } } - - rec_t* next_rec = page_rec_get_next(rec); + next_rec = page_rec_get_next(rec); if (next_rec == supremum) { break; } === modified file 'storage/xtradb/buf/buf0buddy.c' --- a/storage/xtradb/buf/buf0buddy.c 2009-06-25 01:43:25 +0000 +++ b/storage/xtradb/buf/buf0buddy.c 2009-09-09 22:15:38 +0000 @@ -461,16 +461,15 @@ actually is a properly initialized buf_page_t object. */ if (size >= PAGE_ZIP_MIN_SIZE) { - if (!have_page_hash_mutex) - mutex_exit(&zip_free_mutex); - /* This is a compressed page. */ mutex_t* mutex; if (!have_page_hash_mutex) { + mutex_exit(&zip_free_mutex); mutex_enter(&LRU_list_mutex); rw_lock_x_lock(&page_hash_latch); } + /* The src block may be split into smaller blocks, some of which may be free. Thus, the mach_read_from_4() calls below may attempt to read === modified file 'storage/xtradb/buf/buf0flu.c' --- a/storage/xtradb/buf/buf0flu.c 2009-08-09 07:04:58 +0000 +++ b/storage/xtradb/buf/buf0flu.c 2009-09-09 22:15:38 +0000 @@ -1233,13 +1233,13 @@ + BUF_FLUSH_EXTRA_MARGIN) && (distance < BUF_LRU_FREE_SEARCH_LEN)) { + mutex_t* block_mutex; if (!bpage->in_LRU_list) { /* reatart. but it is very optimistic */ bpage = UT_LIST_GET_LAST(buf_pool->LRU); continue; } - - mutex_t* block_mutex = buf_page_get_mutex(bpage); + block_mutex = buf_page_get_mutex_enter(bpage); retry_lock: mutex_enter(block_mutex); === modified file 'storage/xtradb/fil/fil0fil.c' --- a/storage/xtradb/fil/fil0fil.c 2009-06-25 01:43:25 +0000 +++ b/storage/xtradb/fil/fil0fil.c 2009-09-09 22:15:38 +0000 @@ -3039,6 +3039,13 @@ ulint i; int len; ib_uint64_t current_lsn; + ulint size_low, size_high, size; + ib_int64_t size_bytes; + dict_table_t* table; + dict_index_t* index; + fil_system_t* system; + fil_node_t* node = NULL; + fil_space_t* space; current_lsn = log_get_lsn(); @@ -3060,25 +3067,20 @@ success = os_file_write(filepath, file, page, 0, 0, UNIV_PAGE_SIZE); /* get file size */ - ulint size_low, size_high, size; - ib_int64_t size_bytes; os_file_get_size(file, &size_low, &size_high); size_bytes = (((ib_int64_t)size_high) << 32) + (ib_int64_t)size_low; /* get cruster index information */ - dict_table_t* table; - dict_index_t* index; table = dict_table_get_low(name); index = dict_table_get_first_index(table); ut_a(index->page==3); - /* read metadata from .exp file */ n_index = 0; - bzero(old_id, sizeof(old_id)); - bzero(new_id, sizeof(new_id)); - bzero(root_page, sizeof(root_page)); + memset(old_id, 0, sizeof(old_id)); + memset(new_id, 0, sizeof(new_id)); + memset(root_page, 0, sizeof(root_page)); info_file_path = fil_make_ibd_name(name, FALSE); len = strlen(info_file_path); @@ -3128,10 +3130,10 @@ mem_heap_t* heap = NULL; ulint offsets_[REC_OFFS_NORMAL_SIZE]; ulint* offsets = offsets_; + ib_int64_t offset; + size = (ulint) (size_bytes / UNIV_PAGE_SIZE); /* over write space id of all pages */ - ib_int64_t offset; - rec_offs_init(offsets_); fprintf(stderr, "InnoDB: Progress in %:"); @@ -3284,10 +3286,8 @@ } mem_free(info_file_path); - fil_system_t* system = fil_system; + system = fil_system; mutex_enter(&(system->mutex)); - fil_node_t* node = NULL; - fil_space_t* space; space = fil_space_get_by_id(id); if (space) node = UT_LIST_GET_FIRST(space->chain); === modified file 'storage/xtradb/handler/i_s.cc' --- a/storage/xtradb/handler/i_s.cc 2009-06-25 01:43:25 +0000 +++ b/storage/xtradb/handler/i_s.cc 2009-09-09 22:15:38 +0000 @@ -806,7 +806,7 @@ field_store_string(table->field[0], NULL); p = (char *)index->table_name; } - strcpy(table_name_raw, p); + strcpy(table_name_raw, (const char*)p); filename_to_tablename(table_name_raw, table_name, sizeof(table_name)); field_store_string(table->field[1], table_name); field_store_string(table->field[2], index->name); @@ -2861,7 +2861,7 @@ } else { rec_per_key = n_rows; } - snprintf(buff, 256, (i == index->n_uniq)?"%llu":"%llu, ", + ut_snprintf(buff, 256, (i == index->n_uniq)?"%llu":"%llu, ", rec_per_key); strncat(row_per_keys, buff, 256 - strlen(row_per_keys)); } === modified file 'storage/xtradb/srv/srv0srv.c' --- a/storage/xtradb/srv/srv0srv.c 2009-09-08 16:04:58 +0000 +++ b/storage/xtradb/srv/srv0srv.c 2009-09-09 22:15:38 +0000 @@ -2694,11 +2694,11 @@ /* defence line (max_checkpoint_age * 1/2) */ ib_uint64_t lsn = log_sys->lsn; - mutex_exit(&(log_sys->mutex)); - ib_uint64_t level, bpl; buf_page_t* bpage; + mutex_exit(&(log_sys->mutex)); + mutex_enter(&flush_list_mutex); level = 0; === modified file 'storage/xtradb/srv/srv0start.c' --- a/storage/xtradb/srv/srv0start.c 2009-08-03 20:09:53 +0000 +++ b/storage/xtradb/srv/srv0start.c 2009-09-09 22:15:38 +0000 @@ -1134,7 +1134,12 @@ os_aio_use_native_aio = FALSE; } else { /* On Win 2000 and XP use async i/o */ - os_aio_use_native_aio = TRUE; + //os_aio_use_native_aio = TRUE; + os_aio_use_native_aio = FALSE; + fprintf(stderr, + "InnoDB: Windows native async i/o is disabled as default.\n" + "InnoDB: It is not applicable for the current" + " multi io threads implementation.\n"); } #endif if (srv_file_flush_method_str == NULL) { @@ -1170,6 +1175,12 @@ } else if (0 == ut_strcmp(srv_file_flush_method_str, "async_unbuffered")) { srv_win_file_flush_method = SRV_WIN_IO_UNBUFFERED; + os_aio_use_native_aio = TRUE; + srv_n_read_io_threads = srv_n_write_io_threads = 1; + fprintf(stderr, + "InnoDB: 'async_unbuffered' was detected as innodb_flush_method.\n" + "InnoDB: Windows native async i/o is enabled.\n" + "InnoDB: And io threads are restricted.\n"); #endif } else { fprintf(stderr,

1 0