- developers - lists.mariadb.org

[Maria-developers] [Branch ~maria-captains/maria/5.1] Rev 2838: Added missing space from last push
by noreply＠launchpad.net 31 Mar '10

31 Mar '10

------------------------------------------------------------ revno: 2838 committer: Michael Widenius <monty(a)askmonty.org> branch nick: maria-5.1 timestamp: Wed 2010-03-31 23:50:54 +0300 message: Added missing space from last push Fixed compiler warnings modified: mysys/my_gethostbyname.c storage/xtradb/handler/i_s.cc storage/xtradb/log/log0recv.c -- lp:maria https://code.launchpad.net/~maria-captains/maria/5.1 Your team Maria developers is subscribed to branch lp:maria. To unsubscribe from this branch go to https://code.launchpad.net/~maria-captains/maria/5.1/+edit-subscription

1 0

[Maria-developers] bzr commit into MariaDB 5.1, with Maria 1.5:maria branch (monty:2838)
by Michael Widenius 31 Mar '10

31 Mar '10

#At lp:maria based on revid:monty@askmonty.org-20100331191221-xg8yj34ld36r2mhe 2838 Michael Widenius 2010-03-31 Added missing space from last push Fixed compiler warnings modified: mysys/my_gethostbyname.c storage/xtradb/handler/i_s.cc storage/xtradb/log/log0recv.c per-file messages: mysys/my_gethostbyname.c Added missing space from last push storage/xtradb/handler/i_s.cc Removed not used variable storage/xtradb/log/log0recv.c Removed not used variable === modified file 'mysys/my_gethostbyname.c' --- a/mysys/my_gethostbyname.c 2010-03-30 12:36:49 +0000 +++ b/mysys/my_gethostbyname.c 2010-03-31 20:50:54 +0000 @@ -95,7 +95,7 @@ struct hostent * my_gethostbyname_r(const char *name, struct hostent *result __attribute__((unused)), char *buffer __attribute__((unused)), - int buflen__attribute__((unused)), + int buflen __attribute__((unused)), int *h_errnop) { struct hostent *hp; === modified file 'storage/xtradb/handler/i_s.cc' --- a/storage/xtradb/handler/i_s.cc 2010-01-28 11:35:10 +0000 +++ b/storage/xtradb/handler/i_s.cc 2010-03-31 20:50:54 +0000 @@ -2988,7 +2988,6 @@ i_s_innodb_admin_command_fill( COND* cond) { TABLE* i_s_table = (TABLE *) tables->table; - CHARSET_INFO *cs= system_charset_info; char** query_str; char* ptr; char quote = '\0'; === modified file 'storage/xtradb/log/log0recv.c' --- a/storage/xtradb/log/log0recv.c 2010-01-15 15:58:25 +0000 +++ b/storage/xtradb/log/log0recv.c 2010-03-31 20:50:54 +0000 @@ -3280,7 +3280,6 @@ recv_recovery_from_checkpoint_finish(voi #endif /* UNIV_DEBUG */ if (recv_needed_recovery && srv_recovery_stats) { - FILE* file = stderr; ulint i; fprintf(stderr,

1 0

[Maria-developers] [Branch ~maria-captains/maria/5.1] Rev 2837: Fixed compiler warnings
by noreply＠launchpad.net 31 Mar '10

31 Mar '10

------------------------------------------------------------ revno: 2837 committer: Michael Widenius <monty(a)askmonty.org> branch nick: maria-5.1 timestamp: Wed 2010-03-31 22:12:21 +0300 message: Fixed compiler warnings Fixed random failure in test system modified: BUILD/compile-solaris-sparc cmd-line-utils/libedit/filecomplete.c mysql-test/suite/rpl/r/rpl_optimize.result mysql-test/suite/rpl/t/rpl_optimize.test support-files/compiler_warnings.supp -- lp:maria https://code.launchpad.net/~maria-captains/maria/5.1 Your team Maria developers is subscribed to branch lp:maria. To unsubscribe from this branch go to https://code.launchpad.net/~maria-captains/maria/5.1/+edit-subscription

1 0

[Maria-developers] bzr commit into MariaDB 5.1, with Maria 1.5:maria branch (monty:2837)
by Michael Widenius 31 Mar '10

31 Mar '10

