summaryrefslogtreecommitdiff
path: root/sql/sql_lex.h
diff options
context:
space:
mode:
authorAlexander Nozdrin <alik@sun.com>2010-02-03 17:01:48 +0300
committerAlexander Nozdrin <alik@sun.com>2010-02-03 17:01:48 +0300
commitcf55cf596e33bb5287bb8336972dbe3ae35fdad4 (patch)
tree939d5c5ce926dbc17814e750c67d6ddc24765cf0 /sql/sql_lex.h
parentdaec25c11d73e87c0f05b0d4d6cbd18a812d1995 (diff)
parent59f1be1b636e360c410c81de1c41a8c4a254077d (diff)
downloadmariadb-git-cf55cf596e33bb5287bb8336972dbe3ae35fdad4.tar.gz
Manual merge from mysql-5.1-bugteam.
Conflicts: - mysql-test/collections/default.experimental - mysql-test/suite/rpl/r/rpl_sp.result
Diffstat (limited to 'sql/sql_lex.h')
-rw-r--r--sql/sql_lex.h25
1 files changed, 0 insertions, 25 deletions
diff --git a/sql/sql_lex.h b/sql/sql_lex.h
index 13a289eac1d..4bf8cd41aee 100644
--- a/sql/sql_lex.h
+++ b/sql/sql_lex.h
@@ -1799,8 +1799,6 @@ struct LEX: public Query_tables_list
- CREATE TRIGGER (points to "TRIGGER");
- CREATE PROCEDURE (points to "PROCEDURE");
- CREATE FUNCTION (points to "FUNCTION" or "AGGREGATE");
- - CREATE VIEW(points to "VIEW");
- - CREATE EVENT(points to "EVENT");
This pointer is required to add possibly omitted DEFINER-clause to the
DDL-statement before dumping it to the binlog.
@@ -1809,29 +1807,6 @@ struct LEX: public Query_tables_list
const char *stmt_definition_end;
- /*
- stmt_begin is intended to point to the begin of every statement.
- It is now used in the following statements:
- - GRANT ALL PRIVELEGES ON *.* (points to "GRANT");
- - REVOKE ALL PRIVELEGES ON *.* (points to "REVOKE");
- */
- const char *stmt_begin;
- const char *stmt_end;
-
- /*
- stmt_user_begin is intended to point to the begin of the user list in
- the following statements:
- - GRANT ALL PRIVELEGES ON *.* TO 'username'@'hostname'
- (points to "'username'");
- - REVOKE ALL PRIVELEGES ON *.* FROM 'username'@'hostname'
- (points to "'username'");
-
- these pointers are required to replace the CURRENT_USER()
- function by the real user before dumping it to the binlog.
- */
- const char *stmt_user_begin;
- const char *stmt_user_end;
-
/**
During name resolution search only in the table list given by
Name_resolution_context::first_name_resolution_table and