summaryrefslogtreecommitdiff
path: root/handler/ha_innodb.h
diff options
context:
space:
mode:
authorVadim Tkachenko <vadim@percona.com>2009-03-25 23:11:11 -0700
committerVadim Tkachenko <vadim@percona.com>2009-03-25 23:11:11 -0700
commit107072563d771422c9bbb9aeeedce8ae19c5b838 (patch)
tree3ed2f631ee8efd33f83fa406370be3355f305b45 /handler/ha_innodb.h
parent4281699837ef7e5f88d5a04ac0b33bd8b9782881 (diff)
downloadmariadb-git-107072563d771422c9bbb9aeeedce8ae19c5b838.tar.gz
porting to 1.0.3
Diffstat (limited to 'handler/ha_innodb.h')
-rw-r--r--handler/ha_innodb.h39
1 files changed, 26 insertions, 13 deletions
diff --git a/handler/ha_innodb.h b/handler/ha_innodb.h
index dbb24e99901..c08dd3ed173 100644
--- a/handler/ha_innodb.h
+++ b/handler/ha_innodb.h
@@ -1,17 +1,20 @@
-/* Copyright (C) 2000-2005 MySQL AB && Innobase Oy
+/*****************************************************************************
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+Copyright (c) 2000, 2009, MySQL AB & Innobase Oy. All Rights Reserved.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
+This program is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free Software
+Foundation; version 2 of the License.
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
+This program is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along with
+this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+Place, Suite 330, Boston, MA 02111-1307 USA
+
+*****************************************************************************/
/*
This file is based on ha_berkeley.h of MySQL distribution
@@ -27,8 +30,9 @@
typedef struct st_innobase_share {
THR_LOCK lock;
pthread_mutex_t mutex;
- char *table_name;
- uint table_name_length,use_count;
+ const char* table_name;
+ uint use_count;
+ void* table_name_hash;
} INNOBASE_SHARE;
@@ -268,3 +272,12 @@ convert_error_code_to_mysql(
int error, /* in: InnoDB error code */
ulint flags, /* in: InnoDB table flags, or 0 */
MYSQL_THD thd); /* in: user thread handle or NULL */
+
+/*************************************************************************
+Allocates an InnoDB transaction for a MySQL handler object. */
+extern "C"
+trx_t*
+innobase_trx_allocate(
+/*==================*/
+ /* out: InnoDB transaction handle */
+ MYSQL_THD thd); /* in: user thread handle */