diff options
| author | unknown <brian@zim.(none)> | 2006-09-01 09:19:10 -0700 |
|---|---|---|
| committer | unknown <brian@zim.(none)> | 2006-09-01 09:19:10 -0700 |
| commit | b1e2cfce3d9817d8ac4105865df31b41a6526abe (patch) | |
| tree | 56323c4d8d59a1983163b7e1457585082043caad /storage | |
| parent | 16de51bc0783c8f97fe42e293932e93091c7100f (diff) | |
| parent | f1a02cad39b8bc81073cdf6d9ba309803da21b94 (diff) | |
| download | mariadb-git-b1e2cfce3d9817d8ac4105865df31b41a6526abe.tar.gz | |
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1
into zim.(none):/tmp/mysql-5.1-arch
sql/ha_innodb.cc:
Auto merged
sql/ha_partition.cc:
Auto merged
sql/handler.h:
Auto merged
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/archive/ha_archive.cc | 4 | ||||
| -rw-r--r-- | storage/blackhole/ha_blackhole.cc | 4 | ||||
| -rw-r--r-- | storage/csv/ha_tina.cc | 4 | ||||
| -rw-r--r-- | storage/example/ha_example.cc | 4 | ||||
| -rw-r--r-- | storage/federated/ha_federated.cc | 4 | ||||
| -rw-r--r-- | storage/heap/ha_heap.cc | 4 | ||||
| -rw-r--r-- | storage/myisam/ha_myisam.cc | 4 | ||||
| -rw-r--r-- | storage/myisammrg/ha_myisammrg.cc | 4 |
8 files changed, 24 insertions, 8 deletions
diff --git a/storage/archive/ha_archive.cc b/storage/archive/ha_archive.cc index de8b50fd2f3..3029b1db53e 100644 --- a/storage/archive/ha_archive.cc +++ b/storage/archive/ha_archive.cc @@ -1583,7 +1583,9 @@ mysql_declare_plugin(archive) archive_db_init, /* Plugin Init */ archive_db_done, /* Plugin Deinit */ 0x0100 /* 1.0 */, - 0 + NULL, /* status variables */ + NULL, /* system variables */ + NULL /* config options */ } mysql_declare_plugin_end; diff --git a/storage/blackhole/ha_blackhole.cc b/storage/blackhole/ha_blackhole.cc index d22d9372e0d..c1141cce5ae 100644 --- a/storage/blackhole/ha_blackhole.cc +++ b/storage/blackhole/ha_blackhole.cc @@ -223,6 +223,8 @@ mysql_declare_plugin(blackhole) blackhole_init, /* Plugin Init */ NULL, /* Plugin Deinit */ 0x0100 /* 1.0 */, - 0 + NULL, /* status variables */ + NULL, /* system variables */ + NULL /* config options */ } mysql_declare_plugin_end; diff --git a/storage/csv/ha_tina.cc b/storage/csv/ha_tina.cc index 2fe2afeb470..ce19202d745 100644 --- a/storage/csv/ha_tina.cc +++ b/storage/csv/ha_tina.cc @@ -1529,7 +1529,9 @@ mysql_declare_plugin(csv) tina_init_func, /* Plugin Init */ tina_done_func, /* Plugin Deinit */ 0x0100 /* 1.0 */, - 0 + NULL, /* status variables */ + NULL, /* system variables */ + NULL /* config options */ } mysql_declare_plugin_end; diff --git a/storage/example/ha_example.cc b/storage/example/ha_example.cc index 704ea757749..6986796cb2e 100644 --- a/storage/example/ha_example.cc +++ b/storage/example/ha_example.cc @@ -715,7 +715,9 @@ mysql_declare_plugin(example) example_init_func, /* Plugin Init */ example_done_func, /* Plugin Deinit */ 0x0001 /* 0.1 */, - 0 + NULL, /* status variables */ + NULL, /* system variables */ + NULL /* config options */ } mysql_declare_plugin_end; diff --git a/storage/federated/ha_federated.cc b/storage/federated/ha_federated.cc index 98f48b09ba6..456b6c73f3c 100644 --- a/storage/federated/ha_federated.cc +++ b/storage/federated/ha_federated.cc @@ -2896,7 +2896,9 @@ mysql_declare_plugin(federated) federated_db_init, /* Plugin Init */ NULL, /* Plugin Deinit */ 0x0100 /* 1.0 */, - 0 + NULL, /* status variables */ + NULL, /* system variables */ + NULL /* config options */ } mysql_declare_plugin_end; diff --git a/storage/heap/ha_heap.cc b/storage/heap/ha_heap.cc index 317f85d26f2..57777410bea 100644 --- a/storage/heap/ha_heap.cc +++ b/storage/heap/ha_heap.cc @@ -708,6 +708,8 @@ mysql_declare_plugin(heap) heap_init, NULL, 0x0100, /* 1.0 */ - 0 + NULL, /* status variables */ + NULL, /* system variables */ + NULL /* config options */ } mysql_declare_plugin_end; diff --git a/storage/myisam/ha_myisam.cc b/storage/myisam/ha_myisam.cc index 209478ee9a5..6a32ba95eee 100644 --- a/storage/myisam/ha_myisam.cc +++ b/storage/myisam/ha_myisam.cc @@ -1800,7 +1800,9 @@ mysql_declare_plugin(myisam) myisam_init, /* Plugin Init */ NULL, /* Plugin Deinit */ 0x0100, /* 1.0 */ - 0 + NULL, /* status variables */ + NULL, /* system variables */ + NULL /* config options */ } mysql_declare_plugin_end; diff --git a/storage/myisammrg/ha_myisammrg.cc b/storage/myisammrg/ha_myisammrg.cc index 8c767e32b83..2d1628e5e4f 100644 --- a/storage/myisammrg/ha_myisammrg.cc +++ b/storage/myisammrg/ha_myisammrg.cc @@ -573,6 +573,8 @@ mysql_declare_plugin(myisammrg) myisammrg_init, /* Plugin Init */ NULL, /* Plugin Deinit */ 0x0100, /* 1.0 */ - 0 + NULL, /* status variables */ + NULL, /* system variables */ + NULL /* config options */ } mysql_declare_plugin_end; |