Merge mysql.com:/home/emurphy/src/mysql/bk-clean/tmp_merge2

into  mysql.com:/home/emurphy/src/mysql/bk-clean/mysql-5.1-merge-tiny


sql/set_var.cc:
  Manual merge.

sql/set_var.cc

@@ -623,70 +623,202 @@ sys_var_thd_time_zone            sys_time_zone("time_zone");
 /* Read only variables */
 
 sys_var_const_str		sys_os("version_compile_os", SYSTEM_TYPE);
-sys_var_have_variable sys_have_archive_db("have_archive", &have_archive_db);
-sys_var_have_variable sys_have_berkeley_db("have_bdb", &have_berkeley_db);
-sys_var_have_variable sys_have_blackhole_db("have_blackhole_engine",
-                                            &have_blackhole_db);
-sys_var_have_variable sys_have_compress("have_compress", &have_compress);
-sys_var_have_variable sys_have_crypt("have_crypt", &have_crypt);
-sys_var_have_variable sys_have_csv_db("have_csv", &have_csv_db);
-sys_var_have_variable sys_have_dlopen("have_dlopen", &have_dlopen);
-sys_var_have_variable sys_have_example_db("have_example_engine",
-                                          &have_example_db);
-sys_var_have_variable sys_have_federated_db("have_federated_engine",
-                                            &have_federated_db);
-sys_var_have_variable sys_have_geometry("have_geometry", &have_geometry);
-sys_var_have_variable sys_have_innodb("have_innodb", &have_innodb);
-sys_var_have_variable sys_have_ndbcluster("have_ndbcluster", &have_ndbcluster);
-sys_var_have_variable sys_have_openssl("have_openssl", &have_openssl);
-sys_var_have_variable sys_have_partition_db("have_partitioning",
-                                            &have_partition_db);
-sys_var_have_variable sys_have_query_cache("have_query_cache",
-                                           &have_query_cache);
-sys_var_have_variable sys_have_rtree_keys("have_rtree_keys", &have_rtree_keys);
-sys_var_have_variable sys_have_symlink("have_symlink", &have_symlink);
-sys_var_have_variable sys_have_row_based_replication("have_row_based_replication",&have_row_based_replication);
+sys_var_readonly                sys_have_innodb("have_innodb", OPT_GLOBAL,
+                                                SHOW_CHAR, get_have_innodb);
 /* Global read-only variable describing server license */
 sys_var_const_str		sys_license("license", STRINGIFY_ARG(LICENSE));
 
