1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-21 21:22:27 +03:00
Commit Graph

8 Commits

Author SHA1 Message Date
0b73b96f9d Merge 10.1 into 10.2 2018-12-29 11:05:26 +02:00
68143c8905 MDEV-17470: Fix the test for --embedded 2018-12-29 10:57:26 +02:00
33caaba5c8 Merge 10.1 into 10.2 2018-12-28 17:40:38 +02:00
c5a5eaa9a9 MDEV-17470 Orphan temporary files after interrupted ALTER cause InnoDB: Operating system error number 17 and eventual fatal error 71
Orphan #sql* tables may remain after ALTER TABLE
was interrupted by timeout or KILL or client disconnect.

This is a regression caused by MDEV-16515.

Similar to temporary tables (MDEV-16647), we had better ignore the
KILL when dropping the original table in the final part of ALTER TABLE.

Closes #1020
2018-12-28 17:05:48 +02:00
32062cc61c Merge 10.1 into 10.2 2018-11-06 08:41:48 +02:00
30c3d6db32 MDEV-17533 Merge new release of InnoDB 5.6.42 to 10.0
Also, add a test for a bug that does not seem to affect MariaDB.
2018-10-25 13:05:23 +03:00
1494147cf6 Merge 10.1 into 10.2 2017-04-06 09:52:25 +03:00
8e36216a06 Import two ALTER TABLE…ALGORITHM=INPLACE tests from MySQL 5.6.
Also, revert part of MDEV-7685 that added an InnoDB abort when
ALTER TABLE…ALGORITHM=INPLACE is reporting that it ran out of
file space.
2017-04-05 14:46:35 +03:00