1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge trift2.:/MySQL/M51/clone-5.1

Browse Source 
into  trift2.:/MySQL/M51/push-5.1


extra/yassl/src/handshake.cpp:
  Auto merged
extra/yassl/src/template_instnt.cpp:
  Auto merged
extra/yassl/src/yassl_imp.cpp:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/handler.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
This commit is contained in:
unknown 2008-02-13 13:40:53 +01:00
commit d509d8324d
4 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BUILD/compile-dist
View File

@ -39,6 +39,8 @@ then
fi
# Make sure to enable all features that affect "make dist"
# Remember that configure restricts the man pages to the configured features !
./configure \
--with-embedded-server \
--with-ndbcluster
make

2
sql/handler.cc
View File

@ -4034,6 +4034,8 @@ int handler::ha_reset()
DBUG_ASSERT(inited == NONE);
/* Free cache used by filesort */
free_io_cache(table);
/* reset the bitmaps to point to defaults */
table->default_column_bitmaps();
DBUG_RETURN(reset());
}

20
sql/log_event.cc
View File

@ -8031,7 +8031,7 @@ int Rows_log_event::find_row(const Relay_log_info *rli)
{
DBUG_PRINT("info",("ha_index_init returns error %d",error));
table->file->print_error(error, MYF(0));
DBUG_RETURN(error);
goto err;
}
/* Fill key data for the row */
@ -8064,7 +8064,7 @@ int Rows_log_event::find_row(const Relay_log_info *rli)
DBUG_PRINT("info",("no record matching the key found in the table"));
table->file->print_error(error, MYF(0));
table->file->ha_index_end();
DBUG_RETURN(error);
goto err;
}
/*
@ -8092,7 +8092,7 @@ int Rows_log_event::find_row(const Relay_log_info *rli)
if (table->key_info->flags & HA_NOSAME)
{
table->file->ha_index_end();
DBUG_RETURN(0);
goto ok;
}
/*
@ -8124,7 +8124,7 @@ int Rows_log_event::find_row(const Relay_log_info *rli)
DBUG_PRINT("info",("no record matching the given row found"));
table->file->print_error(error, MYF(0));
table->file->ha_index_end();
DBUG_RETURN(error);
goto err;
}
}
@ -8145,7 +8145,7 @@ int Rows_log_event::find_row(const Relay_log_info *rli)
DBUG_PRINT("info",("error initializing table scan"
" (ha_rnd_init returns %d)",error));
table->file->print_error(error, MYF(0));
DBUG_RETURN(error);
goto err;
}
/* Continue until we find the right record or have made a full loop */
@ -8169,7 +8169,7 @@ int Rows_log_event::find_row(const Relay_log_info *rli)
" (rnd_next returns %d)",error));
table->file->print_error(error, MYF(0));
table->file->ha_rnd_end();
DBUG_RETURN(error);
goto err;
}
}
while (restart_count < 2 && record_compare(table));
@ -8189,10 +8189,16 @@ int Rows_log_event::find_row(const Relay_log_info *rli)
table->file->ha_rnd_end();
DBUG_ASSERT(error == HA_ERR_END_OF_FILE || error == HA_ERR_RECORD_DELETED || error == 0);
DBUG_RETURN(error);
goto err;
}
ok:
table->default_column_bitmaps();
DBUG_RETURN(0);
err:
table->default_column_bitmaps();
DBUG_RETURN(error);
}
#endif

4
storage/ndb/src/common/util/OutputStream.cpp
View File

@ -62,7 +62,7 @@ SocketOutputStream::print(const char * fmt, ...){
if(ret >= 0)
m_timeout_remain-=time;
if(errno==ETIMEDOUT || m_timeout_remain<=0)
if((ret < 0 && errno==ETIMEDOUT) || m_timeout_remain<=0)
{
m_timedout= true;
ret= -1;
@ -84,7 +84,7 @@ SocketOutputStream::println(const char * fmt, ...){
if(ret >= 0)
m_timeout_remain-=time;
if (errno==ETIMEDOUT || m_timeout_remain<=0)
if ((ret < 0 && errno==ETIMEDOUT) || m_timeout_remain<=0)
{
m_timedout= true;
ret= -1;