bk commit into 5.0 tree (msvensson:1.2457)

[msvensson]

Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson 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-04-18 13:22:32+02:00, msvensson@stripped +5 -0
  Merge pilot.blaudden:/home/msvensson/mysql/my50-m-mysql_upgrade
  into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
  MERGE: 1.2392.136.1

  BitKeeper/etc/ignore@stripped, 2007-04-18 13:22:29+02:00, msvensson@stripped +2 -2
    auto-union
    MERGE: 1.243.2.1

  CMakeLists.txt@stripped, 2007-04-18 13:22:30+02:00, msvensson@stripped +0 -0
    Auto merged
    MERGE: 1.5.1.1

  Makefile.am@stripped, 2007-04-18 13:22:30+02:00, msvensson@stripped +0 -0
    Auto merged
    MERGE: 1.97.1.1

  include/my_global.h@stripped, 2007-04-18 13:22:30+02:00, msvensson@stripped +0 -0
    Auto merged
    MERGE: 1.136.1.1

  sql/mysql_priv.h@stripped, 2007-04-18 13:22:30+02:00, msvensson@stripped +0 -0
    Auto merged
    MERGE: 1.435.1.1

# 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:	msvensson
# Host:	pilot.blaudden
# Root:	/home/msvensson/mysql/mysql-5.0-maint/RESYNC

--- 1.100/Makefile.am	2007-04-12 01:13:05 +02:00
+++ 1.101/Makefile.am	2007-04-18 13:22:30 +02:00
@@ -21,9 +21,9 @@ AUTOMAKE_OPTIONS =	foreign
 EXTRA_DIST =		INSTALL-SOURCE INSTALL-WIN-SOURCE \
 			README COPYING EXCEPTIONS-CLIENT CMakeLists.txt
 SUBDIRS =		. include @docs_dirs@ @zlib_dir@ @yassl_dir@ \
-			@readline_topdir@ sql-common \
+			@readline_topdir@ sql-common scripts \
 			@thread_dirs@ pstack \
-			@sql_union_dirs@ scripts @man_dirs@ tests \
+			@sql_union_dirs@ @man_dirs@ tests \
 			netware @libmysqld_dirs@ \
 			@bench_dirs@ support-files @tools_dirs@
 

--- 1.441/sql/mysql_priv.h	2007-04-05 08:29:08 +02:00
+++ 1.442/sql/mysql_priv.h	2007-04-18 13:22:30 +02:00
@@ -268,7 +268,6 @@ MY_LOCALE *my_locale_by_number(uint numb
 #endif
 
 #if defined(__WIN__) || defined(OS2)
-#define IF_WIN(A,B) (A)
 #undef	FLUSH_TIME
 #define FLUSH_TIME	1800			/* Flush every half hour */
 
@@ -277,7 +276,6 @@ MY_LOCALE *my_locale_by_number(uint numb
 #define WAIT_PRIOR	0
 #define QUERY_PRIOR	2
 #else
-#define IF_WIN(A,B) (B)
 #define INTERRUPT_PRIOR 10
 #define CONNECT_PRIOR	9
 #define WAIT_PRIOR	8

--- 1.7/CMakeLists.txt	2007-03-28 23:00:25 +02:00
+++ 1.8/CMakeLists.txt	2007-04-18 13:22:30 +02:00
@@ -133,6 +133,7 @@ ADD_SUBDIRECTORY(dbug)
 ADD_SUBDIRECTORY(strings)
 ADD_SUBDIRECTORY(regex)
 ADD_SUBDIRECTORY(mysys)
+ADD_SUBDIRECTORY(scripts)
 ADD_SUBDIRECTORY(extra/yassl)
 ADD_SUBDIRECTORY(extra/yassl/taocrypt)
 ADD_SUBDIRECTORY(extra)

--- 1.137/include/my_global.h	2007-03-09 06:05:04 +01:00
+++ 1.138/include/my_global.h	2007-04-18 13:22:30 +02:00
@@ -86,6 +86,14 @@
 #endif
 #endif /* _WIN32... */
 
+/* Make it easier to add conditionl code for windows */
+#ifdef __WIN__
+#define IF_WIN(A,B) (A)
+#else
+#define IF_WIN(A,B) (B)
+#endif
+
+
 /* Some defines to avoid ifdefs in the code */
 #ifndef NETWARE_YIELD
 #define NETWARE_YIELD

--- 1.245/BitKeeper/etc/ignore	2007-03-21 14:27:25 +01:00
+++ 1.246/BitKeeper/etc/ignore	2007-04-18 13:22:29 +02:00
@@ -1085,6 +1085,7 @@ repl-tests/test-repl/sum-wlen-slave.mast
 repl-tests/test-repl/sum-wlen-slave.master.reje
 replace/*.ds?
 replace/*.vcproj
+scripts/comp_sql
 scripts/fill_func_tables
 scripts/fill_func_tables.sql
 scripts/fill_help_tables
@@ -1102,6 +1103,7 @@ scripts/mysql_find_rows
 scripts/mysql_fix_extensions
 scripts/mysql_fix_privilege_tables
 scripts/mysql_fix_privilege_tables.sql
+scripts/mysql_fix_privilege_tables_sql.c
 scripts/mysql_install_db
 scripts/mysql_secure_installation
 scripts/mysql_setpermission