diff options
| author | unknown <monty@mysql.com> | 2004-03-06 10:43:53 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-03-06 10:43:53 +0200 |
| commit | 5bc89a964433cf323fe7a020cc992d9913c032a3 (patch) | |
| tree | 1fbe425dbef7c2935ed0368e7022ec59a9b8f01c /sql/mysql_priv.h | |
| parent | aa20bd9e8c44fbc14396fa418983b8c515b4e8ad (diff) | |
| parent | c0422729cf5b271d703564ff42afc621b069dfe5 (diff) | |
| download | mariadb-git-5bc89a964433cf323fe7a020cc992d9913c032a3.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/my/mysql-4.0
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_insert.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 3eaa5dcc60e..091e51629f0 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -688,7 +688,7 @@ extern ulong ha_read_first_count, ha_read_last_count; extern ulong ha_read_rnd_count, ha_read_rnd_next_count; extern ulong ha_commit_count, ha_rollback_count,table_cache_size; extern ulong max_connections,max_connect_errors, connect_timeout; -extern ulong max_insert_delayed_threads, max_user_connections; +extern ulong max_user_connections; extern ulong long_query_count, what_to_log,flush_time,opt_sql_mode; extern ulong query_buff_size, thread_stack,thread_stack_min; extern ulong binlog_cache_size, max_binlog_cache_size, open_files_limit; |