diff options
author | unknown <monty@donna.mysql.com> | 2000-09-16 04:27:49 +0300 |
---|---|---|
committer | unknown <monty@donna.mysql.com> | 2000-09-16 04:27:49 +0300 |
commit | 8c6b365e7d8f19985e4732024524ac666f0c596c (patch) | |
tree | b87f72722c003b64cdf08c50143e2cb3b2778317 /sql/mysql_priv.h | |
parent | ff1216a5a9c453b5c131f08687a99105dc1a391a (diff) | |
parent | 19b678eefe59529761691ddebece604107dcb42b (diff) | |
download | mariadb-git-8c6b365e7d8f19985e4732024524ac666f0c596c.tar.gz |
Merge work:/home/bk/mysql into donna.mysql.com:/home/my/bk/mysql
Docs/manual.texi:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_table.cc:
Auto merged
Diffstat (limited to 'sql/mysql_priv.h')
-rw-r--r-- | sql/mysql_priv.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 25bc6430bfe..2bf1a8f9305 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -465,7 +465,7 @@ extern pthread_mutex_t LOCK_mysql_create_db,LOCK_Acl,LOCK_open, extern pthread_cond_t COND_refresh,COND_thread_count, COND_binlog_update, COND_slave_stopped; extern pthread_attr_t connection_attrib; -extern bool opt_endinfo,using_udf_functions; +extern bool opt_endinfo,using_udf_functions, locked_in_memory; extern ulong ha_read_count, ha_write_count, ha_delete_count, ha_update_count, ha_read_key_count, ha_read_next_count, ha_read_prev_count, ha_read_first_count, ha_read_last_count, |