Alexey Kopytov eae3b4fe76 Manual merge from mysql-5.1-bugteam to mysql-trunk-merge. ...

conflicts:
   conflict      mysys/safemalloc.c
   conflict      sql/mysqld.cc
   conflict      sql/sp.cc
   conflict      sql/sql_lex.cc
   conflict      sql/sql_lex.h
   conflict      sql/sql_parse.cc
   conflict      sql/sql_prepare.cc

2010-06-11 17:48:24 +04:00

64 KiB

Raw Blame History

View Raw