October 2009 - developers - lists.mariadb.org

[Maria-developers] Windows buildslaves: suggestion for remedy of 'exception' failures.
by Sergey Petrunya 09 Oct '09

09 Oct '09

Hi! Both mine and Bo's buildslave are prone to error conditions like this: http://askmonty.org/buildbot/builders/win32-rel-nmake/builds/19/steps/bzr/l… Here is a suggestion on how to eliminate those. Buildslave setup ---------------- Buildslave owner needs to download pstools and handle utilites: http://technet.microsoft.com/en-us/sysinternals/bb896683.aspx http://technet.microsoft.com/en-us/sysinternals/bb896655.aspx they need to unpack the zips, then put handle.exe, pskill.exe, pdh.dll somwhere on the path, and then run both exe files manually. The first manual run is needed to accept the EULA. Buildbot script --------------- I've come up with this script that uses the above utilities to kill all stray processes: #!/usr/bin/perl my $cmd="handle.exe maria-slave |" ; open(IN, $cmd) || die("Failed to pipe from handle.exe"); my @pids = (); print "$cmd\n"; while(<IN>) { print $_; if (/ pid: ([0-9]+) /) { push @pids, $1; } } close(IN); print "\n\n"; my %hash = map { $_ => 1} @pids; my @uniq_pids = keys %hash; foreach (@uniq_pids) { $cmd= "pskill.exe $_\n"; print $cmd; system($cmd); } EOF The question is, where do we put the script? Have buildslave owners put it on the slaves manually (bad, complicates the setup)? Download through buildbot? We can't put it into the lp:maria repository because the failure occurs before the bzr branch command, i.e. at a point where there might be not yet a repository. On the other hand, if there is not yet a repository, then the exception condition won't occur. Any comments? BR Sergey -- Sergey Petrunia, Software Developer Monty Program AB, http://askmonty.org Blog: http://s.petrunia.net/blog

3 2

[Maria-developers] Rev 2772: Fix make_win_bin_dist: in file:///home/psergey/bzr-new/maria-5.1-build1/
by Sergey Petrunya 08 Oct '09

08 Oct '09

