MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Timothy Smith Date:July 21 2008 4:19am
Subject:bzr push into mysql-5.0 branch (timothy.smith:2640 to 2643)
View as plain text  
 2643 Timothy Smith	2008-07-20 [merge]
      Merge latest changes from 5.0-build

 2642 Timothy Smith	2008-07-18 [merge]
      Merge 5.0.66a-release changes
modified:
  include/my_sys.h
  mysys/default.c
  mysys/mf_pack.c

 2641 Jonathan Perkin	2008-07-16 [merge]
      Merge from mysql-5.0.60sp1-release

 2640 Joerg Bruehe	2008-07-14 [merge]
      Merge main 5.0 into 5.0-build
added:
  mysql-test/r/parser.result
  mysql-test/t/parser.test
modified:
  mysql-test/include/have_archive.inc
  mysql-test/include/have_bdb.inc
  mysql-test/include/have_big5.inc
  mysql-test/include/have_blackhole.inc
  mysql-test/include/have_case_sensitive_file_system.inc
  mysql-test/include/have_compress.inc
  mysql-test/include/have_cp1250_ch.inc
  mysql-test/include/have_cp932.inc
  mysql-test/include/have_crypt.inc
  mysql-test/include/have_csv.inc
  mysql-test/include/have_eucjpms.inc
  mysql-test/include/have_euckr.inc
  mysql-test/include/have_exampledb.inc
  mysql-test/include/have_federated_db.inc
  mysql-test/include/have_gb2312.inc
  mysql-test/include/have_gbk.inc
  mysql-test/include/have_geometry.inc
  mysql-test/include/have_innodb.inc
  mysql-test/include/have_latin2_ch.inc
  mysql-test/include/have_log_bin.inc
  mysql-test/include/have_lowercase0.inc
  mysql-test/include/have_multi_ndb.inc
  mysql-test/include/have_ndb.inc
  mysql-test/include/have_query_cache.inc
  mysql-test/include/have_sjis.inc
  mysql-test/include/have_ssl.inc
  mysql-test/include/have_tis620.inc
  mysql-test/include/have_ucs2.inc
  mysql-test/include/have_udf.inc
  mysql-test/include/have_ujis.inc
  mysql-test/r/comments.result
  mysql-test/r/func_misc.result
  mysql-test/r/ps.result
  mysql-test/r/varbinary.result
  mysql-test/suite/funcs_1/t/is_columns_myisam_embedded.test
  mysql-test/suite/funcs_2/charset/charset_master.test
  mysql-test/suite/funcs_2/t/innodb_charset.test
  mysql-test/suite/funcs_2/t/memory_charset.test
  mysql-test/suite/funcs_2/t/myisam_charset.test
  mysql-test/suite/funcs_2/t/ndb_charset.test
  mysql-test/t/func_misc.test
  mysql-test/t/varbinary.test
  mysys/default.c
  sql/item.cc
  sql/item_strfunc.cc
  sql/log_event.cc
  sql/sp_head.h
  sql/sql_lex.cc
  sql/sql_parse.cc
  sql/sql_yacc.yy

=== modified file 'configure.in'
--- a/configure.in	2008-07-09 06:23:30 +0000
+++ b/configure.in	2008-07-19 03:46:03 +0000
@@ -2812,9 +2812,15 @@ EOF
 
 case $SYSTEM_TYPE-$MACHINE_TYPE-$ac_cv_prog_gcc-$have_ndbcluster in
   *solaris*-i?86-no-yes)
-  # ndb fail for whatever strange reason to link Sun Forte/x86
-  # unless using incremental linker
-  CXXFLAGS="$CXXFLAGS -xildon"
+  if $CC -xildon 2>&1 | grep "illegal option" >/dev/null
+  then
+    # This Solaris ld does not support -xildon
+    true
+  else
+    # ndb fail for whatever strange reason to link Sun Forte/x86
+    # unless using incremental linker
+    CXXFLAGS="$CXXFLAGS -xildon"
+  fi
   ;;
   *) ;;
 esac

=== modified file 'include/my_sys.h'
--- a/include/my_sys.h	2008-01-31 15:15:46 +0000
+++ b/include/my_sys.h	2008-07-16 22:58:45 +0000
@@ -681,6 +681,7 @@ extern my_string fn_format(my_string to,
 			   const char *form, uint flag);
 extern size_s strlength(const char *str);
 extern void pack_dirname(my_string to,const char *from);
+extern uint normalize_dirname(char * to, const char *from);
 extern uint unpack_dirname(my_string to,const char *from);
 extern uint cleanup_dirname(my_string to,const char *from);
 extern uint system_filename(my_string to,const char *from);

