diff options
| author | Kentoku SHIBA <kentokushiba@gmail.com> | 2014-03-25 05:10:40 +0900 |
|---|---|---|
| committer | Kentoku SHIBA <kentokushiba@gmail.com> | 2014-03-25 05:10:40 +0900 |
| commit | 74195f40b49070b949822361deeba97c383cd0e7 (patch) | |
| tree | dabba66670fb91370a98ab1a30099f390463d514 /storage/spider/ha_spider.cc | |
| parent | 5b07977ac6677c7beced1a804bcdf3c570a84f58 (diff) | |
| download | mariadb-git-74195f40b49070b949822361deeba97c383cd0e7.tar.gz | |
current date
Diffstat (limited to 'storage/spider/ha_spider.cc')
| -rw-r--r-- | storage/spider/ha_spider.cc | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/storage/spider/ha_spider.cc b/storage/spider/ha_spider.cc index 67c2164b818..7d8ad886200 100644 --- a/storage/spider/ha_spider.cc +++ b/storage/spider/ha_spider.cc @@ -9438,11 +9438,6 @@ int ha_spider::direct_update_rows_init( } result_list.direct_order_limit = TRUE; } - - if ((error_num = spider_check_trx_and_get_conn(thd, this, TRUE))) - { - DBUG_RETURN(error_num); - } trx->direct_update_count++; DBUG_PRINT("info",("spider OK")); DBUG_RETURN(0); @@ -9481,6 +9476,10 @@ int ha_spider::direct_update_rows_init( do_direct_update = FALSE; DBUG_RETURN(HA_ERR_WRONG_COMMAND); } + if ((error_num = spider_check_trx_and_get_conn(thd, this, TRUE))) + { + DBUG_RETURN(error_num); + } #endif trx->direct_update_count++; DBUG_PRINT("info",("spider OK")); @@ -9728,11 +9727,6 @@ int ha_spider::direct_delete_rows_init( } result_list.direct_order_limit = TRUE; } - - if ((error_num = spider_check_trx_and_get_conn(thd, this, TRUE))) - { - DBUG_RETURN(error_num); - } trx->direct_delete_count++; DBUG_PRINT("info",("spider OK")); DBUG_RETURN(0); @@ -9750,6 +9744,12 @@ int ha_spider::direct_delete_rows_init( #endif do_direct_update ) { +#if defined(HS_HAS_SQLCOM) && defined(HAVE_HANDLERSOCKET) + if ((error_num = spider_check_trx_and_get_conn(thd, this, TRUE))) + { + DBUG_RETURN(error_num); + } +#endif trx->direct_delete_count++; DBUG_PRINT("info",("spider OK")); DBUG_RETURN(0); |