List:Commits« Previous MessageNext Message »
From:Chad MILLER Date:February 20 2007 3:01pm
Subject:bk commit into 5.0 tree (cmiller:1.2384)
View as plain text  
Below is the list of changes that have just been committed into a local
5.0 repository of cmiller. When cmiller does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-02-20 10:01:31-05:00, cmiller@stripped +9 -0
  Fix merge problems.

  BitKeeper/deleted/.del-profile.result@stripped, 2007-02-20 09:45:43-05:00, cmiller@stripped +0 -0
    Delete: mysql-test/r/profile.result

  BitKeeper/deleted/.del-profile.test@stripped, 2007-02-20 09:45:37-05:00, cmiller@stripped +0 -0
    Delete: mysql-test/t/profile.test

  mysql-test/r/mysqlshow.result@stripped, 2007-02-20 10:01:28-05:00, cmiller@stripped +2 -0
    Fix merge problems.

  sql/sql_cache.cc@stripped, 2007-02-20 10:01:28-05:00, cmiller@stripped +8 -8
    Fix merge problems.

  sql/sql_class.cc@stripped, 2007-02-20 10:01:28-05:00, cmiller@stripped +0 -1
    Fix merge problems.

  sql/sql_insert.cc@stripped, 2007-02-20 10:01:28-05:00, cmiller@stripped +7 -7
    Fix merge problems.

  sql/sql_parse.cc@stripped, 2007-02-20 10:01:29-05:00, cmiller@stripped +1 -1
    Fix merge problems.

  sql/sql_select.cc@stripped, 2007-02-20 10:01:29-05:00, cmiller@stripped +3 -3
    Fix merge problems.

  sql/sql_yacc.yy@stripped, 2007-02-20 10:01:29-05:00, cmiller@stripped +1 -1
    Fix merge problems.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	cmiller
# Host:	zippy.cornsilk.net
# Root:	/home/cmiller/work/mysql/mysql-5.0-community

