===== sql/mysqld.cc 1.658 vs edited =====
--- 1.658/sql/mysqld.cc	2007-06-26 16:08:23 -04:00
+++ edited/sql/mysqld.cc	2007-06-26 15:34:01 -04:00
@@ -5361,7 +5361,7 @@
 #endif
   {"log-queries-not-using-indexes", OPT_LOG_QUERIES_NOT_USING_INDEXES,
    "Log queries that are executed without benefit of any index to the slow log if it is open.",
-   (uchar**) &opt_log_queries_not_using_indexes, (uchar**) &opt_log_queries_not_using_indexes,
+   (uchar**) &global_system_variables.log_queries_not_using_indexes, (uchar**) &max_system_variables.log_queries_not_using_indexes,
    0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
   {"log-short-format", OPT_SHORT_LOG_FORMAT,
    "Don't log extra information to update and slow-query logs.",
===== sql/set_var.cc 1.240 vs edited =====
--- 1.240/sql/set_var.cc	2007-06-26 16:08:23 -04:00
+++ edited/sql/set_var.cc	2007-06-26 15:33:33 -04:00
@@ -246,9 +246,9 @@
 static sys_var_bool_ptr       
 sys_trust_function_creators(&vars, "log_bin_trust_function_creators",
                             &trust_function_creators);
-static sys_var_bool_ptr
+static sys_var_thd_bool
   sys_log_queries_not_using_indexes(&vars, "log_queries_not_using_indexes",
-                                    &opt_log_queries_not_using_indexes);
+                                    &SV::log_queries_not_using_indexes);
 static sys_var_thd_ulong	sys_log_warnings(&vars, "log_warnings", &SV::log_warnings);
 static sys_var_thd_ulong	sys_long_query_time(&vars, "long_query_time",
 					     &SV::long_query_time);
@@ -1091,7 +1091,6 @@
 {
   server_id_supplied = 1;
 }
-
 
 sys_var_long_ptr::
 sys_var_long_ptr(sys_var_chain *chain, const char *name_arg, ulong *value_ptr_arg,
===== sql/sql_class.h 1.371 vs edited =====
--- 1.371/sql/sql_class.h	2007-06-26 16:08:23 -04:00
+++ edited/sql/sql_class.h	2007-06-26 15:16:11 -04:00
@@ -285,6 +285,7 @@
   ulong trans_alloc_block_size;
   ulong trans_prealloc_size;
   ulong log_warnings;
+  my_bool log_queries_not_using_indexes;
   ulong group_concat_max_len;
   ulong ndb_autoincrement_prefetch_sz;
   ulong ndb_index_stat_cache_entries;
===== sql/sql_parse.cc 1.682 vs edited =====
--- 1.682/sql/sql_parse.cc	2007-06-26 16:08:23 -04:00
+++ edited/sql/sql_parse.cc	2007-06-26 15:31:49 -04:00
@@ -1323,7 +1323,7 @@
 	thd->variables.long_query_time ||
 	((thd->server_status &
 	  (SERVER_QUERY_NO_INDEX_USED | SERVER_QUERY_NO_GOOD_INDEX_USED)) &&
-	 (specialflag & SPECIAL_LOG_QUERIES_NOT_USING_INDEXES)))
+	 (thd->variables.log_queries_not_using_indexes)))
     {
       thd->status_var.long_query_count++;
       slow_log_print(thd, thd->query, thd->query_length, start_of_query);