diff options
| author | Kentoku SHIBA <kentokushiba@gmail.com> | 2014-03-25 04:48:23 +0900 |
|---|---|---|
| committer | Kentoku SHIBA <kentokushiba@gmail.com> | 2014-03-25 04:48:23 +0900 |
| commit | 993dd378b741c293bd251675d726bbf5e2f5f1fe (patch) | |
| tree | 290578aeaa4a087bce2bbe2c69227da8b9f1a250 /storage/spider/spd_db_conn.cc | |
| parent | 4e9e561549f5d878a7ec94d1777ae6935d551a67 (diff) | |
| download | mariadb-git-993dd378b741c293bd251675d726bbf5e2f5f1fe.tar.gz | |
fix for MariaDB 10.0.7 building errors
Diffstat (limited to 'storage/spider/spd_db_conn.cc')
| -rw-r--r-- | storage/spider/spd_db_conn.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/storage/spider/spd_db_conn.cc b/storage/spider/spd_db_conn.cc index 4f8279c5d0c..37f363d51c5 100644 --- a/storage/spider/spd_db_conn.cc +++ b/storage/spider/spd_db_conn.cc @@ -5605,7 +5605,6 @@ int spider_db_bulk_bulk_insert( ) { int error_num = 0, first_insert_link_idx = -1, tmp_error_num; int roop_count2; - SPIDER_RESULT_LIST *result_list = &spider->result_list; SPIDER_SHARE *share = spider->share; SPIDER_CONN *conn, *first_insert_conn = NULL; TABLE *table = spider->get_table(); @@ -5645,6 +5644,7 @@ int spider_db_bulk_bulk_insert( if (conn->conn_kind != SPIDER_CONN_KIND_MYSQL) { uint roop_count; + SPIDER_RESULT_LIST *result_list = &spider->result_list; DBUG_PRINT("info",("spider conn=%p", conn)); DBUG_PRINT("info",("spider result_list->hs_upd_rows=%llu", result_list->hs_upd_rows)); @@ -6584,9 +6584,9 @@ int spider_db_bulk_direct_update( #if defined(HS_HAS_SQLCOM) && defined(HAVE_HANDLERSOCKET) if (!spider_bit_is_set(spider->do_hs_direct_update, roop_count)) { +#endif if (!counted) { -#endif *update_rows = spider->conns[roop_count]->db_conn->affected_rows(); DBUG_PRINT("info", ("spider update_rows = %u", *update_rows)); counted = TRUE; @@ -9953,7 +9953,9 @@ int spider_db_bulk_open_handler( int link_idx ) { int error_num = 0; +#if defined(HS_HAS_SQLCOM) && defined(HAVE_HANDLERSOCKET) bool opening_index = FALSE; +#endif DBUG_ENTER("spider_db_bulk_open_handler"); DBUG_PRINT("info",("spider spider=%p", spider)); DBUG_PRINT("info",("spider conn=%p", conn)); |