summaryrefslogtreecommitdiff
path: root/storage
diff options
context:
space:
mode:
authorunknown <stewart@mysql.com>2006-02-01 18:23:34 +1100
committerunknown <stewart@mysql.com>2006-02-01 18:23:34 +1100
commitb89ce88345b25414bb1a98bb914b6a45dbf1042c (patch)
treed2d7232bc6b7b93c1af5d645ef08d6b38a60b7d1 /storage
parentfe98fef92c5981158278aebcbd269a1213dfc2ac (diff)
parentf57e0d8ec4285ef3d5d0396c0ccd40b174cdce34 (diff)
downloadmariadb-git-b89ce88345b25414bb1a98bb914b6a45dbf1042c.tar.gz
Merge mysql.com:/home/stewart/Documents/MySQL/5.1/new
into mysql.com:/home/stewart/Documents/MySQL/5.1/wl1359 sql/ha_innodb.cc: Auto merged sql/ha_ndbcluster.cc: Auto merged sql/ha_partition.cc: Auto merged sql/handler.h: Auto merged sql/log.cc: Auto merged sql/sql_show.cc: SCCS merged
Diffstat (limited to 'storage')
-rw-r--r--storage/csv/ha_tina.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/storage/csv/ha_tina.cc b/storage/csv/ha_tina.cc
index 98d28fea93d..17c842f43e0 100644
--- a/storage/csv/ha_tina.cc
+++ b/storage/csv/ha_tina.cc
@@ -91,6 +91,7 @@ handlerton tina_hton= {
NULL, /* Partition flags */
NULL, /* Alter table flags */
NULL, /* Alter Tablespace */
+ NULL, /* Fill FILES Table */
HTON_CAN_RECREATE
};