diff options
| author | unknown <kroki/tomash@moonlight.intranet> | 2006-11-21 16:53:33 +0300 |
|---|---|---|
| committer | unknown <kroki/tomash@moonlight.intranet> | 2006-11-21 16:53:33 +0300 |
| commit | 596e29c253f31c29367f9e5022052f559fb38fdd (patch) | |
| tree | 56d9e78c141c3fe57a35daf1606fdd64b4631726 /sql/mysqld.cc | |
| parent | 1031c460de5bd4b1014614e8871393eebd0a51bc (diff) | |
| parent | 7a45fb546fab6fe3fb2a26820ac39a8ee5cd45db (diff) | |
| download | mariadb-git-596e29c253f31c29367f9e5022052f559fb38fdd.tar.gz | |
Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-bug23159
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug23159
mysql-test/r/ps.result:
Manual merge.
mysql-test/t/ps.test:
Manual merge.
sql/mysqld.cc:
Manual merge.
sql/set_var.cc:
Manual merge.
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index bb102aa76d8..e70201fa3ca 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -6177,6 +6177,7 @@ struct show_var_st status_vars[]= { {"Open_streams", (char*) &my_stream_opened, SHOW_LONG_CONST}, {"Open_tables", (char*) 0, SHOW_OPENTABLES}, {"Opened_tables", (char*) offsetof(STATUS_VAR, opened_tables), SHOW_LONG_STATUS}, + {"Prepared_stmt_count", (char*) &prepared_stmt_count, SHOW_LONG_CONST}, #ifdef HAVE_QUERY_CACHE {"Qcache_free_blocks", (char*) &query_cache.free_memory_blocks, SHOW_LONG_CONST}, {"Qcache_free_memory", (char*) &query_cache.free_memory, SHOW_LONG_CONST}, @@ -6346,6 +6347,7 @@ static void mysql_init_variables(void) binlog_cache_use= binlog_cache_disk_use= 0; max_used_connections= slow_launch_threads = 0; mysqld_user= mysqld_chroot= opt_init_file= opt_bin_logname = 0; + prepared_stmt_count= 0; errmesg= 0; mysqld_unix_port= opt_mysql_tmpdir= my_bind_addr_str= NullS; bzero((gptr) &mysql_tmpdir_list, sizeof(mysql_tmpdir_list)); |