1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00

Merge with 4.1

This commit is contained in:
monty@mysql.com
2004-12-06 11:38:56 +02:00
107 changed files with 24790 additions and 337 deletions

View File

@ -687,7 +687,6 @@ typedef struct st_lex
List<Item_param> param_list;
List<LEX_STRING> view_list; // view list (list of field names in view)
SQL_LIST proc_list, auxilliary_table_list, save_list;
TYPELIB *interval;
create_field *last_field;
char *savepoint_name; // Transaction savepoint id
udf_func udf;
@ -721,6 +720,7 @@ typedef struct st_lex
/* special JOIN::prepare mode: changing of query is prohibited */
bool view_prepare_mode;
bool safe_to_cache_query;
bool subqueries;
bool variables_used;
ALTER_INFO alter_info;
/* Prepared statements SQL syntax:*/