diff options
| author | unknown <tulin@dl145b.mysql.com> | 2005-07-21 00:04:18 +0200 |
|---|---|---|
| committer | unknown <tulin@dl145b.mysql.com> | 2005-07-21 00:04:18 +0200 |
| commit | 68c558ee5f4dc31f7d0b2a30eba0e30bd61cba02 (patch) | |
| tree | c79866dc5ef4cd038a313224769f5c51e880b6db /sql/examples | |
| parent | cfc234da9056c94fe4312f8b54f9b964d0082f11 (diff) | |
| parent | 1ef3c69685de83a28ce44588f70df808c16df1ce (diff) | |
| download | mariadb-git-68c558ee5f4dc31f7d0b2a30eba0e30bd61cba02.tar.gz | |
merge
sql/field.cc:
Auto merged
sql/ha_berkeley.cc:
Auto merged
sql/ha_federated.cc:
Auto merged
sql/examples/ha_tina.cc:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/ha_myisammrg.cc:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/handler.h:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_select.h:
Auto merged
Diffstat (limited to 'sql/examples')
| -rw-r--r-- | sql/examples/ha_archive.cc | 23 | ||||
| -rw-r--r-- | sql/examples/ha_example.cc | 23 | ||||
| -rw-r--r-- | sql/examples/ha_tina.cc | 23 |
3 files changed, 39 insertions, 30 deletions
diff --git a/sql/examples/ha_archive.cc b/sql/examples/ha_archive.cc index e5c35ae019d..fd47b45ce52 100644 --- a/sql/examples/ha_archive.cc +++ b/sql/examples/ha_archive.cc @@ -140,16 +140,19 @@ static handlerton archive_hton = { "archive", 0, /* slot */ 0, /* savepoint size. */ - 0, /* close_connection */ - 0, /* savepoint */ - 0, /* rollback to savepoint */ - 0, /* releas savepoint */ - 0, /* commit */ - 0, /* rollback */ - 0, /* prepare */ - 0, /* recover */ - 0, /* commit_by_xid */ - 0, /* rollback_by_xid */ + NULL, /* close_connection */ + NULL, /* savepoint */ + NULL, /* rollback to savepoint */ + NULL, /* releas savepoint */ + NULL, /* commit */ + NULL, /* rollback */ + NULL, /* prepare */ + NULL, /* recover */ + NULL, /* commit_by_xid */ + NULL, /* rollback_by_xid */ + NULL, /* create_cursor_read_view */ + NULL, /* set_cursor_read_view */ + NULL, /* close_cursor_read_view */ HTON_NO_FLAGS }; diff --git a/sql/examples/ha_example.cc b/sql/examples/ha_example.cc index 2818c176cd3..a7e193b9730 100644 --- a/sql/examples/ha_example.cc +++ b/sql/examples/ha_example.cc @@ -77,16 +77,19 @@ static handlerton example_hton= { "CSV", 0, /* slot */ 0, /* savepoint size. */ - 0, /* close_connection */ - 0, /* savepoint */ - 0, /* rollback to savepoint */ - 0, /* release savepoint */ - 0, /* commit */ - 0, /* rollback */ - 0, /* prepare */ - 0, /* recover */ - 0, /* commit_by_xid */ - 0, /* rollback_by_xid */ + NULL, /* close_connection */ + NULL, /* savepoint */ + NULL, /* rollback to savepoint */ + NULL, /* release savepoint */ + NULL, /* commit */ + NULL, /* rollback */ + NULL, /* prepare */ + NULL, /* recover */ + NULL, /* commit_by_xid */ + NULL, /* rollback_by_xid */ + NULL, /* create_cursor_read_view */ + NULL, /* set_cursor_read_view */ + NULL, /* close_cursor_read_view */ HTON_NO_FLAGS }; diff --git a/sql/examples/ha_tina.cc b/sql/examples/ha_tina.cc index 50fec4e2883..8a31d9c0b22 100644 --- a/sql/examples/ha_tina.cc +++ b/sql/examples/ha_tina.cc @@ -58,16 +58,19 @@ static handlerton tina_hton= { "CSV", 0, /* slot */ 0, /* savepoint size. */ - 0, /* close_connection */ - 0, /* savepoint */ - 0, /* rollback to savepoint */ - 0, /* release savepoint */ - 0, /* commit */ - 0, /* rollback */ - 0, /* prepare */ - 0, /* recover */ - 0, /* commit_by_xid */ - 0, /* rollback_by_xid */ + NULL, /* close_connection */ + NULL, /* savepoint */ + NULL, /* rollback to savepoint */ + NULL, /* release savepoint */ + NULL, /* commit */ + NULL, /* rollback */ + NULL, /* prepare */ + NULL, /* recover */ + NULL, /* commit_by_xid */ + NULL, /* rollback_by_xid */ + NULL, /* create_cursor_read_view */ + NULL, /* set_cursor_read_view */ + NULL, /* close_cursor_read_view */ HTON_NO_FLAGS }; |