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/unireg.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/unireg.h')
| -rw-r--r-- | sql/unireg.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/unireg.h b/sql/unireg.h index 9ab8753af84..af91793e8fe 100644 --- a/sql/unireg.h +++ b/sql/unireg.h @@ -151,7 +151,8 @@ #define READ_SCREENS 1024 /* Read screens, info and helpfile */ #define DELAYED_OPEN 4096 /* Open table later */ #define OPEN_VIEW 8192 /* Allow open on view */ - +#define OPEN_VIEW_NO_PARSE 16384 /* Open frm only if it's a view, + but do not parse view itself */ #define SC_INFO_LENGTH 4 /* Form format constant */ #define TE_INFO_LENGTH 3 #define MTYP_NOEMPTY_BIT 128 |