diff options
| author | unknown <patg@patrick.local> | 2005-04-01 12:32:17 -0800 |
|---|---|---|
| committer | unknown <patg@patrick.local> | 2005-04-01 12:32:17 -0800 |
| commit | c0333ecee42a4de499b3377cfa21d7b5af1ddd2b (patch) | |
| tree | 389228d07d324be3e962fefab032b134daa8021a /sql/ha_innodb.h | |
| parent | 844acf9a66bb85ea0604f385efdaf2c655fd957a (diff) | |
| parent | bd2da82b2131241ce960bb02075aba2689ed1a3a (diff) | |
| download | mariadb-git-c0333ecee42a4de499b3377cfa21d7b5af1ddd2b.tar.gz | |
5.0 to 5.1 merge
mysql-test/r/grant.result:
Auto merged
scripts/mysql_create_system_tables.sh:
Auto merged
scripts/mysql_fix_privilege_tables.sql:
Auto merged
sql/Makefile.am:
Auto merged
sql/log.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/slave.h:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
configure.in:
merge of 5.0 to 5.1, version info and NDB_VERSION_() conflicts
libmysqld/Makefile.am:
merge of Makefile sql_sources list
sql/sql_acl.h:
merge, no need to hand resolve
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
Diffstat (limited to 'sql/ha_innodb.h')
| -rw-r--r-- | sql/ha_innodb.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/ha_innodb.h b/sql/ha_innodb.h index e1ed3a486cf..6ad385ae848 100644 --- a/sql/ha_innodb.h +++ b/sql/ha_innodb.h @@ -47,7 +47,7 @@ class ha_innobase: public handler THD* user_thd; /* the thread handle of the user currently using the handle; this is set in external_lock function */ - ulong last_query_id; /* the latest query id where the + query_id_t last_query_id; /* the latest query id where the handle was used */ THR_LOCK_DATA lock; INNOBASE_SHARE *share; |