+
+/*
+  List of all variables for initialisation and storage in hash
+  This is sorted in alphabetical order to make it easy to add new variables
+
+  If the variable is not in this list, it can't be changed with
+  SET variable_name=
+*/
+
+sys_var *sys_variables[]=
+{
+  &sys_auto_is_null,
+  &sys_auto_increment_increment,
+  &sys_auto_increment_offset,
+  &sys_autocommit,
+  &sys_automatic_sp_privileges,
+  &sys_big_tables,
+  &sys_big_selects,
+  &sys_binlog_cache_size,
+  &sys_buffer_results,
+  &sys_bulk_insert_buff_size,
+  &sys_character_set_server,
+  &sys_character_set_database,
+  &sys_character_set_client,
+  &sys_character_set_connection,
+  &sys_character_set_results,
+  &sys_character_set_filesystem,
+  &sys_charset_system,
+  &sys_collation_connection,
+  &sys_collation_database,
+  &sys_collation_server,
+  &sys_completion_type,
+  &sys_concurrent_insert,
+  &sys_connect_timeout,
+  &sys_date_format,
+  &sys_datetime_format,
+  &sys_div_precincrement,
+  &sys_default_week_format,
+  &sys_delay_key_write,
+  &sys_delayed_insert_limit,
+  &sys_delayed_insert_timeout,
+  &sys_delayed_queue_size,
+  &sys_error_count,
+  &sys_expire_logs_days,
+  &sys_flush,
+  &sys_flush_time,
+  &sys_ft_boolean_syntax,
+  &sys_foreign_key_checks,
+  &sys_group_concat_max_len,
+  &sys_have_innodb,
+  &sys_identity,
+  &sys_init_connect,
+  &sys_init_slave,
+  &sys_insert_id,
+  &sys_interactive_timeout,
+  &sys_join_buffer_size,
+  &sys_key_buffer_size,
+  &sys_key_cache_block_size,
+  &sys_key_cache_division_limit,
+  &sys_key_cache_age_threshold,
+  &sys_last_insert_id,
+  &sys_license,
+  &sys_local_infile,
+  &sys_log_binlog,
+  &sys_log_off,
+  &sys_log_update,
+  &sys_log_warnings,
+  &sys_long_query_time,
+  &sys_low_priority_updates,
+  &sys_max_allowed_packet,
+  &sys_max_binlog_cache_size,
+  &sys_max_binlog_size,
+  &sys_max_connect_errors,
+  &sys_max_connections,
+  &sys_max_delayed_threads,
+  &sys_max_error_count,
+  &sys_max_insert_delayed_threads,
+  &sys_max_heap_table_size,
+  &sys_max_join_size,
+  &sys_max_length_for_sort_data,
+  &sys_max_prepared_stmt_count,
+  &sys_max_relay_log_size,
+  &sys_max_seeks_for_key,
+  &sys_max_sort_length,
+  &sys_max_sp_recursion_depth,
+  &sys_max_tmp_tables,
+  &sys_max_user_connections,
+  &sys_max_write_lock_count,
+  &sys_multi_range_count,
+  &sys_myisam_data_pointer_size,
+  &sys_myisam_max_sort_file_size,
+  &sys_myisam_repair_threads,
+  &sys_myisam_sort_buffer_size,
+  &sys_myisam_stats_method,
+  &sys_net_buffer_length,
+  &sys_net_read_timeout,
+  &sys_net_retry_count,
+  &sys_net_wait_timeout,
+  &sys_net_write_timeout,
+  &sys_new_mode,
+  &sys_old_passwords,
+  &sys_optimizer_prune_level,
+  &sys_optimizer_search_depth,
+  &sys_preload_buff_size,
+  &sys_prepared_stmt_count,
+  &sys_pseudo_thread_id,
+  &sys_query_alloc_block_size,
+  &sys_query_cache_size,
+  &sys_query_prealloc_size,
+#ifdef HAVE_QUERY_CACHE
+  &sys_query_cache_limit,
+  &sys_query_cache_min_res_unit,
+  &sys_query_cache_type,
+  &sys_query_cache_wlock_invalidate,
+#endif /* HAVE_QUERY_CACHE */
+  &sys_quote_show_create,
+  &sys_rand_seed1,
+  &sys_rand_seed2,
+  &sys_range_alloc_block_size,
+  &sys_readonly,
+  &sys_read_buff_size,
+  &sys_read_rnd_buff_size,
 #ifdef HAVE_REPLICATION
-static int show_slave_skip_errors(THD *thd, SHOW_VAR *var, char *buff)
-{
-  var->type=SHOW_CHAR;
-  var->value= buff;
-  if (!use_slave_mask || bitmap_is_clear_all(&slave_error_mask))
-  {
-    var->value= const_cast<char *>("OFF");
-  }
-  else if (bitmap_is_set_all(&slave_error_mask))
-  {
-    var->value= const_cast<char *>("ALL");
-  }
-  else
-  {
-    /* 10 is enough assuming errors are max 4 digits */
-    int i;
-    var->value= buff;
-    for (i= 1;
-         i < MAX_SLAVE_ERROR &&
-         (buff - var->value) < SHOW_VAR_FUNC_BUFF_SIZE;
-         i++)
-    {
-      if (bitmap_is_set(&slave_error_mask, i))
-      {
-        buff= int10_to_str(i, buff, 10);
-        *buff++= ',';
-      }
-    }
-    if (var->value != buff)
-      buff--;				// Remove last ','
-    if (i < MAX_SLAVE_ERROR)
-      buff= strmov(buff, "...");  // Couldn't show all errors
-    *buff=0;
-  }
-  return 0;
-}
-#endif /* HAVE_REPLICATION */
+  &sys_relay_log_purge,
+#endif
+  &sys_rpl_recovery_rank,
+  &sys_safe_updates,
+  &sys_secure_auth,
+  &sys_select_limit,
+  &sys_server_id,
+#ifdef HAVE_REPLICATION
+  &sys_slave_compressed_protocol,
+  &sys_slave_net_timeout,
+  &sys_slave_trans_retries,
+  &sys_slave_skip_counter,
+#endif
+  &sys_slow_launch_time,
+  &sys_sort_buffer,
+  &sys_sql_big_tables,
+  &sys_sql_low_priority_updates,
+  &sys_sql_max_join_size,
+  &sys_sql_mode,
+  &sys_sql_warnings,
+  &sys_sql_notes,
+  &sys_storage_engine,
+#ifdef HAVE_REPLICATION
+  &sys_sync_binlog_period,
+#endif
+  &sys_sync_frm,
+  &sys_table_cache_size,
+  &sys_table_lock_wait_timeout,
+  &sys_table_type,
+  &sys_thread_cache_size,
+  &sys_time_format,
+  &sys_timed_mutexes,
+  &sys_timestamp,
+  &sys_time_zone,
+  &sys_tmp_table_size,
+  &sys_trans_alloc_block_size,
+  &sys_trans_prealloc_size,
+  &sys_tx_isolation,
+  &sys_os,
+#ifdef HAVE_INNOBASE_DB
+  &sys_innodb_fast_shutdown,
+  &sys_innodb_max_dirty_pages_pct,
+  &sys_innodb_max_purge_lag,
+  &sys_innodb_table_locks,
+  &sys_innodb_support_xa,
+  &sys_innodb_max_purge_lag,
+  &sys_innodb_autoextend_increment,
+  &sys_innodb_sync_spin_loops,
+  &sys_innodb_concurrency_tickets,
+  &sys_innodb_thread_sleep_delay,
+  &sys_innodb_thread_concurrency,
+  &sys_innodb_commit_concurrency,
+  &sys_innodb_flush_log_at_trx_commit,
+#endif
+  &sys_trust_routine_creators,
+  &sys_trust_function_creators,
+  &sys_engine_condition_pushdown,
+#ifdef HAVE_NDBCLUSTER_DB
+  &sys_ndb_autoincrement_prefetch_sz,
+  &sys_ndb_cache_check_time,
+  &sys_ndb_force_send,
+  &sys_ndb_use_exact_count,
+  &sys_ndb_use_transactions,
+#endif
+  &sys_unique_checks,
+  &sys_updatable_views_with_limit,
+  &sys_warning_count
+};
 
 
 /*