=== modified file 'mysys/default.c'
--- a/mysys/default.c	2008-07-02 14:37:29 +0000
+++ b/mysys/default.c	2008-07-16 22:58:45 +0000
@@ -965,8 +965,7 @@ static int add_directory(MEM_ROOT *alloc
   char *p;
   my_bool err __attribute__((unused));
 
-  /* Normalize directory name */
-  len= unpack_dirname(buf, dir);
+  len= normalize_dirname(buf, dir);
   if (!(p= strmake_root(alloc, buf, len)))
     return 1;  /* Failure */
   /* Should never fail if DEFAULT_DIRS_SIZE is correct size */
@@ -1017,7 +1016,7 @@ static const char *my_get_module_parent(
 {
   char *last= NULL;
   char *end;
-  if (!GetModuleFileName(NULL, buf, size))
+  if (!GetModuleFileName(NULL, buf, (DWORD) size))
     return NULL;
   end= strend(buf);
 

=== modified file 'mysys/mf_pack.c'
--- a/mysys/mf_pack.c	2007-12-17 08:13:38 +0000
+++ b/mysys/mf_pack.c	2008-07-16 22:58:45 +0000
@@ -266,22 +266,64 @@ void symdirget(char *dir)
 #endif /* USE_SYMDIR */
 
 
-/*
-  Fixes a directroy name so that can be used by open()
+/**
+  Convert a directory name to a format which can be compared as strings
 
-  SYNOPSIS
-    unpack_dirname()
-    to			result-buffer, FN_REFLEN characters. may be == from
-    from		'Packed' directory name (may contain ~)
-
- IMPLEMENTATION
-  Make that last char of to is '/' if from not empty and
-  from doesn't end in FN_DEVCHAR
-  Uses cleanup_dirname and changes ~/.. to home_dir/..
+  @param to     result buffer, FN_REFLEN chars in length; may be == from
+  @param from   'packed' directory name, in whatever format
+  @returns      size of the normalized name
+
+  @details
+  - Ensures that last char is FN_LIBCHAR, unless it is FN_DEVCHAR
+  - Uses cleanup_dirname
+
+  It does *not* expand ~/ (although, see cleanup_dirname).  Nor does it do
+  any case folding.  All case-insensitive normalization should be done by
+  the caller.
+*/
 
-  Changes a UNIX filename to system filename (replaces / with \ on windows)
+uint normalize_dirname(char *to, const char *from)
+{
+  uint length;
+  char buff[FN_REFLEN];
+  DBUG_ENTER("normalize_dirname");
 
-  RETURN
+  /*
+    Despite the name, this actually converts the name to the system's
+    format (TODO: rip out the non-working VMS stuff and name this
+    properly).
+  */
+  (void) intern_filename(buff, from);
+  length= (uint) strlen(buff);			/* Fix that '/' is last */
+  if (length &&
+#ifdef FN_DEVCHAR
+      buff[length - 1] != FN_DEVCHAR &&
+#endif
+      buff[length - 1] != FN_LIBCHAR && buff[length - 1] != '/')
+  {
+    buff[length]= FN_LIBCHAR;
+    buff[length + 1]= '\0';
+  }
+
+  length=cleanup_dirname(to, buff);
+
+  DBUG_RETURN(length);
+}
+
+
+/**
+  Fixes a directory name so that can be used by open()
+
+  @param to     Result buffer, FN_REFLEN characters. May be == from
+  @param from   'Packed' directory name (may contain ~)
+
+  @details
+  - Uses normalize_dirname()
+  - Expands ~/... to home_dir/...
+  - Resolves MySQL's fake "foo.sym" symbolic directory names (if USE_SYMDIR)
+  - Changes a UNIX filename to system filename (replaces / with \ on windows)
+
+  @returns
    Length of new directory name (= length of to)
 */
 
@@ -291,19 +333,8 @@ uint unpack_dirname(my_string to, const 
   char buff[FN_REFLEN+1+4],*suffix,*tilde_expansion;
   DBUG_ENTER("unpack_dirname");
 
-  (void) intern_filename(buff,from);		/* Change to intern name */
-  length= (uint) strlen(buff);			/* Fix that '/' is last */
-  if (length &&
-#ifdef FN_DEVCHAR
-      buff[length-1] != FN_DEVCHAR &&
-#endif
-      buff[length-1] != FN_LIBCHAR && buff[length-1] != '/')
-  {
-    buff[length]=FN_LIBCHAR;
-    buff[length+1]= '\0';
-  }
+  length= normalize_dirname(buff, from);
 
-  length=cleanup_dirname(buff,buff);
   if (buff[0] == FN_HOMELIB)
   {
     suffix=buff+1; tilde_expansion=expand_tilde(&suffix);

=== modified file 'scripts/make_binary_distribution.sh'
--- a/scripts/make_binary_distribution.sh	2008-04-28 19:53:52 +0000
+++ b/scripts/make_binary_distribution.sh	2008-06-27 17:12:42 +0000
@@ -61,6 +61,7 @@ system=`echo $system | sed -e 's/[a-z]*-
 system=`echo $system | sed -e 's/darwin6.*/osx10.2/g'`
 system=`echo $system | sed -e 's/darwin7.*/osx10.3/g'`
 system=`echo $system | sed -e 's/darwin8.*/osx10.4/g'`
+system=`echo $system | sed -e 's/darwin9.*/osx10.5/g'`
 system=`echo $system | sed -e 's/\(aix4.3\).*/\1/g'`
 system=`echo $system | sed -e 's/\(aix5.1\).*/\1/g'`
 system=`echo $system | sed -e 's/\(aix5.2\).*/\1/g'`

Thread
bzr push into mysql-5.0 branch (timothy.smith:2640 to 2643) Timothy Smith21 Jul