bk commit into 5.1 tree (knielsen:1.2160)

[knielsen]

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.2160 06/02/22 09:26:48 knielsen@stripped +2 -0
  Merge mysqldev@win2003-x86:my/mysql-5.1-new
  into  mysql.com:/usr/local/mysql/tmpbuild-5.1

  win/cmakefiles/sql
    1.6 06/02/22 09:26:43 knielsen@stripped +0 -0
    Auto merged

  mysql-test/mysql-test-run.pl
    1.72 06/02/22 09:26:43 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/tmpbuild-5.1/RESYNC

--- 1.71/mysql-test/mysql-test-run.pl	2006-02-20 00:28:50 +01:00
+++ 1.72/mysql-test/mysql-test-run.pl	2006-02-22 09:26:43 +01:00
@@ -981,16 +981,25 @@
     if ( $glob_win32 )
     {
       $path_client_bindir= mtr_path_exists("$glob_basedir/client_release",
-                                           "$glob_basedir/bin");
+                                           "$glob_basedir/bin",
+                                           # New CMake locations.
+                                           "$glob_basedir/client/release",
+                                           "$glob_basedir/client/debug");
       $exe_mysqld=         mtr_exe_exists ("$path_client_bindir/mysqld-max",
                                            "$path_client_bindir/mysqld-nt",
                                            "$path_client_bindir/mysqld",
-                                           "$path_client_bindir/mysqld-debug",);
-      $path_language=      mtr_path_exists("$glob_basedir/share/english/");
-      $path_charsetsdir=   mtr_path_exists("$glob_basedir/share/charsets");
+                                           "$path_client_bindir/mysqld-debug",
+                                           "$glob_basedir/sql/release/mysqld",
+                                           "$glob_basedir/sql/debug/mysqld");
+      $path_language=      mtr_path_exists("$glob_basedir/share/english/",
+                                           "$glob_basedir/sql/share/english/");
+      $path_charsetsdir=   mtr_path_exists("$glob_basedir/share/charsets",
+                                           "$glob_basedir/sql/share/charsets");
 
       $exe_my_print_defaults=
-        mtr_exe_exists("$path_client_bindir/my_print_defaults");
+        mtr_exe_exists("$path_client_bindir/my_print_defaults",
+                       "$glob_basedir/extra/release/my_print_defaults",
+                       "$glob_basedir/extra/debug/my_print_defaults");
     }
     else
     {

--- 1.5/win/cmakefiles/sql	2006-02-10 11:18:10 +01:00
+++ 1.6/win/cmakefiles/sql	2006-02-22 09:26:43 +01:00
@@ -40,7 +40,7 @@
 					  sql_state.c sql_string.cc sql_table.cc sql_test.cc sql_trigger.cc sql_udf.cc
sql_union.cc
 					  sql_update.cc sql_view.cc sql_yacc.h sql_yacc.cc strfunc.cc table.cc thr_malloc.cc
time.cc tztime.cc
 					  uniques.cc unireg.cc item_xmlfunc.cc rpl_tblmap.cc sql_binlog.cc event_executor.cc
-					  event_timed.cc sql_tablespace.cc event.cc ../sql-common/my_user.c
+					  event_timed.cc sql_tablespace.cc event.cc ../sql-common/my_user.c
partition_info.cc
 					  ${PROJECT_SOURCE_DIR}/sql/sql_yacc.cc
   					  ${PROJECT_SOURCE_DIR}/sql/sql_yacc.h
 					  ${PROJECT_SOURCE_DIR}/include/mysqld_error.h