diff options
| author | unknown <monty@mysql.com> | 2004-10-27 19:52:41 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-10-27 19:52:41 +0300 |
| commit | e646f8f2d19fbfd24c8cc4ce62322691e88d12d1 (patch) | |
| tree | d9b411a738093cebf4896002805fdc91ca117fb1 /sql/mysql_priv.h | |
| parent | 55833fb49bf8570ee11d4b85b143a9a3975733fa (diff) | |
| parent | 3bdd7e77fdb66acb4d051dec2b1c4fd136a49f9c (diff) | |
| download | mariadb-git-e646f8f2d19fbfd24c8cc4ce62322691e88d12d1.tar.gz | |
Merge with 4.0
BitKeeper/deleted/.del-innodb-lock-master.opt~f76a4a1999728f87:
Auto merged
innobase/include/trx0sys.h:
Auto merged
innobase/srv/srv0srv.c:
Auto merged
innobase/trx/trx0purge.c:
Auto merged
innobase/trx/trx0rseg.c:
Auto merged
mysql-test/r/innodb-lock.result:
Auto merged
mysql-test/t/innodb-lock.test:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/mysqld.cc:
Use local version during merge
Diffstat (limited to 'sql/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 18944aebad9..770b7057661 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -681,6 +681,7 @@ int mysql_ha_flush(THD *thd, TABLE_LIST *tables, uint mode_flags); #define MYSQL_HA_FLUSH_ALL 0x02 /* sql_base.cc */ +#define TMP_TABLE_KEY_EXTRA 8 void set_item_name(Item *item,char *pos,uint length); bool add_field_to_list(THD *thd, char *field_name, enum enum_field_types type, char *length, char *decimal, |