--- 1.99/sql/sql_cache.cc	2007-02-20 10:01:36 -05:00
+++ 1.100/sql/sql_cache.cc	2007-02-20 10:01:36 -05:00
@@ -688,7 +688,7 @@ void query_cache_abort(NET *net)
                                    net->query_cache_query);
   if (query_block)			// Test if changed by other thread
   {
-    THD_PROC_INFO(thd, "storing result in query cache");
+    thd_proc_info(thd, "storing result in query cache");
     DUMP(&query_cache);
     BLOCK_LOCK_WR(query_block);
     // The following call will remove the lock on query_block
@@ -726,7 +726,7 @@ void query_cache_end_of_result(THD *thd)
   query_block= ((Query_cache_block*) thd->net.query_cache_query);
   if (query_block)
   {
-    THD_PROC_INFO(thd, "storing result in query cache");
+    thd_proc_info(thd, "storing result in query cache");
     DUMP(&query_cache);
     BLOCK_LOCK_WR(query_block);
     Query_cache_query *header= query_block->query();
@@ -1091,7 +1091,7 @@ Query_cache::send_result_to_client(THD *
     DBUG_PRINT("qcache", ("No active database"));
   }
 
-  THD_PROC_INFO(thd, "checking query cache for query");
+  thd_proc_info(thd, "checking query cache for query");
 
   // fill all gaps between fields with 0 to get repeatable key
   bzero(&flags, QUERY_CACHE_FLAGS_SIZE);
@@ -1167,7 +1167,7 @@ sql mode: 0x%lx, sort len: %lu, conncat 
   }
       
   // Check access;
-  THD_PROC_INFO(thd, "checking privileges on cached query");
+  thd_proc_info(thd, "checking privileges on cached query");
   block_table= query_block->table(0);
   block_table_end= block_table+query_block->n_tables;
   for (; block_table != block_table_end; block_table++)
@@ -1260,7 +1260,7 @@ sql mode: 0x%lx, sort len: %lu, conncat 
     Send cached result to client
   */
 #ifndef EMBEDDED_LIBRARY
-  THD_PROC_INFO(thd, "sending cached result to client");
+  thd_proc_info(thd, "sending cached result to client");
   do
   {
     DBUG_PRINT("qcache", ("Results  (len: %lu  used: %lu  headers: %lu)",
@@ -1342,7 +1342,7 @@ void Query_cache::invalidate(CHANGED_TAB
   DBUG_ENTER("Query_cache::invalidate (changed table list)");
   if (tables_used)
   {
-    THD_PROC_INFO(thd, "invalidating query cache entries (table list)");
+    thd_proc_info(thd, "invalidating query cache entries (table list)");
     STRUCT_LOCK(&structure_guard_mutex);
     if (query_cache_size > 0 && !flush_in_progress)
     {
@@ -1377,7 +1377,7 @@ void Query_cache::invalidate_locked_for_
   DBUG_ENTER("Query_cache::invalidate_locked_for_write");
   if (tables_used)
   {
-    THD_PROC_INFO(thd, "invalidating query cache entries (table)");
+    thd_proc_info(thd, "invalidating query cache entries (table)");
     STRUCT_LOCK(&structure_guard_mutex);
     if (query_cache_size > 0 && !flush_in_progress)
     {
@@ -1427,7 +1427,7 @@ void Query_cache::invalidate(THD *thd, c
   STRUCT_LOCK(&structure_guard_mutex);
   if (query_cache_size > 0 && !flush_in_progress)
   {
-    THD_PROC_INFO(thd, "invalidating query cache entries (key)");
+    thd_proc_info(thd, "invalidating query cache entries (key)");
     using_transactions= using_transactions &&
       (thd->options & (OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN));
     if (using_transactions) // used for innodb => has_transactions() is TRUE

--- 1.258/sql/sql_class.cc	2007-02-20 10:01:36 -05:00
+++ 1.259/sql/sql_class.cc	2007-02-20 10:01:36 -05:00
@@ -332,7 +332,6 @@ void THD::init_for_queries()
                       variables.trans_alloc_block_size,
                       variables.trans_prealloc_size);
 #endif
-  profiling.reset();
   transaction.xid_state.xid.null();
   transaction.xid_state.in_thd=1;
 }

--- 1.213/sql/sql_insert.cc	2007-02-20 10:01:36 -05:00
+++ 1.214/sql/sql_insert.cc	2007-02-20 10:01:36 -05:00
@@ -1869,7 +1869,7 @@ pthread_handler_t handle_delayed_insert(
       /* Information for pthread_kill */
       di->thd.mysys_var->current_mutex= &di->mutex;
       di->thd.mysys_var->current_cond= &di->cond;
-      THD_PROC_INFO(&(di->thd), "Waiting for INSERT");
+      thd_proc_info(&(di->thd), "Waiting for INSERT");
 
       DBUG_PRINT("info",("Waiting for someone to insert rows"));
       while (!thd->killed)
@@ -1904,7 +1904,7 @@ pthread_handler_t handle_delayed_insert(
       pthread_mutex_unlock(&di->thd.mysys_var->mutex);
       pthread_mutex_lock(&di->mutex);
     }
-    THD_PROC_INFO(&(di->thd), 0);
+    thd_proc_info(&(di->thd), 0);
 
     if (di->tables_in_use && ! thd->lock)
     {
@@ -2023,7 +2023,7 @@ bool delayed_insert::handle_inserts(void
 
   table->next_number_field=table->found_next_number_field;
 
-  THD_PROC_INFO(&thd, "upgrading lock");
+  thd_proc_info(&thd, "upgrading lock");
   if (thr_upgrade_write_delay_lock(*thd.lock->locks))
   {
     /* This can only happen if thread is killed by shutdown */
@@ -2031,7 +2031,7 @@ bool delayed_insert::handle_inserts(void
     goto err;
   }
 
-  THD_PROC_INFO(&thd, "insert");
+  thd_proc_info(&thd, "insert");
   max_rows= delayed_insert_limit;
   if (thd.killed || table->s->version != refresh_version)
   {
@@ -2149,7 +2149,7 @@ bool delayed_insert::handle_inserts(void
       {
 	if (tables_in_use)
 	  pthread_cond_broadcast(&cond_client); // If waiting clients
-	THD_PROC_INFO(&thd, "reschedule");
+	thd_proc_info(&thd, "reschedule");
 	pthread_mutex_unlock(&mutex);
 	if ((error=table->file->extra(HA_EXTRA_NO_CACHE)))
 	{
@@ -2168,14 +2168,14 @@ bool delayed_insert::handle_inserts(void
 	if (!using_bin_log)
 	  table->file->extra(HA_EXTRA_WRITE_CACHE);
 	pthread_mutex_lock(&mutex);
-	THD_PROC_INFO(&thd, "insert");
+	thd_proc_info(&thd, "insert");
       }
       if (tables_in_use)
 	pthread_cond_broadcast(&cond_client);	// If waiting clients
     }
   }
 
-  THD_PROC_INFO(&thd, 0);
+  thd_proc_info(&thd, 0);
   table->next_number_field=0;
   pthread_mutex_unlock(&mutex);
   if ((error=table->file->extra(HA_EXTRA_NO_CACHE)))

--- 1.595/sql/sql_parse.cc	2007-02-20 10:01:36 -05:00
+++ 1.596/sql/sql_parse.cc	2007-02-20 10:01:36 -05:00
@@ -2173,7 +2173,7 @@ void log_slow_statement(THD *thd)
         /* == SQLCOM_END unless this is a SHOW command */
         thd->lex->orig_sql_command == SQLCOM_END)
     {
-      THD_PROC_INFO(thd, "logging slow query");
+      thd_proc_info(thd, "logging slow query");
       thd->status_var.long_query_count++;
       mysql_slow_log.write(thd, thd->query, thd->query_length, start_of_query);
     }

--- 1.480/sql/sql_select.cc	2007-02-20 10:01:36 -05:00
+++ 1.481/sql/sql_select.cc	2007-02-20 10:01:36 -05:00
@@ -598,7 +598,7 @@ JOIN::optimize()
   if (thd->lex->orig_sql_command != SQLCOM_SHOW_STATUS)
     thd->status_var.last_query_cost= 0.0;
 
-  THD_PROC_INFO(thd, "optimizing");
+  thd_proc_info(thd, "optimizing");
   row_limit= ((select_distinct || order || group_list) ? HA_POS_ERROR :
 	      unit->select_limit_cnt);
   /* select_limit is used to decide if we are likely to scan the whole table */
@@ -1363,7 +1363,7 @@ JOIN::exec()
   int      tmp_error;
   DBUG_ENTER("JOIN::exec");
 
-  THD_PROC_INFO(thd, "executing");
+  thd_proc_info(thd, "executing");
   error= 0;
   if (procedure)
   {
@@ -2076,7 +2076,7 @@ err:
   {
     thd_proc_info(thd, "end");
     err|= select_lex->cleanup();
-    THD_PROC_INFO(thd, "end");
+    thd_proc_info(thd, "end");
     DBUG_RETURN(err || thd->net.report_error);
   }
   DBUG_RETURN(join->error);

--- 1.502/sql/sql_yacc.yy	2007-02-20 10:01:36 -05:00
+++ 1.503/sql/sql_yacc.yy	2007-02-20 10:01:36 -05:00
@@ -928,7 +928,7 @@ bool my_yyoverflow(short **a, YYSTYPE **
         union_opt select_derived_init option_type2
 
 %type <ulong_num>
-	ulong_num raid_types merge_insert_types opt_profile_query_arg
+	ulong_num raid_types merge_insert_types
 
 %type <ulonglong_number>
 	ulonglong_num

--- 1.4/mysql-test/r/mysqlshow.result	2007-02-20 10:01:36 -05:00
+++ 1.5/mysql-test/r/mysqlshow.result	2007-02-20 10:01:36 -05:00
@@ -85,6 +85,7 @@ Database: information_schema
 | COLUMNS                               |
 | COLUMN_PRIVILEGES                     |
 | KEY_COLUMN_USAGE                      |
+| PROFILING                             |
 | ROUTINES                              |
 | SCHEMATA                              |
 | SCHEMA_PRIVILEGES                     |
@@ -106,6 +107,7 @@ Database: INFORMATION_SCHEMA
 | COLUMNS                               |
 | COLUMN_PRIVILEGES                     |
 | KEY_COLUMN_USAGE                      |
+| PROFILING                             |
 | ROUTINES                              |
 | SCHEMATA                              |
 | SCHEMA_PRIVILEGES                     |
Thread
bk commit into 5.0 tree (cmiller:1.2384)Chad MILLER20 Feb