Alexey Kopytov e58c059695 Manual merge of local mysql-trunk-merge with bk-internal. ...

Conflicts:

Text conflict in sql/CMakeLists.txt

2010-05-07 18:56:46 +04:00

..

inc

WL#4738 streamline/simplify @@variable creation process

2009-12-22 10:35:56 +01:00

r

Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.

2010-04-30 00:33:06 +04:00

t

Manual merge of local mysql-trunk-merge with bk-internal.

2010-05-07 18:56:46 +04:00