summaryrefslogtreecommitdiff
path: root/sql/ha_ndbcluster.cc
diff options
context:
space:
mode:
authorAlexander Nozdrin <alik@sun.com>2009-11-02 14:10:04 +0300
committerAlexander Nozdrin <alik@sun.com>2009-11-02 14:10:04 +0300
commita708ba6524f27d0f0bc3bc4b4b9952f372d38bd0 (patch)
tree52d813ba1e4f0b538b1f175a1d157d865cce8a22 /sql/ha_ndbcluster.cc
parent487bfd56d4386fe9abbd4beb80d759b0c5c95909 (diff)
parent46aa4c2672e2d0b1727dde5b80bd5039adbf96f6 (diff)
downloadmariadb-git-a708ba6524f27d0f0bc3bc4b4b9952f372d38bd0.tar.gz
Manual merge from mysql-next-mr.
Diffstat (limited to 'sql/ha_ndbcluster.cc')
-rw-r--r--sql/ha_ndbcluster.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc
index c30ed826bf5..f9f3db47e21 100644
--- a/sql/ha_ndbcluster.cc
+++ b/sql/ha_ndbcluster.cc
@@ -10451,7 +10451,8 @@ static int ndbcluster_fill_files_table(handlerton *hton,
continue;
ERR_RETURN(ndberr);
}
-
+ table->field[IS_FILES_TABLE_CATALOG]->store(STRING_WITH_LEN("def"),
+ system_charset_info);
table->field[IS_FILES_FILE_NAME]->set_notnull();
table->field[IS_FILES_FILE_NAME]->store(elt.name, strlen(elt.name),
system_charset_info);