diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-10-30 13:02:59 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-10-30 15:10:01 +0100 |
| commit | 44f6f445933e12cbc4cce63e2b7d983b9938d3b9 (patch) | |
| tree | f5230fb24510bb201eb33122a62939ce74588b83 /storage/connect/tabmysql.cpp | |
| parent | 8772824ce72a811ea92dd5cfb73602eb93237891 (diff) | |
| parent | f4b8b6b9a3ad4ce5e5218e2ec2dfe6dd34112e45 (diff) | |
| download | mariadb-git-44f6f445933e12cbc4cce63e2b7d983b9938d3b9.tar.gz | |
Merge branch '10.0' into 10.1
Diffstat (limited to 'storage/connect/tabmysql.cpp')
| -rw-r--r-- | storage/connect/tabmysql.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/storage/connect/tabmysql.cpp b/storage/connect/tabmysql.cpp index 605b3822430..ceffafac02c 100644 --- a/storage/connect/tabmysql.cpp +++ b/storage/connect/tabmysql.cpp @@ -1587,8 +1587,9 @@ bool TDBMYEXC::OpenDB(PGLOBAL g) /* Get the command to execute. */ /*********************************************************************/ if (!(Cmdlist = MakeCMD(g))) { - Myc.Close(); - return true; + // Next lines commented out because of CHECK TABLE + //Myc.Close(); + //return true; } // endif Cmdlist return false; @@ -1647,8 +1648,10 @@ int TDBMYEXC::ReadDB(PGLOBAL g) ++N; return RC_OK; - } else - return RC_EF; + } else { + PushWarning(g, this, 1); + return RC_EF; + } // endif Cmdlist } // end of ReadDB |