summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* MDEV-13857 - Use the 10.2 libmariadb in 10.3bb-10.3-svoj1Sergey Vojtovich2017-09-222-0/+2
* MDEV-13855 - Rename idle_readwrite_transaction_timeout toSergey Vojtovich2017-09-227-26/+26
* Replace dict_table_get_n_sys_cols(table) with DATA_N_SYS_COLSMarko Mäkelä2017-09-217-46/+26
* Merge bb-10.2-ext into 10.3Marko Mäkelä2017-09-21244-2237/+3637
|\
| * Merge 10.2 into bb-10.2-extMarko Mäkelä2017-09-211-1/+2
| |\
| | * MDEV-13589 libmariadbclient18 is broken when using mariadb repo instead of de...Sergei Golubchik2017-09-201-1/+2
| * | After-merge fix: Adjust one more resultMarko Mäkelä2017-09-211-3/+3
| * | Merge 10.2 into bb-10.2-extMarko Mäkelä2017-09-218-37/+58
| |\ \ | | |/
| | * Fix -Wimplicit-fallthrough warnings (no functional change)Marko Mäkelä2017-09-202-0/+2
| | * Fix ut_ad(!leaf) failure in rec_get_offsets_func() with spatial indexMarko Mäkelä2017-09-207-36/+56
| | * Avoid comparison of unsigned to signedMarko Mäkelä2017-09-201-1/+1
| * | After-merge fix: Adjust some results.Marko Mäkelä2017-09-216-17/+17
| * | After-merge fix: Adjust some results.Marko Mäkelä2017-09-2014-55/+55
| * | Merge 10.2 into bb-10.2-extMarko Mäkelä2017-09-20230-2160/+3604
| |\ \ | | |/
| | * MDEV-13847 Allow ALTER TABLE…ADD SPATIAL INDEX…ALGORITHM=INPLACEMarko Mäkelä2017-09-209-115/+158
| | * Add a missing const qualifierMarko Mäkelä2017-09-202-12/+9
| | * Add the parameter bool leaf to rec_get_offsets()Marko Mäkelä2017-09-2037-364/+456
| | * Merge branch '10.1' into 10.2Vicențiu Ciorbaru2017-09-205-5/+72
| | |\
| | | * Merge branch '10.0' into 10.1Vicențiu Ciorbaru2017-09-203-0/+60
| | | |\
| | | | * Merge branch 'bb-10.0-vicentiu' into 10.0Vicențiu Ciorbaru2017-09-20177-3620/+43050
| | | | |\
| | | | * | MDEV-13290: Assertion Assertion `!is_set() || (m_status == DA_OK_BULK && is_b...Oleksandr Byelkin2017-09-193-0/+60
| | | | * | MDEV-13137 MySQL 5.6.23 Crashes when SET GLOBAL server_audit_logging=OFF;Alexey Botchkov2017-09-191-2/+8
| | | * | | Merge branch 'bb-10.1-vicentiu' into 10.1Vicențiu Ciorbaru2017-09-20194-3009/+43238
| | | |\ \ \
| | | * | | | MDEV-13850: Uninitialized variable at wsrep_binlog.cc:455Jan Lindström2017-09-201-1/+1
| | | * | | | MDEV-13137 MySQL 5.6.23 Crashes when SET GLOBAL server_audit_logging=OFF;Alexey Botchkov2017-09-191-2/+8
| | * | | | | Merge branch '10.2' of github.com:MariaDB/server into 10.2Vicențiu Ciorbaru2017-09-2016-388/+220
| | |\ \ \ \ \
| | | * | | | | Remove DICT_UNIVERSALMarko Mäkelä2017-09-205-20/+4
| | | * | | | | Fix a typoMarko Mäkelä2017-09-201-1/+1
| | | * | | | | Introduce page_rec_is_leaf() and clean up page0page.hMarko Mäkelä2017-09-209-363/+214
| | | * | | | | Correct a test resultMarko Mäkelä2017-09-191-4/+1
| | * | | | | | Update libmariadb submoduleVicențiu Ciorbaru2017-09-201-0/+0
| | * | | | | | Update testcase post mergeVicențiu Ciorbaru2017-09-202-0/+16
| | * | | | | | Remove libmariadbclient18.links post mergeVicențiu Ciorbaru2017-09-201-3/+0
| | * | | | | | MDEV-13354: Server crashes in find_field_in_tables upon PS with window functi...Vicențiu Ciorbaru2017-09-193-2/+25
| | * | | | | | MDEV-13774: Server Crash on Execute of SQL StatementVicențiu Ciorbaru2017-09-194-2/+277
| | * | | | | | MDEV-13649: Server crashes in set_field_to_null_with_conversions or in Field:...Vicențiu Ciorbaru2017-09-193-5/+85
| | * | | | | | MDEV-13358: FIRST_V throw SQL Fehler (1292): Incorrect datetime valueVicențiu Ciorbaru2017-09-195-17/+72
| | * | | | | | Merge remote-tracking branch 'connect/10.2' into 10.2bb-10.2-vicentiu2Vicențiu Ciorbaru2017-09-1932-214/+440
| | |\ \ \ \ \ \
| | | * | | | | | Enable MONGO for the C driver. Modified: modified: storage/connect/CMakeLis...Olivier Bertrand2017-09-111-3/+4
| | | * | | | | | - Update version numberOlivier Bertrand2017-09-0415-295/+306
| | | * | | | | | - Add more trace to tbl_thread.test (to debug failure)Olivier Bertrand2017-09-022-0/+8
| | | * | | | | | Disable MONGO modified: storage/connect/CMakeLists.txtOlivier Bertrand2017-09-021-2/+2
| | | * | | | | | - Fix MongoDB C Driver adding for CMAKE.Olivier Bertrand2017-09-021-27/+26
| | | * | | | | | - Set MONGO_ENABLEDOlivier Bertrand2017-08-3115-16/+23
| | | * | | | | | - New distribution enabling or disabling the MONGO table typeOlivier Bertrand2017-08-298-74/+122
| | | * | | | | | - Fix MDEV-13621 Replace sprintf by strcpy for opvalOlivier Bertrand2017-08-264-6/+15
| | | * | | | | | - Fix MDEV-13621 JDBC UPDATE containing single or double quote chars produces...Olivier Bertrand2017-08-2614-308/+481
| | | * | | | | | - Fix failing test tbl_thread on linuxOlivier Bertrand2017-08-172-32/+16
| | * | | | | | | Merge branch '10.1' into 10.2Vicențiu Ciorbaru2017-09-1968-845/+1364
| | |\ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | / / / | | | | |_|/ / / | | | |/| | | |
| | | * | | | | Merge branch '10.0' into 10.1Vicențiu Ciorbaru2017-09-19193-3008/+43237
| | | |\ \ \ \ \ | | | | | |_|_|/ | | | | |/| | |