Merge branch '2.0' into develop-2.0-merge

2016-11-15 00:09:24 +02:00
parent 2202ec7a33 7ddb4d8e5a
commit 3c15b58891
26 changed files with 621 additions and 239 deletions
--- a/query_classifier/qc_sqlite/qc_sqlite.c
+++ b/query_classifier/qc_sqlite/qc_sqlite.c
@ -2417,7 +2417,7 @@ extern void maxscaleShow(Parse* pParse, MxsShow* pShow)
    case MXS_SHOW_COLUMNS:
        {
            info->types = QUERY_TYPE_READ;
-            update_names(info, "information_schema", "COLUMNS");
+            update_names(info, zDatabase, zName);
            if (pShow->data == MXS_SHOW_COLUMNS_FULL)
            {
                update_field_info(info, "information_schema", "COLUMNS", "COLLATION_NAME", u, NULL);