diff options
| author | unknown <konstantin@mysql.com> | 2006-04-07 23:50:45 +0400 |
|---|---|---|
| committer | unknown <konstantin@mysql.com> | 2006-04-07 23:50:45 +0400 |
| commit | f37d610147cbd51bde10aceac4d18e2f1c415e68 (patch) | |
| tree | caef8284933bbc72dce781ebbcc972d4256556b1 /sql/mysql_priv.h | |
| parent | e4e37ae5a1fe6ed169f4e9e48daf86b2e8fbc2ee (diff) | |
| parent | 5b5530daa5c0f5fb20121ab9ce5a159fce900101 (diff) | |
| download | mariadb-git-f37d610147cbd51bde10aceac4d18e2f1c415e68.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/opt/local/work/mysql-4.1-16365
sql/mysql_priv.h:
Auto merged
sql/sql_class.h:
Auto merged
mysql-test/r/ps.result:
Manual merge
mysql-test/t/ps.test:
Manual merge
Diffstat (limited to 'sql/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 72424819078..6676d994cfa 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -918,6 +918,7 @@ extern ulong ha_commit_count, ha_rollback_count,table_cache_size; extern ulong max_connections,max_connect_errors, connect_timeout; extern ulong slave_net_timeout, slave_trans_retries; extern ulong max_user_connections; +extern ulong max_prepared_stmt_count, prepared_stmt_count; extern ulong long_query_count, what_to_log,flush_time; extern ulong query_buff_size, thread_stack,thread_stack_min; extern ulong binlog_cache_size, max_binlog_cache_size, open_files_limit; @@ -961,7 +962,8 @@ extern pthread_mutex_t LOCK_mysql_create_db,LOCK_Acl,LOCK_open, LOCK_error_log, LOCK_delayed_insert, LOCK_uuid_generator, LOCK_delayed_status, LOCK_delayed_create, LOCK_crypt, LOCK_timezone, LOCK_slave_list, LOCK_active_mi, LOCK_manager, - LOCK_global_system_variables, LOCK_user_conn; + LOCK_global_system_variables, LOCK_user_conn, + LOCK_prepared_stmt_count; #ifdef HAVE_OPENSSL extern pthread_mutex_t LOCK_des_key_file; #endif |