List:Commits« Previous MessageNext Message »
From:knielsen Date:January 20 2006 12:24pm
Subject:bk commit into 5.1 tree (knielsen:1.2068)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of knielsen. When knielsen 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
  1.2068 06/01/20 13:24:18 knielsen@stripped +1 -0
  Merge mysql.com:/usr/local/mysql/mysql-5.1-new
  into  mysql.com:/usr/local/mysql/tmp5.1

  sql/sql_class.cc
    1.239 06/01/20 13:24:10 knielsen@stripped +0 -0
    Auto merged

# 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:	knielsen
# Host:	rt.int.sifira.dk
# Root:	/usr/local/mysql/tmp5.1/RESYNC

--- 1.238/sql/sql_class.cc	2006-01-19 21:50:51 +01:00
+++ 1.239/sql/sql_class.cc	2006-01-20 13:24:10 +01:00
@@ -167,6 +167,25 @@
   reset_open_tables_state();
 }
 
+my_bool thd_in_lock_tables(const THD *thd)
+{
+  return thd->in_lock_tables;
+}
+
+
+my_bool thd_tablespace_op(const THD *thd)
+{
+  return thd->tablespace_op;
+}
+
+
+const char *thd_proc_info(THD *thd, const char *info)
+{
+  const char *old_info= thd->proc_info;
+  thd->proc_info= info;
+  return old_info;
+}
+
 
 /*
   Pass nominal parameters to Statement constructor only to ensure that
Thread
bk commit into 5.1 tree (knielsen:1.2068)knielsen20 Jan