- developers - lists.mariadb.org

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

06 Oct '09

#At lp:maria 2753 knielsen(a)knielsen-hq.org 2009-10-06 Fix broken --vs-config option of mysql-test-run.pl. modified: mysql-test/mysql-test-run.pl === modified file 'mysql-test/mysql-test-run.pl' --- a/mysql-test/mysql-test-run.pl 2009-10-05 13:22:23 +0000 +++ b/mysql-test/mysql-test-run.pl 2009-10-06 06:46:45 +0000 @@ -844,7 +844,7 @@ sub command_line_setup { 'ssl|with-openssl' => \$opt_ssl, 'skip-ssl' => \$opt_skip_ssl, 'compress' => \$opt_compress, - 'vs-config' => \$opt_vs_config, + 'vs-config=s' => \$opt_vs_config, # Max number of parallel threads to use 'parallel=s' => \$opt_parallel,

1 0

[Maria-developers] [Branch ~maria-captains/maria/5.1] Rev 2742: Merge with bug fix
by noreply＠launchpad.net 06 Oct '09

06 Oct '09

Merge authors: Michael Widenius (monty) ------------------------------------------------------------ revno: 2742 [merge] committer: Michael Widenius <monty(a)askmonty.org> branch nick: maria-skr timestamp: Tue 2009-10-06 09:20:31 +0300 message: Merge with bug fix modified: storage/maria/ma_extra.c storage/maria/ma_locking.c storage/myisam/mi_extra.c -- lp:maria https://code.launchpad.net/~maria-captains/maria/5.1 Your team Maria developers is subscribed to branch lp:maria. To unsubscribe from this branch go to https://code.launchpad.net/~maria-captains/maria/5.1/+edit-subscription.

1 0

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

06 Oct '09

#At lp:maria based on revid:knielsen@knielsen-hq.org-20091005122657-02wli3dgv82t3125 2742 Michael Widenius 2009-10-06 [merge] Merge with bug fix modified: storage/maria/ma_extra.c storage/maria/ma_locking.c storage/myisam/mi_extra.c === modified file 'storage/maria/ma_extra.c' --- a/storage/maria/ma_extra.c 2009-02-19 09:01:25 +0000 +++ b/storage/maria/ma_extra.c 2009-10-06 06:13:56 +0000 @@ -323,9 +323,16 @@ int maria_extra(MARIA_HA *info, enum ha_ error= my_errno; info->lock_type= F_UNLCK; } - if (share->kfile.file >= 0) - _ma_decrement_open_count(info); + /* + We don't need to call _mi_decrement_open_count() if we are + dropping the table, as the files will be removed anyway. If we + are aborted before the files is removed, it's better to not + call it as in that case the automatic repair on open will add + the missing index entries + */ pthread_mutex_lock(&share->intern_lock); + if (share->kfile.file >= 0 && function != HA_EXTRA_PREPARE_FOR_DROP) + _ma_decrement_open_count(info); if (info->trn) { _ma_remove_table_from_trnman(share, info->trn); === modified file 'storage/maria/ma_locking.c' --- a/storage/maria/ma_locking.c 2009-02-09 21:52:42 +0000 +++ b/storage/maria/ma_locking.c 2009-10-06 06:13:56 +0000 @@ -484,7 +484,7 @@ int _ma_decrement_open_count(MARIA_HA *i { uint old_lock=info->lock_type; share->global_changed=0; - lock_error=maria_lock_database(info,F_WRLCK); + lock_error= my_disable_locking ? 0 : maria_lock_database(info, F_WRLCK); /* Its not fatal even if we couldn't get the lock ! */ if (share->state.open_count > 0) { @@ -499,7 +499,7 @@ int _ma_decrement_open_count(MARIA_HA *i MYF(MY_NABP)); } } - if (!lock_error) + if (!lock_error && !my_disable_locking) lock_error=maria_lock_database(info,old_lock); } return test(lock_error || write_error); === modified file 'storage/myisam/mi_extra.c' --- a/storage/myisam/mi_extra.c 2009-09-03 14:05:38 +0000 +++ b/storage/myisam/mi_extra.c 2009-10-06 06:13:56 +0000 @@ -286,9 +286,19 @@ int mi_extra(MI_INFO *info, enum ha_extr info->lock_type = F_UNLCK; } if (share->kfile >= 0) + { + /* + We don't need to call _mi_decrement_open_count() if we are + dropping the table, as the files will be removed anyway. If we + are aborted before the files is removed, it's better to not + call it as in that case the automatic repair on open will add + the missing index entries + */ + if (function != HA_EXTRA_PREPARE_FOR_DROP) _mi_decrement_open_count(info); - if (share->kfile >= 0 && my_close(share->kfile,MYF(0))) - error=my_errno; + if (my_close(share->kfile,MYF(0))) + error=my_errno; + } { LIST *list_element ; for (list_element=myisam_open_list ;

