diff options
| author | unknown <brian@zim.(none)> | 2005-10-02 20:13:18 -0700 |
|---|---|---|
| committer | unknown <brian@zim.(none)> | 2005-10-02 20:13:18 -0700 |
| commit | cdb571925795518303b64c7149698fc328cf5f65 (patch) | |
| tree | 0d6229a55087d478a4a78a95c498d0e963d270d8 /sql/examples | |
| parent | 05df35e3d67ce8519e3281be29b599c3283db039 (diff) | |
| parent | 5655d31d5ff64ecea103be523985fa755586673b (diff) | |
| download | mariadb-git-cdb571925795518303b64c7149698fc328cf5f65.tar.gz | |
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0
into zim.(none):/home/brian/mysql/fix-5.0
sql/ha_blackhole.cc:
Auto merged
sql/ha_heap.cc:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/examples/ha_example.cc:
Auto merged
sql/examples/ha_tina.cc:
Auto merged
sql/ha_archive.cc:
Auto merged
sql/ha_archive.h:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/ha_myisammrg.cc:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/handler.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_show.cc:
Auto merged
sql/ha_federated.cc:
Merge fix.
Diffstat (limited to 'sql/examples')
| -rw-r--r-- | sql/examples/ha_example.cc | 6 | ||||
| -rw-r--r-- | sql/examples/ha_tina.cc | 4 |
2 files changed, 9 insertions, 1 deletions
diff --git a/sql/examples/ha_example.cc b/sql/examples/ha_example.cc index d809398b69f..d340b9289ec 100644 --- a/sql/examples/ha_example.cc +++ b/sql/examples/ha_example.cc @@ -74,7 +74,11 @@ handlerton example_hton= { - "CSV", + "EXAMPLE", + SHOW_OPTION_YES, + "Example storage engine", + DB_TYPE_EXAMPLE_DB, + NULL, /* We do need to write one! */ 0, /* slot */ 0, /* savepoint size. */ NULL, /* close_connection */ diff --git a/sql/examples/ha_tina.cc b/sql/examples/ha_tina.cc index 559fdfbbbd9..86e6ae8a2de 100644 --- a/sql/examples/ha_tina.cc +++ b/sql/examples/ha_tina.cc @@ -56,6 +56,10 @@ static int tina_init= 0; handlerton tina_hton= { "CSV", + SHOW_OPTION_YES, + "CSV storage engine", + DB_TYPE_CSV_DB, + NULL, /* One needs to be written! */ 0, /* slot */ 0, /* savepoint size. */ NULL, /* close_connection */ |