At file:///home/psergey/bzr-new/maria-5.1-build1/ ------------------------------------------------------------ revno: 2772 revision-id: psergey(a)askmonty.org-20091008210103-xrb1cvmxzc5uhkfa parent: psergey(a)askmonty.org-20091008191148-suda4au7bmdlq1hj committer: Sergey Petrunya <psergey(a)askmonty.org> branch nick: maria-5.1-build1 timestamp: Fri 2009-10-09 01:01:03 +0400 message: Fix make_win_bin_dist: - Include maria_chk and other maria binaries - Include sql/$TARGET/mysqld.lib, like mainline does (but what is that useful for?) - Don't include my_safe_{process,kill} garbage. - call '/bin/find', not just 'find' is that is some incompatible windows command. === modified file 'scripts/make_win_bin_dist' --- a/scripts/make_win_bin_dist 2009-09-01 06:40:13 +0000 +++ b/scripts/make_win_bin_dist 2009-10-08 21:01:03 +0000 @@ -140,12 +140,24 @@ # ---------------------------------------------------------------------- # Copy executables, and client DLL # ---------------------------------------------------------------------- - +MYISAM_BINARIES="myisamchk myisamlog myisampack myisam_ftdump" +MARIA_BINARIES="maria_chk maria_dump_log maria_ftdump maria_pack maria_read_log" mkdir $DESTDIR mkdir $DESTDIR/bin cp client/$TARGET/*.exe $DESTDIR/bin/ cp extra/$TARGET/*.exe $DESTDIR/bin/ -cp storage/myisam/$TARGET/*.exe $DESTDIR/bin/ + +# MyISAM +#cp storage/myisam/$TARGET/*.exe $DESTDIR/bin/ +for eng in $MYISAM_BINARIES ; do + cp storage/myisam/$TARGET/$eng.{exe,pdb} $DESTDIR/bin +done + +# Maria +for eng in $MARIA_BINARIES ; do + cp storage/maria/$TARGET/$eng.{exe,pdb} $DESTDIR/bin +done + cp server-tools/instance-manager/$TARGET/*.{exe,map} $DESTDIR/bin/ if [ x"$TARGET" != x"release" ] ; then cp server-tools/instance-manager/$TARGET/*.pdb $DESTDIR/bin/ @@ -280,6 +292,7 @@ mkdir -p $DESTDIR/lib/opt mkdir -p $DESTDIR/lib/plugin +cp sql/$TARGET/mysqld.lib $DESTDIR/lib/ cp libmysql/$TARGET/libmysql.dll \ libmysql/$TARGET/libmysql.lib \ libmysql/$TARGET/mysqlclient.lib \ @@ -340,6 +353,11 @@ cp mysql-test/README $DESTDIR/mysql-test/ cp -R mysql-test/{t,r,include,suite,std_data,lib} $DESTDIR/mysql-test/ +rm -rf $DESTDIR/mysql-test/lib/My/SafeProcess/my_safe_kill.{dir,vcproj} +rm -rf $DESTDIR/mysql-test/lib/My/SafeProcess/my_safe_process.{dir,vcproj} +rm -rf $DESTDIR/mysql-test/lib/My/SafeProcess/{Debug,RelWithDebInfo}/*.{ilk,idb,map} + + # Note that this will not copy "extra" if a soft link if [ -d mysql-test/extra ] ; then mkdir $DESTDIR/mysql-test/extra @@ -378,7 +396,7 @@ # Clean up from possibly copied SCCS directories # ---------------------------------------------------------------------- -rm -rf `find $DISTDIR -type d -name SCCS -print` +rm -rf `/bin/find $DISTDIR -type d -name SCCS -print` # ---------------------------------------------------------------------- # Copy other files specified on command line DEST=SOURCE

1 0

[Maria-developers] Rev 2771: Include configure-mariadb.sh in source tarball in file:///home/psergey/bzr-new/maria-5.1-build1/
by Sergey Petrunya 08 Oct '09

08 Oct '09

At file:///home/psergey/bzr-new/maria-5.1-build1/ ------------------------------------------------------------ revno: 2771 revision-id: psergey(a)askmonty.org-20091008191148-suda4au7bmdlq1hj parent: psergey(a)askmonty.org-20091008190412-78y3f1r7bdnger9r committer: Sergey Petrunya <psergey(a)askmonty.org> branch nick: maria-5.1-build1 timestamp: Thu 2009-10-08 23:11:48 +0400 message: Include configure-mariadb.sh in source tarball === modified file 'win/Makefile.am' --- a/win/Makefile.am 2009-10-02 12:53:05 +0000 +++ b/win/Makefile.am 2009-10-08 19:11:48 +0000 @@ -17,7 +17,7 @@ EXTRA_DIST = build-vs71.bat build-vs8.bat build-vs8_x64.bat build-vs9.bat \ build-vs9_x64.bat configure.js README mysql_manifest.cmake \ create_manifest.js create_def_file.js build-nmake.bat \ - build-nmake-x64.bat + build-nmake-x64.bat configure-mariadb.sh # Don't update the files from bitkeeper %::SCCS/s.%

1 0

[Maria-developers] Rev 2770: Added win/configure-mariadb.sh - the standard way to configure on Windows. in file:///home/psergey/bzr-new/maria-5.1-build1/
by Sergey Petrunya 08 Oct '09

08 Oct '09