#At lp:maria based on revid:monty@askmonty.org-20100330123649-z64q052mcmpe049v 2837 Michael Widenius 2010-03-31 Fixed compiler warnings Fixed random failure in test system modified: BUILD/compile-solaris-sparc cmd-line-utils/libedit/filecomplete.c mysql-test/suite/rpl/r/rpl_optimize.result mysql-test/suite/rpl/t/rpl_optimize.test support-files/compiler_warnings.supp per-file messages: BUILD/compile-solaris-sparc Addex EXTRA_FLAGS to configure line (to get rid of warnings for not initialzed variables on buildbot) cmd-line-utils/libedit/filecomplete.c Remove not used variables mysql-test/suite/rpl/r/rpl_optimize.result Updated result mysql-test/suite/rpl/t/rpl_optimize.test Use sync_salve_with_master to ensure cleanup on slave support-files/compiler_warnings.supp Added suppression of libedit files === modified file 'BUILD/compile-solaris-sparc' --- a/BUILD/compile-solaris-sparc 2008-09-30 20:57:48 +0000 +++ b/BUILD/compile-solaris-sparc 2010-03-31 19:12:21 +0000 @@ -9,6 +9,6 @@ PATH=$PATH:/usr/ccs/bin:/usr/local/bin path=`dirname $0` . "$path/autorun.sh" -CFLAGS="-g -Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wparentheses -Wsign-compare -Wwrite-strings -Wunused -O3 -fno-omit-frame-pointer -mcpu=v8 -Wa,-xarch=v8plusa" CXX=gcc CXXFLAGS="-Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wparentheses -Wsign-compare -Wwrite-strings -Woverloaded-virtual -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor -felide-constructors -fno-exceptions -fno-rtti -O3 -fno-omit-frame-pointer -mcpu=v8 -Wa,-xarch=v8plusa -g" LIBS="-lmtmalloc" ./configure --prefix=/usr/local/mysql --enable-assembler --with-extra-charsets=complex --enable-thread-safe-client +CFLAGS="-g -Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wparentheses -Wsign-compare -Wwrite-strings -Wunused -O3 -fno-omit-frame-pointer -mcpu=v8 -Wa,-xarch=v8plusa $EXTRA_FLAGS $EXTRA_CFLAGS" CXX=gcc CXXFLAGS="-Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wparentheses -Wsign-compare -Wwrite-strings -Woverloaded-virtual -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor -felide-constructors -fno-exceptions -fno-rtti -O3 -fno-omit-frame-pointer -mcpu=v8 -Wa,-xarch=v8plusa -g $EXTRA_FLAGS $EXTRA_CXXFLAGS" LIBS="-lmtmalloc" ./configure --prefix=/usr/local/mysql --enable-assembler --with-extra-charsets=complex --enable-thread-safe-client make -j 4 === modified file 'cmd-line-utils/libedit/filecomplete.c' --- a/cmd-line-utils/libedit/filecomplete.c 2009-04-30 11:53:30 +0000 +++ b/cmd-line-utils/libedit/filecomplete.c 2010-03-31 19:12:21 +0000 @@ -95,10 +95,9 @@ static char break_chars[] = { ' ', '\t', char * fn_tilde_expand(const char *txt) { - struct passwd pwres, *pass; + struct passwd *pass; char *temp; size_t len = 0; - char pwbuf[1024]; if (txt[0] != '~') return (strdup(txt)); === modified file 'mysql-test/suite/rpl/r/rpl_optimize.result' --- a/mysql-test/suite/rpl/r/rpl_optimize.result 2010-01-13 09:00:03 +0000 +++ b/mysql-test/suite/rpl/r/rpl_optimize.result 2010-03-31 19:12:21 +0000 @@ -4,6 +4,7 @@ reset master; reset slave; drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; start slave; +drop tables if exists t1; CALL mtr.add_suppression('Statement may not be safe to log in statement format.'); create table t1 (a int not null auto_increment primary key, b int, key(b)); INSERT INTO t1 (a) VALUES (1),(2),(3),(4),(5),(6),(7),(8),(9),(10); === modified file 'mysql-test/suite/rpl/t/rpl_optimize.test' --- a/mysql-test/suite/rpl/t/rpl_optimize.test 2010-03-04 08:03:07 +0000 +++ b/mysql-test/suite/rpl/t/rpl_optimize.test 2010-03-31 19:12:21 +0000 @@ -15,6 +15,10 @@ -- source include/not_staging.inc -- source include/master-slave.inc +--disable_warnings +drop tables if exists t1; +--enable_warnings + CALL mtr.add_suppression('Statement may not be safe to log in statement format.'); create table t1 (a int not null auto_increment primary key, b int, key(b)); @@ -51,10 +55,9 @@ sync_with_master; # won't work if slave connection master; # cleanup drop table t1; -connection slave; -sync_with_master; +sync_slave_with_master; # If the machine is so fast that slave syncs before OPTIMIZE -# starts, this test wil demonstrate nothing but will pass. +# starts, this test will demonstrate nothing but will pass. # End of 4.1 tests === modified file 'support-files/compiler_warnings.supp' --- a/support-files/compiler_warnings.supp 2010-03-30 12:36:49 +0000 +++ b/support-files/compiler_warnings.supp 2010-03-31 19:12:21 +0000 @@ -54,6 +54,12 @@ db_vrfy.c : .*comparison is always false # readline is not maintained by us # .*/cmd-line-utils/readline/.* : .* +readline\.c : unused parameter +term\.c : unused parameter +vi\.c : unused parameter +common\.c : unused parameter +term\.c : *.* + # # Ignore some warnings in libevent, which is not maintained by us.

1 0

[Maria-developers] bzr commit into Mariadb 5.2, with Maria 2.0:maria/5.2 branch (igor:2744)
by Igor Babaev 31 Mar '10

31 Mar '10

