sql/sql_lex.h · eae3b4fe762965789badce7b2d6aa51b7f0c317a · nexedi / MariaDB

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

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

eae3b4fe

sql_lex.h 70.5 KB

Replace sql_lex.h