| List: | Commits | « Previous MessageNext Message » | |
| From: | antony | Date: | August 30 2006 11:27pm |
| Subject: | bk commit into 5.1 tree (acurtis:1.2288) | ||
| View as plain text | |||
Below is the list of changes that have just been committed into a local 5.1 repository of antony. When antony does a push these changes will be propagated to the main repository and, within 24 hours after the push, to the public repository. For information on how to access the public repository see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html ChangeSet@stripped, 2006-08-30 14:27:29-07:00, acurtis@stripped +14 -0 add 2 placeholder values for config and system variables. include/mysql/plugin.h@stripped, 2006-08-30 14:27:17-07:00, acurtis@stripped +3 -1 add 2 placeholder values for config and system variables. plugin/fulltext/plugin_example.c@stripped, 2006-08-30 14:27:17-07:00, acurtis@stripped +3 -1 add 2 placeholder values for config and system variables. sql/ha_innodb.cc@stripped, 2006-08-30 14:27:17-07:00, acurtis@stripped +3 -1 add 2 placeholder values for config and system variables. sql/ha_ndbcluster.cc@stripped, 2006-08-30 14:27:17-07:00, acurtis@stripped +3 -1 add 2 placeholder values for config and system variables. sql/ha_partition.cc@stripped, 2006-08-30 14:27:17-07:00, acurtis@stripped +3 -1 add 2 placeholder values for config and system variables. sql/log.cc@stripped, 2006-08-30 14:27:18-07:00, acurtis@stripped +3 -1 add 2 placeholder values for config and system variables. storage/archive/ha_archive.cc@stripped, 2006-08-30 14:27:18-07:00, acurtis@stripped +3 -1 add 2 placeholder values for config and system variables. storage/blackhole/ha_blackhole.cc@stripped, 2006-08-30 14:27:18-07:00, acurtis@stripped +3 -1 add 2 placeholder values for config and system variables. storage/csv/ha_tina.cc@stripped, 2006-08-30 14:27:18-07:00, acurtis@stripped +3 -1 add 2 placeholder values for config and system variables. storage/example/ha_example.cc@stripped, 2006-08-30 14:27:18-07:00, acurtis@stripped +3 -1 add 2 placeholder values for config and system variables. storage/federated/ha_federated.cc@stripped, 2006-08-30 14:27:18-07:00, acurtis@stripped +3 -1 add 2 placeholder values for config and system variables. storage/heap/ha_heap.cc@stripped, 2006-08-30 14:27:18-07:00, acurtis@stripped +3 -1 add 2 placeholder values for config and system variables. storage/myisam/ha_myisam.cc@stripped, 2006-08-30 14:27:18-07:00, acurtis@stripped +3 -1 add 2 placeholder values for config and system variables. storage/myisammrg/ha_myisammrg.cc@stripped, 2006-08-30 14:27:18-07:00, acurtis@stripped +3 -1 add 2 placeholder values for config and system variables. # This is a BitKeeper patch. What follows are the unified diffs for the # set of deltas contained in the patch. The rest of the patch, the part # that BitKeeper cares about, is below these diffs. # User: acurtis # Host: ltantony.xiphis.org # Root: /anubis/antony/work2/plugins-5.1 --- 1.95/storage/heap/ha_heap.cc 2006-08-30 14:27:43 -07:00 +++ 1.96/storage/heap/ha_heap.cc 2006-08-30 14:27:43 -07:00 @@ -708,6 +708,8 @@ heap_init, NULL, 0x0100, /* 1.0 */ - 0 + NULL, /* status variables */ + NULL, /* system variables */ + NULL /* config options */ } mysql_declare_plugin_end; --- 1.190/storage/myisam/ha_myisam.cc 2006-08-30 14:27:43 -07:00 +++ 1.191/storage/myisam/ha_myisam.cc 2006-08-30 14:27:43 -07:00 @@ -1800,7 +1800,9 @@ myisam_init, /* Plugin Init */ NULL, /* Plugin Deinit */ 0x0100, /* 1.0 */ - 0 + NULL, /* status variables */ + NULL, /* system variables */ + NULL /* config options */ } mysql_declare_plugin_end; --- 1.96/storage/myisammrg/ha_myisammrg.cc 2006-08-30 14:27:43 -07:00 +++ 1.97/storage/myisammrg/ha_myisammrg.cc 2006-08-30 14:27:43 -07:00 @@ -573,6 +573,8 @@ myisammrg_init, /* Plugin Init */ NULL, /* Plugin Deinit */ 0x0100, /* 1.0 */ - 0 + NULL, /* status variables */ + NULL, /* system variables */ + NULL /* config options */ } mysql_declare_plugin_end; --- 1.223/sql/log.cc 2006-08-30 14:27:43 -07:00 +++ 1.224/sql/log.cc 2006-08-30 14:27:43 -07:00 @@ -4678,6 +4678,8 @@ binlog_init, /* Plugin Init */ NULL, /* Plugin Deinit */ 0x0100 /* 1.0 */, - 0 + NULL, /* status variables */ + NULL, /* system variables */ + NULL /* config options */ } mysql_declare_plugin_end; --- 1.99/storage/archive/ha_archive.cc 2006-08-30 14:27:43 -07:00 +++ 1.100/storage/archive/ha_archive.cc 2006-08-30 14:27:43 -07:00 @@ -1583,7 +1583,9 @@ 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; --- 1.58/storage/csv/ha_tina.cc 2006-08-30 14:27:43 -07:00 +++ 1.59/storage/csv/ha_tina.cc 2006-08-30 14:27:43 -07:00 @@ -1529,7 +1529,9 @@ 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; --- 1.41/storage/example/ha_example.cc 2006-08-30 14:27:43 -07:00 +++ 1.42/storage/example/ha_example.cc 2006-08-30 14:27:43 -07:00 @@ -715,7 +715,9 @@ 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; --- 1.38/storage/blackhole/ha_blackhole.cc 2006-08-30 14:27:43 -07:00 +++ 1.39/storage/blackhole/ha_blackhole.cc 2006-08-30 14:27:43 -07:00 @@ -223,6 +223,8 @@ blackhole_init, /* Plugin Init */ NULL, /* Plugin Deinit */ 0x0100 /* 1.0 */, - 0 + NULL, /* status variables */ + NULL, /* system variables */ + NULL /* config options */ } mysql_declare_plugin_end; --- 1.353/sql/ha_ndbcluster.cc 2006-08-30 14:27:43 -07:00 +++ 1.354/sql/ha_ndbcluster.cc 2006-08-30 14:27:43 -07:00 @@ -10598,7 +10598,9 @@ ndbcluster_init, /* Plugin Init */ NULL, /* Plugin Deinit */ 0x0100 /* 1.0 */, - ndb_status_variables_export + ndb_status_variables_export,/* status variables */ + NULL, /* system variables */ + NULL /* config options */ } mysql_declare_plugin_end; --- 1.286/sql/ha_innodb.cc 2006-08-30 14:27:43 -07:00 +++ 1.287/sql/ha_innodb.cc 2006-08-30 14:27:43 -07:00 @@ -7623,7 +7623,9 @@ innobase_init, /* Plugin Init */ NULL, /* Plugin Deinit */ 0x0100 /* 1.0 */, - innodb_status_variables_export + innodb_status_variables_export,/* status variables */ + NULL, /* system variables */ + NULL /* config options */ } mysql_declare_plugin_end; --- 1.16/include/mysql/plugin.h 2006-08-30 14:27:43 -07:00 +++ 1.17/include/mysql/plugin.h 2006-08-30 14:27:43 -07:00 @@ -60,7 +60,7 @@ builtin_ ## NAME ## _sizeof_struct_st_plugin, \ builtin_ ## NAME ## _plugin) -#define mysql_declare_plugin_end ,{0,0,0,0,0,0,0,0,0}} +#define mysql_declare_plugin_end ,{0,0,0,0,0,0,0,0,0,0,0}} /* declarations for SHOW STATUS support in plugins @@ -96,6 +96,8 @@ int (*deinit)(void); /* the function to invoke when plugin is unloaded */ unsigned int version; /* plugin version (for SHOW PLUGINS) */ struct st_mysql_show_var *status_vars; + void * __reserved1; /* placeholder for system variables */ + void * __reserved2; /* placeholder for config options */ }; /************************************************************************* --- 1.66/sql/ha_partition.cc 2006-08-30 14:27:43 -07:00 +++ 1.67/sql/ha_partition.cc 2006-08-30 14:27:43 -07:00 @@ -5598,7 +5598,9 @@ partition_initialize, /* Plugin Init */ NULL, /* Plugin Deinit */ 0x0100, /* 1.0 */ - 0 + NULL, /* status variables */ + NULL, /* system variables */ + NULL /* config options */ } mysql_declare_plugin_end; --- 1.76/storage/federated/ha_federated.cc 2006-08-30 14:27:43 -07:00 +++ 1.77/storage/federated/ha_federated.cc 2006-08-30 14:27:43 -07:00 @@ -2896,7 +2896,9 @@ 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; --- 1.11/plugin/fulltext/plugin_example.c 2006-08-30 14:27:43 -07:00 +++ 1.12/plugin/fulltext/plugin_example.c 2006-08-30 14:27:43 -07:00 @@ -225,7 +225,9 @@ simple_parser_plugin_init, /* init function (when loaded) */ simple_parser_plugin_deinit,/* deinit function (when unloaded) */ 0x0001, /* version */ - simple_status /* status variables */ + simple_status, /* status variables */ + NULL, /* system variables */ + NULL /* config options */ } mysql_declare_plugin_end;
| Thread | ||
|---|---|---|
| • bk commit into 5.1 tree (acurtis:1.2288) | antony | 30 Aug |
© 1995-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
Page generated in 0.448 sec. using MySQL 5.1.14-beta-log