1 0

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

06 Oct '09

#At lp:maria based on revid:monty@askmonty.org-20091006061356-w62ct9y58lfyl1oa 2742 Michael Widenius 2009-10-06 [merge] Merge with trunk modified: mysql-test/lib/mtr_cases.pm mysql-test/mysql-test-run.pl === modified file 'mysql-test/lib/mtr_cases.pm' --- a/mysql-test/lib/mtr_cases.pm 2009-09-07 20:50:10 +0000 +++ b/mysql-test/lib/mtr_cases.pm 2009-10-05 12:26:57 +0000 @@ -560,8 +560,12 @@ sub collect_one_suite($) sub optimize_cases { my ($cases)= @_; + my @new_cases= (); + foreach my $tinfo ( @$cases ) { + push @new_cases, $tinfo; + # Skip processing if already marked as skipped next if $tinfo->{skip}; @@ -615,6 +619,13 @@ sub optimize_cases { $tinfo->{'skip'}= 1; $tinfo->{'comment'}= "Doesn't support --binlog-format='$test_binlog_format'"; + # This test was added as a replication combination, but it is not + # actually ever possible to run it, as it is not made for this + # combination. + # So delete it from the list, rather than confuse the user with a + # message that this test is skipped (it is not really, just run + # with other combinations). + pop(@new_cases); next; } } @@ -683,6 +694,7 @@ sub optimize_cases { } } } + @$cases= @new_cases; } === modified file 'mysql-test/mysql-test-run.pl' --- a/mysql-test/mysql-test-run.pl 2009-09-26 02:25:56 +0000 +++ b/mysql-test/mysql-test-run.pl 2009-10-05 12:26:57 +0000 @@ -126,13 +126,13 @@ my $path_config_file; # The ge # executables will be used by the test suite. our $opt_vs_config = $ENV{'MTR_VS_CONFIG'}; -my $DEFAULT_SUITES= "binlog,federated,main,maria,ndb,rpl,rpl_ndb,innodb"; +my $DEFAULT_SUITES= "binlog,federated,main,maria,rpl,innodb"; my $opt_suites; our $opt_usage; our $opt_list_options; our $opt_suites; -our $opt_suites_default= "main,backup,backup_engines,binlog,rpl,rpl_ndb,ndb"; # Default suites to run +our $opt_suites_default= "main,backup,backup_engines,binlog,rpl"; # Default suites to run our $opt_script_debug= 0; # Script debugging, enable with --script-debug our $opt_verbose= 0; # Verbose output, enable with --verbose our $exe_mysql;

1 0

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

06 Oct '09

