- developers - lists.mariadb.org

[Maria-developers] Rev 2724: Ability to stop mysql-test-run.pl temporary (useful for them who run buildbot slave on thier work computers) in file:///Users/bell/maria/bzr/work-maria-5.1/
by sanja＠askmonty.org 24 Sep '09

24 Sep '09

At file:///Users/bell/maria/bzr/work-maria-5.1/ ------------------------------------------------------------ revno: 2724 revision-id: sanja(a)askmonty.org-20090924121915-k4ooompd72l2hkn5 parent: psergey(a)askmonty.org-20090901115954-nge2brzh3akkmtlz committer: sanja(a)askmonty.org branch nick: work-maria-5.1 timestamp: Thu 2009-09-24 15:19:15 +0300 message: Ability to stop mysql-test-run.pl temporary (useful for them who run buildbot slave on thier work computers) === modified file 'mysql-test/lib/mtr_misc.pl' --- a/mysql-test/lib/mtr_misc.pl 2009-02-19 09:01:25 +0000 +++ b/mysql-test/lib/mtr_misc.pl 2009-09-24 12:19:15 +0000 @@ -174,4 +174,24 @@ select(undef, undef, undef, ($millis/1000)); } +sub mtr_wait_lock_file { + die "usage: mtr_wait_lock_file(path_to_file, keep_alive)" unless @_ == 2; + my ($file, $keep_alive)= @_; + my $waited= 0; + my $msg_counter= $keep_alive; + + while ( -e $file) + { + if ($keep_alive && !$msg_counter) + { + print "\n-STOPPED- [pass] ".$keep_alive."\n"; + $msg_counter= $keep_alive; + } + mtr_milli_sleep(1000); + $waited= 1; + $msg_counter--; + } + return ($waited); +} + 1; === modified file 'mysql-test/mysql-test-run.pl' --- a/mysql-test/mysql-test-run.pl 2009-06-22 08:06:35 +0000 +++ b/mysql-test/mysql-test-run.pl 2009-09-24 12:19:15 +0000 @@ -252,6 +252,11 @@ my $opt_parallel= $ENV{MTR_PARALLEL} || 1; +# lock file to stop tests +my $opt_stop_file= $ENV{MTR_STOP_FILE}; +# print messages when test suite is stopped (for buildbot) +my $opt_stop_keep_alive= $ENV{MTR_STOP_KEEP_ALIVE}; + select(STDOUT); $| = 1; # Automatically flush STDOUT @@ -450,6 +455,15 @@ my $s= IO::Select->new(); $s->add($server); while (1) { + if ($opt_stop_file) + { + if (mtr_wait_lock_file($opt_stop_file, $opt_stop_keep_alive)) + { + # We were waiting so restart timer process + $suite_timeout_proc->kill(); + $suite_timeout_proc= My::SafeProcess->timer(suite_timeout()); + } + } my @ready = $s->can_read(1); # Wake up once every second foreach my $sock (@ready) { if ($sock == $server) { @@ -931,6 +945,8 @@ 'warnings!' => \$opt_warnings, 'timestamp' => \&report_option, 'timediff' => \&report_option, + 'stop-file=s' => \$opt_stop_file, + 'stop-keep-alive=i' => \$opt_stop_keep_alive, 'help|h' => \$opt_usage, 'list-options' => \$opt_list_options, @@ -5392,6 +5408,14 @@ warnings Scan the log files for warnings. Use --nowarnings to turn off. + stop-file=file (also MTR_STOP_FILE environment variable) if this + file detected mysql test will not start new tests + until the file will be removed. + stop-keep-alive=sec (also MTR_STOP_KEEP_ALIVE environment variable) + works with stop-file, print messages every sec + seconds when mysql test is waiting to removing + the file (for buildbot) + sleep=SECONDS Passed to mysqltest, will be used as fixed sleep time debug-sync-timeout=NUM Set default timeout for WAIT_FOR debug sync actions. Disable facility with NUM=0.

1 0

Re: [Maria-developers] Updated (by Guest): Add a mysqlbinlog option to change the used database (36)
by Kristian Nielsen 24 Sep '09

24 Sep '09

