mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
Updated VC++ project files for 4.0.4
Only write short usage if one starts mysqldump without any options Added query cache on windows Added error message if one can't read privilege tables Docs/manual.texi: Changelog VC++Files/bdb/bdb.dsp: Updated project files for 4.0.4 VC++Files/client/mysqlclient.dsp: Updated project files for 4.0.4 VC++Files/innobase/innobase.dsp: Updated project files for 4.0.4 VC++Files/mysqlbinlog/mysqlbinlog.dsp: Updated project files for 4.0.4 VC++Files/mysys/mysys.dsp: Updated project files for 4.0.4 VC++Files/perror/perror.dsp: Updated project files for 4.0.4 VC++Files/sql/mysqld.dsp: Updated project files for 4.0.4 client/mysqldump.c: Only write short usage if one starts mysqldump without any options include/config-win.h: Added query cache on windows libmysql/libmysql.def: Removed old depricated functions from windows dll sql/ha_innodb.cc: Added missing defines sql/set_var.cc: Code cleanup sql/sql_acl.cc: Added error message if one can't read privilege tables sql/sql_cache.h: Changed some C linkage functions to C++ functions (portability fix) sql/sql_class.cc: Safety fix
This commit is contained in:
@ -165,14 +165,21 @@ my_bool acl_init(bool dont_read_acl_tables)
|
||||
tables[0].db=tables[1].db=tables[2].db=thd->db;
|
||||
|
||||
if (open_tables(thd,tables))
|
||||
{
|
||||
sql_print_error("Fatal error: Can't open privilege tables: %s",
|
||||
thd->net.last_error);
|
||||
goto end;
|
||||
}
|
||||
TABLE *ptr[3]; // Lock tables for quick update
|
||||
ptr[0]= tables[0].table;
|
||||
ptr[1]= tables[1].table;
|
||||
ptr[2]= tables[2].table;
|
||||
if (!(lock=mysql_lock_tables(thd,ptr,3)))
|
||||
{
|
||||
sql_print_error("Fatal error: Can't lock privilege tables: %s",
|
||||
thd->net.last_error);
|
||||
goto end;
|
||||
|
||||
}
|
||||
init_sql_alloc(&mem,1024,0);
|
||||
init_read_record(&read_record_info,thd,table= tables[0].table,NULL,1,0);
|
||||
VOID(my_init_dynamic_array(&acl_hosts,sizeof(ACL_HOST),20,50));
|
||||
|
Reference in New Issue
Block a user