- developers - lists.mariadb.org

[Maria-developers] New (by Psergey): Windows installer for MariaDB (55)
by worklog-noreply＠askmonty.org 13 Oct '09

13 Oct '09

----------------------------------------------------------------------- WORKLOG TASK -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- TASK...........: Windows installer for MariaDB CREATION DATE..: Wed, 14 Oct 2009, 00:07 SUPERVISOR.....: Monty IMPLEMENTOR....: COPIES TO......: CATEGORY.......: Server-RawIdeaBin TASK ID........: 55 (http://askmonty.org/worklog/?tid=55) VERSION........: Server-9.x STATUS.........: Un-Assigned PRIORITY.......: 60 WORKED HOURS...: 0 ESTIMATE.......: 0 (hours remain) ORIG. ESTIMATE.: 0 PROGRESS NOTES: DESCRIPTION: We need Windows Installer package for MariaDB. ESTIMATED WORK TIME ESTIMATED COMPLETION DATE ----------------------------------------------------------------------- WorkLog (v3.5.9)

1 0

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

13 Oct '09

#At lp:maria based on revid:monty@askmonty.org-20091013124717-sf1jtz0ddzadb5uh 2745 Michael Widenius 2009-10-13 Removed not used declarations modified: sql/sql_string.cc === modified file 'sql/sql_string.cc' --- a/sql/sql_string.cc 2009-09-07 20:50:10 +0000 +++ b/sql/sql_string.cc 2009-10-13 16:57:36 +0000 @@ -27,14 +27,6 @@ #include <floatingpoint.h> #endif -/* - The following extern declarations are ok as these are interface functions - required by the string function -*/ - -extern uchar* sql_alloc(unsigned size); -extern void sql_element_free(void *ptr); - #include "sql_string.h" /*****************************************************************************

1 0

[Maria-developers] A mess with sql_alloc() ?
by Alexi1952 13 Oct '09

13 Oct '09

I need to use sql_string.* and sql_list.* in MYSQL_CLIENT context (mysqlbinlog.cc). sql_list.h refers to sql_alloc() function which originally has "THD dependent" implementation: mysql_priv.h: #ifndef MYSQL_CLIENT ... (1) void *sql_alloc(size_t); ... #endif thr_malloc.cc: void *sql_alloc(size_t Size) { MEM_ROOT *root= *my_pthread_getspecific_ptr(MEM_ROOT**,THR_MALLOC); return alloc_root(root,Size); } So I redefined sql_alloc() in a client context: void *sql_alloc(size_t size) { ... } ... #include "sql_string.h" #include "sql_list.h" And this appeared to run into conflict with sql/sql_string.cc: (2) extern uchar* sql_alloc(unsigned size); Moreover I found the following declaration client\sql_string.cc: (3) extern void sql_alloc(size_t size); Isn't it a mess: compare (1), (2) and (3) ? Actually, looks like both (2) & (3) are reducible: - I found no direct usage of sql_alloc() in sql_string.* files; - After commenting (2) & (3) out the rebuild was successfull. If (2) & (3) shouldn't be deleted, then they should be brought in correspondence with (1). If not, what should I do to redefine sql_alloc()? Looks like along with sql_alloc(), we can delete similar declarations (2a) & (3a) of sql_element_free() (and actually all occurences of this function): mysql_priv.h #ifndef MYSQL_CLIENT ... (1a) void sql_element_free(void *ptr); ... #endif thr_malloc.cc void sql_element_free(void *ptr __attribute__((unused))) {} /* purecov: deadcode */ sql/sql_string.cc (2a) extern void sql_element_free(void *ptr); client/sql_string.cc (3a) extern void sql_element_free(void *ptr); Indeed, besides pointed above we find only the following occurences of sql_element_free(): client/mysql.cc void* sql_alloc(unsigned size); void sql_element_free(void *ptr); ... void *sql_alloc(size_t Size) { return my_malloc(Size,MYF(MY_WME)); } void sql_element_free(void *ptr) { my_free(ptr,MYF(0)); } So sql_element_free() is called nowhere (note also that this function has a do-nothing body).

3 4

[Maria-developers] [Branch ~maria-captains/maria/5.1] Rev 2744: Force restart before maria_showlog_error to get rid of status from previous connections
by noreply＠launchpad.net 13 Oct '09

13 Oct '09

------------------------------------------------------------ revno: 2744 committer: Michael Widenius <monty(a)askmonty.org> branch nick: mysql-maria timestamp: Tue 2009-10-13 15:47:17 +0300 message: Force restart before maria_showlog_error to get rid of status from previous connections This fixes a race condition in the test system added: mysql-test/suite/maria/t/maria_showlog_error-master.opt modified: mysql-test/include/maria_empty_logs.inc mysql-test/include/wait_for_status_var.inc 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] bzr commit into MariaDB 5.1, with Maria 1.5:maria branch (monty:2744)
by Michael Widenius 13 Oct '09