Alexi1952 <Alexi1952(a)yandex.ru> writes: > PS. I don't know company rules, so being currently a "pre-member" of Maria (ha! I even don't know how the company is called) > I didn't send this reply to "maria-developers(a)lists.launchpad.net". If that's not right, I will do it. You are welcome to use maria-developers(a)lists.launchpad.net for anything related to development of MariaDB. We often have people also outside of Monty Program that provide insightful comments on patches or discussions that catch their interest. I've Cc:ed the list for now. (Are you a member of maria-developers@ ? If not, you should be, apply on https://launchpad.net/~maria-developers (or just let me know your Launchpad login) and I will approve you.) > > 18.09.09, 17:29, "Kristian Nielsen" <knielsen(a)knielsen-hq.org>: > >> Hi Alexi, >> Thanks for writing up the low-level design. I read it through, and have a >> couple of comments: >> > 1.3. In mysqlbinlog.cc: >> > >> > - Add { "rewrite-db", OPT_REWRITE_DB, ...} record to my_long_options: >> > - Add Rpl_filter object to mysqlbinlog.cc >> > >> > Rpl_filter* binlog_filter; >> Sharing code with similar replication options inside mysqld is a noble >> goal. However, in this case I think it is a case of "the cure is worse than >> the disease". >> The Rpl_filter class has _so_ much mysqld server internals that we do not want >> to mix into a client application. That is also why you need to do all these >> modifications in sql_list, rpl_filter, etc. >> So I think it is wrong to use the Rpl_filter class in mysqlbinlog. >> To share code between the two, I think the better method is to move out the >> needed functionality (add_db_rewrite() and get_rewrite_db()) in a separate >> class, and have both the Rpl_filter class and mysqlbinlog use that. >> Alternatively, if the shared functionality is really small (as it appears it >> might be), just duplicating the functionality may be better. > > ******************************************************************************* > Funny: in my first version I wrote my own simple list-class with add() and get() > functions (what is really needed here) and was "scarified" by SPetrunia for why > didn't I use Rpl_filter. :) His idea was that mysqlbinlog options should be Right, sharing the code is best, hence the idea to extract common functionality in a separate class. In particular, I do not like this method of Rpl_filter: bool tables_ok(const char* db, TABLE_LIST* tables); TABLE_LIST is deep deep into server internals, that is why I didn't like pulling Rpl_filter as it is now into mysqlbinlog. But actually Rpl_filter::tables_ok() seems to be the only problem of this kind in Rpl_filter. So probably we just need to move this single method out into a separate class (or existing class or static function, didn't check which would be most appropriate). That method feels misplaced in that class to me. So an Rpl_filter class without tables_ok() I see no problem with including in mysqlbinlog. That would seem to me much cleaner, and should be simple, what do you think? > processed in the same manner as for replication. > > I had two reasons for using the very Rpl_filter: > > 1. It already contains add_db_rewrite() and get_rewrite_db() functions which > are exactly what is needed. > > 2. I had in my mind WL40 ("Add a mysqlbinlog option to filter updates to > certain tables") for which also I saw needed function in Rpl_filter. Yes, I agree that these are good reasons. > But frankly speaking, I looked through Rpl_filter code not-deeply - just to > be sure that two mentioned function do what exactly I need and to get an > impression that other functions looks like appropriate for options mentioned > in WL40. I need to examine this more closely to take a final decision and/or > to continue discussing with you on this point. Nevertheless, just few notes: > > Note 1. In any case, I like the idea of a "separate class". > (But see the "objection" in Note 2 which may be applied to rpl_filter > as well). > > Note 2. Please note that, essentially, modifications touches only sql_list - > not Rpl_filter. As I noticed there several "generally used" classes > (lists is just one example) which are bound to the server context only > because of using the sql_alloc() function in new-operator(s). This > function returns MEM_ROOT pointer attached to the current thread and > because of that is "server-dependent". But why not - with the help of > just two-three #ifdef's - to make this classes server-independent? > Why not to allow sql_list to be used outside server context especially > in view of that sql_list essentially (i.e. functionally) is not server > dependent? > > Surely, I can foresee at least one reasonable objection: because these > classes strictly belong to the server "internals" and are not supposed > to be used outside. That's OK. But they can be used outside INDIRECTLY. > Thus starting to work on "embedded parser" (currently, my work is only > in embryo :) I came acrross several places where sql_alloc() is used in > the same "not-essentially-server-dependent" manner. So in my opinion, > making lists and similar classes applicable for both MYSQL_SERVER and > MYSQL_CLIENT contexts is quite reasonble in general. Yes. This is the other problem to be solved with getting Rpl_filter into mysqlbinlog (apart from the tables_ok() problem discussed above). And I agree that it _does_ make sense to have String, IList, HASH, DYNAMIC_ARRAY, etc. available in client code (and these seem to use sql_alloc, right?). So it's 'just' a matter of doing this in a good way. Maybe that is better seen in a full patch, and maybe we should ask someone (like Monty or maybe Sergei Golubchik) who has a better overview of how memory management works in the client and server code. But for now, a couple of comments: 1. Maybe some of this is already done? I would imagine at least some of the primitive data structures would be used in client code. 2. One of the crucial points is to control the lifetime of allocations. In the server there is extensive use of memroots with different lifetimes. Probably a good way would be to support memroots in client applications (don't know if/how much is already available). 3. I would like to avoid sprinkling #ifdef around the code, it should be possible to do in a cleaner way. #ifdef introduce complex dependencies when working on code, and there are already too much of that for mysqlbinlog. Though if the existing client code already depends on some #ifdef-magic we need to use it I guess. In particular related to the changes you propose: > - In rpl_filter.cc: > > Rpl_filter::Rpl_filter() : > ... > { > #ifdef MYSQL_CLIENT > init_alloc_root(&sql_list_client_mem_root, ...); > #endif > ... > } > > Rpl_filter::~Rpl_filter() > { ... > #ifdef MYSQL_CLIENT > free_root(&sql_list_client_mem_root, ...); > #endif > } This is particular feels wrong, Rpl_filter should not need to maintain a global mem_root like sql_list_client_mem_root. What if I want to use two instances of Rpl_filter? > - In sql_list.cc/h, Sql_alloc::new(size_t) and Sql_alloc::new[](size_t) > uses sql_alloc() which is THD dependent. These are to be modified > as follows: > > #ifdef MYSQL_CLIENT > extern MEM_ROOT sql_list_client_mem_root; // defined in sql_list.cc > #endif > > class Sql_alloc > { ... > static void *operator new(size_t size) throw () > { > #ifndef MYSQL_CLIENT > return sql_alloc(size); > #else > return alloc_root(&sql_list_client_mem_root, size); > #endif > } > static void *operator new[](size_t size) throw () > { > #ifndef MYSQL_CLIENT > return sql_alloc(size); > #else > return alloc_root(&sql_list_client_mem_root, size); > #endif > } > ... > } > Can't we instead of this just define an alternate implementation of sql_alloc() in mysqlbinlog? Then mysqlbinlog could initialize a memroot which is used in its version of sql_alloc(). And it seems we would not need any of the above #ifdef's? In fact if you look at the end of client/mysql.cc it seems to do exactly this. (Except it does not use memroot, just malloc(). Not sure what is best in our case). What do you think? > ************************************************************************************ > This is OK: I wrote my code closely going along the code of the corresponding > Table_map_log_event constructor (just in case, I copied full text of the rewrite_db > at the end of this letter). > ************************************************************************************ Ok, great! - Kristian.

2 3

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

23 Sep '09

#At lp:maria 2754 knielsen(a)knielsen-hq.org 2009-09-23 Merge Percona microsec_process patch into MariaDB. This adds a TIME_MS column to SHOW FULL PROCESSLIST and INFORMATION_SCHEMA.PROCESSLIST that works like the TIME column, but in units of milliseconds with microsecond precision. Note that this also changes behaviour of the existing TIME column. In the MySQL server, the TIME column changes when a thread sets @TIMESTAMP. This is contrary to documentation and also potentially confusing, so could in any case be considered a bug. With this patch, to ensure consistency between TIME and TIME_MS, setting @TIMESTAMP has no effect on either value. Add a test case for the TIME and TIME_MS columns. Update existing test cases for changed behaviour. Author: Percona Signed-off-by: Kristian Nielsen <knielsen(a)knielsen-hq.org> modified: mysql-test/r/create.result mysql-test/r/information_schema.result mysql-test/t/information_schema.test mysql-test/t/not_embedded_server.test sql/sql_show.cc per-file messages: mysql-test/r/create.result Result file update. mysql-test/r/information_schema.result Add test case. Result file update (changed behaviour). mysql-test/t/information_schema.test Add test case. Adjust test case for changed behaviour. mysql-test/t/not_embedded_server.test Update (commented-out) test case for newly added column. sql/sql_show.cc Merge Percona microsec_process patch into MariaDB. === modified file 'mysql-test/r/create.result' --- a/mysql-test/r/create.result 2009-09-07 20:50:10 +0000 +++ b/mysql-test/r/create.result 2009-09-23 11:03:47 +0000 @@ -1749,7 +1749,8 @@ t1 CREATE TABLE `t1` ( `COMMAND` varchar(16) NOT NULL DEFAULT '', `TIME` int(7) NOT NULL DEFAULT '0', `STATE` varchar(64) DEFAULT NULL, - `INFO` longtext + `INFO` longtext, + `TIME_MS` decimal(22,3) NOT NULL DEFAULT '0.000' ) DEFAULT CHARSET=utf8 drop table t1; create temporary table t1 like information_schema.processlist; @@ -1763,7 +1764,8 @@ t1 CREATE TEMPORARY TABLE `t1` ( `COMMAND` varchar(16) NOT NULL DEFAULT '', `TIME` int(7) NOT NULL DEFAULT '0', `STATE` varchar(64) DEFAULT NULL, - `INFO` longtext + `INFO` longtext, + `TIME_MS` decimal(22,3) NOT NULL DEFAULT '0.000' ) DEFAULT CHARSET=utf8 drop table t1; create table t1 like information_schema.character_sets; === modified file 'mysql-test/r/information_schema.result' --- a/mysql-test/r/information_schema.result 2009-09-07 20:50:10 +0000 +++ b/mysql-test/r/information_schema.result 2009-09-23 11:03:47 +0000 @@ -1380,6 +1380,17 @@ select user,db from information_schema.p user db user3148 test drop user user3148@localhost; +SELECT 'other connection here' AS who; +who +other connection here +SELECT IF(`time` > 0, 'OK', `time`) AS time_low, +IF(`time` < 1000, 'OK', `time`) AS time_high, +IF(time_ms > 900, 'OK', time_ms) AS time_ms_low, +IF(time_ms < 1000000, 'OK', time_ms) AS time_ms_high +FROM INFORMATION_SCHEMA.PROCESSLIST +WHERE ID=@tid; +time_low time_high time_ms_low time_ms_high +OK OK OK OK DROP TABLE IF EXISTS server_status; DROP EVENT IF EXISTS event_status; SET GLOBAL event_scheduler=1; @@ -1602,8 +1613,7 @@ CREATE_OPTIONS key_block_size=1 DROP TABLE t1; SET TIMESTAMP=@@TIMESTAMP + 10000000; -SELECT 'OK' AS TEST_RESULT FROM INFORMATION_SCHEMA.PROCESSLIST WHERE time < 0; +SELECT 'NOT_OK' AS TEST_RESULT FROM INFORMATION_SCHEMA.PROCESSLIST WHERE time < 0; TEST_RESULT -OK SET TIMESTAMP=DEFAULT; End of 5.1 tests. === modified file 'mysql-test/t/information_schema.test' --- a/mysql-test/t/information_schema.test 2009-09-07 20:50:10 +0000 +++ b/mysql-test/t/information_schema.test 2009-09-23 11:03:47 +0000 @@ -1099,6 +1099,25 @@ disconnect con3148; drop user user3148@localhost; # +# `time` and `time_ms` columns of INFORMATION_SCHEMA.PROCESSLIST. +# +connect (pslistcon,localhost,root,,test); +let $ID= `select connection_id()`; +SELECT 'other connection here' AS who; +connection default; +sleep 1; +--disable_query_log +eval SET @tid=$ID; +--enable_query_log +SELECT IF(`time` > 0, 'OK', `time`) AS time_low, + IF(`time` < 1000, 'OK', `time`) AS time_high, + IF(time_ms > 900, 'OK', time_ms) AS time_ms_low, + IF(time_ms < 1000000, 'OK', time_ms) AS time_ms_high + FROM INFORMATION_SCHEMA.PROCESSLIST + WHERE ID=@tid; +disconnect pslistcon; + +# # Bug#26174 Server Crash: INSERT ... SELECT ... FROM I_S.GLOBAL_STATUS # in Event (see also openssl_1.test) # @@ -1352,9 +1371,16 @@ DROP TABLE t1; # Bug #22047: Time in SHOW PROCESSLIST for SQL thread in replication seems # to become negative # +# Note that at the time of writing, MariaDB differs in behaviour from MySQL on +# the `time` column. In MySQL this changes depending on the setting of +# @TIMESTAMP, which is contrary to the documented (and sensible) behaviour. +# In MariaDB, the `time` column is independent of @TIMESTAMP. +# (The rationale for this is to keep `time` and `time_ms` consistent; +# @TIMESTAMP has no microsecond precision). +# SET TIMESTAMP=@@TIMESTAMP + 10000000; -SELECT 'OK' AS TEST_RESULT FROM INFORMATION_SCHEMA.PROCESSLIST WHERE time < 0; +SELECT 'NOT_OK' AS TEST_RESULT FROM INFORMATION_SCHEMA.PROCESSLIST WHERE time < 0; SET TIMESTAMP=DEFAULT; --echo End of 5.1 tests. === modified file 'mysql-test/t/not_embedded_server.test' --- a/mysql-test/t/not_embedded_server.test 2009-04-30 10:29:19 +0000 +++ b/mysql-test/t/not_embedded_server.test 2009-09-23 11:03:47 +0000 @@ -32,7 +32,7 @@ select 1; ## End of 4.1 tests # #prepare stmt1 from ' SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST WHERE COMMAND!=\'Daemon\' '; -#--replace_column 1 number 6 time 3 localhost +#--replace_column 1 number 6 time 3 localhost 9 time_ms #execute stmt1; #deallocate prepare stmt1; === modified file 'sql/sql_show.cc' --- a/sql/sql_show.cc 2009-09-15 10:46:35 +0000 +++ b/sql/sql_show.cc 2009-09-23 11:03:47 +0000 @@ -1819,7 +1819,7 @@ int fill_schema_processlist(THD* thd, TA TABLE *table= tables->table; CHARSET_INFO *cs= system_charset_info; char *user; - time_t now= my_time(0); + ulonglong unow= my_micro_time(); DBUG_ENTER("fill_process_list"); user= thd->security_ctx->master_access & PROCESS_ACL ? @@ -1877,8 +1877,8 @@ int fill_schema_processlist(THD* thd, TA table->field[4]->store(command_name[tmp->command].str, command_name[tmp->command].length, cs); /* MYSQL_TIME */ - table->field[5]->store((longlong)(tmp->start_time ? - now - tmp->start_time : 0), FALSE); + const ulonglong utime= tmp->start_utime ? unow - tmp->start_utime : 0; + table->field[5]->store(utime / 1000000, TRUE); /* STATE */ #ifndef EMBEDDED_LIBRARY val= (char*) (tmp->locked ? "Locked" : @@ -1912,6 +1912,9 @@ int fill_schema_processlist(THD* thd, TA table->field[7]->set_notnull(); } + /* TIME_MS */ + table->field[8]->store((double)(utime / 1000.0)); + if (schema_table_store_record(thd, table)) { VOID(pthread_mutex_unlock(&LOCK_thread_count)); @@ -5542,7 +5545,7 @@ ST_SCHEMA_TABLE *get_schema_table(enum e into it two numbers, based on modulus of base-10 numbers. In the ones position is the number of decimals. Tens position is unused. In the hundreds and thousands position is a two-digit decimal number representing - length. Encode this value with (decimals*100)+length , where + length. Encode this value with (length*100)+decimals , where 0<decimals<10 and 0<=length<100 . @param @@ -6557,6 +6560,8 @@ ST_FIELD_INFO processlist_fields_info[]= {"STATE", 64, MYSQL_TYPE_STRING, 0, 1, "State", SKIP_OPEN_TABLE}, {"INFO", PROCESS_LIST_INFO_WIDTH, MYSQL_TYPE_STRING, 0, 1, "Info", SKIP_OPEN_TABLE}, + {"TIME_MS", 100 * (MY_INT64_NUM_DECIMAL_DIGITS + 1) + 3, MYSQL_TYPE_DECIMAL, + 0, 0, "Time_ms", SKIP_OPEN_TABLE}, {0, 0, MYSQL_TYPE_STRING, 0, 0, 0, SKIP_OPEN_TABLE} };

1 0

[Maria-developers] negative TIME in SHOW FULL PROCESSLIST and information_schema.processlist
by Kristian Nielsen 22 Sep '09

22 Sep '09

Hi, While merging the Percona microsec_process patch (the 5.1 port of the patch is called acc-pslist), I encountered a problem related to Bug#22047: http://bugs.mysql.com/bug.php?id=22047 The issue is with the exact behaviour of the TIME column of SHOW FULL PROCESSLIST and information_schema.processlist. The documentation says (http://dev.mysql.com/doc/refman/5.1/en/show-processlist.html) Time The time in seconds that the thread has been in its current state. However, the TIME column is actually computed as <current local time> - @@TIMESTAMP This means that the value will differ from the documented value for threads that modify @@TIMESTAMP. In particular, it will differ for the replication thread. There is a replication FAQ, which says this: http://dev.mysql.com/doc/refman/5.1/en/replication-faq.html 16.3.4.3: How do I know how late a slave is compared to the master? You can read the Seconds_Behind_Master column in SHOW SLAVE STATUS. See Section 16.4.1,“Replication Implementation Details”. In the Time column in the output of SHOW PROCESSLIST, the number of seconds displayed for the slave SQL thread is the number of seconds between the timestamp of the last replicated event and the real time of the slave machine. You can use this to determine the date of the last replicated event. However, this does not take into account the possibility of time skew between master and slave. The actual value displayed in SHOW PROCESSLIST is <current time> - <time of original event> + <time skew> To me, this is just too complex to be really useful. On the other hand, Seconds_Behind_Master _does_ take into account the time skew, so it seems a much more useful metric to use to me. Frankly, to me this last part of the documentation sounds to me like trying to spin a bug as a feature. Now, the microsec_process patch adds a TIME_MS column, which works like TIME is documented, except with microsecond precision. This leaves three options to choose between: 1. Let TIME_MS also depend on @@TIMESTAMP. This is particularly ugly, as TIMESTAMP has seconds granularity, so rounding effects will be "interesting". I really don't like this idea. 2. Let TIME_MS be independent of @@TIMESTAMP; it will just be the time since last state change, with microseconds resolution. But keep currently implemented semantics of TIME. This means that TIME and TIME_MS will be unrelated for threads that change @@TIMESTAMP (like the slave thread). This will be confusing. 3. Change implementation of TIME so that both TIME and TIME_MS are independent of @@TIMESTAMP. Of these, I tend to prefer option 3. Reason is that the semantics is much cleaner and simple to understand. The functionality to see how much slave is behind is in any case better obtained using Seconds_Behind_Master. However, it does involve a change in behaviour, so I want to ask opinions if anyone thinks the change in behaviour would cause too much breakage? If so, I prefer to implement option 2. If not, I will go ahead with option 3. Thanks, - Kristian.

