mirror of
https://github.com/MariaDB/server.git
synced 2026-01-06 05:22:24 +03:00
This patch does 1) fix my build breakage 2) Complete the removal of all symbols which could clash with another parser.
sql/mysql_priv.h: Porting update sql/mysqld.cc: Porting update sql/sp.cc: Porting update sql/sql_lex.cc: Porting update sql/sql_lex.h: Porting update sql/sql_parse.cc: Porting update sql/sql_prepare.cc: Portinng update sql/sql_trigger.cc: Porting update sql/sql_view.cc: Porting update
This commit is contained in:
@@ -15,6 +15,7 @@
|
||||
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*/
|
||||
|
||||
#define MYSQL_LEX 1
|
||||
#include "mysql_priv.h"
|
||||
#include "sql_select.h"
|
||||
#include "parse_file.h"
|
||||
@@ -889,7 +890,7 @@ bool mysql_make_view(THD *thd, File_parser *parser, TABLE_LIST *table)
|
||||
MODE_IGNORE_SPACE | MODE_NO_BACKSLASH_ESCAPES);
|
||||
CHARSET_INFO *save_cs= thd->variables.character_set_client;
|
||||
thd->variables.character_set_client= system_charset_info;
|
||||
res= yyparse((void *)thd);
|
||||
res= MYSQLparse((void *)thd);
|
||||
thd->variables.character_set_client= save_cs;
|
||||
thd->variables.sql_mode= save_mode;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user