mirror of
https://github.com/MariaDB/server.git
synced 2026-05-15 19:37:16 +02:00
- Fix a regression bug on (XML) HTML tables.
modified: tabxml.cpp added: xml_html.test xml_html.result beers.xml coffee.htm - Fix MDEV-7935 by suppressing error resetting code in delete_or_rename_table. However, the issue is that this code was added because without it an assertion was raised in some cases. Unfortunately I can't remember what were these cases. Therefore fixing it in this case will perhaps make a new crash happening on another cases. modified: ha_connect.cc - Add the UDF Json_Array_Delete. modified: jsonudf.cpp
This commit is contained in:
parent
1b07ba57a4
commit
12bebceb8e
7 changed files with 201 additions and 18 deletions
|
|
@ -4632,8 +4632,13 @@ int ha_connect::delete_or_rename_table(const char *name, const char *to)
|
|||
|
||||
} // endif pos
|
||||
|
||||
} else // Avoid infamous DBUG_ASSERT
|
||||
thd->get_stmt_da()->reset_diagnostics_area();
|
||||
} // endif open_table_def
|
||||
|
||||
// This below was done to avoid DBUG_ASSERT in some case that
|
||||
// we don't know anymore what they were. It was suppressed because
|
||||
// it did cause assertion in other cases (see MDEV-7935)
|
||||
// } else // Avoid infamous DBUG_ASSERT
|
||||
// thd->get_stmt_da()->reset_diagnostics_area();
|
||||
|
||||
free_table_share(share);
|
||||
} else // Temporary file
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue