summaryrefslogtreecommitdiff
path: root/sql/ha_myisammrg.cc
diff options
context:
space:
mode:
authorunknown <monty@mashka.mysql.fi>2002-12-12 21:01:32 +0200
committerunknown <monty@mashka.mysql.fi>2002-12-12 21:01:32 +0200
commite6783a8785925f0e7433cd96d8f7f8b5c6d0c9a0 (patch)
tree60ab7f5c2863b09ca19f3f9cda800c3ac4eb3bdd /sql/ha_myisammrg.cc
parent25c8f58ac7710db353a1078f22988cdaa5633817 (diff)
downloadmariadb-git-e6783a8785925f0e7433cd96d8f7f8b5c6d0c9a0.tar.gz
Removed compiler warnings
Fixed wrong variable name for Windows VC++Files/innobase/innobase.dsp: Don't use precompiled headers (doesn't work with samba) VC++Files/myisammrg/myisammrg.dsp: Add missing files VC++Files/mysqlbinlog/mysqlbinlog.dsp: Fixed included paths VC++Files/mysqldemb/mysqldemb.dsp: Don't use precompiled headers (doesn't work with samba) VC++Files/mysqlserver/mysqlserver.dsp: Don't use precompiled headers (doesn't work with samba) VC++Files/sql/mysqld.dsp: Fixed paths innobase/include/univ.i: Removed compiler warning myisammrg/myrg_open.c: Removed compiler warning sql/ha_myisam.cc: Removed compiler warning Fixed wrong (but not dangerous) if statement sql/ha_myisammrg.cc: Removed compiler warning sql/mysqld.cc: Fixed wrong variable name for Windows sql/sql_update.cc: Removed not used label
Diffstat (limited to 'sql/ha_myisammrg.cc')
-rw-r--r--sql/ha_myisammrg.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/ha_myisammrg.cc b/sql/ha_myisammrg.cc
index efebeb8b46d..b043c6fd942 100644
--- a/sql/ha_myisammrg.cc
+++ b/sql/ha_myisammrg.cc
@@ -254,7 +254,7 @@ int ha_myisammrg::extra(enum ha_extra_function operation)
int ha_myisammrg::extra_opt(enum ha_extra_function operation, ulong cache_size)
{
- if ((specialflag & SPECIAL_SAFE_MODE) & operation == HA_EXTRA_WRITE_CACHE)
+ if ((specialflag & SPECIAL_SAFE_MODE) && operation == HA_EXTRA_WRITE_CACHE)
return 0;
return myrg_extra(file, operation, (void*) &cache_size);
}