[Maria-developers] bzr commit into MariaDB 5.1, with Maria 1.5:maria branch (monty:2744)
#At lp:maria based on
revid:kniel...@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 +
+++ b/mysql-test/include/maria_empty_logs.inc 2009-10-13 12:47:17 +
@@ -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.inc2009-04-03 21:33:13
+
+++ b/mysql-test/include/wait_for_status_var.inc2009-10-13 12:47:17
+
@@ -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 +
+++ b/mysql-test/mysql-test-run.pl 2009-10-13 12:47:17 +
@@ -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 +
+++ b/mysql-test/suite/maria/t/maria_showlog_error-master.opt 2009-10-13
12:47:17 +
@@ -0,0 +1 @@
+--force-restart
___
Mailing list: https://launchpad.net/~maria-developers
Post to : maria-developers@lists.launchpad.net
Unsubscribe : https://launchpad.net/~maria-developers
More help : https://help.launchpad.net/ListHelp
[Maria-developers] [Branch ~maria-captains/maria/5.1] Rev 2744: Force restart before maria_showlog_error to get rid of status from previous connections
revno: 2744
committer: Michael Widenius mo...@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.
=== modified file 'mysql-test/include/maria_empty_logs.inc'
--- mysql-test/include/maria_empty_logs.inc 2009-02-19 09:01:25 +
+++ mysql-test/include/maria_empty_logs.inc 2009-10-13 12:47:17 +
@@ -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'
--- mysql-test/include/wait_for_status_var.inc 2009-04-03 21:33:13 +
+++ mysql-test/include/wait_for_status_var.inc 2009-10-13 12:47:17 +
@@ -51,11 +51,12 @@
}
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'
--- mysql-test/mysql-test-run.pl 2009-10-06 18:37:55 +
+++ mysql-test/mysql-test-run.pl 2009-10-13 12:47:17 +
@@ -2826,7 +2826,7 @@
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'
--- mysql-test/suite/maria/t/maria_showlog_error-master.opt 1970-01-01 00:00:00 +
+++ mysql-test/suite/maria/t/maria_showlog_error-master.opt 2009-10-13 12:47:17 +
@@ -0,0 +1,1 @@
+--force-restart
___
Mailing list: https://launchpad.net/~maria-developers
Post to : maria-developers@lists.launchpad.net
Unsubscribe : https://launchpad.net/~maria-developers
More help : https://help.launchpad.net/ListHelp
[Maria-developers] New (by Psergey): Windows installer for MariaDB (55)
--- 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) ___ Mailing list: https://launchpad.net/~maria-developers Post to : maria-developers@lists.launchpad.net Unsubscribe : https://launchpad.net/~maria-developers More help : https://help.launchpad.net/ListHelp
[Maria-developers] Updated (by Psergey): Windows installer for MariaDB (55)
--- 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: -=-=(Psergey - Wed, 14 Oct 2009, 00:07)=-=- High-Level Specification modified. --- /tmp/wklog.55.old.28205 2009-10-14 00:07:28.0 +0300 +++ /tmp/wklog.55.new.28205 2009-10-14 00:07:28.0 +0300 @@ -1 +1,50 @@ +Not a spec so far but a list of points to consider: + +1. Installer wishlist (user POV) + +From the user point of view: + +1.1 Step 1: simplest installer +~~ +An installer package that +- Copies files on installation +- Registers mysqld a service +- Checks if installation directory, MySQL's port, or named pipe are + busy. If they are, it asks to remove the previous installation first + and aborts. +- Uninstall procedure (TODO: should that remove the datadir or leave it?) + +1.2 Step 2: upgrades from MySQL +~~~ +- Same as above but with handling of the case where MySQL has been already + installed: + - offer to replace MySQL. + - upgrade the data directory (todo we should sort out if anything/what is +needed for this). + - Uninstall MySQL + - Install MariaDB. + +1.3 Step 3: Configuration wizard + +- Installer should include configuration wizard that's similar to what MySQL + installer does. + +1.1 Step 1 +~~ + +2. Installer wishlist (developer POV) +- +* Some installshield-like tool that's easy to use (suggestion by Webyog: + NSIS) +* Installation procedure source should reside in MariaDB source repository +* Installation procedure source file is better to be in human-readable text + format. +* It should be possible to automate creation of the installer package, in a way + that can be run from buildbot (e.g. the installer package build process + should print messages to its stdout) + +* Any suggestions on how can one automatically test the installation package? + (for example, we'll want to start the installer, install, check that + installation succeeded, then start the server, run some commands, then + uninstall. Any ways to achieve that?) DESCRIPTION: We need Windows Installer package for MariaDB. HIGH-LEVEL SPECIFICATION: Not a spec so far but a list of points to consider: 1. Installer wishlist (user POV) From the user point of view: 1.1 Step 1: simplest installer ~~ An installer package that - Copies files on installation - Registers mysqld a service - Checks if installation directory, MySQL's port, or named pipe are busy. If they are, it asks to remove the previous installation first and aborts. - Uninstall procedure (TODO: should that remove the datadir or leave it?) 1.2 Step 2: upgrades from MySQL ~~~ - Same as above but with handling of the case where MySQL has been already installed: - offer to replace MySQL. - upgrade the data directory (todo we should sort out if anything/what is needed for this). - Uninstall MySQL - Install MariaDB. 1.3 Step 3: Configuration wizard - Installer should include configuration wizard that's similar to what MySQL installer does. 1.1 Step 1 ~~ 2. Installer wishlist (developer POV) - * Some installshield-like tool that's easy to use (suggestion by Webyog: NSIS) * Installation procedure source should reside in MariaDB source repository * Installation procedure source file is better to be in human-readable text format. * It should be possible to automate creation of the installer package, in a way that can be run from buildbot (e.g. the installer package build process should print messages to its stdout) * Any suggestions on how can one automatically test the installation package? (for example, we'll want to start the installer, install, check that installation succeeded, then start the server, run some commands, then uninstall. Any ways to achieve that?) ESTIMATED WORK TIME ESTIMATED COMPLETION DATE --- WorkLog (v3.5.9) ___ Mailing list: https://launchpad.net/~maria-developers Post to : maria-developers@lists.launchpad.net Unsubscribe : https://launchpad.net/~maria-developers More help : https://help.launchpad.net/ListHelp
Re: [Maria-developers] bzr commit into MariaDB 5.1, with Maria 1.5:maria branch (knielsen:2763)
Hi Monty On 14/10/2009, at 2:13 AM, Michael Widenius wrote: Arjen There is actually more wrong, namely the --help --verbose help texts. Arjen I don't think you updated those with your changes/additions compared Arjen to the microslow v1 patch you used as a base. Sorry, what do you mean ? Arjen If you can find your original commit for this you might want to go Arjen over that clean chunk again to make sure it's complete and consistent. Arjen I didn't have the time to find it in the history and it's rather more Arjen difficult to spot potential issues in the big source. I did go through the hunk in detail when I originally committed it. Without knowing what to look for, it will not help to go over it once more (by the same person). I just checked the help messages for log_slow_filter and log_slow_verbosity and they look fine. I think they're incomplete and possibly the default that's shown is wrong in the text. Just compare the option lists and the defaults with the text, that's all. 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 ___ Mailing list: https://launchpad.net/~maria-developers Post to : maria-developers@lists.launchpad.net Unsubscribe : https://launchpad.net/~maria-developers More help : https://help.launchpad.net/ListHelp
