Commit 12af490a authored by unknown's avatar unknown

Merge trift2.:/MySQL/M50/mysql-5.0

into  trift2.:/MySQL/M50/push-5.0

parents 9cd17b6c f61918ec
......@@ -2516,9 +2516,9 @@ linked_client_targets="linked_libmysql_sources"
if test "$THREAD_SAFE_CLIENT" = "no"
then
sql_client_dirs="strings regex mysys extra libmysql client"
sql_client_dirs="strings regex mysys dbug extra libmysql client"
else
sql_client_dirs="strings regex mysys extra libmysql libmysql_r client"
sql_client_dirs="strings regex mysys dbug extra libmysql libmysql_r client"
linked_client_targets="$linked_client_targets linked_libmysql_r_sources"
AC_CONFIG_FILES(libmysql_r/Makefile)
AC_DEFINE([THREAD_SAFE_CLIENT], [1], [Should be client be thread safe])
......
......@@ -592,8 +592,8 @@ static uint copy_decode_table(uint16 *to_pos, uint offset,
uint16 *decode_table)
{
uint prev_offset;
prev_offset= offset;
DBUG_ENTER("copy_decode_table");
prev_offset= offset;
/* Descent on the left side. */
if (!(*decode_table & IS_CHAR))
......
......@@ -6111,7 +6111,7 @@ ndb_get_table_statistics(ha_ndbcluster* file, bool report_error, Ndb* ndb,
retry:
if(report_error)
{
if (file)
if (file && pTrans)
{
reterr= file->ndb_err(pTrans);
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment