summaryrefslogtreecommitdiff
path: root/sql/sql_parse.cc
diff options
context:
space:
mode:
authorunknown <brian@zim.(none)>2005-06-01 17:34:10 -0700
committerunknown <brian@zim.(none)>2005-06-01 17:34:10 -0700
commit0218ecf7af9bb7dee577ec01f42f602205ec3483 (patch)
treeea8ba4e29fcc4c122113103ea3fc25d18326ea68 /sql/sql_parse.cc
parente07f6ebf7fe5c35965d03485226d0c5eaff65966 (diff)
downloadmariadb-git-0218ecf7af9bb7dee577ec01f42f602205ec3483.tar.gz
Mainly cleanups for gcc 4.0. Some small pieces from looking at -Wall. Removed a number of dumb things in ha_tina.
client/mysqladmin.cc: gcc 4.0 fix sql/examples/ha_archive.cc: Bunch of little cleanups from -Wall and gcc 4.0 fixes sql/examples/ha_example.cc: Noticed that the error call was not quite right. sql/examples/ha_tina.cc: Bunch of cleanups (many of which were quite dumb of me... and I have no earthly idea how they missed everyone's notice). sql/ha_heap.cc: Removed unused variable (-Wall find) sql/item_subselect.cc: Removed unused label. sql/mysqld.cc: Cleanup of unused function and gcc 4.0 bit. sql/opt_range.h: Cleanup for gcc 4.0 sql/repl_failsafe.cc: Cleanup for gcc 4.0 sql/slave.cc: Cleanup for gcc 4.0 sql/sql_acl.cc: Cleanup for gcc 4.0 sql/sql_insert.cc: Cleanedup for gcc 4.0 sql/sql_parse.cc: Cleanedup for gcc 4.0 sql/sql_repl.cc: Removed unused variable sql/sql_select.cc: Cleanedup for gcc 4.0
Diffstat (limited to 'sql/sql_parse.cc')
-rw-r--r--sql/sql_parse.cc2
1 files changed, 0 insertions, 2 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index 80c68dad247..0d67c25cee5 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -561,7 +561,6 @@ bool is_update_query(enum enum_sql_command command)
static void time_out_user_resource_limits(THD *thd, USER_CONN *uc)
{
- bool error= 0;
time_t check_time = thd->start_time ? thd->start_time : time(NULL);
DBUG_ENTER("time_out_user_resource_limits");
@@ -587,7 +586,6 @@ static bool check_mqh(THD *thd, uint check_command)
{
#ifndef NO_EMBEDDED_ACCESS_CHECKS
bool error= 0;
- time_t check_time = thd->start_time ? thd->start_time : time(NULL);
USER_CONN *uc=thd->user_connect;
DBUG_ENTER("check_mqh");
DBUG_ASSERT(uc != 0);