#At lp:maria based on revid:monty@askmonty.org-20091002115611-mp80efi9m4h4qyi6 2741 Michael Widenius 2009-10-06 Don't call _ma_decrement_open_count() for ma_extra(HA_EXTRA_PREPARE_FOR_DROP). Don't call _mi_decrement_open_count() for mi_extra(HA_EXTRA_PREPARE_FOR_DROP). This ensures that if we empty the key cache and a drop table fails later, the index will be automaticly rebuilt modified: storage/maria/ma_extra.c storage/maria/ma_locking.c storage/myisam/mi_extra.c per-file messages: storage/maria/ma_extra.c Don't call _ma_decrement_open_count() for ma_extra(HA_EXTRA_PREPARE_FOR_DROP). This ensures that if we empty the key cache and a drop table fails later, the index will be automaticly rebuilt storage/maria/ma_locking.c Simple optimization: Don't call maria_lock_database() if locking is disabled storage/myisam/mi_extra.c Don't call _mi_decrement_open_count() for mi_extra(HA_EXTRA_PREPARE_FOR_DROP). Simplify code to remove if === modified file 'storage/maria/ma_extra.c' --- a/storage/maria/ma_extra.c 2009-02-19 09:01:25 +0000 +++ b/storage/maria/ma_extra.c 2009-10-06 06:13:56 +0000 @@ -323,9 +323,16 @@ int maria_extra(MARIA_HA *info, enum ha_ error= my_errno; info->lock_type= F_UNLCK; } - if (share->kfile.file >= 0) - _ma_decrement_open_count(info); + /* + We don't need to call _mi_decrement_open_count() if we are + dropping the table, as the files will be removed anyway. If we + are aborted before the files is removed, it's better to not + call it as in that case the automatic repair on open will add + the missing index entries + */ pthread_mutex_lock(&share->intern_lock); + if (share->kfile.file >= 0 && function != HA_EXTRA_PREPARE_FOR_DROP) + _ma_decrement_open_count(info); if (info->trn) { _ma_remove_table_from_trnman(share, info->trn); === modified file 'storage/maria/ma_locking.c' --- a/storage/maria/ma_locking.c 2009-02-09 21:52:42 +0000 +++ b/storage/maria/ma_locking.c 2009-10-06 06:13:56 +0000 @@ -484,7 +484,7 @@ int _ma_decrement_open_count(MARIA_HA *i { uint old_lock=info->lock_type; share->global_changed=0; - lock_error=maria_lock_database(info,F_WRLCK); + lock_error= my_disable_locking ? 0 : maria_lock_database(info, F_WRLCK); /* Its not fatal even if we couldn't get the lock ! */ if (share->state.open_count > 0) { @@ -499,7 +499,7 @@ int _ma_decrement_open_count(MARIA_HA *i MYF(MY_NABP)); } } - if (!lock_error) + if (!lock_error && !my_disable_locking) lock_error=maria_lock_database(info,old_lock); } return test(lock_error || write_error); === modified file 'storage/myisam/mi_extra.c' --- a/storage/myisam/mi_extra.c 2009-09-03 14:05:38 +0000 +++ b/storage/myisam/mi_extra.c 2009-10-06 06:13:56 +0000 @@ -286,9 +286,19 @@ int mi_extra(MI_INFO *info, enum ha_extr info->lock_type = F_UNLCK; } if (share->kfile >= 0) + { + /* + We don't need to call _mi_decrement_open_count() if we are + dropping the table, as the files will be removed anyway. If we + are aborted before the files is removed, it's better to not + call it as in that case the automatic repair on open will add + the missing index entries + */ + if (function != HA_EXTRA_PREPARE_FOR_DROP) _mi_decrement_open_count(info); - if (share->kfile >= 0 && my_close(share->kfile,MYF(0))) - error=my_errno; + if (my_close(share->kfile,MYF(0))) + error=my_errno; + } { LIST *list_element ; for (list_element=myisam_open_list ;

1 0

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

05 Oct '09

