mysys/safemalloc.c · f84b3f5c21c62ebe3b489250a09aca0ffde1313c · nexedi / MariaDB

Manual merge from mysql-5.1-bugteam to mysql-trunk-merge. · f84b3f5c

Alexey Kopytov authored Jun 11, 2010

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

f84b3f5c

safemalloc.c 17 KB

Replace safemalloc.c