2 5

[Maria-developers] bzr commit into MariaDB 5.1, with Maria 1.5:maria branch (igor:2753) Bug#47016
by Igor Babaev 20 Sep '09

20 Sep '09

#At lp:maria based on revid:igor@askmonty.org-20090919221119-bpy6nqq2xmn64dh4 2753 Igor Babaev 2009-09-19 Applied the fix for bug #47016 - a failure of rpl_do_grant watched on Windows. modified: mysql-test/suite/rpl/t/rpl_do_grant.test === modified file 'mysql-test/suite/rpl/t/rpl_do_grant.test' --- a/mysql-test/suite/rpl/t/rpl_do_grant.test 2009-03-18 13:48:23 +0000 +++ b/mysql-test/suite/rpl/t/rpl_do_grant.test 2009-09-20 03:02:26 +0000 @@ -129,6 +129,9 @@ CREATE DATABASE bug42217_db; GRANT CREATE ROUTINE ON bug42217_db.* TO 'create_rout_db'@'localhost' IDENTIFIED BY 'create_rout_db' WITH GRANT OPTION; +sync_slave_with_master; +connection master; + connect (create_rout_db_master, localhost, create_rout_db, create_rout_db, bug42217_db,$MASTER_MYPORT,); connect (create_rout_db_slave, localhost, create_rout_db, create_rout_db, bug42217_db, $SLAVE_MYPORT,);

1 0

[Maria-developers] bzr commit into MariaDB 5.1, with Maria 1.5:maria branch (igor:2752)
by Igor Babaev 19 Sep '09

19 Sep '09

