Alexander Nozdrin 1a0f34e6a4 Manual merge from mysql-next-mr. ... Conflicts: - sql/sys_vars.cc		2010-02-05 15:05:37 +03:00
..
inc	WL#4738 streamline/simplify @@variable creation process	2009-12-22 10:35:56 +01:00
r	Manual merge from mysql-next-mr.	2010-02-05 15:05:37 +03:00
t	Manual merge of patch for Bug#46364 from mysql-next-mr-bugfixing.	2010-02-02 10:56:42 +03:00