#At lp:maria 2752 knielsen(a)knielsen-hq.org 2009-10-05 MBug#443092: test cases mysql and mysql_upgrade fails with wildcard DNS When DNS is not working and returns some address even for non-existing host names, some test cases fail with wrong error. Fix by disabling these tests on such systems. added: mysql-test/include/have_working_dns.inc mysql-test/r/have_working_dns.require modified: mysql-test/mysql-test-run.pl mysql-test/t/mysql.test mysql-test/t/mysql_upgrade.test === added file 'mysql-test/include/have_working_dns.inc' --- a/mysql-test/include/have_working_dns.inc 1970-01-01 00:00:00 +0000 +++ b/mysql-test/include/have_working_dns.inc 2009-10-05 13:22:23 +0000 @@ -0,0 +1,11 @@ +# +# Check if we have a working DNS. +# Some 'wildcard dns' return some address even for non-existing hosts. This +# makes it hard to test connections to such host names. +# The actual check for working DNS is done in Perl, and the result available +# in an environment variable. +# +--require r/have_working_dns.require +disable_query_log; +eval SELECT LENGTH('$HAVE_BROKEN_DNS') = 0 AS 'have_working_dns'; +enable_query_log; === modified file 'mysql-test/mysql-test-run.pl' --- a/mysql-test/mysql-test-run.pl 2009-09-29 19:02:48 +0000 +++ b/mysql-test/mysql-test-run.pl 2009-10-05 13:22:23 +0000 @@ -2003,6 +2003,15 @@ sub environment_setup { $ENV{'MYSQL_TMP_DIR'}= $opt_tmpdir; $ENV{'MYSQLTEST_VARDIR'}= $opt_vardir; + # + # Some stupid^H^H^H^H^H^Hignorant network providers set up "wildcard DNS" + # servers that return some given web server address for any lookup of a + # non-existent host name. This confuses test cases that want to test the + # behaviour when connecting to a non-existing host, so we need to be able + # to disable those tests when DNS is broken. + # + $ENV{HAVE_BROKEN_DNS}= defined(gethostbyname('invalid_hostname')); + # ---------------------------------------------------- # Setup env for NDB # ---------------------------------------------------- === added file 'mysql-test/r/have_working_dns.require' --- a/mysql-test/r/have_working_dns.require 1970-01-01 00:00:00 +0000 +++ b/mysql-test/r/have_working_dns.require 2009-10-05 13:22:23 +0000 @@ -0,0 +1,2 @@ +have_working_dns +1 === modified file 'mysql-test/t/mysql.test' --- a/mysql-test/t/mysql.test 2009-07-31 00:51:25 +0000 +++ b/mysql-test/t/mysql.test 2009-10-05 13:22:23 +0000 @@ -1,3 +1,4 @@ +-- source include/have_working_dns.inc # This test should work in embedded server after we fix mysqltest -- source include/not_embedded.inc # === modified file 'mysql-test/t/mysql_upgrade.test' --- a/mysql-test/t/mysql_upgrade.test 2009-07-28 19:59:38 +0000 +++ b/mysql-test/t/mysql_upgrade.test 2009-10-05 13:22:23 +0000 @@ -1,3 +1,4 @@ +-- source include/have_working_dns.inc # Can't run test of external client with embedded server -- source include/not_embedded.inc

1 0

[Maria-developers] [Branch ~maria-captains/maria/5.1] Rev 2741: MBug#443014: Too many 'skipped' messages in mysql-test-run
by noreply＠launchpad.net 05 Oct '09

05 Oct '09

------------------------------------------------------------ revno: 2741 committer: knielsen(a)knielsen-hq.org branch nick: work-5.1 timestamp: Mon 2009-10-05 14:26:57 +0200 message: MBug#443014: Too many 'skipped' messages in mysql-test-run Remove mysql-test-run.pl unnecessary and confusing 'skipped' messages. - In mysql-test-run.pl, we auto-generate combinations of replication tests. But this sometimes generates combinations that are meaningless, like running a test that requires row-based replication with statement-based. These superfluous combinationes should not be reported as skipped, they should just be deleted. - Remove ndb suites from default suites, as we do not support NDB in MariaDB. Keep skip messages resulting from running mysql-test-run.pl in special ways, eg. --mysqld=--binlog-format=statement. modified: mysql-test/lib/mtr_cases.pm 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 (knielsen:2741)
by knielsen＠knielsen-hq.org 05 Oct '09

05 Oct '09