#At lp:maria/5.2 based on revid:igor@askmonty.org-20100329211612-d7f7utiqasfk0ups 2744 Igor Babaev 2010-03-31 Adjusted results modified: mysql-test/r/key_cache.result mysql-test/suite/pbxt/r/mysqlshow.result mysql-test/t/key_cache.test === modified file 'mysql-test/r/key_cache.result' --- a/mysql-test/r/key_cache.result 2010-02-16 16:41:11 +0000 +++ b/mysql-test/r/key_cache.result 2010-03-31 18:45:41 +0000 @@ -467,18 +467,18 @@ Key_write_requests 26 Key_writes 6 select * from information_schema.key_caches; KEY_CACHE_NAME PARTITIONS PARTITION_NUMBER FULL_SIZE BLOCK_SIZE USED_BLOCKS UNUSED_BLOCKS DIRTY_BLOCKS READ_REQUESTS READS WRITE_REQUESTS WRITES -default 2 1 1048576 1024 3 # 0 10 0 13 4 -default 2 2 1048576 1024 1 # 0 12 0 13 2 -default 2 NULL 2097152 1024 4 # 0 22 0 26 6 -small NULL NULL 1048576 1024 1 # 0 1 0 2 1 +default 2 1 1048576 1024 # # 0 10 0 13 4 +default 2 2 1048576 1024 # # 0 12 0 13 2 +default 2 NULL 2097152 1024 # # 0 22 0 26 6 +small NULL NULL 1048576 1024 # # 0 1 0 2 1 delete from t1; delete from t2; select * from information_schema.key_caches; KEY_CACHE_NAME PARTITIONS PARTITION_NUMBER FULL_SIZE BLOCK_SIZE USED_BLOCKS UNUSED_BLOCKS DIRTY_BLOCKS READ_REQUESTS READS WRITE_REQUESTS WRITES -default 2 1 1048576 1024 3 # 0 10 0 13 4 -default 2 2 1048576 1024 1 # 0 12 0 13 2 -default 2 NULL 2097152 1024 4 # 0 22 0 26 6 -small NULL NULL 1048576 1024 1 # 0 1 0 2 1 +default 2 1 1048576 1024 # # 0 10 0 13 4 +default 2 2 1048576 1024 # # 0 12 0 13 2 +default 2 NULL 2097152 1024 # # 0 22 0 26 6 +small NULL NULL 1048576 1024 # # 0 1 0 2 1 set global key_cache_partitions=1; select @@key_cache_partitions; @@key_cache_partitions === modified file 'mysql-test/suite/pbxt/r/mysqlshow.result' --- a/mysql-test/suite/pbxt/r/mysqlshow.result 2010-02-01 06:14:12 +0000 +++ b/mysql-test/suite/pbxt/r/mysqlshow.result 2010-03-31 18:45:41 +0000 @@ -91,6 +91,7 @@ Database: information_schema | GLOBAL_STATUS | | GLOBAL_VARIABLES | | INDEX_STATISTICS | +| KEY_CACHES | | KEY_COLUMN_USAGE | | PARTITIONS | | PLUGINS | @@ -144,6 +145,7 @@ Database: INFORMATION_SCHEMA | GLOBAL_STATUS | | GLOBAL_VARIABLES | | INDEX_STATISTICS | +| KEY_CACHES | | KEY_COLUMN_USAGE | | PARTITIONS | | PLUGINS | === modified file 'mysql-test/t/key_cache.test' --- a/mysql-test/t/key_cache.test 2010-02-16 16:41:11 +0000 +++ b/mysql-test/t/key_cache.test 2010-03-31 18:45:41 +0000 @@ -316,12 +316,12 @@ update t2 set i=2 where i=1; --replace_result 1808 KEY_BLOCKS_UNUSED 1670 KEY_BLOCKS_UNUSED show status like 'key_%'; ---replace_column 7 # +--replace_column 6 # 7 # select * from information_schema.key_caches; delete from t1; delete from t2; ---replace_column 7 # +--replace_column 6 # 7 # select * from information_schema.key_caches; # Check that we can work with one partition with the same results

1 0

[Maria-developers] bzr commit into Mariadb 5.2, with Maria 2.0:maria/5.2 branch (monty:2761)
by Michael Widenius 31 Mar '10

31 Mar '10

