Changes for the BitKeeper resolve.

One more notice:

limiting number of queries per hour for different users has been done
on 4.0.1 , but I can port it to 3.23.* 

This will require only certain changes, like number of columns in user
table.

I will also make a test case for it, after it is approved by Monty, 
as result file will depend on the error message text.


BitKeeper/etc/ignore:
  auto-union
libmysqld/lib_sql.cc:
  Auto merged
scripts/mysql_install_db.sh:
  Auto merged
sql/item_timefunc.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_acl.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/lex.h:
  Changes for BitKeeper resolve...
sql/sql_class.h:
  Changes for BitKeeper resolve...
sql/sql_lex.h:
  Changes for BitKeeper resolve...
sql/sql_parse.cc:
  Changes for BitKeeper resolve...
sql/sql_yacc.yy:
  Changes for BitKeeper resolve...

1 files changed, 1 insertions, 1 deletions

diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h
index 739991f55b1..ba39199a1ad 100644
--- a/sql/mysql_priv.h
+++ b/sql/mysql_priv.h
@@ -512,7 +512,7 @@ int write_record(TABLE *table,COPY_INFO *info);
 /* bits set in manager_status */
 #define MANAGER_BERKELEY_LOG_CLEANUP    (1L << 0)
 extern ulong volatile manager_status;
-extern bool volatile manager_thread_in_use;
+extern bool volatile manager_thread_in_use, mqh_used;
 extern pthread_t manager_thread;
 extern pthread_mutex_t LOCK_manager;
 extern pthread_cond_t COND_manager;