#At lp:maria 2741 knielsen(a)knielsen-hq.org 2009-10-05 MBug#443014: Too many 'skipped' messages in mysql-test-run Remove mysql-test-run.pl unnecessary and confusing 'skipped' messages. - In mysql-test-run.pl, we auto-generate combinations of replication tests. But this sometimes generates combinations that are meaningless, like running a test that requires row-based replication with statement-based. These superfluous combinationes should not be reported as skipped, they should just be deleted. - Remove ndb suites from default suites, as we do not support NDB in MariaDB. Keep skip messages resulting from running mysql-test-run.pl in special ways, eg. --mysqld=--binlog-format=statement. modified: mysql-test/lib/mtr_cases.pm mysql-test/mysql-test-run.pl === modified file 'mysql-test/lib/mtr_cases.pm' --- a/mysql-test/lib/mtr_cases.pm 2009-09-07 20:50:10 +0000 +++ b/mysql-test/lib/mtr_cases.pm 2009-10-05 12:26:57 +0000 @@ -560,8 +560,12 @@ sub collect_one_suite($) sub optimize_cases { my ($cases)= @_; + my @new_cases= (); + foreach my $tinfo ( @$cases ) { + push @new_cases, $tinfo; + # Skip processing if already marked as skipped next if $tinfo->{skip}; @@ -615,6 +619,13 @@ sub optimize_cases { $tinfo->{'skip'}= 1; $tinfo->{'comment'}= "Doesn't support --binlog-format='$test_binlog_format'"; + # This test was added as a replication combination, but it is not + # actually ever possible to run it, as it is not made for this + # combination. + # So delete it from the list, rather than confuse the user with a + # message that this test is skipped (it is not really, just run + # with other combinations). + pop(@new_cases); next; } } @@ -683,6 +694,7 @@ sub optimize_cases { } } } + @$cases= @new_cases; } === modified file 'mysql-test/mysql-test-run.pl' --- a/mysql-test/mysql-test-run.pl 2009-09-26 02:25:56 +0000 +++ b/mysql-test/mysql-test-run.pl 2009-10-05 12:26:57 +0000 @@ -126,13 +126,13 @@ my $path_config_file; # The ge # executables will be used by the test suite. our $opt_vs_config = $ENV{'MTR_VS_CONFIG'}; -my $DEFAULT_SUITES= "binlog,federated,main,maria,ndb,rpl,rpl_ndb,innodb"; +my $DEFAULT_SUITES= "binlog,federated,main,maria,rpl,innodb"; my $opt_suites; our $opt_usage; our $opt_list_options; our $opt_suites; -our $opt_suites_default= "main,backup,backup_engines,binlog,rpl,rpl_ndb,ndb"; # Default suites to run +our $opt_suites_default= "main,backup,backup_engines,binlog,rpl"; # Default suites to run our $opt_script_debug= 0; # Script debugging, enable with --script-debug our $opt_verbose= 0; # Verbose output, enable with --verbose our $exe_mysql;

1 0

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

05 Oct '09

#At lp:maria 2741 knielsen(a)knielsen-hq.org 2009-10-05 MBug#443014: Too many 'skipped' messages in mysql-test-run Remove mysql-test-run.pl unnecessary and confusing 'skipped' messages. - In mysql-test-run.pl, we auto-generate combinations of replication tests. But this sometimes generates combinations that are meaningless, like running a test that requires row-based replication with statement-based. These superfluous combinationes should not be reported as skipped, they should just be deleted. - Remove ndb suites from default suites, as we do not support NDB in MariaDB. Keep skip messages resulting from running mysql-test-run.pl in special ways, eg. --mysqld=--binlog-format=statement. modified: mysql-test/lib/mtr_cases.pm mysql-test/mysql-test-run.pl === modified file 'mysql-test/lib/mtr_cases.pm' --- a/mysql-test/lib/mtr_cases.pm 2009-09-07 20:50:10 +0000 +++ b/mysql-test/lib/mtr_cases.pm 2009-10-05 11:06:49 +0000 @@ -560,10 +560,13 @@ sub collect_one_suite($) sub optimize_cases { my ($cases)= @_; - foreach my $tinfo ( @$cases ) + my $i= 0; + while ($i < @$cases) { + my $tinfo= $cases->[$i]; + # Skip processing if already marked as skipped - next if $tinfo->{skip}; + goto next_iteration if $tinfo->{skip}; # ======================================================= # If a special binlog format was selected with @@ -615,6 +618,13 @@ sub optimize_cases { $tinfo->{'skip'}= 1; $tinfo->{'comment'}= "Doesn't support --binlog-format='$test_binlog_format'"; + # This test was added as a replication combination, but it is not + # actually ever possible to run it, as it is not made for this + # combination. + # So delete it from the list, rather than confuse the user with a + # message that this test is skipped (it is not really, just run + # with other combinations). + splice(@$cases, $i, 1); next; } } @@ -682,6 +692,9 @@ sub optimize_cases { if ( $default_engine =~ /^innodb/i ); } } + + next_iteration: + $i++; } } === modified file 'mysql-test/mysql-test-run.pl' --- a/mysql-test/mysql-test-run.pl 2009-09-26 02:25:56 +0000 +++ b/mysql-test/mysql-test-run.pl 2009-10-05 11:06:49 +0000 @@ -126,13 +126,13 @@ my $path_config_file; # The ge # executables will be used by the test suite. our $opt_vs_config = $ENV{'MTR_VS_CONFIG'}; -my $DEFAULT_SUITES= "binlog,federated,main,maria,ndb,rpl,rpl_ndb,innodb"; +my $DEFAULT_SUITES= "binlog,federated,main,maria,rpl,innodb"; my $opt_suites; our $opt_usage; our $opt_list_options; our $opt_suites; -our $opt_suites_default= "main,backup,backup_engines,binlog,rpl,rpl_ndb,ndb"; # Default suites to run +our $opt_suites_default= "main,backup,backup_engines,binlog,rpl"; # Default suites to run our $opt_script_debug= 0; # Script debugging, enable with --script-debug our $opt_verbose= 0; # Verbose output, enable with --verbose our $exe_mysql;