#At lp:maria/5.2 based on revid:sanja@askmonty.org-20100330123515-4p8q03xccl3d6k59 2761 Michael Widenius 2010-03-31 Fixed some compiler warnings modified: include/m_ctype.h plugin/auth/dialog.c sql/sql_acl.cc storage/pbxt/src/ha_pbxt.cc per-file messages: include/m_ctype.h MY_UNICASE_INFO already includes 'const' plugin/auth/dialog.c Fixed parameters to have correct signed/unsigned type sql/sql_acl.cc old_password_plugin is not used for EMBEDDED_LIBRARY storage/pbxt/src/ha_pbxt.cc Remove not used variable === modified file 'include/m_ctype.h' --- a/include/m_ctype.h 2010-01-06 19:20:16 +0000 +++ b/include/m_ctype.h 2010-03-31 18:37:45 +0000 @@ -291,7 +291,7 @@ struct charset_info_st const uint16 *const *sort_order_big; const uint16 *tab_to_uni; MY_UNI_IDX *tab_from_uni; - const MY_UNICASE_INFO *const *caseinfo; + MY_UNICASE_INFO *const *caseinfo; const uchar *state_map; const uchar *ident_map; uint strxfrm_multiply; === modified file 'plugin/auth/dialog.c' --- a/plugin/auth/dialog.c 2010-03-29 15:13:53 +0000 +++ b/plugin/auth/dialog.c 2010-03-31 18:37:45 +0000 @@ -51,6 +51,8 @@ #define PASSWORD_QUESTION "\4" #define LAST_PASSWORD "\5" +typedef unsigned char uchar; + /********************* SERVER SIDE ****************************************/ /** @@ -63,7 +65,9 @@ static int two_questions(MYSQL_PLUGIN_VI int pkt_len; /* send a password question */ - if (vio->write_packet(vio, PASSWORD_QUESTION "Password, please:", 18)) + if (vio->write_packet(vio, + (const uchar*) (PASSWORD_QUESTION "Password, please:"), + 18)) return CR_ERROR; /* read the answer */ @@ -73,11 +77,12 @@ static int two_questions(MYSQL_PLUGIN_VI info->password_used = 1; /* fail if the password is wrong */ - if (strcmp(pkt, info->auth_string)) + if (strcmp((char*) pkt, info->auth_string)) return CR_ERROR; /* send the last, ordinary, question */ - if (vio->write_packet(vio, LAST_QUESTION "Are you sure ?", 15)) + if (vio->write_packet(vio, + (const uchar*) (LAST_QUESTION "Are you sure ?"), 15)) return CR_ERROR; /* read the answer */ @@ -85,7 +90,7 @@ static int two_questions(MYSQL_PLUGIN_VI return CR_ERROR; /* check the reply */ - return strcmp(pkt, "yes, of course") ? CR_ERROR : CR_OK; + return strcmp((char*) pkt, "yes, of course") ? CR_ERROR : CR_OK; } static struct st_mysql_auth two_handler= @@ -108,7 +113,8 @@ static int three_attempts(MYSQL_PLUGIN_V for (i= 0; i < 3; i++) { /* send the prompt */ - if (vio->write_packet(vio, PASSWORD_QUESTION "Password, please:", 18)) + if (vio->write_packet(vio, + (const uchar*) (PASSWORD_QUESTION "Password, please:"), 18)) return CR_ERROR; /* read the password */ @@ -121,7 +127,7 @@ static int three_attempts(MYSQL_PLUGIN_V finish, if the password is correct. note, that we did not mark the prompt packet as "last" */ - if (strcmp(pkt, info->auth_string) == 0) + if (strcmp((char*) pkt, info->auth_string) == 0) return CR_OK; } @@ -255,12 +261,12 @@ static int perform_dialog(MYSQL_PLUGIN_V if ((cmd >> 1) == 2 && *pkt == 0) reply= mysql->passwd; else - reply= ask(mysql, cmd >> 1, pkt, reply_buf, sizeof(reply_buf)); + reply= ask(mysql, cmd >> 1, (char*) pkt, reply_buf, sizeof(reply_buf)); if (!reply) return CR_ERROR; } /* send the reply to the server */ - res= vio->write_packet(vio, reply, strlen(reply)+1); + res= vio->write_packet(vio, (uchar*) reply, strlen(reply)+1); if (reply != mysql->passwd && reply != reply_buf) free(reply); === modified file 'sql/sql_acl.cc' --- a/sql/sql_acl.cc 2010-03-29 15:13:53 +0000 +++ b/sql/sql_acl.cc 2010-03-31 18:37:45 +0000 @@ -161,7 +161,10 @@ static LEX_STRING old_password_plugin_na /// @todo make it configurable LEX_STRING *default_auth_plugin_name= &native_password_plugin_name; -static plugin_ref native_password_plugin, old_password_plugin; +static plugin_ref native_password_plugin; +#ifndef EMBEDDED_LIBRARY +static plugin_ref old_password_plugin; +#endif /* Classes */ === modified file 'storage/pbxt/src/ha_pbxt.cc' --- a/storage/pbxt/src/ha_pbxt.cc 2010-03-03 14:44:14 +0000 +++ b/storage/pbxt/src/ha_pbxt.cc 2010-03-31 18:37:45 +0000 @@ -1215,8 +1215,6 @@ static int pbxt_init(void *p) THD *thd = NULL; #ifndef DRIZZLED - extern myxt_mutex_t LOCK_plugin; - /* {MYSQL QUIRK} * I have to release this lock for PBXT recovery to * work, because it needs to open .frm files.

1 0

[Maria-developers] Rev 31: Merge. in file:///Users/hakan/work/monty_program/mariadb-tools/
by Hakan Kuecuekyilmaz 31 Mar '10

31 Mar '10

