Commit 272625d9 authored by Kentoku SHIBA's avatar Kentoku SHIBA

fix Spider executing one by one commands before SQL

parent c34deb4c
...@@ -450,8 +450,8 @@ int spider_db_conn_queue_action( ...@@ -450,8 +450,8 @@ int spider_db_conn_queue_action(
(!conn->queued_autocommit_val && conn->autocommit != 0) (!conn->queued_autocommit_val && conn->autocommit != 0)
) && ) &&
!conn->db_conn->set_autocommit_in_bulk_sql() && !conn->db_conn->set_autocommit_in_bulk_sql() &&
(error_num = spider_dbton[conn->dbton_id].db_util-> (error_num = conn->db_conn->
append_autocommit(&sql_str, conn->queued_autocommit_val)) set_autocommit(conn->queued_autocommit_val, (int *) conn->need_mon))
) { ) {
DBUG_RETURN(error_num); DBUG_RETURN(error_num);
} }
...@@ -462,8 +462,8 @@ int spider_db_conn_queue_action( ...@@ -462,8 +462,8 @@ int spider_db_conn_queue_action(
(!conn->queued_sql_log_off_val && conn->sql_log_off != 0) (!conn->queued_sql_log_off_val && conn->sql_log_off != 0)
) && ) &&
!conn->db_conn->set_sql_log_off_in_bulk_sql() && !conn->db_conn->set_sql_log_off_in_bulk_sql() &&
(error_num = spider_dbton[conn->dbton_id].db_util-> (error_num = conn->db_conn->
append_sql_log_off(&sql_str, conn->queued_sql_log_off_val)) set_sql_log_off(conn->queued_sql_log_off_val, (int *) conn->need_mon))
) { ) {
DBUG_RETURN(error_num); DBUG_RETURN(error_num);
} }
...@@ -471,8 +471,9 @@ int spider_db_conn_queue_action( ...@@ -471,8 +471,9 @@ int spider_db_conn_queue_action(
conn->queued_wait_timeout && conn->queued_wait_timeout &&
conn->queued_wait_timeout_val != conn->wait_timeout && conn->queued_wait_timeout_val != conn->wait_timeout &&
!conn->db_conn->set_wait_timeout_in_bulk_sql() && !conn->db_conn->set_wait_timeout_in_bulk_sql() &&
(error_num = spider_dbton[conn->dbton_id].db_util-> (error_num = conn->db_conn->
append_wait_timeout(&sql_str, conn->queued_wait_timeout_val)) set_wait_timeout(conn->queued_wait_timeout_val,
(int *) conn->need_mon))
) { ) {
DBUG_RETURN(error_num); DBUG_RETURN(error_num);
} }
...@@ -480,8 +481,9 @@ int spider_db_conn_queue_action( ...@@ -480,8 +481,9 @@ int spider_db_conn_queue_action(
conn->queued_sql_mode && conn->queued_sql_mode &&
conn->queued_sql_mode_val != conn->sql_mode && conn->queued_sql_mode_val != conn->sql_mode &&
!conn->db_conn->set_sql_mode_in_bulk_sql() && !conn->db_conn->set_sql_mode_in_bulk_sql() &&
(error_num = spider_dbton[conn->dbton_id].db_util-> (error_num = conn->db_conn->
append_sql_mode(&sql_str, conn->queued_sql_mode_val)) set_sql_mode(conn->queued_sql_mode_val,
(int *) conn->need_mon))
) { ) {
DBUG_RETURN(error_num); DBUG_RETURN(error_num);
} }
...@@ -489,8 +491,9 @@ int spider_db_conn_queue_action( ...@@ -489,8 +491,9 @@ int spider_db_conn_queue_action(
conn->queued_time_zone && conn->queued_time_zone &&
conn->queued_time_zone_val != conn->time_zone && conn->queued_time_zone_val != conn->time_zone &&
!conn->db_conn->set_time_zone_in_bulk_sql() && !conn->db_conn->set_time_zone_in_bulk_sql() &&
(error_num = spider_dbton[conn->dbton_id].db_util-> (error_num = conn->db_conn->
append_time_zone(&sql_str, conn->queued_time_zone_val)) set_time_zone(conn->queued_time_zone_val,
(int *) conn->need_mon))
) { ) {
DBUG_RETURN(error_num); DBUG_RETURN(error_num);
} }
......
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