diff options
| author | unknown <brian@zim.(none)> | 2006-09-28 10:51:56 -0700 |
|---|---|---|
| committer | unknown <brian@zim.(none)> | 2006-09-28 10:51:56 -0700 |
| commit | 4de03074d318aa485403b463c51e4b5bf7c6ba29 (patch) | |
| tree | 3ac295a506b2714f5b298c281e0b068d9dde1e91 /storage/csv | |
| parent | 2d48a1f2a3c3539a977839b94a9d3fe703666753 (diff) | |
| parent | 62c30cd5d3ec011e7255f0de9c8bcea5ee83fc3d (diff) | |
| download | mariadb-git-4de03074d318aa485403b463c51e4b5bf7c6ba29.tar.gz | |
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1
into zim.(none):/home/brian/mysql/merge-5.1
storage/csv/ha_tina.cc:
Auto merged
storage/myisam/ha_myisam.cc:
Auto merged
Diffstat (limited to 'storage/csv')
| -rw-r--r-- | storage/csv/ha_tina.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/csv/ha_tina.cc b/storage/csv/ha_tina.cc index eaa11d5b061..b9fdfc1ae0c 100644 --- a/storage/csv/ha_tina.cc +++ b/storage/csv/ha_tina.cc @@ -1516,7 +1516,7 @@ bool ha_tina::check_if_incompatible_data(HA_CREATE_INFO *info, } struct st_mysql_storage_engine csv_storage_engine= -{ MYSQL_HANDLERTON_INTERFACE_VERSION, tina_hton }; +{ MYSQL_HANDLERTON_INTERFACE_VERSION }; mysql_declare_plugin(csv) { |