13 Oct '09

#At lp:maria based on revid:knielsen@knielsen-hq.org-20091006183755-y08lid6fg8mnr8sk 2744 Michael Widenius 2009-10-13 Force restart before maria_showlog_error to get rid of status from previous connections This fixes a race condition in the test system added: mysql-test/suite/maria/t/maria_showlog_error-master.opt modified: mysql-test/include/maria_empty_logs.inc mysql-test/include/wait_for_status_var.inc mysql-test/mysql-test-run.pl per-file messages: mysql-test/include/maria_empty_logs.inc Added comment mysql-test/include/wait_for_status_var.inc Fixed type in variable name. Add ' around variables for better error message mysql-test/mysql-test-run.pl Remove -skip-falcon (not to be used), add skip-pbxt to bootstrap mysql-test/suite/maria/t/maria_showlog_error-master.opt Force restart before maria_showlog_error to get rid of status from previous connection === modified file 'mysql-test/include/maria_empty_logs.inc' --- a/mysql-test/include/maria_empty_logs.inc 2009-02-19 09:01:25 +0000 +++ b/mysql-test/include/maria_empty_logs.inc 2009-10-13 12:47:17 +0000 @@ -1,6 +1,10 @@ # Maria help script. # Cleans up all logs to give recovery a fresh start. - +# +# Note that this script relies on the number of threads connect at start of +# this script, so one should run this script with a freshly started server +# for it to work. +# # API: set mel_keep_control_file=1 if want to keep control file; # uses vardir, port and socket. === modified file 'mysql-test/include/wait_for_status_var.inc' --- a/mysql-test/include/wait_for_status_var.inc 2009-04-03 21:33:13 +0000 +++ b/mysql-test/include/wait_for_status_var.inc 2009-10-13 12:47:17 +0000 @@ -51,11 +51,12 @@ if (`SELECT '$_status_var_comparsion' = } let $_show_status_value= query_get_value("SHOW $status_type STATUS LIKE '$status_var'", Value, 1); + while (`SELECT NOT('$_show_status_value' $_status_var_comparsion '$status_var_value')`) { if (!$_status_timeout_counter) { - --echo **** ERROR: failed while waiting for $status_type $status_var $_status_var_comparison $status_var_value **** + --echo **** ERROR: failed while waiting for '$status_type' '$status_var' $_status_var_comparsion '$status_var_value' **** --echo Note: the following output may have changed since the failure was detected --echo **** Showing STATUS, PROCESSLIST **** eval SHOW $status_type STATUS LIKE '$status_var'; === modified file 'mysql-test/mysql-test-run.pl' --- a/mysql-test/mysql-test-run.pl 2009-10-06 18:37:55 +0000 +++ b/mysql-test/mysql-test-run.pl 2009-10-13 12:47:17 +0000 @@ -2826,7 +2826,7 @@ sub mysql_install_db { mtr_add_arg($args, "--basedir=%s", $install_basedir); mtr_add_arg($args, "--datadir=%s", $install_datadir); mtr_add_arg($args, "--loose-skip-innodb"); - mtr_add_arg($args, "--loose-skip-falcon"); + mtr_add_arg($args, "--loose-skip-pbxt"); mtr_add_arg($args, "--loose-skip-ndbcluster"); mtr_add_arg($args, "--loose-skip-maria"); mtr_add_arg($args, "--disable-sync-frm"); === added file 'mysql-test/suite/maria/t/maria_showlog_error-master.opt' --- a/mysql-test/suite/maria/t/maria_showlog_error-master.opt 1970-01-01 00:00:00 +0000 +++ b/mysql-test/suite/maria/t/maria_showlog_error-master.opt 2009-10-13 12:47:17 +0000 @@ -0,0 +1 @@ +--force-restart

1 0

[Maria-developers] WL40: Notes/questions
by Alexi1952 12 Oct '09

12 Oct '09