At file:///home/psergey/bzr-new/maria-5.1-build1/ ------------------------------------------------------------ revno: 2770 revision-id: psergey(a)askmonty.org-20091008190412-78y3f1r7bdnger9r parent: knielsen(a)knielsen-hq.org-20091008094331-wgvbuy10n25l7u14 committer: Sergey Petrunya <psergey(a)askmonty.org> branch nick: maria-5.1-build1 timestamp: Thu 2009-10-08 23:04:12 +0400 message: Added win/configure-mariadb.sh - the standard way to configure on Windows. === added file 'win/configure-mariadb.sh' --- a/win/configure-mariadb.sh 1970-01-01 00:00:00 +0000 +++ b/win/configure-mariadb.sh 2009-10-08 19:04:12 +0000 @@ -0,0 +1,23 @@ +#!/bin/sh + +# +# This script is the "standard" way to configure MariaDB on Windows. To be +# used by buildbot slaves and release build script. +# + +set -e + +cscript win/configure.js \ + WITH_ARCHIVE_STORAGE_ENGINE \ + WITH_BLACKHOLE_STORAGE_ENGINE \ + WITH_CSV_STORAGE_ENGINE \ + WITH_EXAMPLE_STORAGE_ENGINE \ + WITH_FEDERATED_STORAGE_ENGINE \ + WITH_MERGE_STORAGE_ENGINE \ + WITH_PARTITION_STORAGE_ENGINE \ + WITH_MARIA_STORAGE_ENGINE \ + WITH_PBXT_STORAGE_ENGINE \ + WITH_XTRADB_STORAGE_ENGINE \ + WITH_EMBEDDED_SERVER + +

1 0

Re: [Maria-developers] bzr commit into MariaDB 5.1, with Maria 1.5:maria branch (knielsen:2763)
by Arjen Lentz 08 Oct '09

08 Oct '09

Hi Monty, Henrik On 08/10/2009, at 8:45 PM, Michael Widenius wrote: >>>>>> "Henrik" == Henrik Ingo <henrik.ingo(a)avoinelama.fi> writes: > Henrik> On Wed, Oct 7, 2009 at 4:16 PM, <knielsen(a)knielsen-hq.org> > wrote: >>> #At lp:maria >>> >>> 2763 knielsen(a)knielsen-hq.org 2009-10-07 [merge] >>> Merge Arjen's fix for new slow log functionality. >>> modified: >>> sql/mysqld.cc > > Henrik> Sorry to be a nitpick, but since this touches source code > and not just > Henrik> build stuff... Does that even matter, it's part of the same? I actually got build-related scripts out of Sun/MySQL under GPL that were kept internal, because there was the simple case that I wasn't otherwise able to rebuild binaries from the provided source. IIRC it was some Solaris foo. > Henrik> Arjen, could you please clarify the terms under which this > fix are > Henrik> contributed to Monty Program (since we've discussed this > earlier > Henrik> today, I'll omit the reasoning why this is necessary). > Henrik> -MCA (needs to be signed and faxed/emailed) > Henrik> -BSD (needs to be stated in the patch or email, etc...) > Henrik> or > Henrik> ...for this particular two liner fix, do you agree (please > reply) that > Henrik> it does not constitute a copyrightable "work" in itself? (I > don't know > Henrik> the English term, but means that trivial things are not > "creative > Henrik> works" and thus not copyrightable.) > > Henrik, in general you are right. However, for a few lines bug fix > "that is obvious", one generally don't need a copyright assignment. Even if it were not obvious, such small patches are not generally considered original work and thus don't acquire their own copyright. This differs per country, by the way, just to be fun - it's not fixed at what point a patch becomes an original work. Anyway I regarded it as trivial and therefore I just submitted it. I think you want to be rather "careful" in chasing this kind of thing - on the one hand I appreciate that you want to keep the IP clear and proper, but on the other hand you don't want to make it tedious for potential contributors to the project to actually do that. The more legalese and hoops, the fewer we'll see. > That said, Arjen would you mind either signing the MCA to ensure that > we can get your fixes in without a hazzle or do you prefer to always > give your changes to MariaDB under the BSD? So is there a "finished" MCA ? Wasn't there still an open thread with some things to do? I'm happy to take a look at it. I'm ok with pooling copyright, but I'm less ok with any construct that enables dual licensing, specifically I don't feel like supporting Sun/ MySQL's continued ability to conduct their sales scam. Now, I see my contributions to be primarily benefiting MariaDB not MySQL (plus I doubt significant things will flow upstream - although pigs might fly) so I can probably live with signing an MP MCA. Cheers, Arjen. -- Arjen Lentz, Exec.Director @ Open Query (http://openquery.com) Exceptional Services for MySQL at a fixed budget. Follow our blog at http://openquery.com/blog/ OurDelta: enhanced builds for MySQL @ http://ourdelta.org

