diff options
| author | unknown <kostja@bodhi.local> | 2006-08-02 21:54:10 +0400 |
|---|---|---|
| committer | unknown <kostja@bodhi.local> | 2006-08-02 21:54:10 +0400 |
| commit | e44e344cac60606be0fe13373b6166688e449244 (patch) | |
| tree | 3241b2854c0aa8cee9250880ef30eb407e84e7ec /sql/sql_yacc.yy | |
| parent | a0efaba36344800e522ba03d373ab2450841852d (diff) | |
| parent | 1cf65f311dbf09615bea443b041a78db34d7e2ea (diff) | |
| download | mariadb-git-e44e344cac60606be0fe13373b6166688e449244.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into bodhi.local:/opt/local/work/mysql-5.0-runtime-merge
sql/item.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_view.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.h:
Auto merged
mysql-test/r/sp.result:
Manual merge.
mysql-test/r/udf.result:
Manual merge.
mysql-test/t/sp.test:
Manual merge.
mysql-test/t/udf.test:
Manual merge.
Diffstat (limited to 'sql/sql_yacc.yy')
| -rw-r--r-- | sql/sql_yacc.yy | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 675c54c0fbc..ccf4a9d6687 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -9017,11 +9017,11 @@ view_algorithm_opt: view_suid: /* empty */ - { Lex->create_view_suid= TRUE; } + { Lex->create_view_suid= VIEW_SUID_DEFAULT; } | SQL_SYM SECURITY_SYM DEFINER_SYM - { Lex->create_view_suid= TRUE; } + { Lex->create_view_suid= VIEW_SUID_DEFINER; } | SQL_SYM SECURITY_SYM INVOKER_SYM - { Lex->create_view_suid= FALSE; } + { Lex->create_view_suid= VIEW_SUID_INVOKER; } ; view_tail: |