database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Manual merge from mysql-5.1-bugteam.

Browse Source 
Conflicts:
  - mysql-test/collections/default.experimental
  - mysql-test/suite/rpl/r/rpl_sp.result
This commit is contained in:
Alexander Nozdrin
2010-02-03 17:01:48 +03:00
parent adcda7df2b f392eddabc
commit 31ba3bf5cb
17 changed files with 111 additions and 2325 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
sql/sql_lex.h
View File

@ -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