3 2

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

08 Oct '09

#At lp:maria 2769 knielsen(a)knielsen-hq.org 2009-10-08 Revert change of package name in configure.in, as it breaks too much stuff. modified: configure.in === modified file 'configure.in' --- a/configure.in 2009-10-07 22:57:43 +0000 +++ b/configure.in 2009-10-08 09:43:31 +0000 @@ -12,10 +12,10 @@ AC_CANONICAL_SYSTEM # in mysqlbinlog.cc / check_master_version(). # # When merging new MySQL releases, update the version number to match the -# MySQL version number, but reset the maria subrelease (m1). +# MySQL version number. # # Note: the following line must be parseable by win/configure.js:GetVersion() -AM_INIT_AUTOMAKE(mariadb, 5.1.38-beta) +AM_INIT_AUTOMAKE(mysql, 5.1.38-maria-beta) AM_CONFIG_HEADER([include/config.h:config.h.in]) PROTOCOL_VERSION=10

1 0

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

08 Oct '09

#At lp:maria 2768 knielsen(a)knielsen-hq.org 2009-10-08 [merge] Merge. modified: mysql-test/lib/mtr_cases.pm === modified file 'mysql-test/lib/mtr_cases.pm' --- a/mysql-test/lib/mtr_cases.pm 2009-10-07 22:57:43 +0000 +++ b/mysql-test/lib/mtr_cases.pm 2009-10-07 22:59:07 +0000 @@ -1084,6 +1084,17 @@ sub collect_one_test_case { $tinfo->{template_path}= $config; } + if ( $tinfo->{'example_plugin_test'} ) + { + if ( !$ENV{'EXAMPLE_PLUGIN'} ) + { + $tinfo->{'skip'}= 1; + $tinfo->{'comment'}= "Test requires the 'example' plugin"; + return $tinfo; + } + } + + # Set extra config file to use if (defined $defaults_extra_file) { $tinfo->{extra_template_path}= $defaults_extra_file; @@ -1136,6 +1147,7 @@ my @tags= ["federated.inc", "federated_test", 1], ["include/not_embedded.inc", "not_embedded", 1], ["include/not_valgrind.inc", "not_valgrind", 1], + ["include/have_example_plugin.inc", "example_plugin_test", 1] );

1 0

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

08 Oct '09

