diff options
| author | unknown <paul@frost.snake.net> | 2005-08-27 21:52:26 -0500 |
|---|---|---|
| committer | unknown <paul@frost.snake.net> | 2005-08-27 21:52:26 -0500 |
| commit | ee4db475ec79aab556d447f6144965b1095899d5 (patch) | |
| tree | 6b5aeb4836f709178067f488a95dff4329f54271 /sql/mysqld.cc | |
| parent | 56b8fc52cfe81b22031ece94475d9a6f3fa663c2 (diff) | |
| parent | d7ff622e8d4dbbb2ea1a3f37049b190b54c30dd1 (diff) | |
| download | mariadb-git-ee4db475ec79aab556d447f6144965b1095899d5.tar.gz | |
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into frost.snake.net:/Volumes/frost2/MySQL/bk/mysql-4.1
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 2f24ccf34cb..865f494bbc9 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -5500,11 +5500,11 @@ struct show_var_st status_vars[]= { {"Com_show_warnings", (char*) (com_stat+(uint) SQLCOM_SHOW_WARNS),SHOW_LONG}, {"Com_slave_start", (char*) (com_stat+(uint) SQLCOM_SLAVE_START),SHOW_LONG}, {"Com_slave_stop", (char*) (com_stat+(uint) SQLCOM_SLAVE_STOP),SHOW_LONG}, - {"Com_stmt_prepare", (char*) &com_stmt_prepare, SHOW_LONG}, + {"Com_stmt_close", (char*) &com_stmt_close, SHOW_LONG}, {"Com_stmt_execute", (char*) &com_stmt_execute, SHOW_LONG}, - {"Com_stmt_send_long_data", (char*) &com_stmt_send_long_data, SHOW_LONG}, + {"Com_stmt_prepare", (char*) &com_stmt_prepare, SHOW_LONG}, {"Com_stmt_reset", (char*) &com_stmt_reset, SHOW_LONG}, - {"Com_stmt_close", (char*) &com_stmt_close, SHOW_LONG}, + {"Com_stmt_send_long_data", (char*) &com_stmt_send_long_data, SHOW_LONG}, {"Com_truncate", (char*) (com_stat+(uint) SQLCOM_TRUNCATE),SHOW_LONG}, {"Com_unlock_tables", (char*) (com_stat+(uint) SQLCOM_UNLOCK_TABLES),SHOW_LONG}, {"Com_update", (char*) (com_stat+(uint) SQLCOM_UPDATE),SHOW_LONG}, @@ -5570,8 +5570,8 @@ struct show_var_st status_vars[]= { {"Select_range_check", (char*) &select_range_check_count, SHOW_LONG}, {"Select_scan", (char*) &select_scan_count, SHOW_LONG}, {"Slave_open_temp_tables", (char*) &slave_open_temp_tables, SHOW_LONG}, - {"Slave_running", (char*) 0, SHOW_SLAVE_RUNNING}, {"Slave_retried_transactions",(char*) 0, SHOW_SLAVE_RETRIED_TRANS}, + {"Slave_running", (char*) 0, SHOW_SLAVE_RUNNING}, {"Slow_launch_threads", (char*) &slow_launch_threads, SHOW_LONG}, {"Slow_queries", (char*) &long_query_count, SHOW_LONG}, {"Sort_merge_passes", (char*) &filesort_merge_passes, SHOW_LONG}, |