summaryrefslogtreecommitdiff
path: root/sql/log.cc
diff options
context:
space:
mode:
authormonty@mysql.com <>2004-07-08 15:45:25 +0300
committermonty@mysql.com <>2004-07-08 15:45:25 +0300
commitdb7efa27803b1ee58a3b04c63a4cc14241420fd0 (patch)
tree15b952a3b20bb1c0c60974e9f451385a4fa45208 /sql/log.cc
parent6fdafa5635d5ad369f7a4e5272b818b9e4957a1c (diff)
downloadmariadb-git-db7efa27803b1ee58a3b04c63a4cc14241420fd0.tar.gz
New handler::index_flags() definition to make it easy to check the full used key and a specific key part.
Added key part to optimize_range() to fix problems when using fields in key parts.
Diffstat (limited to 'sql/log.cc')
-rw-r--r--sql/log.cc7
1 files changed, 4 insertions, 3 deletions
diff --git a/sql/log.cc b/sql/log.cc
index 124439ae9eb..afba530ce49 100644
--- a/sql/log.cc
+++ b/sql/log.cc
@@ -2046,10 +2046,8 @@ bool flush_error_log()
bool MYSQL_LOG::cut_spurious_tail()
{
int error= 0;
- char llbuf1[22], llbuf2[22];
- ulonglong actual_size;
-
DBUG_ENTER("cut_spurious_tail");
+
#ifdef HAVE_INNOBASE_DB
if (have_innodb != SHOW_OPTION_YES)
DBUG_RETURN(0);
@@ -2059,6 +2057,9 @@ bool MYSQL_LOG::cut_spurious_tail()
*/
char *name= ha_innobase::get_mysql_bin_log_name();
ulonglong pos= ha_innobase::get_mysql_bin_log_pos();
+ ulonglong actual_size;
+ char llbuf1[22], llbuf2[22];
+
if (name[0] == 0 || pos == ULONGLONG_MAX)
{
DBUG_PRINT("info", ("InnoDB has not set binlog info"));