summaryrefslogtreecommitdiff
path: root/mysql-test/main
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '10.5' into 10.6Oleksandr Byelkin2021-11-024-37/+51
|\
| * Merge branch '10.4' into 10.5Oleksandr Byelkin2021-11-024-37/+51
| |\
| | * Merge branch '10.3' into 10.4Oleksandr Byelkin2021-11-024-37/+51
| | |\
| | | * move "bad" test in seperate file with valgrind prohibited (different size of ...Oleksandr Byelkin2021-11-024-37/+51
* | | | Merge 10.5 into 10.6Marko Mäkelä2021-10-285-0/+93
|\ \ \ \ | |/ / /
| * | | Merge 10.4 into 10.5Marko Mäkelä2021-10-285-0/+93
| |\ \ \ | | |/ /
| | * | Merge 10.3 into 10.4Marko Mäkelä2021-10-285-0/+93
| | |\ \ | | | |/
| | | * Merge 10.2 into 10.3Marko Mäkelä2021-10-285-0/+87
* | | | Merge 10.5 into 10.6Marko Mäkelä2021-10-2716-36/+314
|\ \ \ \ | |/ / /
| * | | Merge 10.4 into 10.5st-10.5-mergeMarko Mäkelä2021-10-2716-36/+314
| |\ \ \ | | |/ /
| | * | MDEV-22380 Assertion `name.length == strlen(name.str)' failed .. w/optimizer_...bb-10.4-bar-MDEV-22380Alexander Barkov2021-10-272-0/+44
| | * | Merge remote-tracking branch 'origin/10.3' into 10.4Alexander Barkov2021-10-2714-36/+270
| | |\ \ | | | |/
| | | * MDEV-22380: Assertion `name.length == strlen(name.str)' failed ...bb-10.3-bar-MDEV-22380Alexander Barkov2021-10-2714-36/+270
* | | | Merge 10.5 into 10.6Marko Mäkelä2021-10-2121-3/+506
|\ \ \ \ | |/ / /
| * | | Merge 10.4 into 10.5Marko Mäkelä2021-10-2121-3/+404
| |\ \ \ | | |/ /
| | * | Merge 10.3 into 10.4Marko Mäkelä2021-10-2114-0/+275
| | |\ \ | | | |/
| | | * Merge 10.2 into 10.3Marko Mäkelä2021-10-2114-0/+275
| | * | MDEV-20131 Assertion `!pk->has_virtual()' failedNikita Malyavin2021-10-203-0/+9
| | * | MDEV-26363 Passwords incorrectly expiring after MySQL5.7 -> MariaDB10.3 -> 10...bb-10.4-MDEV-26363-danielblack-zero_last_password_changedDaniel Black2021-10-202-0/+110
* | | | Merge 10.5 into 10.6Marko Mäkelä2021-10-1318-1/+387
|\ \ \ \ | |/ / /
| * | | Merge 10.4 into 10.5Marko Mäkelä2021-10-1318-1/+387
| |\ \ \ | | |/ /
| | * | Merge 10.3 into 10.4Marko Mäkelä2021-10-1318-1/+387
| | |\ \ | | | |/
| | | * Merge 10.2 into 10.3Marko Mäkelä2021-10-1312-0/+113
| | | * MDEV-22464 Server crash on UPDATE with nested subqueryAleksey Midenkov2021-10-112-0/+21
| | | * MDEV-25891 Computed default for INVISIBLE column is ignored in INSERTAleksey Midenkov2021-10-112-1/+29
| | | * MDEV-25444: mysql --binary-mode is not able to replay some mysqlbinlog outputsbb-10.3-25444Brandon Nesterenko2021-10-054-21/+224
| | | * MDEV-25444 mysql --binary-mode is not able to replay some mysqlbinlog outputsSachin Kumar2021-10-052-0/+21
* | | | Merge 10.5 into 10.6Marko Mäkelä2021-10-051-1/+1
|\ \ \ \ | |/ / /
| * | | Merge 10.4 into 10.5Marko Mäkelä2021-10-041-1/+1
| |\ \ \ | | |/ /
| | * | Merge 10.3 into 10.4Marko Mäkelä2021-10-042-4/+2
| | |\ \ | | | |/
| | | * Work around MDEV-26754 main.sp test fails for embedded serverMarko Mäkelä2021-10-042-4/+2
* | | | Merge 10.5 into 10.6Marko Mäkelä2021-09-3011-15/+141
|\ \ \ \ | |/ / /
| * | | Merge 10.4 into 10.5Marko Mäkelä2021-09-3011-15/+141
| |\ \ \ | | |/ /
| | * | Merge 10.3 into 10.4Marko Mäkelä2021-09-302-0/+6
| | |\ \ | | | |/
| | | * MDEV-20699 followup.Vladislav Vaintroub2021-09-292-0/+6
| | * | Merge 10.3 into 10.4Marko Mäkelä2021-09-299-15/+137
| | |\ \ | | | |/
| | | * Merge 10.2 into 10.3Marko Mäkelä2021-09-292-0/+92
| | | * MDEV-20699 mysqldump of routines causes MariaDB to get killed by oom-killerbb-10.3-wlad-MDEV-20699Vladislav Vaintroub2021-09-275-12/+42
* | | | Merge 10.5 into 10.6Marko Mäkelä2021-09-246-118/+13
|\ \ \ \ | |/ / /
| * | | Merge 10.4 into 10.5Marko Mäkelä2021-09-246-118/+13
| |\ \ \ | | |/ /
| | * | Merge 10.3 into 10.4Marko Mäkelä2021-09-224-109/+2
| | |\ \ | | | |/
| | | * Merge 10.2 into 10.3Marko Mäkelä2021-09-222-3/+3
| | | * MDEV-26521 Remove mdev-504.testVladislav Vaintroub2021-09-212-104/+0
| | * | Fixed random failure of main.truncate_notembeddedMonty2021-09-212-2/+4
| | * | Updated main.alias test to fix max_lengthMonty2021-09-212-7/+7
* | | | Merge 10.5 into 10.6Marko Mäkelä2021-09-172-7/+7
|\ \ \ \ | |/ / /
| * | | Merge 10.4 into 10.5Marko Mäkelä2021-09-172-7/+7
| |\ \ \ | | |/ /
| | * | Fixed alias.test to also works with psMonty2021-09-172-7/+7
* | | | Merge 10.5 into 10.6Marko Mäkelä2021-09-163-0/+39
|\ \ \ \ | |/ / /
| * | | Merge branch '10.4' into 10.5Monty2021-09-153-0/+39
| |\ \ \ | | |/ /