diff options
author | unknown <jani@a88-113-38-195.elisa-laajakaista.fi> | 2008-03-13 23:35:52 +0200 |
---|---|---|
committer | unknown <jani@a88-113-38-195.elisa-laajakaista.fi> | 2008-03-13 23:35:52 +0200 |
commit | 6ef32fd0a91148b9758acaa1e2ebde3110e96781 (patch) | |
tree | 45d9abbd3b89bec4d4880130013f666463dccb90 /storage | |
parent | abf07615394340cf8100afdb192b37d518cf3910 (diff) | |
parent | 269ebe54211cf96c4e64fa7268a1414588ca1de8 (diff) | |
download | mariadb-git-6ef32fd0a91148b9758acaa1e2ebde3110e96781.tar.gz |
Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-main
into a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-marvel
client/mysqldump.c:
Auto merged
include/my_global.h:
Auto merged
mysql-test/lib/mtr_report.pl:
Auto merged
sql/handler.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/log.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_plugin.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.h:
Auto merged
mysys/my_create.c:
SCCS merged
Diffstat (limited to 'storage')
-rw-r--r-- | storage/example/ha_example.cc | 14 | ||||
-rw-r--r-- | storage/heap/ha_heap.cc | 4 | ||||
-rw-r--r-- | storage/ndb/src/kernel/blocks/backup/Backup.hpp | 3 | ||||
-rw-r--r-- | storage/ndb/src/kernel/blocks/pgman.cpp | 4 |
4 files changed, 20 insertions, 5 deletions
diff --git a/storage/example/ha_example.cc b/storage/example/ha_example.cc index 6d9f4841e06..604722c3c8c 100644 --- a/storage/example/ha_example.cc +++ b/storage/example/ha_example.cc @@ -849,6 +849,7 @@ struct st_mysql_storage_engine example_storage_engine= { MYSQL_HANDLERTON_INTERFACE_VERSION }; static ulong srv_enum_var= 0; +static ulong srv_ulong_var= 0; const char *enum_var_names[]= { @@ -871,8 +872,21 @@ static MYSQL_SYSVAR_ENUM( 0, // def &enum_var_typelib); // typelib +static MYSQL_SYSVAR_ULONG( + ulong_var, + srv_ulong_var, + PLUGIN_VAR_RQCMDARG, + "0..1000", + NULL, + NULL, + 8, + 0, + 1000, + 0); + static struct st_mysql_sys_var* example_system_variables[]= { MYSQL_SYSVAR(enum_var), + MYSQL_SYSVAR(ulong_var), NULL }; diff --git a/storage/heap/ha_heap.cc b/storage/heap/ha_heap.cc index 601d4612dda..be2914adac4 100644 --- a/storage/heap/ha_heap.cc +++ b/storage/heap/ha_heap.cc @@ -61,8 +61,8 @@ static handler *heap_create_handler(handlerton *hton, *****************************************************************************/ ha_heap::ha_heap(handlerton *hton, TABLE_SHARE *table_arg) - :handler(hton, table_arg), file(0), records_changed(0), internal_table(0), - key_stat_version(0) + :handler(hton, table_arg), file(0), records_changed(0), key_stat_version(0), + internal_table(0) {} diff --git a/storage/ndb/src/kernel/blocks/backup/Backup.hpp b/storage/ndb/src/kernel/blocks/backup/Backup.hpp index ad6e3b8fadc..e28b322adb3 100644 --- a/storage/ndb/src/kernel/blocks/backup/Backup.hpp +++ b/storage/ndb/src/kernel/blocks/backup/Backup.hpp @@ -425,8 +425,9 @@ public: ArrayPool<TriggerRecord> & trp) : slaveState(b, validSlaveTransitions, validSlaveTransitionsCount,1) , tables(tp), triggers(trp), files(bp) - , masterData(b), backup(b) , ctlFilePtr(RNIL), logFilePtr(RNIL), dataFilePtr(RNIL) + , masterData(b), backup(b) + { } diff --git a/storage/ndb/src/kernel/blocks/pgman.cpp b/storage/ndb/src/kernel/blocks/pgman.cpp index aa1f04c720c..21295944eab 100644 --- a/storage/ndb/src/kernel/blocks/pgman.cpp +++ b/storage/ndb/src/kernel/blocks/pgman.cpp @@ -259,14 +259,14 @@ Pgman::execCONTINUEB(Signal* signal) // page entry Pgman::Page_entry::Page_entry(Uint32 file_no, Uint32 page_no) : - m_state(0), m_file_no(file_no), + m_state(0), m_page_no(page_no), m_real_page_i(RNIL), - m_copy_page_i(RNIL), m_lsn(0), m_last_lcp(0), m_dirty_count(0), + m_copy_page_i(RNIL), m_busy_count(0), m_requests() { |