At file:///Users/hakan/work/monty_program/mariadb-tools/ ------------------------------------------------------------ revno: 31 [merge] revision-id: hakan(a)askmonty.org-20100331181744-71hyuyjjlijrsl68 parent: hakan(a)askmonty.org-20100331181651-pxx2ep0u5658d6q1 parent: knielsen@hasky-20100329172857-9qy2lqbl892ikh89 committer: Hakan Kuecuekyilmaz <hakan(a)askmonty.org> branch nick: mariadb-tools timestamp: Wed 2010-03-31 20:17:44 +0200 message: Merge. modified: buildbot/maria-master.cfg mariamaster.cfg-20091218103450-cvifjz3i70oerkej-1 === modified file 'buildbot/maria-master.cfg' --- a/buildbot/maria-master.cfg 2010-02-23 07:48:54 +0000 +++ b/buildbot/maria-master.cfg 2010-03-29 17:28:57 +0000 @@ -114,7 +114,8 @@ "lp:~maria-captains/maria/5.2-dsmrr" : "5.2-dsmrr", "lp:~maria-captains/maria/5.3" : "5.3", "lp:~maria-captains/maria/5.3-sj-subqueries" : "5.3-sj-subqueries", - "lp:~maria-captains/maria/5.3-subqueries" : "5.3-subqueries" + "lp:~maria-captains/maria/5.3-subqueries" : "5.3-subqueries", + "lp:~maria-captains/maria/maria-5.2-wl85" : "maria-5.2-wl85" } mailSource = mail.BzrLaunchpadEmailMaildirSource("/var/lib/buildbot/Maildir", branchMap=myBranchMap) @@ -155,11 +156,11 @@ "mariadb-5.1-monty", "mariadb-5.2-monty", "mariadb-5.1-knielsen","5.1-release", "5.1-merge", "maria-5.1-wl24", "maria-5.1-vcol","maria-5.1-wl36","mysql-5.1-mwl36", - "5.1.39-oqgraph", "5.2-dsmrr", "5.3", "5.3-sj-subqueries", "5.3-subqueries" + "5.1.39-oqgraph", "5.2-dsmrr", "5.3", "5.3-sj-subqueries", "5.3-subqueries", + "maria-5.2-wl85" ], treeStableTimer=60, # 1 sec for bzr - builderNames=["centos5-debug", "hardy-x86-rtai", "hardy-amd64-makedist", - "hardy-amd64-dbg", + builderNames=["centos5-debug", "hardy-amd64-makedist", # "lenny-amd64-dbg", "adutko-alpha", "debian5-i386-fulltest", "jaunty-x86-valgrind", "jaunty-amd64-rel", @@ -170,6 +171,19 @@ "sol10-amd64-dbg", "sol10-sparc32-forte", "sol10-sparc64-forte", "sol-sparc-32"])) +# A scheduler for less powerful hosts, only run on most important branches. +c['schedulers'].append(AnyBranchScheduler( + name="mariadb-light", + branches=["5.1", "5.2", + "mariadb-5.1-knielsen", + "5.1-release", "5.1-merge", + "5.2-release", "5.2-merge", + "5.3-release", "5.3-merge", + ], + treeStableTimer=60, # 1 sec for bzr + builderNames=["hardy-x86-rtai", "hardy-amd64-dbg", + ])) + c['schedulers'].append(Triggerable( name="tarbuild-sched", builderNames=["win32-tarball", "win32-make-noinstall-zip", "centos5-amd64-minimal"])) @@ -298,7 +312,7 @@ f1.addStep(getMTR( test_type="nm", test_info="Valgrind run, no --ps-protocol", - command=["sh", "-c", "cd mysql-test && exec perl mysql-test-run.pl --mem --parallel=3 --valgrind --force --retry=3 --skip-ndb"])) + command=["sh", "-c", "cd mysql-test && exec perl mysql-test-run.pl --mem --parallel=3 --valgrind --valgrind-option=--show-reachable=yes --valgrind-option=--gen-suppressions=all --force --retry=3 --skip-ndb"])) bld_valgrind = {'name': "hardy-amd64-valgrind", 'slavename': "valgrind", @@ -428,7 +442,8 @@ f_rel_1_32 = factory.BuildFactory() f_rel_1_32.addStep(bzr_checkout) -f_rel_1_32.addStep(getCompileStep(["BUILD/compile-pentium-max"])) +f_rel_1_32.addStep(getCompileStep(["BUILD/compile-pentium-max"], + env={"AM_MAKEFLAGS": "-j1", "EXTRA_FLAGS": "-DFORCE_INIT_OF_VARS"})) # --testcase-timeout as this host is really slow at some tests. f_rel_1_32.addStep(getMTR( test_type="nm", @@ -482,6 +497,7 @@ 'slavename': "archivist-cnc", 'builddir': "archivist-cnc", 'factory': f_rel_1_32, + "env": { "AM_MAKEFLAGS": "-j1" }, "category": "experimental", } @@ -489,6 +505,7 @@ 'slavename': "archivist-amd64", 'builddir': "archivist-amd64", 'factory': f_dbg_2_64, + "env": { "AM_MAKEFLAGS": "-j1" }, "category": "main", } @@ -514,7 +531,7 @@ command=["sh", "-c", WithProperties("rm -Rf %(distname)s && tar zxf %(distname)s.tar.gz")])) f_minimal.addStep(getCompileStep( ["sh", "-c", WithProperties("cd %(distname)s && ./configure --without-uca --without-query-cache --without-geomery --without-readline --without-libedit --without-embedded-server --without-plugin-example --without-plugin-innobase --without-plugin-federated --without-plugin-pbxt --without-plugin-partition --without-plugin-daemon_example --without-plugin-ftexample --without-plugin-archive --without-plugin-blackhole --without-plugin-ibmdb2i --without-plugin-ndbcluster && make -j3")], - subdir="%(distname)s")) + subdir="%(distname)s/")) f_minimal.addStep(getMTR( test_type="nm", test_info="Normal run, no --ps-protocol", @@ -1134,8 +1151,9 @@ bld_kvm_deb_lucid_x86 = getDebBuilder("kvm-deb-lucid-x86", "vm-lucid-i386", "2239", "qemu32,-nx") bld_kvm_deb_debian5_amd64 = getDebBuilder("kvm-deb-debian5-amd64", "vm-debian5-amd64", "2234", "qemu64") bld_kvm_deb_debian5_x86 = getDebBuilder("kvm-deb-debian5-x86", "vm-debian5-i386", "2226", "qemu32,-nx") -bld_kvm_deb_debian4_amd64 = getDebBuilder("kvm-deb-debian4-amd64", "vm-debian4-amd64", "2240", "qemu64", kvmargs=["--netdev=e1000", "--kvm=-cdrom", "--kvm=/kvm/debian-40r8-amd64-netinst.iso"]) -bld_kvm_deb_debian4_x86 = getDebBuilder("kvm-deb-debian4-x86", "vm-debian4-i386", "2241", "qemu32,-nx", kvmargs=["--netdev=e1000", "--kvm=-cdrom", "--kvm=/kvm/debian-40r8-i386-netinst.iso"]) +# Some serious kvm/kernel problem on debian4, need aggressive retry +bld_kvm_deb_debian4_amd64 = getDebBuilder("kvm-deb-debian4-amd64", "vm-debian4-amd64", "2240", "qemu64", kvmargs=["--netdev=e1000", "--kvm-retries=20", "--kvm=-cdrom", "--kvm=/kvm/debian-40r8-amd64-netinst.iso"]) +bld_kvm_deb_debian4_x86 = getDebBuilder("kvm-deb-debian4-x86", "vm-debian4-i386", "2241", "qemu32,-nx", kvmargs=["--netdev=e1000", "--kvm-retries=20", "--kvm=-cdrom", "--kvm=/kvm/debian-40r8-i386-netinst.iso"]) def getBintarBuilder(name, kvm_image, port, cpu): @@ -1221,7 +1239,7 @@ description="untarring", descriptionDone="untar", command=["sh", "-c", WithProperties("rm -Rf %(distdirname)s && tar zxf %(distname)s")])) f_sol_64_bintar.addStep(getCompileStep(["sh", "-c", WithProperties("cd %(distdirname)s && BUILD/compile-solaris-amd64-debug")], - subdir="%(distdirname)s")) + subdir="%(distdirname)s/")) f_sol_64_bintar.addStep(ShellCommand( description="packaging", descriptionDone="package", command=["sh", "-c", WithProperties("""

