List:Commits« Previous MessageNext Message »
From:Sergei Golubchik Date:February 26 2008 2:43pm
Subject:Re: bk commit into 5.1 tree (davi:1.2578) BUG#34424
View as plain text  
Hi!

On Feb 25, Davi Arnaut wrote:
> ChangeSet@stripped, 2008-02-25 07:39:20-03:00, davi@stripped +7 -0
>   Bug#34424 query_cache_debug.test leads to valgrind warnings
>   Bug#34678 @@debug variable's incremental mode

two bugs in one changeset, ok.

ok to push.
   
> diff -Nrup a/dbug/user.r b/dbug/user.r
> --- a/dbug/user.r	2007-01-28 18:11:39 -02:00
> +++ b/dbug/user.r	2008-02-25 07:39:18 -03:00
> @@ -730,8 +730,9 @@ warning will be given.  The DBUG_POP mac
>  EX:\ \fCDBUG_POP\ ();\fR
>  .SP 1
>  .LI DBUG_SET\ 
> -Modifies the current debugger state on top of the stack using the
> -debug control string passed as the macro argument.  Unless
> +Modifies the current debugger state on top of the stack or pushes
> +a new state if the current is set to the initial settings, using
> +the debug control string passed as the macro argument.  Unless
>  .I incremental
>  control string is used (see below), it's equivalent to a combination of
>  DBUG_POP and DBUG_PUSH.

Heh, interesting to note that old behaviour of DBUG_SET was incorrect,
according to the manual. It was *not* equivalent to DBUG_POP+DBUG_PUSH
if the current setting was initial. You patch makes DBUG_SET to behave
as documented :)

> diff -Nrup a/mysql-test/r/variables_debug.result
> b/mysql-test/r/variables_debug.result
> --- /dev/null	Wed Dec 31 16:00:00 196900
> +++ b/mysql-test/r/variables_debug.result	2008-02-25 07:39:18 -03:00
> @@ -0,0 +1,15 @@
> +select @@debug;
> +@@debug
> +
> +set debug= 'T';
> +select @@debug;
> +@@debug
> +T
> +set debug= '+P';
> +select @@debug;
> +@@debug
> +P:T
> +set debug= '-P';
> +select @@debug;
> +@@debug
> +T

Before pushing, please verify that this test doesn't fail when run
with --debug (I don't think it will, but anyway).

Regards / Mit vielen Grüssen,
Sergei

-- 
   __  ___     ___ ____  __
  /  |/  /_ __/ __/ __ \/ /   Sergei Golubchik <serg@stripped>
 / /|_/ / // /\ \/ /_/ / /__  Principal Software Developer/Server Architect
/_/  /_/\_, /___/\___\_\___/  MySQL GmbH, Dachauer Str. 37, D-80335 München
       <___/                  Geschäftsführer: Kaj Arnö - HRB
München 162140
Thread
bk commit into 5.1 tree (davi:1.2578) BUG#34424Davi Arnaut25 Feb
  • Re: bk commit into 5.1 tree (davi:1.2578) BUG#34424Sergei Golubchik26 Feb