delta/mariadb-git.git, branch bb-10.2-ext github.com: MariaDB/server.git Merge pull request #652 from halfspawn/bb-10.2-ext 2018-03-13T10:22:28+00:00 Alexander Barkov bar@mariadb.com 2018-03-13T10:22:28+00:00 42433a2dbcc740dd27d6bb0c93ce0f93122febe7 MDEV-10574 / SUBSTR - sql_mode=Oracle: return null instead of empty string 
MDEV-10574 / SUBSTR - sql_mode=Oracle: return null instead of empty string
 MDEV-10574 / SUBSTR - sql_mode=Oracle: return null instead of empty string 2018-03-13T09:34:28+00:00 halfspawn j.brauge@qualiac.com 2018-03-13T09:34:28+00:00 3e6893e29a4298e9bb11bd91c6f8f88c7c1191d0 






Merge 10.2 into bb-10.2-ext
2018-03-13T06:11:54+00:00

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

2018-03-13T06:11:54+00:00

1c4b6afbaaf7dbcee4b035d1bf79156fa68a6475












After-merge fix
2018-03-12T20:08:08+00:00

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

2018-03-12T20:08:08+00:00

036b9dc9a1fa8418e0de5c9f8cf4fa2e5ee4513e












MDEV-15217 Assertion `thd->transaction.xid_state.xid.is_null()' failed
2018-03-12T19:43:42+00:00

Alexey Botchkov
holyfoot@askmonty.org

2018-03-12T19:43:42+00:00

9d95b8665a3d87ab857e77e220effc64454eb881

in trans_xa_start.

        test fixed.





in trans_xa_start.

        test fixed.







MDEV-14581 - changded .result file
2018-03-12T18:38:40+00:00

Vladislav Vaintroub
wlad@mariadb.com

2018-03-12T18:38:40+00:00

68482a22155f1b741d0c19cff87292688ce17fc4












MDEV-14581 Warning info not cleared when caching THD
2018-03-12T18:29:54+00:00

Vladislav Vaintroub
wlad@mariadb.com

2018-03-12T18:29:31+00:00

248e5d01a57d4d3783081112ce4852593dfe3742

In thread caching code, clear THD's warnings before reuse.





In thread caching code, clear THD's warnings before reuse.







MDEV-15328: MariaDB 10.2.13 Crashes upon CALL PROCEDURE PARAM LAST_INSERT_ID ()
2018-03-12T16:37:23+00:00

Oleksandr Byelkin
sanja@mariadb.com

2018-03-05T16:43:30+00:00

5511e8ed5941e3b5a7687f87a1fb4fa75815ee7b

There is not current SELECT during assigning SP parameters, do not use it if current_select is empty.





There is not current SELECT during assigning SP parameters, do not use it if current_select is empty.







Merge 10.2 into bb-10.2-ext
2018-03-12T13:11:15+00:00

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

2018-03-12T12:48:53+00:00

e0792e7603e17169d38c0d8e4556744250f2813e












Merge 10.1 into 10.2
2018-03-12T12:27:17+00:00

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

2018-03-12T12:27:17+00:00

3a93ec53c1efdb511721fdb9e3bef9c3cf3bf675