database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge branch '10.9' into 10.10

Browse Source
This commit is contained in:
Oleksandr Byelkin
2023-08-05 16:14:46 +02:00
parent b1b47264d2 998edc374e
commit ced243a099
867 changed files with 12543 additions and 6345 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
storage/spider/spd_direct_sql.cc
View File

@@ -1370,12 +1370,6 @@ int spider_udf_set_direct_sql_param_default(
direct_sql->table_loop_mode = 0;
if (direct_sql->priority == -1)
direct_sql->priority = 1000000;
if (direct_sql->connect_timeout == -1)
direct_sql->connect_timeout = 6;
if (direct_sql->net_read_timeout == -1)
direct_sql->net_read_timeout = 600;
if (direct_sql->net_write_timeout == -1)
direct_sql->net_write_timeout = 600;
if (direct_sql->bulk_insert_rows == -1)
direct_sql->bulk_insert_rows = 3000;
if (direct_sql->connection_channel == -1)