Skip to content

Commit

Permalink
MDEV-9739 Assertion `m_status == DA_ERROR || m_status == DA_OK' faile…
Browse files Browse the repository at this point in the history
…d in Diagnostics_area::message() ; connect.xml* tests fail in buildbot
  • Loading branch information
vuvova committed Mar 19, 2016
1 parent d70697b commit a1782b4
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 0 deletions.
3 changes: 3 additions & 0 deletions sql/sql_show.cc
Original file line number Diff line number Diff line change
Expand Up @@ -5063,7 +5063,10 @@ static int get_schema_tables_record(THD *thd, TABLE_LIST *tables,
HA_STATUS_TIME |
HA_STATUS_VARIABLE_EXTRA |
HA_STATUS_AUTO)) != 0)
{
file->print_error(info_error, MYF(0));
goto err;
}

enum row_type row_type = file->get_row_type();
switch (row_type) {
Expand Down
12 changes: 12 additions & 0 deletions storage/connect/mysql-test/connect/r/infoschema-9739.result
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
Warnings:
Warning 1105 No file name. Table will use t1.xml
create table t1 (i int) engine=Connect table_type=XML;
Warnings:
Warning 1105 No file name. Table will use t1.xml
select * from information_schema.tables where create_options like '%table_type=XML%';
TABLE_CATALOG TABLE_SCHEMA TABLE_NAME TABLE_TYPE ENGINE VERSION ROW_FORMAT TABLE_ROWS AVG_ROW_LENGTH DATA_LENGTH MAX_DATA_LENGTH INDEX_LENGTH DATA_FREE AUTO_INCREMENT CREATE_TIME UPDATE_TIME CHECK_TIME TABLE_COLLATION CHECKSUM CREATE_OPTIONS TABLE_COMMENT
Warnings:
Warning 1286 Unknown storage engine 'InnoDB'
Warning 1286 Unknown storage engine 'InnoDB'
Warning 1296 Got error 174 'File t1.xml not found' from CONNECT
drop table t1;
9 changes: 9 additions & 0 deletions storage/connect/mysql-test/connect/t/infoschema-9739.test
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#
# MDEV-9739 Assertion `m_status == DA_ERROR || m_status == DA_OK' failed in Diagnostics_area::message() ; connect.xml* tests fail in buildbot
#

--source have_libxml2.inc

create table t1 (i int) engine=Connect table_type=XML;
select * from information_schema.tables where create_options like '%table_type=XML%';
drop table t1;

0 comments on commit a1782b4

Please sign in to comment.