#At lp:maria 2767 knielsen(a)knielsen-hq.org 2009-10-08 Fixes for package name change mysql -> mariadb. - Don't need any m1 prefix for the first release based on given MySQL version number. - Fix mysql-test-run to understand that some stuff is installed under share/mariadb rather than share/mysql. modified: configure.in mysql-test/lib/My/ConfigFactory.pm mysql-test/lib/mtr_cases.pm mysql-test/mysql-test-run.pl === modified file 'configure.in' --- a/configure.in 2009-10-07 17:26:36 +0000 +++ b/configure.in 2009-10-07 22:57:43 +0000 @@ -15,7 +15,7 @@ AC_CANONICAL_SYSTEM # MySQL version number, but reset the maria subrelease (m1). # # Note: the following line must be parseable by win/configure.js:GetVersion() -AM_INIT_AUTOMAKE(mariadb, 5.1.38m1-beta) +AM_INIT_AUTOMAKE(mariadb, 5.1.38-beta) AM_CONFIG_HEADER([include/config.h:config.h.in]) PROTOCOL_VERSION=10 === modified file 'mysql-test/lib/My/ConfigFactory.pm' --- a/mysql-test/lib/My/ConfigFactory.pm 2009-04-25 09:04:38 +0000 +++ b/mysql-test/lib/My/ConfigFactory.pm 2009-10-07 22:57:43 +0000 @@ -19,7 +19,7 @@ my @pre_rules= ); -my @share_locations= ("share/mysql", "sql/share", "share"); +my @share_locations= ("share/mariadb", "share/mysql", "sql/share", "share"); sub get_basedir { === modified file 'mysql-test/lib/mtr_cases.pm' --- a/mysql-test/lib/mtr_cases.pm 2009-09-07 20:50:10 +0000 +++ b/mysql-test/lib/mtr_cases.pm 2009-10-07 22:57:43 +0000 @@ -490,6 +490,8 @@ sub collect_one_suite($) my $lib_innodb_plugin= mtr_file_exists(::vs_config_dirs('storage/innodb_plugin', 'ha_innodb_plugin.dll'), "$::basedir/storage/innodb_plugin/.libs/ha_innodb_plugin.so", + "$::basedir/lib/mariadb/plugin/ha_innodb_plugin.so", + "$::basedir/lib/mariadb/plugin/ha_innodb_plugin.dll", "$::basedir/lib/mysql/plugin/ha_innodb_plugin.so", "$::basedir/lib/mysql/plugin/ha_innodb_plugin.dll"); if ($::mysql_version_id >= 50100 && !(IS_WINDOWS && $::opt_embedded_server) && === modified file 'mysql-test/mysql-test-run.pl' --- a/mysql-test/mysql-test-run.pl 2009-10-06 14:02:53 +0000 +++ b/mysql-test/mysql-test-run.pl 2009-10-07 22:57:43 +0000 @@ -1018,7 +1018,8 @@ sub command_line_setup { } # Look for language files and charsetsdir, use same share - $path_language= mtr_path_exists("$basedir/share/mysql/english", + $path_language= mtr_path_exists("$basedir/share/mariadb/english", + "$basedir/share/mysql/english", "$basedir/sql/share/english", "$basedir/share/english"); @@ -1887,6 +1888,7 @@ sub environment_setup { my $lib_udf_example= mtr_file_exists(vs_config_dirs('sql', 'udf_example.dll'), "$basedir/sql/.libs/udf_example.so", + "$basedir/lib/mariadb/plugin/udf_example.so", "$basedir/lib/mysql/plugin/udf_example.so",); if ( $lib_udf_example ) @@ -1915,6 +1917,7 @@ sub environment_setup { my $lib_example_plugin= mtr_file_exists(vs_config_dirs('storage/example',$plugin_filename), "$basedir/storage/example/.libs/".$plugin_filename, + "$basedir/lib/mariadb/plugin/".$plugin_filename, "$basedir/lib/mysql/plugin/".$plugin_filename); $ENV{'EXAMPLE_PLUGIN'}= ($lib_example_plugin ? basename($lib_example_plugin) : ""); @@ -1931,6 +1934,7 @@ sub environment_setup { my $lib_simple_parser= mtr_file_exists(vs_config_dirs('plugin/fulltext', 'mypluglib.dll'), "$basedir/plugin/fulltext/.libs/mypluglib.so", + "$basedir/lib/mariadb/plugin/mypluglib.so", "$basedir/lib/mysql/plugin/mypluglib.so",); $ENV{'SIMPLE_PARSER'}= @@ -2074,6 +2078,7 @@ sub environment_setup { my $file_mysql_fix_privilege_tables= mtr_file_exists("$basedir/scripts/mysql_fix_privilege_tables.sql", "$basedir/share/mysql_fix_privilege_tables.sql", + "$basedir/share/mariadb/mysql_fix_privilege_tables.sql", "$basedir/share/mysql/mysql_fix_privilege_tables.sql"); $ENV{'MYSQL_FIX_PRIVILEGE_TABLES'}= $file_mysql_fix_privilege_tables; @@ -2870,8 +2875,8 @@ sub mysql_install_db { my $bootstrap_sql_file= "$opt_vardir/tmp/bootstrap.sql"; my $path_sql= my_find_file($install_basedir, - ["mysql", "sql/share", "share/mysql", - "share", "scripts"], + ["mysql", "sql/share", "share/mariadb", + "share/mysql", "share", "scripts"], "mysql_system_tables.sql", NOT_REQUIRED);

1 0

[Maria-developers] Rev 2767: MBUG#442254: mysql-test-run --embedded fails on Windows with: ERROR: .opt file references 'EXAMPLE_PLUGIN_OPT' in file:///home/psergey/bzr-new/maria-5.1-build2/
by Sergey Petrunya 08 Oct '09

08 Oct '09

At file:///home/psergey/bzr-new/maria-5.1-build2/ ------------------------------------------------------------ revno: 2767 revision-id: psergey(a)askmonty.org-20091007212904-81yqfkvgidlatwjc parent: psergey(a)askmonty.org-20091007210029-bxfk4r2xo0128uhq committer: Sergey Petrunya <psergey(a)askmonty.org> branch nick: maria-5.1-build2 timestamp: Thu 2009-10-08 01:29:04 +0400 message: MBUG#442254: mysql-test-run --embedded fails on Windows with: ERROR: .opt file references 'EXAMPLE_PLUGIN_OPT' - Fix suggested by Kristian on review: ignore the test using mtr's facilities === modified file 'mysql-test/lib/mtr_cases.pm' --- a/mysql-test/lib/mtr_cases.pm 2009-09-07 20:50:10 +0000 +++ b/mysql-test/lib/mtr_cases.pm 2009-10-07 21:29:04 +0000 @@ -1082,6 +1082,17 @@ $tinfo->{template_path}= $config; } + if ( $tinfo->{'example_plugin_test'} ) + { + if ( !$ENV{'EXAMPLE_PLUGIN'} ) + { + $tinfo->{'skip'}= 1; + $tinfo->{'comment'}= "Test requires the 'example' plugin"; + return $tinfo; + } + } + + # Set extra config file to use if (defined $defaults_extra_file) { $tinfo->{extra_template_path}= $defaults_extra_file; @@ -1134,6 +1145,7 @@ ["federated.inc", "federated_test", 1], ["include/not_embedded.inc", "not_embedded", 1], ["include/not_valgrind.inc", "not_valgrind", 1], + ["include/have_example_plugin.inc", "example_plugin_test", 1] );

2 1

[Maria-developers] Rev 2766: Fix win/configure.js: now configure.in has AM_INIT_AUTOMAKE(mariadb, ...) in file:///home/psergey/bzr-new/maria-5.1-build1/
by Sergey Petrunya 07 Oct '09

07 Oct '09

At file:///home/psergey/bzr-new/maria-5.1-build1/ ------------------------------------------------------------ revno: 2766 revision-id: psergey(a)askmonty.org-20091007210029-bxfk4r2xo0128uhq parent: psergey(a)askmonty.org-20091007172636-oan0ue1yxk41bza1 committer: Sergey Petrunya <psergey(a)askmonty.org> branch nick: maria-5.1-build1 timestamp: Thu 2009-10-08 01:00:29 +0400 message: Fix win/configure.js: now configure.in has AM_INIT_AUTOMAKE(mariadb, ...) - Part 2. make it really work. === modified file 'win/configure.js' --- a/win/configure.js 2009-10-07 17:26:36 +0000 +++ b/win/configure.js 2009-10-07 21:00:29 +0000 @@ -157,11 +157,15 @@ { var key = "AM_INIT_AUTOMAKE(mysql, "; var key2 = "AM_INIT_AUTOMAKE(mariadb, "; + var key_len = key.length; var pos = str.indexOf(key); //5.0.6-beta) if (pos == -1) + { pos = str.indexOf(key2); + key_len= key2.length; + } if (pos == -1) return null; - pos += key.length; + pos += key_len; var end = str.indexOf(")", pos); if (end == -1) return null; return str.substring(pos, end);

1 0