diff options
| author | unknown <istruewing@chilla.local> | 2007-04-27 19:09:39 +0200 |
|---|---|---|
| committer | unknown <istruewing@chilla.local> | 2007-04-27 19:09:39 +0200 |
| commit | 2f664e46c69d5edf2b76763c872b71b956d45adc (patch) | |
| tree | bcce20c17922057e22634534a05e0f8d72242d4a /sql/ha_partition.h | |
| parent | 7148d00222bfd2dc6eb698622b85729ff5a86520 (diff) | |
| parent | 6cc76eb61cb190d5ec410ffe3bd2e064e7951e44 (diff) | |
| download | mariadb-git-2f664e46c69d5edf2b76763c872b71b956d45adc.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines
into chilla.local:/home/mydev/mysql-5.1-wl2936-two
client/mysql.cc:
Auto merged
client/mysqltest.c:
Auto merged
include/my_global.h:
Auto merged
include/my_sys.h:
Auto merged
mysql-test/lib/mtr_cases.pl:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/ndb_dd_basic.result:
Auto merged
mysql-test/r/variables.result:
Auto merged
mysql-test/t/ndb_dd_basic.test:
Auto merged
mysql-test/t/variables.test:
Auto merged
mysys/hash.c:
Auto merged
sql/event_queue.cc:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_partition.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_sum.cc:
Auto merged
sql/log.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_connect.cc:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_plugin.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/structs.h:
Auto merged
sql/table.cc:
Auto merged
storage/innobase/handler/ha_innodb.cc:
Auto merged
storage/innobase/handler/ha_innodb.h:
Auto merged
include/typelib.h:
WL#2936 - Falcon & MySQL plugin interface: server variables
Manual merge
mysys/typelib.c:
WL#2936 - Falcon & MySQL plugin interface: server variables
Manual merge
Diffstat (limited to 'sql/ha_partition.h')
| -rw-r--r-- | sql/ha_partition.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sql/ha_partition.h b/sql/ha_partition.h index a081e4bb472..f5695e91ee0 100644 --- a/sql/ha_partition.h +++ b/sql/ha_partition.h @@ -27,6 +27,7 @@ enum partition_keywords The partition implements the minimum of what you will probably need. */ +#ifdef NOT_USED typedef struct st_partition_share { char *table_name; @@ -34,6 +35,7 @@ typedef struct st_partition_share pthread_mutex_t mutex; THR_LOCK lock; } PARTITION_SHARE; +#endif #define PARTITION_BYTES_IN_POS 2 @@ -54,7 +56,7 @@ private: uint m_open_test_lock; // Open test_if_locked char *m_file_buffer; // Buffer with names char *m_name_buffer_ptr; // Pointer to first partition name - handlerton **m_engine_array; // Array of types of the handlers + plugin_ref *m_engine_array; // Array of types of the handlers handler **m_file; // Array of references to handler inst. uint m_file_tot_parts; // Debug handler **m_new_file; // Array of references to new handlers @@ -130,7 +132,9 @@ private: Variables for lock structures. */ THR_LOCK_DATA lock; /* MySQL lock */ +#ifdef NOT_USED PARTITION_SHARE *share; /* Shared lock info */ +#endif /* TRUE <=> this object was created with ha_partition::clone and doesn't |