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

Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new

Browse Source 
into  mysql.com:/users/lthalmann/bk/mysql-5.1-new-wl3023-mats


configure.in:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
mysql-test/r/rpl_ndb_blob.result:
  Merge
mysql-test/t/disabled.def:
  Merge
mysql-test/t/rpl_ndb_blob.test:
  Merge
This commit is contained in:
unknown
2006-03-10 10:21:41 +01:00
parent 5d85c84310 c46b93eee0
commit 35e5d241e8
50 changed files with 2475 additions and 340 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/mysql_priv.h
View File

@ -548,7 +548,8 @@ bool insert_precheck(THD *thd, TABLE_LIST *tables);
bool create_table_precheck(THD *thd, TABLE_LIST *tables,
TABLE_LIST *create_table);
bool get_default_definer(THD *thd, LEX_USER *definer);
void get_default_definer(THD *thd, LEX_USER *definer);
LEX_USER *create_default_definer(THD *thd);
LEX_USER *create_definer(THD *thd, LEX_STRING *user_name, LEX_STRING *host_name);
enum enum_mysql_completiontype {
@ -1223,7 +1224,7 @@ File open_binlog(IO_CACHE *log, const char *log_file_name,
const char **errmsg);
/* mysqld.cc */
extern void yyerror(const char*);
extern void MYSQLerror(const char*);
/* item_func.cc */
extern bool check_reserved_words(LEX_STRING *name);
@ -1634,7 +1635,7 @@ void free_list(I_List <i_string_pair> *list);
void free_list(I_List <i_string> *list);
/* sql_yacc.cc */
extern int yyparse(void *thd);
extern int MYSQLparse(void *thd);
/* frm_crypt.cc */
#ifdef HAVE_CRYPTED_FRM