bk commit into 5.1 tree (antony:1.2406)

[antony]

Below is the list of changes that have just been committed into a local
5.1 repository of antony. When antony 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-01-25 20:51:10-08:00, antony@stripped +1 -0
  fixes for windows build
  ---
  remove file which should not have been committed.

  sql/mysqld.cc@stripped, 2007-01-25 20:51:07-08:00, antony@stripped +4 -4
    move define to not interfere with windows build

# 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:	antony
# Host:	ppcg5.local
# Root:	/Volumes/Development/Work/mysql-5.1-cmake

--- 1.608/sql/mysqld.cc	2007-01-25 20:51:19 -08:00
+++ 1.609/sql/mysqld.cc	2007-01-25 20:51:19 -08:00
@@ -13,10 +13,6 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
-#ifndef DEFAULT_MYSQL_HOME
-#define DEFAULT_MYSQL_HOME "/usr/local/mysql"
-#endif
-
 #include "mysql_priv.h"
 #include <m_ctype.h>
 #include <my_dir.h>
@@ -32,6 +28,10 @@
 #include "../storage/myisam/ha_myisam.h"
 
 #include "rpl_injector.h"
+
+#ifndef DEFAULT_MYSQL_HOME
+#define DEFAULT_MYSQL_HOME "/usr/local/mysql"
+#endif
 
 #ifdef WITH_INNOBASE_STORAGE_ENGINE
 #define OPT_INNODB_DEFAULT 1