diff options
| -rw-r--r-- | configure.in | 4 | ||||
| -rw-r--r-- | myisam/mi_packrec.c | 2 | ||||
| -rw-r--r-- | sql/ha_ndbcluster.cc | 25 |
3 files changed, 12 insertions, 19 deletions
diff --git a/configure.in b/configure.in index 94bc85557df..cf1b4b0cd32 100644 --- a/configure.in +++ b/configure.in @@ -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]) diff --git a/myisam/mi_packrec.c b/myisam/mi_packrec.c index 37614cc1e1f..d45d6f8b16f 100644 --- a/myisam/mi_packrec.c +++ b/myisam/mi_packrec.c @@ -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)) diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc index 0f580c833a9..c40404f0219 100644 --- a/sql/ha_ndbcluster.cc +++ b/sql/ha_ndbcluster.cc @@ -6109,23 +6109,7 @@ ndb_get_table_statistics(ha_ndbcluster* file, bool report_error, Ndb* ndb, DBUG_RETURN(0); retry: - if(report_error) - { - if (file) - { - reterr= file->ndb_err(pTrans); - } - else - { - const NdbError& tmp= error; - ERR_PRINT(tmp); - reterr= ndb_to_mysql_error(&tmp); - } - } - else - reterr= error.code; - if (pTrans) { ndb->closeTransaction(pTrans); pTrans= NULL; @@ -6135,6 +6119,15 @@ retry: my_sleep(retry_sleep); continue; } + if(report_error) + { + const NdbError& tmp= error; + ERR_PRINT(tmp); + reterr= ndb_to_mysql_error(&tmp); + } + else + reterr= error.code; + break; } while(1); DBUG_PRINT("exit", ("failed, reterr: %u, NdbError %u(%s)", reterr, |