- developers - lists.mariadb.org

[Maria-developers] Updated (by Shinguz): Index usage tracker (103)
by worklog-noreply＠askmonty.org 10 Mar '10

10 Mar '10

----------------------------------------------------------------------- WORKLOG TASK -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- TASK...........: Index usage tracker CREATION DATE..: Wed, 10 Mar 2010, 11:29 SUPERVISOR.....: Bothorsen IMPLEMENTOR....: COPIES TO......: CATEGORY.......: Client-BackLog TASK ID........: 103 (http://askmonty.org/worklog/?tid=103) VERSION........: Benchmarks-3.0 STATUS.........: Un-Assigned PRIORITY.......: 60 WORKED HOURS...: 0 ESTIMATE.......: 0 (hours remain) ORIG. ESTIMATE.: 0 PROGRESS NOTES: -=-=(Shinguz - Wed, 10 Mar 2010, 11:30)=-=- High Level Description modified. --- /tmp/wklog.103.old.30875 2010-03-10 11:30:45.000000000 +0000 +++ /tmp/wklog.103.new.30875 2010-03-10 11:30:45.000000000 +0000 @@ -35,3 +35,6 @@ Possibly this could/should be implemented on the handler interface level because there we know what we are touching? But I am not familiar with the code. + +If some more specification is need for implementation let me know and I will +collect the stuff from the sources mentioned above. DESCRIPTION: What indexes are needed is often easy to find. What is more difficult is to find which indexes are not used at all. Thus some statistics about the index usage would be nice. I think Percona has already something like this done some time ago. And big O has similar functionality. I could imagine something like this: +------------+------------+--------------+---------------------+---------------------+---------------------+------------+----------+-----------+-----------+------------+ | table_name | index_name | index_length | create_time | update_time | use_time | read_first | read_key | read_next | full_scan | range_scan | +------------+------------+--------------+---------------------+---------------------+---------------------+------------+----------+-----------+-----------+------------+ | test_table | idx1 | 1234567890 | 2010-01-01 00:00:00 | 2010-01-01 00:00:00 | 2010-03-10 11:34:56 | 1234 | 42560 | 2468 | 234 | 321 | | test_table | idx2 | 123456 | 2010-01-01 00:00:00 | NULL | NULL | 0 | 0 | 0 | 0 | 0 | | test_table | idx3 | 234561 | 2010-01-01 00:00:00 | 2010-03-10 11:12:34 | 2010-03-10 11:34:56 | 7890 | 89890 | 15780 | 678 | 321 | | test_table | idx4 | 345612 | 2010-01-01 00:00:00 | 2010-03-10 11:34:56 | NULL | 0 | 0 | 0 | 0 | 0 | | test_table | idx5 | 456123 | 2010-01-01 00:00:00 | 2010-03-10 06:56:12 | NULL | 0 | 0 | 0 | 0 | 0 | | test_table | idx6 | 561234 | 2010-01-01 00:00:00 | 2010-03-10 01:12:34 | 2010-03-10 11:34:42 | 3456 | 12356 | 6912 | 123 | 12 | +------------+------------+--------------+---------------------+---------------------+---------------------+------------+----------+-----------+-----------+------------+ Possibly this could/should be implemented on the handler interface level because there we know what we are touching? But I am not familiar with the code. If some more specification is need for implementation let me know and I will collect the stuff from the sources mentioned above. ESTIMATED WORK TIME ESTIMATED COMPLETION DATE ----------------------------------------------------------------------- WorkLog (v3.5.9)

1 0

[Maria-developers] New (by Shinguz): Index usage tracker (103)
by worklog-noreply＠askmonty.org 10 Mar '10

10 Mar '10

----------------------------------------------------------------------- WORKLOG TASK -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- TASK...........: Index usage tracker CREATION DATE..: Wed, 10 Mar 2010, 11:29 SUPERVISOR.....: Bothorsen IMPLEMENTOR....: COPIES TO......: CATEGORY.......: Client-BackLog TASK ID........: 103 (http://askmonty.org/worklog/?tid=103) VERSION........: Benchmarks-3.0 STATUS.........: Un-Assigned PRIORITY.......: 60 WORKED HOURS...: 0 ESTIMATE.......: 0 (hours remain) ORIG. ESTIMATE.: 0 PROGRESS NOTES: DESCRIPTION: What indexes are needed is often easy to find. What is more difficult is to find which indexes are not used at all. Thus some statistics about the index usage would be nice. I think Percona has already something like this done some time ago. And big O has similar functionality. I could imagine something like this: +------------+------------+--------------+---------------------+---------------------+---------------------+------------+----------+-----------+-----------+------------+ | table_name | index_name | index_length | create_time | update_time | use_time | read_first | read_key | read_next | full_scan | range_scan | +------------+------------+--------------+---------------------+---------------------+---------------------+------------+----------+-----------+-----------+------------+ | test_table | idx1 | 1234567890 | 2010-01-01 00:00:00 | 2010-01-01 00:00:00 | 2010-03-10 11:34:56 | 1234 | 42560 | 2468 | 234 | 321 | | test_table | idx2 | 123456 | 2010-01-01 00:00:00 | NULL | NULL | 0 | 0 | 0 | 0 | 0 | | test_table | idx3 | 234561 | 2010-01-01 00:00:00 | 2010-03-10 11:12:34 | 2010-03-10 11:34:56 | 7890 | 89890 | 15780 | 678 | 321 | | test_table | idx4 | 345612 | 2010-01-01 00:00:00 | 2010-03-10 11:34:56 | NULL | 0 | 0 | 0 | 0 | 0 | | test_table | idx5 | 456123 | 2010-01-01 00:00:00 | 2010-03-10 06:56:12 | NULL | 0 | 0 | 0 | 0 | 0 | | test_table | idx6 | 561234 | 2010-01-01 00:00:00 | 2010-03-10 01:12:34 | 2010-03-10 11:34:42 | 3456 | 12356 | 6912 | 123 | 12 | +------------+------------+--------------+---------------------+---------------------+---------------------+------------+----------+-----------+-----------+------------+ Possibly this could/should be implemented on the handler interface level because there we know what we are touching? But I am not familiar with the code. ESTIMATED WORK TIME ESTIMATED COMPLETION DATE ----------------------------------------------------------------------- WorkLog (v3.5.9)

1 0

[Maria-developers] [Branch ~maria-captains/maria/5.1] Rev 2828: Fix some compiler warnings seen in Buildbot.
by noreply＠launchpad.net 10 Mar '10

10 Mar '10

------------------------------------------------------------ revno: 2828 committer: knielsen(a)knielsen-hq.org branch nick: mariadb-5.1 timestamp: Wed 2010-03-10 11:32:14 +0100 message: Fix some compiler warnings seen in Buildbot. Add some extra error output and code cleanup in an attempt to fix/debug a rare random testsuite problem in check_warnings, where the exit code from mysqltest is somehow corrupted inside mysql-test-run.pl. modified: include/my_global.h mysql-test/lib/My/SafeProcess.pm mysql-test/mysql-test-run.pl sql/sql_lex.cc sql/table.cc storage/federatedx/ha_federatedx.cc storage/maria/ma_delete.c storage/maria/ma_loghandler.c storage/myisam/ft_stopwords.c storage/myisam/mi_write.c storage/xtradb/btr/btr0cur.c support-files/compiler_warnings.supp vio/viossl.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] Updated (by Shinguz): MySQL/Maria Wait Interface (102)
by worklog-noreply＠askmonty.org 10 Mar '10

10 Mar '10

----------------------------------------------------------------------- WORKLOG TASK -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- TASK...........: MySQL/Maria Wait Interface CREATION DATE..: Wed, 10 Mar 2010, 10:53 SUPERVISOR.....: Bothorsen IMPLEMENTOR....: COPIES TO......: CATEGORY.......: Client-BackLog TASK ID........: 102 (http://askmonty.org/worklog/?tid=102) VERSION........: Server-9.x STATUS.........: Un-Assigned PRIORITY.......: 60 WORKED HOURS...: 0 ESTIMATE.......: 0 (hours remain) ORIG. ESTIMATE.: 0 PROGRESS NOTES: -=-=(Shinguz - Wed, 10 Mar 2010, 10:55)=-=- Title modified. --- /tmp/wklog.102.old.29019 2010-03-10 10:55:18.000000000 +0000 +++ /tmp/wklog.102.new.29019 2010-03-10 10:55:18.000000000 +0000 @@ -1 +1 @@ -MySQL Wait Interface +MySQL/Maria Wait Interface -=-=(Shinguz - Wed, 10 Mar 2010, 10:55)=-=- Version updated. --- /tmp/wklog.102.old.29019 2010-03-10 10:55:18.000000000 +0000 +++ /tmp/wklog.102.new.29019 2010-03-10 10:55:18.000000000 +0000 @@ -1 +1 @@ -Benchmarks-3.0 +Server-9.x DESCRIPTION: What lacks in MySQL is something similar like the Oracle Wait Interface. The basic idea is, that every connection/thread (and the whole system) shows (on request) where it spent how much time doing what. They implemented the wait interface (which is possibly a sub-set of Sun's dtrace) where you can see where you loose your time. Marc Callaghan and Baron Schwartz blogged in this direction recently: http://www.xaprb.com/blog/2009/11/07/a-review-of-optimizing-oracle-performa… http://www.facebook.com/note.php?note_id=355839540932 Good sources to start with: http://www.amazon.com/Oracle-Wait-Interface-Performance-Diagnostics/dp/0072… http://books.google.ch/books?id=14OmJzfCfXMC&pg=PA6&lpg=PA6&dq=owi+is+a+per… http://www.oracle.com/technology/books/pdfs/sample%20chapter%202729x.pdf http://www.amazon.com/Optimizing-Oracle-Performance-Cary-Millsap/dp/0596005… ESTIMATED WORK TIME ESTIMATED COMPLETION DATE ----------------------------------------------------------------------- WorkLog (v3.5.9)

1 0

[Maria-developers] Updated (by Shinguz): MySQL/Maria Wait Interface (102)
by worklog-noreply＠askmonty.org 10 Mar '10

10 Mar '10

----------------------------------------------------------------------- WORKLOG TASK -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- TASK...........: MySQL/Maria Wait Interface CREATION DATE..: Wed, 10 Mar 2010, 10:53 SUPERVISOR.....: Bothorsen IMPLEMENTOR....: COPIES TO......: CATEGORY.......: Client-BackLog TASK ID........: 102 (http://askmonty.org/worklog/?tid=102) VERSION........: Server-9.x STATUS.........: Un-Assigned PRIORITY.......: 60 WORKED HOURS...: 0 ESTIMATE.......: 0 (hours remain) ORIG. ESTIMATE.: 0 PROGRESS NOTES: -=-=(Shinguz - Wed, 10 Mar 2010, 10:55)=-=- Title modified. --- /tmp/wklog.102.old.29019 2010-03-10 10:55:18.000000000 +0000 +++ /tmp/wklog.102.new.29019 2010-03-10 10:55:18.000000000 +0000 @@ -1 +1 @@ -MySQL Wait Interface +MySQL/Maria Wait Interface -=-=(Shinguz - Wed, 10 Mar 2010, 10:55)=-=- Version updated. --- /tmp/wklog.102.old.29019 2010-03-10 10:55:18.000000000 +0000 +++ /tmp/wklog.102.new.29019 2010-03-10 10:55:18.000000000 +0000 @@ -1 +1 @@ -Benchmarks-3.0 +Server-9.x DESCRIPTION: What lacks in MySQL is something similar like the Oracle Wait Interface. The basic idea is, that every connection/thread (and the whole system) shows (on request) where it spent how much time doing what. They implemented the wait interface (which is possibly a sub-set of Sun's dtrace) where you can see where you loose your time. Marc Callaghan and Baron Schwartz blogged in this direction recently: http://www.xaprb.com/blog/2009/11/07/a-review-of-optimizing-oracle-performa… http://www.facebook.com/note.php?note_id=355839540932 Good sources to start with: http://www.amazon.com/Oracle-Wait-Interface-Performance-Diagnostics/dp/0072… http://books.google.ch/books?id=14OmJzfCfXMC&pg=PA6&lpg=PA6&dq=owi+is+a+per… http://www.oracle.com/technology/books/pdfs/sample%20chapter%202729x.pdf http://www.amazon.com/Optimizing-Oracle-Performance-Cary-Millsap/dp/0596005… ESTIMATED WORK TIME ESTIMATED COMPLETION DATE ----------------------------------------------------------------------- WorkLog (v3.5.9)

1 0

[Maria-developers] New (by Shinguz): MySQL Wait Interface (102)
by worklog-noreply＠askmonty.org 10 Mar '10

10 Mar '10

----------------------------------------------------------------------- WORKLOG TASK -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- TASK...........: MySQL Wait Interface CREATION DATE..: Wed, 10 Mar 2010, 10:53 SUPERVISOR.....: Bothorsen IMPLEMENTOR....: COPIES TO......: CATEGORY.......: Client-BackLog TASK ID........: 102 (http://askmonty.org/worklog/?tid=102) VERSION........: Benchmarks-3.0 STATUS.........: Un-Assigned PRIORITY.......: 60 WORKED HOURS...: 0 ESTIMATE.......: 0 (hours remain) ORIG. ESTIMATE.: 0 PROGRESS NOTES: DESCRIPTION: What lacks in MySQL is something similar like the Oracle Wait Interface. The basic idea is, that every connection/thread (and the whole system) shows (on request) where it spent how much time doing what. They implemented the wait interface (which is possibly a sub-set of Sun's dtrace) where you can see where you loose your time. Marc Callaghan and Baron Schwartz blogged in this direction recently: http://www.xaprb.com/blog/2009/11/07/a-review-of-optimizing-oracle-performa… http://www.facebook.com/note.php?note_id=355839540932 Good sources to start with: http://www.amazon.com/Oracle-Wait-Interface-Performance-Diagnostics/dp/0072… http://books.google.ch/books?id=14OmJzfCfXMC&pg=PA6&lpg=PA6&dq=owi+is+a+per… http://www.oracle.com/technology/books/pdfs/sample%20chapter%202729x.pdf http://www.amazon.com/Optimizing-Oracle-Performance-Cary-Millsap/dp/0596005… ESTIMATED WORK TIME ESTIMATED COMPLETION DATE ----------------------------------------------------------------------- WorkLog (v3.5.9)

1 0

[Maria-developers] New (by Shinguz): MySQL Wait Interface (102)
by worklog-noreply＠askmonty.org 10 Mar '10

10 Mar '10

----------------------------------------------------------------------- WORKLOG TASK -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- TASK...........: MySQL Wait Interface CREATION DATE..: Wed, 10 Mar 2010, 10:53 SUPERVISOR.....: Bothorsen IMPLEMENTOR....: COPIES TO......: CATEGORY.......: Client-BackLog TASK ID........: 102 (http://askmonty.org/worklog/?tid=102) VERSION........: Benchmarks-3.0 STATUS.........: Un-Assigned PRIORITY.......: 60 WORKED HOURS...: 0 ESTIMATE.......: 0 (hours remain) ORIG. ESTIMATE.: 0 PROGRESS NOTES: DESCRIPTION: What lacks in MySQL is something similar like the Oracle Wait Interface. The basic idea is, that every connection/thread (and the whole system) shows (on request) where it spent how much time doing what. They implemented the wait interface (which is possibly a sub-set of Sun's dtrace) where you can see where you loose your time. Marc Callaghan and Baron Schwartz blogged in this direction recently: http://www.xaprb.com/blog/2009/11/07/a-review-of-optimizing-oracle-performa… http://www.facebook.com/note.php?note_id=355839540932 Good sources to start with: http://www.amazon.com/Oracle-Wait-Interface-Performance-Diagnostics/dp/0072… http://books.google.ch/books?id=14OmJzfCfXMC&pg=PA6&lpg=PA6&dq=owi+is+a+per… http://www.oracle.com/technology/books/pdfs/sample%20chapter%202729x.pdf http://www.amazon.com/Optimizing-Oracle-Performance-Cary-Millsap/dp/0596005… 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 (knielsen:2828)
by knielsen＠knielsen-hq.org 10 Mar '10

10 Mar '10

#At lp:maria 2828 knielsen(a)knielsen-hq.org 2010-03-10 Fix some compiler warnings seen in Buildbot. Add some extra error output and code cleanup in an attempt to fix/debug a rare random testsuite problem in check_warnings, where the exit code from mysqltest is somehow corrupted inside mysql-test-run.pl. modified: include/my_global.h mysql-test/lib/My/SafeProcess.pm mysql-test/mysql-test-run.pl sql/sql_lex.cc sql/table.cc storage/federatedx/ha_federatedx.cc storage/maria/ma_delete.c storage/maria/ma_loghandler.c storage/myisam/ft_stopwords.c storage/myisam/mi_write.c storage/xtradb/btr/btr0cur.c support-files/compiler_warnings.supp vio/viossl.c per-file messages: include/my_global.h Fix compiler warnings on some platforms. mysql-test/lib/My/SafeProcess.pm Move dereference of $? subprocess exit code closer to where it is generated, to make the code more robust and on the chance that this will fix the occasional problems in check_warnings we see in Buildbot. mysql-test/mysql-test-run.pl When check_warnings failed, also log the mysqld server for which it failed. sql/sql_lex.cc Fix compiler warning about possibly uninitialised value, by rewriting a for() loop that is always executed at least once into a do .. while() loop with an assert. sql/table.cc Fix compiler warning about uninitialised value. storage/federatedx/ha_federatedx.cc Fix uninitialised variable. storage/maria/ma_delete.c Fix compiler warning about uninitialised value. storage/maria/ma_loghandler.c Fix compiler warning about uninitialised value. storage/myisam/ft_stopwords.c Fix compiler warning. storage/myisam/mi_write.c Fix compiler warning about possibly uninitialised value, by rewriting a while() loop that is always executed at least once into a do .. while() loop with an assert. storage/xtradb/btr/btr0cur.c Fix compiler warning about possibly uninitialised value. support-files/compiler_warnings.supp Fix warning suppression to cover all cases in yassl. vio/viossl.c Fix compiler warning. === modified file 'include/my_global.h' --- a/include/my_global.h 2010-03-04 08:03:07 +0000 +++ b/include/my_global.h 2010-03-10 10:32:14 +0000 @@ -1260,9 +1260,9 @@ do { doubleget_union _tmp; \ } while (0) #define float4get(V,M) do { *((float *) &(V)) = *((const float*) (M)); } while(0) #define float8get(V,M) doubleget((V),(M)) -#define float4store(V,M) memcpy((uchar*) V,(const uchar*) (&M),sizeof(float)) -#define floatstore(T,V) memcpy((uchar*)(T), (const uchar*)(&V),sizeof(float)) -#define floatget(V,M) memcpy((uchar*) &V,(const uchar*) (M),sizeof(float)) +#define float4store(V,M) memcpy((uchar*) V,(uchar*) (&M),sizeof(float)) +#define floatstore(T,V) memcpy((uchar*)(T), (uchar*)(&V),sizeof(float)) +#define floatget(V,M) memcpy((uchar*) &V,(uchar*) (M),sizeof(float)) #define float8store(V,M) doublestore((V),(M)) #else === modified file 'mysql-test/lib/My/SafeProcess.pm' --- a/mysql-test/lib/My/SafeProcess.pm 2009-04-29 14:13:38 +0000 +++ b/mysql-test/lib/My/SafeProcess.pm 2010-03-10 10:32:14 +0000 @@ -384,9 +384,9 @@ sub kill { sub _collect { - my ($self)= @_; + my ($self, $exit_code)= @_; - $self->{EXIT_STATUS}= $?; + $self->{EXIT_STATUS}= $exit_code; _verbose("_collect: $self"); # Take the process out of running list @@ -453,6 +453,7 @@ sub wait_one { #_verbose("blocking: $blocking, use_alarm: $use_alarm"); my $retpid; + my $exit_code; eval { # alarm should break the wait @@ -461,6 +462,7 @@ sub wait_one { alarm($timeout) if $use_alarm; $retpid= waitpid($pid, $blocking ? 0 : &WNOHANG); + $exit_code= $?; alarm(0) if $use_alarm; }; @@ -492,7 +494,7 @@ sub wait_one { #warn "wait_one: expected pid $pid but got $retpid" # unless( $retpid == $pid ); - $self->_collect(); + $self->_collect($exit_code); return 0; } @@ -505,6 +507,8 @@ sub wait_one { # sub wait_any { my $ret_pid; + my $exit_code; + if (IS_WIN32PERL) { # Can't wait for -1 => use a polling loop do { @@ -514,6 +518,7 @@ sub wait_any { last if $pid == $ret_pid; } } while ($ret_pid == 0); + $exit_code= $?; } else { @@ -523,6 +528,7 @@ sub wait_any { print STDERR "wait_any, got invalid pid: $ret_pid\n"; return undef; } + $exit_code= $?; } # Look it up in "running" table @@ -532,7 +538,7 @@ sub wait_any { print STDERR "running: ". join(", ", keys(%running)). "\n"; return undef; } - $proc->_collect; + $proc->_collect($exit_code); return $proc; } === modified file 'mysql-test/mysql-test-run.pl' --- a/mysql-test/mysql-test-run.pl 2010-03-04 08:03:07 +0000 +++ b/mysql-test/mysql-test-run.pl 2010-03-10 10:32:14 +0000 @@ -4102,7 +4102,7 @@ sub start_check_warnings ($$) { error => $errfile, output => $errfile, args => \$args, - user_data => $errfile, + user_data => [$errfile, $mysqld], verbose => $opt_verbose, ); mtr_verbose("Started $proc"); @@ -4148,7 +4148,7 @@ sub check_warnings ($) { if ( delete $started{$proc->pid()} ) { # One check warning process returned my $res= $proc->exit_status(); - my $err_file= $proc->user_data(); + my ($err_file, $mysqld)= @{$proc->user_data()}; if ( $res == 0 or $res == 62 ){ @@ -4184,7 +4184,8 @@ sub check_warnings ($) { my $report= mtr_grab_file($err_file); $tinfo->{comment}.= "Could not execute 'check-warnings' for ". - "testcase '$tname' (res: $res):\n"; + "testcase '$tname' (res: $res) server: '". + $mysqld->name() .":\n"; $tinfo->{comment}.= $report; $result= 2; === modified file 'sql/sql_lex.cc' --- a/sql/sql_lex.cc 2009-12-03 11:19:05 +0000 +++ b/sql/sql_lex.cc 2010-03-10 10:32:14 +0000 @@ -1842,13 +1842,15 @@ void st_select_lex_unit::exclude_tree() void st_select_lex::mark_as_dependent(st_select_lex *last, Item *dependency) { SELECT_LEX *next_to_last; + + DBUG_ASSERT(this != last); + /* Mark all selects from resolved to 1 before select where was found table as depended (of select where was found table) */ - for (SELECT_LEX *s= this; - s && s != last; - s= s->outer_select()) + SELECT_LEX *s= this; + do { if (!(s->uncacheable & UNCACHEABLE_DEPENDENT)) { @@ -1866,7 +1868,8 @@ void st_select_lex::mark_as_dependent(st } } next_to_last= s; - } + } while ((s= s->outer_select()) != last && s != 0); + is_correlated= TRUE; this->master_unit()->item->is_correlated= TRUE; if (dependency) === modified file 'sql/table.cc' --- a/sql/table.cc 2010-03-09 19:23:30 +0000 +++ b/sql/table.cc 2010-03-10 10:32:14 +0000 @@ -2053,6 +2053,8 @@ ulong get_form_pos(File file, uchar *hea ulong ret_value=0; DBUG_ENTER("get_form_pos"); + LINT_INIT(buf); + names=uint2korr(head+8); a_length=(names+2)*sizeof(char *); /* Room for two extra */ === modified file 'storage/federatedx/ha_federatedx.cc' --- a/storage/federatedx/ha_federatedx.cc 2009-12-03 11:34:11 +0000 +++ b/storage/federatedx/ha_federatedx.cc 2010-03-10 10:32:14 +0000 @@ -1783,7 +1783,7 @@ int ha_federatedx::open(const char *name int ha_federatedx::close(void) { - int retval, error; + int retval= 0, error; THD *thd= current_thd; DBUG_ENTER("ha_federatedx::close"); === modified file 'storage/maria/ma_delete.c' --- a/storage/maria/ma_delete.c 2009-01-12 11:12:00 +0000 +++ b/storage/maria/ma_delete.c 2010-03-10 10:32:14 +0000 @@ -169,6 +169,8 @@ my_bool _ma_ck_delete(MARIA_HA *info, MA MARIA_KEY org_key; DBUG_ENTER("_ma_ck_delete"); + LINT_INIT_STRUCT(org_key); + save_key_data= key->data; if (share->now_transactional) { === modified file 'storage/maria/ma_loghandler.c' --- a/storage/maria/ma_loghandler.c 2010-01-06 21:27:53 +0000 +++ b/storage/maria/ma_loghandler.c 2010-03-10 10:32:14 +0000 @@ -1394,6 +1394,7 @@ LSN translog_get_file_max_lsn_stored(uin { LOGHANDLER_FILE_INFO info; + LINT_INIT_STRUCT(info); File fd= open_logfile_by_number_no_cache(file); if ((fd < 0) || (translog_read_file_header(&info, fd) | my_close(fd, MYF(MY_WME)))) === modified file 'storage/myisam/ft_stopwords.c' --- a/storage/myisam/ft_stopwords.c 2010-01-28 14:49:14 +0000 +++ b/storage/myisam/ft_stopwords.c 2010-03-10 10:32:14 +0000 @@ -45,7 +45,7 @@ static int ft_add_stopword(const char *w { FT_STOPWORD sw; return !w || - (((sw.len= (uint) strlen(sw.pos=w)) >= ft_min_word_len) && + (((sw.len= (uint) strlen(sw.pos=(const uchar *)w)) >= ft_min_word_len) && (tree_insert(stopwords3, &sw, 0, stopwords3->custom_arg)==NULL)); } === modified file 'storage/myisam/mi_write.c' --- a/storage/myisam/mi_write.c 2009-12-03 11:19:05 +0000 +++ b/storage/myisam/mi_write.c 2010-03-10 10:32:14 +0000 @@ -735,10 +735,12 @@ static uchar *_mi_find_last_pos(MI_KEYDE } end=page+length-key_ref_length; + DBUG_ASSERT(page < end); *key='\0'; length=0; lastpos=page; - while (page < end) + + do { prevpos=lastpos; lastpos=page; last_length=length; @@ -749,7 +751,8 @@ static uchar *_mi_find_last_pos(MI_KEYDE my_errno=HA_ERR_CRASHED; DBUG_RETURN(0); } - } + } while (page < end); + *return_key_length=last_length; *after_key=lastpos; DBUG_PRINT("exit",("returns: 0x%lx page: 0x%lx end: 0x%lx", === modified file 'storage/xtradb/btr/btr0cur.c' --- a/storage/xtradb/btr/btr0cur.c 2009-11-13 21:26:08 +0000 +++ b/storage/xtradb/btr/btr0cur.c 2010-03-10 10:32:14 +0000 @@ -3233,7 +3233,7 @@ btr_estimate_number_of_different_key_val ulint matched_bytes; ib_int64_t n_recs = 0; ib_int64_t* n_diff; - ib_int64_t* n_not_nulls; + ib_int64_t* n_not_nulls= 0; ullint n_sample_pages; /* number of pages to sample */ ulint not_empty_flag = 0; ulint total_external_size = 0; === modified file 'support-files/compiler_warnings.supp' --- a/support-files/compiler_warnings.supp 2010-01-28 14:49:14 +0000 +++ b/support-files/compiler_warnings.supp 2010-03-10 10:32:14 +0000 @@ -108,7 +108,7 @@ ha_pbxt\.cc : variable.*might be clobber # # Yassl include/runtime.hpp: .*pure_error.* -.*/extra/yassl/taocrypt/.*: comparison with string literal +.*/extra/yassl/.*taocrypt/.*: comparison with string literal .*/extra/yassl/taocrypt/src/blowfish\.cpp: array subscript is above array bounds .*/extra/yassl/taocrypt/src/file\.cpp: ignoring return value .*/extra/yassl/taocrypt/src/integer\.cpp: control reaches end of non-void function === modified file 'vio/viossl.c' --- a/vio/viossl.c 2010-01-29 10:42:31 +0000 +++ b/vio/viossl.c 2010-03-10 10:32:14 +0000 @@ -75,9 +75,11 @@ report_errors(SSL* ssl) if (ssl) { +#ifndef DBUG_OFF int error= SSL_get_error(ssl, l); DBUG_PRINT("error", ("error: %s (%d)", ERR_error_string(error, buf), error)); +#endif } DBUG_PRINT("info", ("socket_errno: %d", socket_errno));

1 0

[Maria-developers] [Branch ~maria-captains/maria/5.1] Rev 2827: Automerge MySQL 5.1.44 merge into latest MariaDB trunk.
by noreply＠launchpad.net 10 Mar '10

10 Mar '10

Merge authors: <Dao-Gang.Qu(a)sun.com> <Li-Bing.Song(a)sun.com> Alexander Barkov <bar(a)mysql.com> Alexander Nozdrin <alik(a)sun.com> Alexey Kopytov (akopytov)... ------------------------------------------------------------ revno: 2827 [merge] committer: knielsen(a)knielsen-hq.org branch nick: mariadb-5.1 timestamp: Wed 2010-03-10 10:12:23 +0100 message: Automerge MySQL 5.1.44 merge into latest MariaDB trunk. added: mysql-test/extra/rpl_tests/rpl_mixing_engines.inc mysql-test/extra/rpl_tests/rpl_set_null.test mysql-test/extra/rpl_tests/rpl_tmp_table_and_DDL.test mysql-test/include/binlog_inject_error.inc mysql-test/include/truncate_file.inc mysql-test/r/innodb-autoinc-44030.result mysql-test/r/sp_sync.result mysql-test/std_data/bug47142_master-bin.000001 mysql-test/suite/binlog/r/binlog_write_error.result mysql-test/suite/binlog/t/binlog_write_error.test mysql-test/suite/ibmdb2i/r/ibmdb2i_bug_49329.result mysql-test/suite/ibmdb2i/t/ibmdb2i_bug_49329.test mysql-test/suite/ndb/r/ndb_tmp_table_and_DDL.result mysql-test/suite/ndb/t/ndb_tmp_table_and_DDL.test mysql-test/suite/rpl/r/rpl_geometry.result mysql-test/suite/rpl/r/rpl_loaddata_concurrent.result mysql-test/suite/rpl/r/rpl_manual_change_index_file.result mysql-test/suite/rpl/r/rpl_set_null_innodb.result mysql-test/suite/rpl/r/rpl_set_null_myisam.result mysql-test/suite/rpl/r/rpl_stm_binlog_direct.result mysql-test/suite/rpl/r/rpl_tmp_table_and_DDL.result mysql-test/suite/rpl/t/rpl_geometry.test mysql-test/suite/rpl/t/rpl_loaddata_concurrent.test mysql-test/suite/rpl/t/rpl_manual_change_index_file.test mysql-test/suite/rpl/t/rpl_set_null_innodb.test mysql-test/suite/rpl/t/rpl_set_null_myisam.test mysql-test/suite/rpl/t/rpl_stm_binlog_direct-master.opt mysql-test/suite/rpl/t/rpl_stm_binlog_direct.test mysql-test/suite/rpl/t/rpl_tmp_table_and_DDL.test mysql-test/suite/rpl_ndb/r/rpl_ndb_set_null.result mysql-test/suite/rpl_ndb/t/rpl_ndb_set_null.test mysql-test/t/innodb-autoinc-44030.test mysql-test/t/partition_innodb-master.opt mysql-test/t/sp_sync.test renamed: mysql-test/suite/binlog/r/binlog_tbl_metadata.result => mysql-test/suite/rpl/r/rpl_row_tbl_metadata.result mysql-test/suite/binlog/t/binlog_tbl_metadata.test => mysql-test/suite/rpl/t/rpl_row_tbl_metadata.test modified: client/client_priv.h client/mysql.cc client/mysql_upgrade.c client/mysqladmin.cc client/mysqlbinlog.cc client/mysqldump.c configure.in extra/yassl/taocrypt/src/asn.cpp include/config-win.h include/m_string.h include/my_global.h include/my_no_pthread.h include/my_pthread.h include/my_stacktrace.h include/my_sys.h include/myisam.h libmysql/libmysql.c mysql-test/collections/default.experimental mysql-test/extra/rpl_tests/rpl_loaddata.test mysql-test/extra/rpl_tests/rpl_row_func003.test mysql-test/include/kill_query.inc mysql-test/include/setup_fake_relay_log.inc mysql-test/lib/v1/mysql-test-run.pl mysql-test/mysql-test-run.pl mysql-test/r/alter_table.result mysql-test/r/bug46080.result* mysql-test/r/count_distinct.result mysql-test/r/create.result mysql-test/r/ctype_ucs.result mysql-test/r/ctype_utf8.result mysql-test/r/delete.result mysql-test/r/fulltext.result mysql-test/r/fulltext_order_by.result mysql-test/r/func_concat.result mysql-test/r/func_str.result mysql-test/r/func_time.result mysql-test/r/gis.result mysql-test/r/information_schema.result mysql-test/r/innodb-autoinc.result mysql-test/r/join_outer.result mysql-test/r/myisam.result mysql-test/r/mysql.result mysql-test/r/mysql_upgrade.result mysql-test/r/mysqlbinlog.result mysql-test/r/openssl_1.result mysql-test/r/order_by.result mysql-test/r/partition.result mysql-test/r/partition_bug18198.result mysql-test/r/partition_error.result mysql-test/r/partition_innodb.result mysql-test/r/partition_pruning.result mysql-test/r/ps.result mysql-test/r/ps_ddl.result mysql-test/r/select.result mysql-test/r/sp-ucs2.result mysql-test/r/sp.result mysql-test/r/subselect.result mysql-test/r/union.result mysql-test/r/user_var.result mysql-test/r/variables.result mysql-test/std_data/Index.xml mysql-test/std_data/cacert.pem mysql-test/std_data/client-cert.pem mysql-test/std_data/client-key.pem mysql-test/std_data/server-cert.pem mysql-test/std_data/server-key.pem mysql-test/std_data/server8k-cert.pem mysql-test/std_data/server8k-key.pem mysql-test/suite/binlog/r/binlog_index.result mysql-test/suite/binlog/r/binlog_killed_simulate.result mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result mysql-test/suite/binlog/r/binlog_stm_blackhole.result mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result mysql-test/suite/binlog/r/binlog_unsafe.result mysql-test/suite/binlog/t/binlog_index.test mysql-test/suite/binlog/t/binlog_unsafe.test mysql-test/suite/parts/inc/part_blocked_sql_funcs_main.inc mysql-test/suite/parts/inc/partition_timestamp.inc mysql-test/suite/parts/r/part_blocked_sql_func_innodb.result mysql-test/suite/parts/r/part_blocked_sql_func_myisam.result mysql-test/suite/parts/r/partition_datetime_innodb.result mysql-test/suite/parts/r/partition_datetime_myisam.result mysql-test/suite/pbxt/r/partition_error.result mysql-test/suite/pbxt/r/partition_pruning.result mysql-test/suite/pbxt/t/partition_error.test mysql-test/suite/rpl/r/rpl_create_if_not_exists.result mysql-test/suite/rpl/r/rpl_do_grant.result mysql-test/suite/rpl/r/rpl_drop_temp.result mysql-test/suite/rpl/r/rpl_get_master_version_and_clock.result mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result mysql-test/suite/rpl/r/rpl_killed_ddl.result mysql-test/suite/rpl/r/rpl_loaddata.result mysql-test/suite/rpl/r/rpl_loaddata_fatal.result mysql-test/suite/rpl/r/rpl_loaddata_map.result mysql-test/suite/rpl/r/rpl_misc_functions.result mysql-test/suite/rpl/r/rpl_nondeterministic_functions.result mysql-test/suite/rpl/r/rpl_optimize.result mysql-test/suite/rpl/r/rpl_row_func003.result mysql-test/suite/rpl/r/rpl_row_mysqlbinlog.result mysql-test/suite/rpl/r/rpl_sp.result mysql-test/suite/rpl/r/rpl_stm_log.result mysql-test/suite/rpl/r/rpl_stm_maria.result mysql-test/suite/rpl/r/rpl_stm_until.result mysql-test/suite/rpl/r/rpl_temporary.result mysql-test/suite/rpl/t/rpl_circular_for_4_hosts.test mysql-test/suite/rpl/t/rpl_create_if_not_exists.test mysql-test/suite/rpl/t/rpl_do_grant.test mysql-test/suite/rpl/t/rpl_drop_temp.test mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test mysql-test/suite/rpl/t/rpl_killed_ddl.test mysql-test/suite/rpl/t/rpl_misc_functions.test mysql-test/suite/rpl/t/rpl_nondeterministic_functions.test mysql-test/suite/rpl/t/rpl_optimize.test mysql-test/suite/rpl/t/rpl_stm_maria.test mysql-test/suite/rpl/t/rpl_stm_until.test mysql-test/suite/rpl/t/rpl_temporary.test mysql-test/suite/rpl/t/rpl_timezone.test mysql-test/suite/rpl/t/rpl_trigger.test mysql-test/suite/rpl_ndb/r/rpl_ndb_func003.result mysql-test/t/alter_table.test mysql-test/t/bug46080.test mysql-test/t/count_distinct.test mysql-test/t/create.test mysql-test/t/ctype_ucs.test mysql-test/t/ctype_utf8.test mysql-test/t/delete.test mysql-test/t/disabled.def mysql-test/t/fulltext.test mysql-test/t/fulltext_order_by.test mysql-test/t/func_concat.test mysql-test/t/func_str.test mysql-test/t/gis.test mysql-test/t/information_schema.test mysql-test/t/innodb-autoinc.test mysql-test/t/join_outer.test mysql-test/t/lock_multi.test mysql-test/t/myisam.test mysql-test/t/mysql.test mysql-test/t/mysql_upgrade.test mysql-test/t/mysqlbinlog.test mysql-test/t/openssl_1.test mysql-test/t/order_by.test mysql-test/t/partition.test mysql-test/t/partition_bug18198.test mysql-test/t/partition_error.test mysql-test/t/partition_innodb.test mysql-test/t/partition_pruning.test mysql-test/t/ps.test mysql-test/t/ps_ddl.test mysql-test/t/select.test mysql-test/t/sp-ucs2.test mysql-test/t/sp.test mysql-test/t/subselect.test mysql-test/t/union.test mysql-test/t/user_var.test mysql-test/t/variables.test mysys/charset.c mysys/default.c mysys/mf_pack.c mysys/my_getopt.c mysys/my_init.c mysys/my_thr_init.c mysys/my_winthread.c mysys/stacktrace.c netware/libmysqlmain.c scripts/mysql_system_tables_fix.sql scripts/mysqld_multi.sh server-tools/instance-manager/instance_map.cc server-tools/instance-manager/listener.cc server-tools/instance-manager/options.cc server-tools/instance-manager/user_map.cc sql/event_data_objects.cc sql/event_db_repository.cc sql/event_scheduler.cc* sql/events.cc sql/field.cc sql/field.h sql/filesort.cc sql/ha_partition.cc sql/ha_partition.h sql/item.cc sql/item.h sql/item_cmpfunc.cc sql/item_cmpfunc.h sql/item_create.cc sql/item_func.cc sql/item_func.h sql/item_strfunc.cc sql/item_strfunc.h sql/item_subselect.cc sql/item_subselect.h sql/item_timefunc.cc sql/item_timefunc.h sql/log.cc sql/log.h sql/log_event.cc sql/log_event.h sql/log_event_old.cc sql/mysql_priv.h sql/mysqld.cc sql/rpl_injector.cc sql/rpl_record.cc sql/rpl_rli.cc sql/rpl_rli.h sql/rpl_utility.h sql/set_var.cc sql/share/errmsg.txt sql/slave.cc sql/sp.cc sql/sp_head.cc sql/sp_pcontext.h sql/sql_acl.cc sql/sql_base.cc sql/sql_class.h sql/sql_connect.cc sql/sql_crypt.cc sql/sql_crypt.h sql/sql_db.cc sql/sql_delete.cc sql/sql_insert.cc sql/sql_load.cc sql/sql_parse.cc sql/sql_partition.cc sql/sql_partition.h sql/sql_plugin.cc sql/sql_prepare.cc sql/sql_rename.cc sql/sql_repl.cc sql/sql_select.cc sql/sql_select.h sql/sql_servers.cc sql/sql_show.cc sql/sql_table.cc sql/sql_tablespace.cc sql/sql_test.cc sql/sql_trigger.cc sql/sql_udf.cc sql/sql_union.cc sql/sql_update.cc sql/sql_view.cc sql/sql_yacc.yy sql/table.cc storage/archive/ha_archive.cc storage/ibmdb2i/db2i_constraints.cc storage/ibmdb2i/ha_ibmdb2i.cc storage/innobase/fil/fil0fil.c storage/innobase/handler/ha_innodb.cc storage/innobase/handler/ha_innodb.h storage/innobase/include/fil0fil.h storage/innobase/include/lock0lock.h storage/innobase/include/mtr0mtr.h storage/innobase/include/srv0srv.h storage/innobase/lock/lock0lock.c storage/innobase/log/log0log.c storage/innobase/log/log0recv.c storage/innobase/row/row0mysql.c storage/innobase/srv/srv0srv.c storage/innobase/srv/srv0start.c storage/innodb_plugin/CMakeLists.txt storage/innodb_plugin/handler/ha_innodb.cc storage/myisam/mi_packrec.c storage/myisam/mi_static.c storage/myisam/myisamdef.h storage/myisammrg/ha_myisammrg.cc strings/Makefile.am strings/ctype-ucs2.c strings/strmov.c support-files/Makefile.am support-files/mysql.spec.sh win/configure.js mysql-test/suite/rpl/r/rpl_row_tbl_metadata.result mysql-test/suite/rpl/t/rpl_row_tbl_metadata.test The size of the diff (20019 lines) is larger than your specified limit of 5000 lines -- 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] [Branch ~maria-captains/maria/5.1] Rev 2826: Fixes for two test failures in Buildbot.
by noreply＠launchpad.net 10 Mar '10

10 Mar '10

------------------------------------------------------------ revno: 2826 committer: knielsen(a)knielsen-hq.org branch nick: mariadb-5.1 timestamp: Wed 2010-03-10 10:11:02 +0100 message: Fixes for two test failures in Buildbot. - Adjust timing in test case, to avoid test failures caused by high load on machines and consequent race conditions in the test case. - Add another variant of Valgrind suppressions for memory leak in system libraries when unloading dynamic object files. modified: mysql-test/r/information_schema.result mysql-test/t/information_schema.test mysql-test/valgrind.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