delta/mariadb-git.git/sql/sql_load.cc, branch bb-10.4-cleanup github.com: MariaDB/server.git Merge 10.3 into 10.4 2019-03-06T07:00:52+00:00 Marko Mäkelä marko.makela@mariadb.com 2019-03-06T07:00:52+00:00 2a791c53ad93c8bc1441dd227000234bd49c4990 






Merge 10.2 into 10.3
2019-03-05T10:56:05+00:00

Marko Mäkelä
marko.makela@mariadb.com

2019-03-05T10:56:05+00:00

446b3ebdfc75f3a97d349d1347c4900a2e3eee03

FIXME: Properly resolve conflicts between MDEV-18883
and MDEV-7742/MDEV-8305, and record the correct result for
main.log_slow





FIXME: Properly resolve conflicts between MDEV-18883
and MDEV-7742/MDEV-8305, and record the correct result for
main.log_slow







Merge 10.1 into 10.2
2019-03-04T14:46:58+00:00

Marko Mäkelä
marko.makela@mariadb.com

2019-03-04T14:46:58+00:00

9835f7b80fc0eaa7fe4969ae87ae1bfbcc7aa157












Merge branch '10.0' into 10.1
2019-03-01T14:52:06+00:00

Oleksandr Byelkin
sanja@mariadb.com

2019-03-01T14:52:06+00:00

f2e1451740d417f1c9ea8626d937fbcacc91bb55












Merge branch '5.5' into 10.0
2019-02-28T20:50:00+00:00

Oleksandr Byelkin
sanja@mariadb.com

2019-02-28T20:50:00+00:00

7b5c63856b324281a3b0533b7b90fb6c130fcc66












A cleanup in derived table handling: removing duplicate code from st_select_lex::handle_derived()
2019-02-28T14:13:28+00:00

Alexander Barkov
bar@mariadb.com

2019-02-28T14:13:28+00:00

0ad598a00b17008b0c0702db40948b14d7eee0d5

st_select_lex::handle_derived() and mysql_handle_list_of_derived() had
exactly the same implementations.

- Adding a new method LEX::handle_list_of_derived() instead
- Removing public function mysql_handle_list_of_derived()
- Reusing LEX::handle_list_of_derived() in st_select_lex::handle_derived()





st_select_lex::handle_derived() and mysql_handle_list_of_derived() had
exactly the same implementations.

- Adding a new method LEX::handle_list_of_derived() instead
- Removing public function mysql_handle_list_of_derived()
- Reusing LEX::handle_list_of_derived() in st_select_lex::handle_derived()







Backporting MDEV-15597 Add class Load_data_outvar and avoid using Item::STRING_ITEM for Item_user_var_as_out_param detection
2019-02-23T13:43:59+00:00

Alexander Barkov
bar@mariadb.com

2018-03-20T09:02:44+00:00

80c3fd184d4eeb66cd520079c3d23595e52cfdc0

This is a part of "MDEV-18045 Backporting the MDEV-15497 changes to 10.2 branch"





This is a part of "MDEV-18045 Backporting the MDEV-15497 changes to 10.2 branch"







Backporting MDEV-15497 Wrong empty value in a GEOMETRY column on LOAD DATA
2019-02-23T13:43:59+00:00

Alexander Barkov
bar@mariadb.org

2018-03-07T15:52:00+00:00

8036ad541e9da4073a6136052e41c22c758b770e

This is a part of "MDEV-18045 Backporting the MDEV-15497 changes to 10.2 branch"





This is a part of "MDEV-18045 Backporting the MDEV-15497 changes to 10.2 branch"







Backporting MDEV-14628 Wrong autoinc value assigned by LOAD XML in the NO_AUTO_VALUE_ON_ZERO mode
2019-02-23T13:43:59+00:00

Alexander Barkov
bar@mariadb.org

2017-12-13T09:22:45+00:00

0ef8848526c117ed8731e42edbb3f28652b168f2

This is a part of "MDEV-18045 Backporting the MDEV-15497 changes to 10.2 branch"





This is a part of "MDEV-18045 Backporting the MDEV-15497 changes to 10.2 branch"







Implement wsrep_load_data_splitting with streaming replication
2019-02-12T08:37:05+00:00

Teemu Ollakka
teemu.ollakka@galeracluster.com

2019-02-11T12:47:08+00:00

f06a0b5338694755842a58798bb3a9a40da78bfd

If wsrep_load_data_splitting is configured, change streaming replication
parameters internally to match the original behavior, i.e. replicate
on every 10000 rows. After load data is over, restore original
streaming replication settings.

Removed redundant wsrep_tc_log_commit().





If wsrep_load_data_splitting is configured, change streaming replication
parameters internally to match the original behavior, i.e. replicate
on every 10000 rows. After load data is over, restore original
streaming replication settings.

Removed redundant wsrep_tc_log_commit().