diff options
| author | unknown <tulin/mysqldev@mysql.com/production.mysql.com> | 2007-01-17 10:42:57 +0100 |
|---|---|---|
| committer | unknown <tulin/mysqldev@mysql.com/production.mysql.com> | 2007-01-17 10:42:57 +0100 |
| commit | 4828be9ed6acea27ca365a34091523f2b461a079 (patch) | |
| tree | 18d93296bb584eb494fe502c9a47e3440beffd93 | |
| parent | 05527cfcadd6d981b3ff004bba6ffade0f8efb52 (diff) | |
| parent | 15eebdc0a1549c9af5be4a053f192f21365ab479 (diff) | |
| download | mariadb-git-4828be9ed6acea27ca365a34091523f2b461a079.tar.gz | |
Merge mysql.com:/data0/mysqldev/users/tomas/mysql-5.0-release
into mysql.com:/data0/mysqldev/users/tomas/mysql-5.0-build
| -rw-r--r-- | sql/ha_ndbcluster.cc | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc index c40404f0219..f0ae4bae3a2 100644 --- a/sql/ha_ndbcluster.cc +++ b/sql/ha_ndbcluster.cc @@ -6109,7 +6109,23 @@ ndb_get_table_statistics(ha_ndbcluster* file, bool report_error, Ndb* ndb, DBUG_RETURN(0); retry: + if(report_error) + { + if (file && pTrans) + { + 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; @@ -6119,15 +6135,6 @@ 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, |