diff options
| author | unknown <evgen@sunlight.local> | 2006-08-09 02:49:29 +0400 |
|---|---|---|
| committer | unknown <evgen@sunlight.local> | 2006-08-09 02:49:29 +0400 |
| commit | 68d265154ee02a2305537699054e5874b5e0fc4a (patch) | |
| tree | d3677af0311c695e32ef6490310663287f0f2054 /sql/sql_lex.h | |
| parent | b6897efbb8b7119e4abd28bed93a3579c2bf914e (diff) | |
| parent | 1e9ebd010a6b6c7a078d0caa13f9c8145dec1d50 (diff) | |
| download | mariadb-git-68d265154ee02a2305537699054e5874b5e0fc4a.tar.gz | |
Merge sunlight.local:/local_work/leak_fix_orig
into sunlight.local:/local_work/leak_fix-5.1-mysql
sql/sql_lex.h:
Auto merged
sql/sql_view.cc:
Auto merged
sql/sql_view.h:
Auto merged
sql/unireg.h:
Auto merged
sql/sql_base.cc:
Manual merge
sql/table.cc:
Manual merge
Diffstat (limited to 'sql/sql_lex.h')
| -rw-r--r-- | sql/sql_lex.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_lex.h b/sql/sql_lex.h index 55dc6cb55a4..192b6c75f24 100644 --- a/sql/sql_lex.h +++ b/sql/sql_lex.h @@ -402,7 +402,7 @@ public: friend class st_select_lex_unit; friend bool mysql_new_select(struct st_lex *lex, bool move_down); friend bool mysql_make_view(THD *thd, File_parser *parser, - TABLE_LIST *table); + TABLE_LIST *table, uint flags); private: void fast_exclude(); }; |