mirror of
https://github.com/MariaDB/server.git
synced 2025-06-12 01:53:02 +03:00
Small bug fixes + code for DELETE QUICK
Docs/manual.texi: Change log + bug fixes from the mailing list configure.in: added mlockall include/config-win.h: Fix to use SAFE_MUTEX include/ft_global.h: Free memory include/my_pthread.h: Fix for SAFE_MUTEX on windows myisam/Makefile.am: Fix modes myisam/ft_static.c: Fix language problem with fulltext myisam/ft_stopwords.c: Free memory at end myisam/mi_create.c: Fix language problem with fulltext myisam/mi_delete.c: Added optimization to not join blocks when using delete with QUICK myisam/mi_panic.c: Added freeing of memorty myisam/mi_test2.c: Added quick mode myisam/myisamchk.c: Fixed help text myisam/myisamdef.h: Added optimization to not join blocks when using delete with QUICK mysys/mf_format.c: Don't change case for extension mysys/my_wincond.c: Fix for safe mutex mysys/thr_mutex.c: Fix for safe mutex sql-bench/test-insert.sh: Split delete test to get more information about the times sql/ChangeLog: Changelog sql/ha_myisam.cc: Better OPTIMIZE handling sql/log.cc: Cleanup sql/mysql_priv.h: Fix for safe mutex sql/mysqld.cc: Added define for --one-thread option sql/sql_class.h: Fixed lock_time in slow_log sql/sql_delete.cc: Fix for safe mutex sql/sql_parse.cc: Fix processlist message for new process sql/sql_table.cc: Fix windows problem med CREATE INDEX sql/sql_yacc.yy: Fix for safe mutex sql/table.cc: Made code simpler strings/bmove512.c: Small speed fix support-files/mysql.server.sh: Fixed awk usage
This commit is contained in:
@ -394,6 +394,7 @@ pthread_handler_decl(handle_one_connection,arg)
|
||||
thd->client_capabilities|=CLIENT_IGNORE_SPACE;
|
||||
|
||||
thd->proc_info=0; // Remove 'login'
|
||||
thd->command=COM_SLEEP;
|
||||
thd->version=refresh_version;
|
||||
thd->set_time();
|
||||
init_sql_alloc(&thd->mem_root,8192,8192);
|
||||
@ -754,7 +755,7 @@ bool do_command(THD *thd)
|
||||
{
|
||||
mysql_log.write(thd,command,NullS);
|
||||
char buff[200];
|
||||
ulong uptime = (ulong) (time((time_t*) 0) - start_time);
|
||||
ulong uptime = (ulong) (thd->start_time - start_time);
|
||||
sprintf((char*) buff,
|
||||
"Uptime: %ld Threads: %d Questions: %lu Slow queries: %ld Opens: %ld Flush tables: %ld Open tables: %d Queries per second avg: %.3f",
|
||||
uptime,
|
||||
@ -813,7 +814,9 @@ bool do_command(THD *thd)
|
||||
|
||||
time_t start_of_query=thd->start_time;
|
||||
thd->set_time();
|
||||
if ((ulong) (thd->start_time - start_of_query) > long_query_time)
|
||||
/* If not reading from backup and if the query took too long */
|
||||
if (!thd->user_time &&
|
||||
(ulong) (thd->start_time - start_of_query) > long_query_time)
|
||||
{
|
||||
long_query_count++;
|
||||
mysql_slow_log.write(thd, thd->query, thd->query_length, start_of_query);
|
||||
@ -1355,7 +1358,7 @@ mysql_execute_command(void)
|
||||
// Set privilege for the WHERE clause
|
||||
tables->grant.want_privilege=(SELECT_ACL & ~tables->grant.privilege);
|
||||
res = mysql_delete(thd,tables,lex->where,lex->select_limit,
|
||||
lex->lock_option);
|
||||
lex->lock_option, lex->options);
|
||||
#ifdef DELETE_ITEMS
|
||||
delete lex->where;
|
||||
#endif
|
||||
@ -1818,7 +1821,10 @@ check_table_access(THD *thd,uint want_access,TABLE_LIST *tables)
|
||||
return TRUE; // Access denied
|
||||
}
|
||||
if (grant_option)
|
||||
{
|
||||
want_access &= ~EXTRA_ACL; // Remove SHOW attribute
|
||||
return check_grant(thd,want_access,org_tables);
|
||||
}
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user