2 1

[Maria-developers] Rev 2731: BUG#39249 Maria:query cache returns out of date results in file:///Users/bell/maria/bzr/work-maria-5.1-querycache/
by sanja＠askmonty.org 05 Oct '09

05 Oct '09

At file:///Users/bell/maria/bzr/work-maria-5.1-querycache/ ------------------------------------------------------------ revno: 2731 revision-id: sanja(a)askmonty.org-20090923065953-l23fsjfy8lx3hkm4 parent: knielsen(a)knielsen-hq.org-20090907131358-6bq1e3qfcgi30hu8 committer: sanja(a)askmonty.org branch nick: work-maria-5.1-querycache timestamp: Wed 2009-09-23 09:59:53 +0300 message: BUG#39249 Maria:query cache returns out of date results BUG#41098 Query Cache returns wrong result with concurent insert === modified file 'BUILD/SETUP.sh' --- a/BUILD/SETUP.sh 2009-05-11 15:31:30 +0000 +++ b/BUILD/SETUP.sh 2009-09-23 06:59:53 +0000 @@ -172,6 +172,7 @@ max_no_embedded_configs="$SSL_LIBRARY --with-plugins=max" +max_no_qc_configs="$SSL_LIBRARY --with-plugins=max --without-query-cache" max_no_ndb_configs="$SSL_LIBRARY --with-plugins=max-no-ndb --with-embedded-server --with-libevent" max_configs="$SSL_LIBRARY --with-plugins=max --with-embedded-server -with-libevent" # Disable NDB in maria max builds === added file 'BUILD/compile-pentium-debug-max-no-qc' --- a/BUILD/compile-pentium-debug-max-no-qc 1970-01-01 00:00:00 +0000 +++ b/BUILD/compile-pentium-debug-max-no-qc 2009-09-23 06:59:53 +0000 @@ -0,0 +1,9 @@ +#! /bin/sh + +path=`dirname $0` +. "$path/SETUP.sh" + +extra_flags="$pentium_cflags $debug_cflags" +extra_configs="$pentium_configs $debug_configs $max_no_qc_configs" + +. "$path/FINISH.sh" === modified file 'sql/mysql_priv.h' --- a/sql/mysql_priv.h 2009-09-03 14:56:46 +0000 +++ b/sql/mysql_priv.h 2009-09-23 06:59:53 +0000 @@ -933,7 +933,6 @@ #define query_cache_abort(A) #define query_cache_end_of_result(A) -#define query_cache_invalidate_by_MyISAM_filename_ref NULL #define query_cache_maybe_disabled(T) 1 #define query_cache_is_cacheable_query(L) 0 #endif /*HAVE_QUERY_CACHE*/ === modified file 'storage/maria/ha_maria.cc' --- a/storage/maria/ha_maria.cc 2009-06-29 21:03:30 +0000 +++ b/storage/maria/ha_maria.cc 2009-09-23 06:59:53 +0000 @@ -28,6 +28,7 @@ #include <my_bit.h> #include "ha_maria.h" #include "trnman_public.h" +#include "trnman.h" C_MODE_START #include "maria_def.h" @@ -907,6 +908,8 @@ if (!(file= maria_open(name, mode, test_if_locked | HA_OPEN_FROM_SQL_LAYER))) return (my_errno ? my_errno : -1); + file->s->chst_invalidator= query_cache_invalidate_by_MyISAM_filename_ref; + if (test_if_locked & (HA_OPEN_IGNORE_IF_LOCKED | HA_OPEN_TMP_TABLE)) VOID(maria_extra(file, HA_EXTRA_NO_WAIT_LOCK, 0)); @@ -3227,6 +3230,9 @@ */ *engine_data= 0; + if (file->s->now_transactional && file->s->have_versioning) + return (file->trn->trid != file->s->state.last_change_trn); + /* If a concurrent INSERT has happened just before the currently processed SELECT statement, the total size of the table is unknown. === 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 2009-09-23 06:59:53 +0000 @@ -118,13 +118,6 @@ mi_sizestore(lastpos, info->cur_row.lastpos); VOID(_ma_writeinfo(info,WRITEINFO_UPDATE_KEYFILE)); allow_break(); /* Allow SIGHUP & SIGINT */ - if (info->invalidator != 0) - { - DBUG_PRINT("info", ("invalidator... '%s' (delete)", - share->open_file_name.str)); - (*info->invalidator)(share->open_file_name.str); - info->invalidator=0; - } DBUG_RETURN(0); err: === modified file 'storage/maria/ma_locking.c' --- a/storage/maria/ma_locking.c 2009-02-09 21:52:42 +0000 +++ b/storage/maria/ma_locking.c 2009-09-23 06:59:53 +0000 @@ -214,7 +214,6 @@ VOID(_ma_test_if_changed(info)); info->lock_type=lock_type; - info->invalidator=share->invalidator; share->w_locks++; share->tot_locks++; break; @@ -269,7 +268,6 @@ } if (check_keybuffer) VOID(_ma_test_if_changed(info)); - info->invalidator=share->invalidator; } else if (lock_type == F_WRLCK && info->lock_type == F_RDLCK) { === modified file 'storage/maria/ma_state.c' --- a/storage/maria/ma_state.c 2008-12-27 02:05:16 +0000 +++ b/storage/maria/ma_state.c 2009-09-23 06:59:53 +0000 @@ -318,6 +318,13 @@ DBUG_ASSERT(!info->s->base.born_transactional); share->state.state= *info->state; info->state= &share->state.state; +#ifdef HAVE_QUERY_CACHE + DBUG_PRINT("info", ("invalidator... '%s' (status update)", + info->s->data_file_name.str)); + DBUG_ASSERT(info->s->chst_invalidator != NULL); + (*info->s->chst_invalidator)((const char *)info->s->data_file_name.str); +#endif + } info->append_insert_at_end= 0; } @@ -469,6 +476,8 @@ tables->state_start.checksum); history->trid= trn->commit_trid; + share->state.last_change_trn= trn->commit_trid; + if (history->next) { /* Remove not visible states */ === modified file 'storage/maria/ma_update.c' --- a/storage/maria/ma_update.c 2008-10-31 23:14:58 +0000 +++ b/storage/maria/ma_update.c 2009-09-23 06:59:53 +0000 @@ -187,13 +187,6 @@ */ VOID(_ma_writeinfo(info, WRITEINFO_UPDATE_KEYFILE)); allow_break(); /* Allow SIGHUP & SIGINT */ - if (info->invalidator != 0) - { - DBUG_PRINT("info", ("invalidator... '%s' (update)", - share->open_file_name.str)); - (*info->invalidator)(share->open_file_name.str); - info->invalidator=0; - } DBUG_RETURN(0); err: === modified file 'storage/maria/ma_write.c' --- a/storage/maria/ma_write.c 2009-02-19 09:01:25 +0000 +++ b/storage/maria/ma_write.c 2009-09-23 06:59:53 +0000 @@ -295,13 +295,6 @@ info->cur_row.lastpos= filepos; VOID(_ma_writeinfo(info, WRITEINFO_UPDATE_KEYFILE)); - if (info->invalidator != 0) - { - DBUG_PRINT("info", ("invalidator... '%s' (update)", - share->open_file_name.str)); - (*info->invalidator)(share->open_file_name.str); - info->invalidator=0; - } /* Update status of the table. We need to do so after each row write === modified file 'storage/maria/maria_def.h' --- a/storage/maria/maria_def.h 2009-02-19 09:01:25 +0000 +++ b/storage/maria/maria_def.h 2009-09-23 06:59:53 +0000 @@ -83,6 +83,7 @@ pgcache_page_no_t first_bitmap_with_space; ulonglong auto_increment; TrID create_trid; /* Minum trid for file */ + TrID last_change_trn; /* selfdescriptive */ ulong update_count; /* Updated for each write lock */ ulong status; double *rec_per_key_part; @@ -337,7 +338,7 @@ /* Mapings to read/write the data file */ size_t (*file_read)(MARIA_HA *, uchar *, size_t, my_off_t, myf); size_t (*file_write)(MARIA_HA *, const uchar *, size_t, my_off_t, myf); - invalidator_by_filename invalidator; /* query cache invalidator */ + invalidator_by_filename chst_invalidator; /* query cache invalidator */ my_off_t key_del_current; /* delete links for index pages */ ulong this_process; /* processid */ ulong last_process; /* For table-change-check */ @@ -507,7 +508,6 @@ uint int_nod_flag; /* -""- */ uint32 int_keytree_version; /* -""- */ int (*read_record)(MARIA_HA *, uchar*, MARIA_RECORD_POS); - invalidator_by_filename invalidator; /* query cache invalidator */ ulonglong last_auto_increment; /* auto value at start of statement */ ulong this_unique; /* uniq filenumber or thread */ ulong last_unique; /* last unique number */ === modified file 'storage/myisam/ha_myisam.cc' --- a/storage/myisam/ha_myisam.cc 2009-06-29 21:03:30 +0000 +++ b/storage/myisam/ha_myisam.cc 2009-09-23 06:59:53 +0000 @@ -660,6 +660,9 @@ if (!(file=mi_open(name, mode, test_if_locked | HA_OPEN_FROM_SQL_LAYER))) return (my_errno ? my_errno : -1); + + file->s->chst_invalidator= query_cache_invalidate_by_MyISAM_filename_ref; + if (!table->s->tmp_table) /* No need to perform a check for tmp table */ { if ((my_errno= table2myisam(table, &keyinfo, &recinfo, &recs))) === modified file 'storage/myisam/mi_locking.c' --- a/storage/myisam/mi_locking.c 2009-09-03 14:05:38 +0000 +++ b/storage/myisam/mi_locking.c 2009-09-23 06:59:53 +0000 @@ -329,6 +329,12 @@ #endif info->s->state.state= *info->state; info->state= &info->s->state.state; +#ifdef HAVE_QUERY_CACHE + DBUG_PRINT("info", ("invalidator... '%s' (status update)", + info->filename)); + DBUG_ASSERT(info->s->chst_invalidator != NULL); + (*info->s->chst_invalidator)((const char *)info->filename); +#endif } info->append_insert_at_end= 0; === modified file 'storage/myisam/myisamdef.h' --- a/storage/myisam/myisamdef.h 2009-04-25 09:04:38 +0000 +++ b/storage/myisam/myisamdef.h 2009-09-23 06:59:53 +0000 @@ -190,7 +190,10 @@ const uchar *record, my_off_t pos); size_t (*file_read) (MI_INFO *, uchar *, size_t, my_off_t, myf); size_t (*file_write) (MI_INFO *, const uchar *, size_t, my_off_t, myf); - invalidator_by_filename invalidator; /* query cache invalidator */ + /* query cache invalidator for merged tables */ + invalidator_by_filename invalidator; + /* query cache invalidator for changing state */ + invalidator_by_filename chst_invalidator; ulong this_process; /* processid */ ulong last_process; /* For table-change-check */ ulong last_version; /* Version on start */

2 1