1 0

[Maria-developers] Rev 30: Added necessary options for mysql client calls. in file:///Users/hakan/work/monty_program/mariadb-tools/
by Hakan Kuecuekyilmaz 31 Mar '10

31 Mar '10

At file:///Users/hakan/work/monty_program/mariadb-tools/ ------------------------------------------------------------ revno: 30 revision-id: hakan(a)askmonty.org-20100331181651-pxx2ep0u5658d6q1 parent: hakan(a)askmonty.org-20100329105306-6hthpbelo9xop3kw committer: Hakan Kuecuekyilmaz <hakan(a)askmonty.org> branch nick: mariadb-tools timestamp: Wed 2010-03-31 20:16:51 +0200 message: Added necessary options for mysql client calls. === modified file 'sysbench/run-sysbench-myisam.sh' --- a/sysbench/run-sysbench-myisam.sh 2010-03-29 10:53:06 +0000 +++ b/sysbench/run-sysbench-myisam.sh 2010-03-31 18:16:51 +0000 @@ -70,6 +70,7 @@ # Variables. # MY_SOCKET="/tmp/mysql.sock" +MYSQL_OPTIONS="-uroot --socket=$MY_SOCKET" MYSQLADMIN_OPTIONS="--no-defaults -uroot --socket=$MY_SOCKET" MYSQLD_OPTIONS="--no-defaults \ --datadir=$DATA_DIR \ @@ -334,10 +335,11 @@ start_mysqld sync + echo "" echo "[$(date "+%Y-%m-%d %H:%M:%S")] Starting warm up of $WARM_UP_TIME seconds." $SYSBENCH $SYSBENCH_OPTIONS_WARM_UP run sync - echo 'FLUSH STATUS' | $MYSQL -uroot + echo 'FLUSH STATUS' | $MYSQL $MYSQL_OPTIONS echo "[$(date "+%Y-%m-%d %H:%M:%S")] Finnished warm up." echo "[$(date "+%Y-%m-%d %H:%M:%S")] Starting actual sysbench run." @@ -345,7 +347,7 @@ grep "write requests:" ${THIS_RESULT_DIR}/result${k}.txt | awk '{ print $4 }' | sed -e 's/(//' >> ${THIS_RESULT_DIR}/results.txt - echo 'SELECT * FROM INFORMATION_SCHEMA.KEY_CACHES' | $MYSQL -uroot > ${THIS_RESULT_DIR}/key_cache_stats${k}.txt + echo 'SELECT * FROM INFORMATION_SCHEMA.KEY_CACHES' | $MYSQL $MYSQL_OPTIONS > ${THIS_RESULT_DIR}/key_cache_stats${k}.txt k=$(($k + 1)) done === modified file 'sysbench/run-sysbench.sh' --- a/sysbench/run-sysbench.sh 2010-03-25 01:42:05 +0000 +++ b/sysbench/run-sysbench.sh 2010-03-31 18:16:51 +0000 @@ -327,6 +327,7 @@ start_mysqld sync + echo "" echo "[$(date "+%Y-%m-%d %H:%M:%S")] Starting warm up of $WARM_UP_TIME seconds." $SYSBENCH $SYSBENCH_OPTIONS_WARM_UP run sync

1 0

[Maria-developers] Updated (by Knielsen): Merge OQGraph into MariaDB (112)
by worklog-noreply＠askmonty.org 31 Mar '10

31 Mar '10