#At lp:maria based on revid:igor@askmonty.org-20090919212129-p3ydr02t0es1py7y 2752 Igor Babaev 2009-09-19 [merge] Merge modified: mysql-test/mysql-test-run.pl mysql-test/r/myisam.result mysql-test/suite/maria/r/maria3.result mysql-test/t/myisam.test sql/sql_table.cc === modified file 'mysql-test/mysql-test-run.pl' --- a/mysql-test/mysql-test-run.pl 2009-09-17 00:13:50 +0000 +++ b/mysql-test/mysql-test-run.pl 2009-09-18 00:55:27 +0000 @@ -4433,7 +4433,7 @@ sub mysqld_start ($$) { if (IS_WINDOWS) { # Trick the server to send output to stderr, with --console - if (!(join(' ', @$args) =~ /--log-error/)) { + if (!(grep(/^--log-error/, @$args))) { mtr_add_arg($args, "--console"); } } @@ -5058,7 +5058,7 @@ sub start_mysqltest ($) { if (IS_WINDOWS) { # Trick the server to send output to stderr, with --console - if (!(join(' ', @$args) =~ /--log-error/)) { + if (!(grep(/^--server-arg=--log-error/, @$args))) { mtr_add_arg($args, "--server-arg=--console"); } } === modified file 'mysql-test/r/myisam.result' --- a/mysql-test/r/myisam.result 2009-09-07 20:50:10 +0000 +++ b/mysql-test/r/myisam.result 2009-09-18 01:04:43 +0000 @@ -2234,7 +2234,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `n` int(11) NOT NULL, `c` char(1) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 TRANSACTIONAL=1 drop table t1; CREATE TABLE t1 (line LINESTRING NOT NULL) engine=myisam; INSERT INTO t1 VALUES (GeomFromText("POINT(0 0)")); === modified file 'mysql-test/suite/maria/r/maria3.result' --- a/mysql-test/suite/maria/r/maria3.result 2009-09-16 18:25:18 +0000 +++ b/mysql-test/suite/maria/r/maria3.result 2009-09-18 01:04:43 +0000 @@ -518,7 +518,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `n` int(11) NOT NULL, `c` char(1) DEFAULT NULL -) ENGINE=MARIA DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 +) ENGINE=MARIA DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 TRANSACTIONAL=1 drop table t1; create table t1 (n int not null, c char(1)) engine=myisam transactional=1; Warnings: @@ -529,7 +529,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `n` int(11) NOT NULL, `c` char(1) DEFAULT NULL -) ENGINE=MARIA DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 +) ENGINE=MARIA DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 TRANSACTIONAL=1 drop table t1; create table t1 (a int, key(a)) transactional=0; insert into t1 values (0),(1),(2),(3),(4); === modified file 'mysql-test/t/myisam.test' --- a/mysql-test/t/myisam.test 2009-09-07 20:50:10 +0000 +++ b/mysql-test/t/myisam.test 2009-09-18 01:04:43 +0000 @@ -1478,7 +1478,10 @@ let $MYSQLD_DATADIR= `select @@datadir`; --exec $MYISAMCHK -d $MYSQLD_DATADIR/test/t1 DROP TABLE t1; +# # Test warnings with transactional=1 with MyISAM +# MariaDB: Note that the table will still have 'TRANSACTIONAL=1' attribute. +# That's the intended behavior atm. # create table t1 (n int not null, c char(1)) transactional=1; show create table t1; === modified file 'sql/sql_table.cc' --- a/sql/sql_table.cc 2009-09-16 11:31:20 +0000 +++ b/sql/sql_table.cc 2009-09-18 01:04:43 +0000 @@ -3747,19 +3747,11 @@ bool mysql_create_table_no_lock(THD *thd /* Give warnings for not supported table options */ if (create_info->transactional && !file->ht->commit) - { push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_ERROR, ER_ILLEGAL_HA_CREATE_OPTION, ER(ER_ILLEGAL_HA_CREATE_OPTION), file->engine_name()->str, "TRANSACTIONAL=1"); - /* - MariaDB: need to do the same for row_format and page_checksum - options. See MBUG#425916 - */ - create_info->transactional= HA_CHOICE_UNDEF; - create_info->used_fields &= ~HA_CREATE_USED_TRANSACTIONAL; - } VOID(pthread_mutex_lock(&LOCK_open)); if (!internal_tmp_table && !(create_info->options & HA_LEX_CREATE_TMP_TABLE))

1 0

[Maria-developers] bzr commit into MariaDB 5.1, with Maria 1.5:maria branch (igor:2751) Bug#47455
by Igor Babaev 19 Sep '09

19 Sep '09

#At lp:maria based on revid:igor@askmonty.org-20090918192704-0vlgzsth6r0e86zk 2751 Igor Babaev 2009-09-19 Fixed bug #47455 - a failure with main.myisam_crash_before_flush_keys.test on Windows. modified: storage/myisam/myisamchk.c === modified file 'storage/myisam/myisamchk.c' --- a/storage/myisam/myisamchk.c 2009-09-07 20:50:10 +0000 +++ b/storage/myisam/myisamchk.c 2009-09-19 21:21:29 +0000 @@ -83,7 +83,9 @@ HA_CHECK check_param; int main(int argc, char **argv) { int error; + uchar rc; MY_INIT(argv[0]); + my_progname_short= "myisamchk"; myisamchk_init(&check_param); check_param.opt_lock_memory=1; /* Lock memory if possible */ @@ -132,7 +134,8 @@ int main(int argc, char **argv) free_tmpdir(&myisamchk_tmpdir); ft_free_stopwords(); my_end(check_param.testflag & T_INFO ? MY_CHECK_ERROR | MY_GIVE_INFO : MY_CHECK_ERROR); - exit(error); + rc= (uchar) error; + exit(rc); #ifndef _lint return 0; /* No compiler warning */ #endif

