From: Dmitry Lenev
Date: March 11 2011 1:38pm
Subject: Re: bzr commit into mysql-5.5 branch (Dmitry.Shulga:3362)
 Bug#11764168
List-Archive: http://lists.mysql.com/commits/132833
Message-Id: <20110311133828.GB5568@bandersnatch>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii

Hello Dmitry!

* Dmitry Shulga <Dmitry.Shulga@stripped> [11/03/11 16:13]:
> #At file:///Users/shulga/projects/mysql/mysql-5.5/ based on revid:marc.alff@stripped
> 
>  3362 Dmitry Shulga	2011-03-11 [merge]
>       Manual merge from mysql-5.1 for Bug#11764168 (56976: Severe denial
>       of service in prepared statements).
> 
>     added:
>       mysql-test/suite/sys_vars/t/max_long_data_size_basic.test

What about result file for this test? Have your forgotten to add it?

...

> === added file 'mysql-test/suite/sys_vars/t/max_long_data_size_basic.test'
> --- a/mysql-test/suite/sys_vars/t/max_long_data_size_basic.test	1970-01-01 00:00:00 +0000
> +++ b/mysql-test/suite/sys_vars/t/max_long_data_size_basic.test	2011-03-11 13:10:21 +0000
> @@ -0,0 +1,24 @@
> +#
> +# only global
> +#
> +# 2010-01-20 OBN - Modified to include check for valid values
> +#                - Added check for variable value matching I_S tables

I think the above note from Omer is not relevant for this test and should
be removed.

...

Otherwise your merge looks OK.

-- 
Dmitry Lenev, Software Developer
Oracle Development SPB/MySQL, www.mysql.com

Are you MySQL certified?  http://www.mysql.com/certification