mirror of
https://github.com/MariaDB/server.git
synced 2026-05-06 07:05:33 +02:00
Cherry-pick some changes from innodb-5.1-ss2545 snapshot. Includes fixes for
Bug#37531, Bug#36941, Bug#36941, Bug#36942, Bug#38185. Also include test case from Bug 34300 which was left out from earlier snapshot (5.1-ss2387). Also include fix for Bug #29507, "TRUNCATE shows to many rows effected", since the fix for Bug 37531 depends on it.
This commit is contained in:
parent
c8fad67da7
commit
9eb2ebd4d1
11 changed files with 433 additions and 9 deletions
|
|
@ -3549,8 +3549,7 @@ static int get_schema_tables_record(THD *thd, TABLE_LIST *tables,
|
|||
|
||||
if(file)
|
||||
{
|
||||
file->info(HA_STATUS_VARIABLE | HA_STATUS_TIME | HA_STATUS_AUTO |
|
||||
HA_STATUS_NO_LOCK);
|
||||
file->info(HA_STATUS_VARIABLE | HA_STATUS_TIME | HA_STATUS_AUTO);
|
||||
enum row_type row_type = file->get_row_type();
|
||||
switch (row_type) {
|
||||
case ROW_TYPE_NOT_USED:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue