diff options
| author | unknown <brian@zim.(none)> | 2005-09-19 12:12:41 -0700 |
|---|---|---|
| committer | unknown <brian@zim.(none)> | 2005-09-19 12:12:41 -0700 |
| commit | 7a1cc524330aa13fc69e95ce5a5f993e28b9e7de (patch) | |
| tree | c03092e4987a8068f5d8987f31f325027325cb6e /sql/ha_federated.cc | |
| parent | da0f9ecef8afe617f048789ee95c841570540a5f (diff) | |
| parent | fa8fcecb8eb1dafeb51b69901fbf53682f81f4dc (diff) | |
| download | mariadb-git-7a1cc524330aa13fc69e95ce5a5f993e28b9e7de.tar.gz | |
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0
into zim.(none):/home/brian/mysql/mysql-5.0
sql/ha_federated.cc:
Auto merged
Diffstat (limited to 'sql/ha_federated.cc')
| -rw-r--r-- | sql/ha_federated.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/ha_federated.cc b/sql/ha_federated.cc index 2590e7881a4..d83b047d75a 100644 --- a/sql/ha_federated.cc +++ b/sql/ha_federated.cc @@ -693,7 +693,7 @@ error: /* Federated storage engine handlerton */ -static handlerton federated_hton= { +handlerton federated_hton= { "FEDERATED", 0, /* slot */ 0, /* savepoint size. */ |