mariadb/storage/innobase
Marko Mäkelä 5c93509aad After-merge fix: Correct a copyright statement
In the merge c51f85f882
the files row0trunc.cc and read0read.cc were not supposed
to be changed in MariaDB 10.3.

The row0trunc.cc code that was changed in MariaDB 10.2
commit 3db94d2403 does not exist,
because it was removed earlier in 10.3
commit 5a1868b58d.

When it comes to read0read.cc, as explained in the 10.2
commit e0271a7b43
the code had been moved to trx0sys.h in 10.3. In
10.3 commit 380069c235
appproriate mutex protection was added to checking the
transaction system state. The assertion expression was
properly updated in the earlier merge
commit acf6f92aa9.
2019-05-13 08:35:55 +03:00
..
btr Merge 10.2 into 10.3 2019-04-29 17:54:10 +03:00
buf Merge branch '10.2' into 10.3 2019-05-12 17:20:23 +02:00
data Merge 10.2 into 10.3 2019-05-03 20:14:09 +03:00
dict Merge branch '10.2' into 10.3 2019-05-12 17:20:23 +02:00
eval Fix most -Wsign-conversion in InnoDB 2018-04-28 20:45:45 +03:00
fil Merge branch '10.2' into 10.3 2019-05-12 17:20:23 +02:00
fsp MDEV-12266: Pass fil_space_t* to fseg_free_page() 2019-04-08 21:38:43 +03:00
fts Merge branch '10.2' into 10.3 2019-05-12 17:20:23 +02:00
fut review fixes 2018-02-16 22:15:51 +03:00
gis Merge branch '10.2' into 10.3 2019-05-12 17:20:23 +02:00
ha Merge 10.2 into 10.3 2018-11-19 18:45:53 +02:00
handler Merge branch '10.2' into 10.3 2019-05-12 17:20:23 +02:00
ibuf Merge 10.2 into 10.3 2019-04-25 09:05:52 +03:00
include Merge branch '10.2' into 10.3 2019-05-12 17:20:23 +02:00
lock Merge 10.2 into 10.3 2019-04-29 17:54:10 +03:00
log Merge branch '10.2' into 10.3 2019-05-12 17:20:23 +02:00
mach
mem Merge 10.2 into 10.3 2018-11-19 18:45:53 +02:00
mtr Merge 10.2 into 10.3 2018-11-19 18:45:53 +02:00
mysql-test/storage_engine Fix for MDEV-17449, typo in error message (#1146) 2019-03-24 21:24:28 +04:00
os Merge 10.2 into 10.3 2019-04-27 20:41:31 +03:00
page Merge 10.2 into 10.3 2019-04-07 11:49:50 +03:00
pars Merge 10.2 into 10.3 2019-04-02 13:48:42 +03:00
que Merge 10.2 into 10.3 2019-04-27 20:41:31 +03:00
read After-merge fix: Correct a copyright statement 2019-05-13 08:35:55 +03:00
rem Merge 10.2 into 10.3 2019-05-03 20:14:09 +03:00
row Merge branch '10.2' into 10.3 2019-05-12 17:20:23 +02:00
srv Merge branch '10.2' into 10.3 2019-05-12 17:20:23 +02:00
sync Merge 10.2 into 10.3 2018-11-30 09:38:56 +02:00
trx Merge 10.2 into 10.3 2019-05-03 20:14:09 +03:00
ut Merge branch '10.2' into 10.3 2019-05-12 17:20:23 +02:00
bzip2.cmake
CMakeLists.txt Merge 10.2 into 10.3 2019-03-27 13:27:04 +02:00
compile-innodb
COPYING.Google
COPYING.Percona
innodb.cmake Merge 10.2 into 10.3 2019-03-27 13:27:04 +02:00
lz4.cmake
lzma.cmake
lzo.cmake
plugin_exports
snappy.cmake