With WL36 and WL40 we have: mysqlbinlog options: --database=db --rewrite-db=db_from->db_to --do-table=db.tbl --ignore-table=db.tbl --wild-do-table=pattern.pattern --wild-ignore-table=pattern.pattern replication options: --replicate-rewrite-db=db_from->db_to --replicate-do-db=db --replicate-ignore-db=db --replicate-do-table=tbl --replicate-ignore-table=tbl --replicate-wild-do-table=db.tbl --replicate-wild-ignore-table=db.tbl 1. In mysqlbinlog we do not have --do_db and --ignore_db options. Does it mean that instead it is supposed to use: --replicate-wild-do-table=db.% --replicate-wild-ignore-table=db.% respectively? Compared with other options, --database option looks like a "foreign body" : - contrary to other options, it allows to specify only one database (with multiple --database's only the last one is used); - having with --database an analog of do_db, we have no similar analog of ignore_db. 2. In replication two functions are used for filtering databases: - db_ok(const char* db) which matches db only with do-db and ignore-db rules; - db_ok_with_wild_table(const char* db) which matches db only with wild-do-table=db.% and wild-ignore-table=db.% rules. This function is applied only to CREATE DB, DROP DB, and ALTER DATABASE statements. In mysqlbinlog, should we follow the same scheme, namely: - db_ok() for matching db with --database option only; - db_ok_with_wild_table() for statements listed above? 3. According to replication filtering rules, --replicate-rewrite_db is always done _before_ other --replicate-* rules are tested; see explanation for --replicate-rewrite-db in RefMan (16.1.3.3. Replication Slave Options and Variables), or the following piece of code in og_event.cc: int Table_map_log_event::do_apply_event(Relay_log_info const* rli) { RPL_TABLE_LIST* table_list; ... strmov(table_list->db, rpl_filter->get_rewrite_db(m_dbnam, &dummy_len)); ... if (...!rpl_filter->db_ok(table_list->db) ...) ... } And what about --database + rewrite-db for mysqlbinlog? If we mean to output only database xxx with renaming it to yyy, should we use (1) mysqlbinlog --database=xxx --rewrite-db=xxx->yyy or (2) mysqlbinlog --database=yyy --rewrite-db=xxx->yyy In current WL36 design it is supposed that (1) should be used (surely, this can easily be redesigned). But this becomes confused with using of --wild-do-table + replication filtering rules, for which we should use: (3) --wild-do-table=yyy.% --rewrite-db=xxx->yyy

4 5

[Maria-developers] Rev 2787: Cosmetic fixes to win/make_mariadb_win_dist in file:///home/psergey/bzr-new/maria-5.1-build1/
by Sergey Petrunya 12 Oct '09

12 Oct '09

At file:///home/psergey/bzr-new/maria-5.1-build1/ ------------------------------------------------------------ revno: 2787 revision-id: psergey(a)askmonty.org-20091012165020-wy00cdvjz603quz5 parent: psergey(a)askmonty.org-20091012131431-24eoadm2kfeorp6q committer: Sergey Petrunya <psergey(a)askmonty.org> branch nick: maria-5.1-build1 timestamp: Mon 2009-10-12 20:50:20 +0400 message: Cosmetic fixes to win/make_mariadb_win_dist === modified file 'win/make_mariadb_win_dist' --- a/win/make_mariadb_win_dist 2009-10-12 13:14:31 +0000 +++ b/win/make_mariadb_win_dist 2009-10-12 16:50:20 +0000 @@ -4,6 +4,7 @@ # This is a script that one needs to run in the source tarball to build # a MariaDB release for Windows # + set -e if [ ! -d win/data ] ; then @@ -67,6 +68,6 @@ if [ $RES ] ; then echo "Archive contents differ from the standard file list, check the diff output above" else - echo "Archive contents match the standard list" + echo "Archive contents match the standard list, OK" fi

1 0

[Maria-developers] Rev 2786: Fix typo bug in make_mariadb_win_dist in file:///home/psergey/bzr-new/maria-5.1-build1/
by Sergey Petrunya 12 Oct '09

12 Oct '09

At file:///home/psergey/bzr-new/maria-5.1-build1/ ------------------------------------------------------------ revno: 2786 revision-id: psergey(a)askmonty.org-20091012131431-24eoadm2kfeorp6q parent: psergey(a)askmonty.org-20091012112648-m5ios3dfizjipeir committer: Sergey Petrunya <psergey(a)askmonty.org> branch nick: maria-5.1-build1 timestamp: Mon 2009-10-12 17:14:31 +0400 message: Fix typo bug in make_mariadb_win_dist === modified file 'win/make_mariadb_win_dist' --- a/win/make_mariadb_win_dist 2009-10-12 11:26:48 +0000 +++ b/win/make_mariadb_win_dist 2009-10-12 13:14:31 +0000 @@ -53,7 +53,7 @@ http://askmonty.org/wiki/images/5/57/Mariadb-5.1-pre-beta-file-list-r2.txt.… gunzip base.list.gz unzip ../$ZIPFILE -(cd $ZIPNAME; /bin/find . | sort ) > new.list +(cd $ZIPCONTENT; /bin/find . | sort ) > new.list diff -u base.list new.list || true RES=$?

1 0

[Maria-developers] Rev 2785: Fix win32 binary zipfile name and contents to match the usual expectations in file:///home/psergey/bzr-new/maria-5.1-build1/
by Sergey Petrunya 12 Oct '09

12 Oct '09

At file:///home/psergey/bzr-new/maria-5.1-build1/ ------------------------------------------------------------ revno: 2785 revision-id: psergey(a)askmonty.org-20091012112648-m5ios3dfizjipeir parent: psergey(a)askmonty.org-20091012090353-zb2ctgd7u421btxq committer: Sergey Petrunya <psergey(a)askmonty.org> branch nick: maria-5.1-build1 timestamp: Mon 2009-10-12 15:26:48 +0400 message: Fix win32 binary zipfile name and contents to match the usual expectations === modified file 'win/make_mariadb_win_dist' --- a/win/make_mariadb_win_dist 2009-10-12 09:03:53 +0000 +++ b/win/make_mariadb_win_dist 2009-10-12 11:26:48 +0000 @@ -28,23 +28,36 @@ echo Version string: $VER. -ZIPNAME=mariadb-$VER-win32-noinstall -ZIPFILE="$ZIPNAME.zip" -sh -x scripts/make_win_bin_dist $ZIPNAME +# Remove '-maria-' from version number +VER_NO_MARIA=${VER/maria-/} + +# We want the final zip to be named like this: +# mariadb-noinstall-5.1.38-win32.zip +ZIPNAME=mariadb-noinstall-$VER_NO_MARIA-win32 +ZIPFILE=$ZIPNAME.zip + +# The top directory inside the zip should be called like this: +# mariadb-5.1-38-win32 +ZIPCONTENT=mariadb-$VER_NO_MARIA-win32 + +# This will make $ZIPCONTENT.zip +sh -x scripts/make_win_bin_dist $ZIPCONTENT + +mv $ZIPCONTENT.zip $ZIPFILE rm -rf unpack mkdir unpack cd unpack wget -O base.list.gz \ -http://askmonty.org/wiki/images/6/6c/Mariadb-5.1-pre-beta-file-list.txt.gz +http://askmonty.org/wiki/images/5/57/Mariadb-5.1-pre-beta-file-list-r2.txt.gz gunzip base.list.gz unzip ../$ZIPFILE (cd $ZIPNAME; /bin/find . | sort ) > new.list -set +x + diff -u base.list new.list || true RES=$? -set -x + cd .. rm -rf unpack

1 0

[Maria-developers] Rev 2784: Fix typo bug, s/$ZIPFILE/$ZIPNAME/ in file:///home/psergey/bzr-new/maria-5.1-build1/
by Sergey Petrunya 12 Oct '09

12 Oct '09

At file:///home/psergey/bzr-new/maria-5.1-build1/ ------------------------------------------------------------ revno: 2784 revision-id: psergey(a)askmonty.org-20091012090353-zb2ctgd7u421btxq parent: psergey(a)askmonty.org-20091012071523-cbvawl22ygnuajpy committer: Sergey Petrunya <psergey(a)askmonty.org> branch nick: maria-5.1-build1 timestamp: Mon 2009-10-12 13:03:53 +0400 message: Fix typo bug, s/$ZIPFILE/$ZIPNAME/ === modified file 'win/make_mariadb_win_dist' --- a/win/make_mariadb_win_dist 2009-10-12 07:15:23 +0000 +++ b/win/make_mariadb_win_dist 2009-10-12 09:03:53 +0000 @@ -30,7 +30,7 @@ ZIPNAME=mariadb-$VER-win32-noinstall ZIPFILE="$ZIPNAME.zip" -sh -x scripts/make_win_bin_dist $ZIPFILE +sh -x scripts/make_win_bin_dist $ZIPNAME rm -rf unpack mkdir unpack @@ -48,6 +48,7 @@ cd .. rm -rf unpack +ls -lah $ZIPFILE echo "$ZIPFILE is the Windows noinstall binary zip" if [ $RES ] ; then

1 0