diff options
| author | unknown <paul@polar.kitebird.com> | 2006-04-27 07:53:15 -0500 |
|---|---|---|
| committer | unknown <paul@polar.kitebird.com> | 2006-04-27 07:53:15 -0500 |
| commit | 04ef66f41ece17c8f7bde740418ea4f504785eb7 (patch) | |
| tree | 88d1bec7afe763809a4b25dc6b67092b3e732d9d | |
| parent | dcad798ae8df525c49c3754e13e8052cf8014243 (diff) | |
| parent | af05b9fc7efa93b87dd11647c7b9d9890ab9930f (diff) | |
| download | mariadb-git-04ef66f41ece17c8f7bde740418ea4f504785eb7.tar.gz | |
Merge polar.kitebird.com:/src/extern/MySQL/bk/mysql-4.1
into polar.kitebird.com:/src/extern/MySQL/bk/mysql-5.0
sql/set_var.cc:
Auto merged
| -rw-r--r-- | sql/set_var.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc index 81fc497437c..329c06e7596 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -964,9 +964,9 @@ struct show_var_st init_vars[]= { {sys_optimizer_search_depth.name,(char*) &sys_optimizer_search_depth, SHOW_SYS}, {"pid_file", (char*) pidfile_name, SHOW_CHAR}, - {sys_prepared_stmt_count.name, (char*) &sys_prepared_stmt_count, SHOW_SYS}, {"port", (char*) &mysqld_port, SHOW_INT}, {sys_preload_buff_size.name, (char*) &sys_preload_buff_size, SHOW_SYS}, + {sys_prepared_stmt_count.name, (char*) &sys_prepared_stmt_count, SHOW_SYS}, {"protocol_version", (char*) &protocol_version, SHOW_INT}, {sys_query_alloc_block_size.name, (char*) &sys_query_alloc_block_size, SHOW_SYS}, |