1 0

[Maria-developers] [Branch ~maria-captains/maria/5.1] Rev 2733: Merge.
by noreply＠launchpad.net 18 Sep '09

18 Sep '09

Merge authors: Hakan Küçükyılmaz (hakan-askmonty) ------------------------------------------------------------ revno: 2733 [merge] committer: Hakan Kuecuekyilmaz <hakan(a)askmonty.org> branch nick: maria-local-master timestamp: Fri 2009-09-18 21:32:50 +0200 message: Merge. modified: client/mysqlslap.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] Rev 2733: Merge. in file:///Users/hakan/work/monty_program/maria-local-master/
by Hakan Kuecuekyilmaz 18 Sep '09

18 Sep '09

At file:///Users/hakan/work/monty_program/maria-local-master/ ------------------------------------------------------------ revno: 2733 [merge] revision-id: hakan(a)askmonty.org-20090918193250-imuhuvjq1n21b01n parent: psergey(a)askmonty.org-20090918011529-3d7glu6ot7n0xqc9 parent: hakan(a)askmonty.org-20090918033703-3ztdey1rpydiaeds committer: Hakan Kuecuekyilmaz <hakan(a)askmonty.org> branch nick: maria-local-master timestamp: Fri 2009-09-18 21:32:50 +0200 message: Merge. modified: client/mysqlslap.c sp1f-mysqlslap.c-20051130000206-7t375hf5mtlqof5xd4nj76yckxvxykhv === modified file 'client/mysqlslap.c' --- a/client/mysqlslap.c 2009-04-25 10:05:32 +0000 +++ b/client/mysqlslap.c 2009-09-18 03:30:54 +0000 @@ -448,7 +448,16 @@ /* First we create */ if (create_statements) + { + /* + If we have an --engine option, then we indicate + create_schema() to add the engine type to the DDL. + */ + if (eptr) + create_statements->type= CREATE_TABLE_TYPE; + create_schema(mysql, create_schema_string, create_statements, eptr); + } /* If we generated GUID we need to build a list of them from creation that @@ -588,7 +597,9 @@ "Detach (close and reopen) connections after X number of requests.", (uchar**) &detach_rate, (uchar**) &detach_rate, 0, GET_UINT, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, - {"engine", 'e', "Storage engine to use for creating the table.", + {"engine", 'e', "Comma separated list of storage engines to use for creating the table." + "The test is run for each engine. You can also specify an option for an engine" + "after a `:', like memory:max_row=2300", (uchar**) &default_engine, (uchar**) &default_engine, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, {"host", 'h', "Connect to host.", (uchar**) &host, (uchar**) &host, 0, GET_STR, @@ -958,6 +969,7 @@ ptr->type= UPDATE_TYPE_REQUIRES_PREFIX ; else ptr->type= UPDATE_TYPE; + strmov(ptr->string, update_string.str); dynstr_free(&update_string); DBUG_RETURN(ptr); @@ -973,8 +985,8 @@ static statement * build_insert_string(void) { - char buf[HUGE_STRING_LENGTH]; - unsigned int col_count; + char buf[HUGE_STRING_LENGTH]; + unsigned int col_count; statement *ptr; DYNAMIC_STRING insert_string; DBUG_ENTER("build_insert_string"); @@ -1064,8 +1076,8 @@ static statement * build_select_string(my_bool key) { - char buf[HUGE_STRING_LENGTH]; - unsigned int col_count; + char buf[HUGE_STRING_LENGTH]; + unsigned int col_count; statement *ptr; static DYNAMIC_STRING query_string; DBUG_ENTER("build_select_string"); @@ -1117,6 +1129,7 @@ ptr->type= SELECT_TYPE_REQUIRES_PREFIX; else ptr->type= SELECT_TYPE; + strmov(ptr->string, query_string.str); dynstr_free(&query_string); DBUG_RETURN(ptr); @@ -1175,8 +1188,6 @@ exit(1); } - - if (auto_generate_sql && num_of_query && auto_actual_queries) { fprintf(stderr, @@ -1217,6 +1228,7 @@ num_int_cols= atoi(str->string); if (str->option) num_int_cols_index= atoi(str->option); + option_cleanup(str); } @@ -1229,6 +1241,7 @@ num_char_cols_index= atoi(str->option); else num_char_cols_index= 0; + option_cleanup(str); } @@ -1463,6 +1476,7 @@ if (tty_password) opt_password= get_tty_password(NullS); + DBUG_RETURN(0); } @@ -1477,6 +1491,7 @@ if (verbose >= 3) printf("%.*s;\n", len, query); + return mysql_real_query(mysql, query, len); } @@ -1592,18 +1607,6 @@ } } - if (engine_stmt) - { - len= snprintf(query, HUGE_STRING_LENGTH, "set storage_engine=`%s`", - engine_stmt->string); - if (run_query(mysql, query, len)) - { - fprintf(stderr,"%s: Cannot set default engine: %s\n", my_progname, - mysql_error(mysql)); - exit(1); - } - } - count= 0; after_create= stmt; @@ -1617,8 +1620,21 @@ { char buffer[HUGE_STRING_LENGTH]; - snprintf(buffer, HUGE_STRING_LENGTH, "%s %s", ptr->string, - engine_stmt->option); + snprintf(buffer, HUGE_STRING_LENGTH, "%s Engine = %s %s", + ptr->string, engine_stmt->string, engine_stmt->option); + if (run_query(mysql, buffer, strlen(buffer))) + { + fprintf(stderr,"%s: Cannot run query %.*s ERROR : %s\n", + my_progname, (uint)ptr->length, ptr->string, mysql_error(mysql)); + exit(1); + } + } + else if (engine_stmt && engine_stmt->string && ptr->type == CREATE_TABLE_TYPE) + { + char buffer[HUGE_STRING_LENGTH]; + + snprintf(buffer, HUGE_STRING_LENGTH, "%s Engine = %s", + ptr->string, engine_stmt->string); if (run_query(mysql, buffer, strlen(buffer))) { fprintf(stderr,"%s: Cannot run query %.*s ERROR : %s\n", @@ -1652,6 +1668,7 @@ { char query[HUGE_STRING_LENGTH]; int len; + DBUG_ENTER("drop_schema"); len= snprintf(query, HUGE_STRING_LENGTH, "DROP SCHEMA IF EXISTS `%s`", db); @@ -1940,17 +1957,27 @@ uint count= 0; /* We know that there is always one */ for (tmp= *sptr= (option_string *)my_malloc(sizeof(option_string), - MYF(MY_ZEROFILL|MY_FAE|MY_WME)); + MYF(MY_ZEROFILL|MY_FAE|MY_WME)); (retstr= strchr(ptr, delm)); tmp->next= (option_string *)my_malloc(sizeof(option_string), - MYF(MY_ZEROFILL|MY_FAE|MY_WME)), + MYF(MY_ZEROFILL|MY_FAE|MY_WME)), tmp= tmp->next) { - char buffer[HUGE_STRING_LENGTH]; + /* + Initialize buffer, because otherwise an + --engine=<storage_engine>:<option>,<eng1>,<eng2> + will crash. + */ + char buffer[HUGE_STRING_LENGTH]= ""; char *buffer_ptr; count++; strncpy(buffer, ptr, (size_t)(retstr - ptr)); + /* + Handle --engine=memory:max_row=200 cases, or more general speaking + --engine=<storage_engine>:<options>, which will be translated to + Engine = storage_engine option. + */ if ((buffer_ptr= strchr(buffer, ':'))) { char *option_ptr; @@ -1971,13 +1998,15 @@ tmp->length= (size_t)(retstr - ptr); } + /* Skip delimiter delm */ ptr+= retstr - ptr + 1; if (isspace(*ptr)) ptr++; + count++; } - if (ptr != origin+length) + if (ptr != origin + length) { char *origin_ptr; @@ -1986,7 +2015,7 @@ char *option_ptr; tmp->length= (size_t)(origin_ptr - ptr); - tmp->string= my_strndup(origin, tmp->length, MYF(MY_FAE)); + tmp->string= my_strndup(ptr, tmp->length, MYF(MY_FAE)); option_ptr= (char *)ptr + 1 + tmp->length; @@ -2036,7 +2065,7 @@ if (ptr != script+length) { tmp->string= my_strndup(ptr, (uint)((script + length) - ptr), - MYF(MY_FAE)); + MYF(MY_FAE)); tmp->length= (size_t)((script + length) - ptr); count++; } @@ -2094,6 +2123,7 @@ { char buffer[HUGE_STRING_LENGTH]; const char *ptr= auto_generate_sql_type ? auto_generate_sql_type : "query"; + snprintf(buffer, HUGE_STRING_LENGTH, "%s,%s,%ld.%03ld,%ld.%03ld,%ld.%03ld,%d,%llu\n", con->engine ? con->engine : "", /* Storage engine we ran against */

1 0

[Maria-developers] bzr commit into MariaDB 5.1, with Maria 1.5:maria branch (igor:2750)
by Igor Babaev 18 Sep '09

18 Sep '09

#At lp:maria based on revid:igor@askmonty.org-20090918190257-descsgkvdgbqtfgq 2750 Igor Babaev 2009-09-18 Made innodb_xtradb_bug317074.test to be a 'big' test to avoid a timeout failure of it on Windows. modified: mysql-test/t/innodb_xtradb_bug317074.test === modified file 'mysql-test/t/innodb_xtradb_bug317074.test' --- a/mysql-test/t/innodb_xtradb_bug317074.test 2009-09-08 16:04:58 +0000 +++ b/mysql-test/t/innodb_xtradb_bug317074.test 2009-09-18 19:27:04 +0000 @@ -1,4 +1,5 @@ --- source include/have_innodb.inc +--source include/big_test.inc +--source include/have_innodb.inc SET @old_innodb_file_format=@@innodb_file_format; SET @old_innodb_file_per_table=@@innodb_file_per_table;

1 0