----------------------------------------------------------------------- WORKLOG TASK -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- TASK...........: Merge OQGraph into MariaDB CREATION DATE..: Mon, 29 Mar 2010, 18:00 SUPERVISOR.....: Knielsen IMPLEMENTOR....: Knielsen COPIES TO......: CATEGORY.......: Server-Sprint TASK ID........: 112 (http://askmonty.org/worklog/?tid=112) VERSION........: Server-5.2 STATUS.........: Code-Review PRIORITY.......: 60 WORKED HOURS...: 0 ESTIMATE.......: 15 (hours remain) ORIG. ESTIMATE.: 15 PROGRESS NOTES: -=-=(Knielsen - Wed, 31 Mar 2010, 13:38)=-=- Status updated. --- /tmp/wklog.112.old.12166 2010-03-31 13:38:25.000000000 +0000 +++ /tmp/wklog.112.new.12166 2010-03-31 13:38:25.000000000 +0000 @@ -1 +1 @@ -Assigned +Code-Review -=-=(Knielsen - Wed, 31 Mar 2010, 13:38)=-=- High-Level Specification modified. --- /tmp/wklog.112.old.12070 2010-03-31 13:38:08.000000000 +0000 +++ /tmp/wklog.112.new.12070 2010-03-31 13:38:08.000000000 +0000 @@ -15,3 +15,5 @@ Fix OQGraph plug.in to detect boost version >= 1.40.0, and only enable OQGraph if such boost is found. +Update the packaging in ourdelta/bakery to include the oqgraph_engine.so and +link with g++ rather than gcc. -=-=(Knielsen - Mon, 29 Mar 2010, 21:46)=-=- High-Level Specification modified. --- /tmp/wklog.112.old.31142 2010-03-29 21:46:11.000000000 +0000 +++ /tmp/wklog.112.new.31142 2010-03-29 21:46:11.000000000 +0000 @@ -1,28 +1,17 @@ Tasks: -Find the latest version of OQGraph to base this on (there should be a -Launchpad branch somewhere, match it up with what is in the OQGraph patch for -MySQL 5.0 in the ourdelta stuff). - -Extract the correct version of Boost from the MySQL 5.0 ourdelta patch. This -is a patched version of Boost fixing a bug that is supposedly fatal for -OQGraph (details are not known at the time of writing). +Base work on the Launchpad branch lp:~knielsen/maria/mariadb-5.1-oqgraph -Document in OQGraph README the need for boost of a specific version, and point -to where it can be obtained. Also include the patch for boost if the correct -base version of boost to do this against can be determined. +OQGraph requires Boost >= 1.40.0 (earlier versions have a bug that affects +OQGraph). -Install the patched boost in /usr/local/ on the build machines (release builds -and selected Buildbot slaves). +Document in OQGraph README the need for boost of a specific version, and point +to where it can be obtained. -Fix OQGraph plug.in to detect correct version of OQGraph that makes the build -not break. Check which version in Ubuntu starts working (I think it was -Jaunty), and require at least that version. - -Setup some repository or source tarball of the patched boost -somewhere. Preferably a Launchpad branch or similar (if upstream project can -be found). +Install the patched boost in /usr/local/include/boost on the build machines +(release builds and selected Buildbot slaves). G++ seems to by default look in +/usr/local/include, so that is sufficient to find it. -Setup in plug.in or /configure.in appropriate --with-boost=xxx. Or in a pinch, -we can make do with CFLAGS=-Ixxx, or even default look in /usr/local/. +Fix OQGraph plug.in to detect boost version >= 1.40.0, and only enable OQGraph +if such boost is found. -=-=(Knielsen - Mon, 29 Mar 2010, 18:09)=-=- High-Level Specification modified. --- /tmp/wklog.112.old.23061 2010-03-29 18:09:27.000000000 +0000 +++ /tmp/wklog.112.new.23061 2010-03-29 18:09:27.000000000 +0000 @@ -1 +1,28 @@ +Tasks: + +Find the latest version of OQGraph to base this on (there should be a +Launchpad branch somewhere, match it up with what is in the OQGraph patch for +MySQL 5.0 in the ourdelta stuff). + +Extract the correct version of Boost from the MySQL 5.0 ourdelta patch. This +is a patched version of Boost fixing a bug that is supposedly fatal for +OQGraph (details are not known at the time of writing). + +Document in OQGraph README the need for boost of a specific version, and point +to where it can be obtained. Also include the patch for boost if the correct +base version of boost to do this against can be determined. + +Install the patched boost in /usr/local/ on the build machines (release builds +and selected Buildbot slaves). + +Fix OQGraph plug.in to detect correct version of OQGraph that makes the build +not break. Check which version in Ubuntu starts working (I think it was +Jaunty), and require at least that version. + +Setup some repository or source tarball of the patched boost +somewhere. Preferably a Launchpad branch or similar (if upstream project can +be found). + +Setup in plug.in or /configure.in appropriate --with-boost=xxx. Or in a pinch, +we can make do with CFLAGS=-Ixxx, or even default look in /usr/local/. DESCRIPTION: Get the OQGraph storage engine merged into MariaDB, fixing the remaining problems blocking the merge. HIGH-LEVEL SPECIFICATION: Tasks: Base work on the Launchpad branch lp:~knielsen/maria/mariadb-5.1-oqgraph OQGraph requires Boost >= 1.40.0 (earlier versions have a bug that affects OQGraph). Document in OQGraph README the need for boost of a specific version, and point to where it can be obtained. Install the patched boost in /usr/local/include/boost on the build machines (release builds and selected Buildbot slaves). G++ seems to by default look in /usr/local/include, so that is sufficient to find it. Fix OQGraph plug.in to detect boost version >= 1.40.0, and only enable OQGraph if such boost is found. Update the packaging in ourdelta/bakery to include the oqgraph_engine.so and link with g++ rather than gcc. ESTIMATED WORK TIME ESTIMATED COMPLETION DATE ----------------------------------------------------------------------- WorkLog (v3.5.9)

1 0

[Maria-developers] Updated (by Knielsen): Merge OQGraph into MariaDB (112)
by worklog-noreply＠askmonty.org 31 Mar '10

31 Mar '10

----------------------------------------------------------------------- WORKLOG TASK -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- TASK...........: Merge OQGraph into MariaDB CREATION DATE..: Mon, 29 Mar 2010, 18:00 SUPERVISOR.....: Knielsen IMPLEMENTOR....: Knielsen COPIES TO......: CATEGORY.......: Server-Sprint TASK ID........: 112 (http://askmonty.org/worklog/?tid=112) VERSION........: Server-5.2 STATUS.........: Assigned PRIORITY.......: 60 WORKED HOURS...: 0 ESTIMATE.......: 15 (hours remain) ORIG. ESTIMATE.: 15 PROGRESS NOTES: -=-=(Knielsen - Wed, 31 Mar 2010, 13:38)=-=- High-Level Specification modified. --- /tmp/wklog.112.old.12070 2010-03-31 13:38:08.000000000 +0000 +++ /tmp/wklog.112.new.12070 2010-03-31 13:38:08.000000000 +0000 @@ -15,3 +15,5 @@ Fix OQGraph plug.in to detect boost version >= 1.40.0, and only enable OQGraph if such boost is found. +Update the packaging in ourdelta/bakery to include the oqgraph_engine.so and +link with g++ rather than gcc. -=-=(Knielsen - Mon, 29 Mar 2010, 21:46)=-=- High-Level Specification modified. --- /tmp/wklog.112.old.31142 2010-03-29 21:46:11.000000000 +0000 +++ /tmp/wklog.112.new.31142 2010-03-29 21:46:11.000000000 +0000 @@ -1,28 +1,17 @@ Tasks: -Find the latest version of OQGraph to base this on (there should be a -Launchpad branch somewhere, match it up with what is in the OQGraph patch for -MySQL 5.0 in the ourdelta stuff). - -Extract the correct version of Boost from the MySQL 5.0 ourdelta patch. This -is a patched version of Boost fixing a bug that is supposedly fatal for -OQGraph (details are not known at the time of writing). +Base work on the Launchpad branch lp:~knielsen/maria/mariadb-5.1-oqgraph -Document in OQGraph README the need for boost of a specific version, and point -to where it can be obtained. Also include the patch for boost if the correct -base version of boost to do this against can be determined. +OQGraph requires Boost >= 1.40.0 (earlier versions have a bug that affects +OQGraph). -Install the patched boost in /usr/local/ on the build machines (release builds -and selected Buildbot slaves). +Document in OQGraph README the need for boost of a specific version, and point +to where it can be obtained. -Fix OQGraph plug.in to detect correct version of OQGraph that makes the build -not break. Check which version in Ubuntu starts working (I think it was -Jaunty), and require at least that version. - -Setup some repository or source tarball of the patched boost -somewhere. Preferably a Launchpad branch or similar (if upstream project can -be found). +Install the patched boost in /usr/local/include/boost on the build machines +(release builds and selected Buildbot slaves). G++ seems to by default look in +/usr/local/include, so that is sufficient to find it. -Setup in plug.in or /configure.in appropriate --with-boost=xxx. Or in a pinch, -we can make do with CFLAGS=-Ixxx, or even default look in /usr/local/. +Fix OQGraph plug.in to detect boost version >= 1.40.0, and only enable OQGraph +if such boost is found. -=-=(Knielsen - Mon, 29 Mar 2010, 18:09)=-=- High-Level Specification modified. --- /tmp/wklog.112.old.23061 2010-03-29 18:09:27.000000000 +0000 +++ /tmp/wklog.112.new.23061 2010-03-29 18:09:27.000000000 +0000 @@ -1 +1,28 @@ +Tasks: + +Find the latest version of OQGraph to base this on (there should be a +Launchpad branch somewhere, match it up with what is in the OQGraph patch for +MySQL 5.0 in the ourdelta stuff). + +Extract the correct version of Boost from the MySQL 5.0 ourdelta patch. This +is a patched version of Boost fixing a bug that is supposedly fatal for +OQGraph (details are not known at the time of writing). + +Document in OQGraph README the need for boost of a specific version, and point +to where it can be obtained. Also include the patch for boost if the correct +base version of boost to do this against can be determined. + +Install the patched boost in /usr/local/ on the build machines (release builds +and selected Buildbot slaves). + +Fix OQGraph plug.in to detect correct version of OQGraph that makes the build +not break. Check which version in Ubuntu starts working (I think it was +Jaunty), and require at least that version. + +Setup some repository or source tarball of the patched boost +somewhere. Preferably a Launchpad branch or similar (if upstream project can +be found). + +Setup in plug.in or /configure.in appropriate --with-boost=xxx. Or in a pinch, +we can make do with CFLAGS=-Ixxx, or even default look in /usr/local/. DESCRIPTION: Get the OQGraph storage engine merged into MariaDB, fixing the remaining problems blocking the merge. HIGH-LEVEL SPECIFICATION: Tasks: Base work on the Launchpad branch lp:~knielsen/maria/mariadb-5.1-oqgraph OQGraph requires Boost >= 1.40.0 (earlier versions have a bug that affects OQGraph). Document in OQGraph README the need for boost of a specific version, and point to where it can be obtained. Install the patched boost in /usr/local/include/boost on the build machines (release builds and selected Buildbot slaves). G++ seems to by default look in /usr/local/include, so that is sufficient to find it. Fix OQGraph plug.in to detect boost version >= 1.40.0, and only enable OQGraph if such boost is found. Update the packaging in ourdelta/bakery to include the oqgraph_engine.so and link with g++ rather than gcc. ESTIMATED WORK TIME ESTIMATED COMPLETION DATE ----------------------------------------------------------------------- WorkLog (v3.5.9)

1 0