From 71583c893afba17533d59ed8863674ade47ede5f Mon Sep 17 00:00:00 2001
From: unknown <tsmith@maint2.mysql.com>
Date: Wed, 30 Aug 2006 21:24:09 +0200
Subject: [PATCH 1/2] portability fix in BUILD/* for solaris

---
 BUILD/check-cpu | 363 ++++++++++++++++++++++++------------------------
 1 file changed, 183 insertions(+), 180 deletions(-)

diff --git a/BUILD/check-cpu b/BUILD/check-cpu
index b970a4b9a5b..e207d12d972 100755
--- a/BUILD/check-cpu
+++ b/BUILD/check-cpu
@@ -3,203 +3,206 @@
 # Check cpu of current machine and find the
 # best compiler optimization flags for gcc
 #
-#
 
-if test -r /proc/cpuinfo ; then
-  # on Linux (and others?) we can get detailed CPU information out of /proc
-  cpuinfo="cat /proc/cpuinfo"
+check_cpu () {
+  if test -r /proc/cpuinfo ; then
+    # on Linux (and others?) we can get detailed CPU information out of /proc
+    cpuinfo="cat /proc/cpuinfo"
 
-  # detect CPU family
-  cpu_family=`$cpuinfo | grep 'family' | cut -d ':' -f 2 | cut -d ' ' -f 2 | head -1`
-  if test -z "$cpu_family" ; then
-    cpu_family=`$cpuinfo | grep 'cpu' | cut -d ':' -f 2 | cut -d ' ' -f 2 | head -1`
+    # detect CPU family
+    cpu_family=`$cpuinfo | grep 'family' | cut -d ':' -f 2 | cut -d ' ' -f 2 | head -1`
+    if test -z "$cpu_family" ; then
+      cpu_family=`$cpuinfo | grep 'cpu' | cut -d ':' -f 2 | cut -d ' ' -f 2 | head -1`
+    fi
+
+    # detect CPU vendor and model
+    cpu_vendor=`$cpuinfo | grep 'vendor_id' | cut -d ':' -f 2 | cut -d ' ' -f 2 | head -1`
+    model_name=`$cpuinfo | grep 'model name' | cut -d ':' -f 2 | head -1`
+    if test -z "$model_name" ; then
+      model_name=`$cpuinfo | grep 'cpu model' | cut -d ':' -f 2 | head -1`
+    fi
+
+    # fallback: get CPU model from uname output
+    if test -z "$model_name" ; then
+      model_name=`uname -m`
+    fi
+
+    # parse CPU flags
+    for flag in `$cpuinfo | grep '^flags' | sed -e 's/^flags.*: //'`; do 
+          eval cpu_flag_$flag=yes
+    done
+  else
+    # Fallback when there is no /proc/cpuinfo
+    case "`uname -s`" in
+      FreeBSD|OpenBSD)
+        cpu_family=`uname -m`;
+        model_name=`sysctl -n hw.model`
+        ;;
+      Darwin)
+        cpu_family=`uname -p`
+        model_name=`machine`
+        ;;
+      *)
+        cpu_family=`uname -m`;
+        model_name=`uname -p`;
+        ;;
+    esac
   fi
 
-  # detect CPU vendor and model
-  cpu_vendor=`$cpuinfo | grep 'vendor_id' | cut -d ':' -f 2 | cut -d ' ' -f 2 | head -1`
-  model_name=`$cpuinfo | grep 'model name' | cut -d ':' -f 2 | head -1`
-  if test -z "$model_name" ; then
-    model_name=`$cpuinfo | grep 'cpu model' | cut -d ':' -f 2 | head -1`
-  fi
-
-  # fallback: get CPU model from uname output
-  if test -z "$model_name" ; then
-    model_name=`uname -m`
-  fi
-
-  # parse CPU flags
-  for flag in `$cpuinfo | grep '^flags' | sed -e 's/^flags.*: //'`; do 
-	eval cpu_flag_$flag=yes
-  done
-else
-  # Fallback when there is no /proc/cpuinfo
-  case "`uname -s`" in
-    FreeBSD|OpenBSD)
-      cpu_family=`uname -m`;
-      model_name=`sysctl -n hw.model`
+  # detect CPU shortname as used by gcc options 
+  # this list is not complete, feel free to add further entries
+  cpu_arg=""
+  case "$cpu_family--$model_name" in
+    # DEC Alpha
+    Alpha*EV6*)
+      cpu_arg="ev6";
       ;;
-    Darwin)
-      cpu_family=`uname -p`
-      model_name=`machine`
+
+    # Intel ia32
+    *Xeon*)
+      # a Xeon is just another pentium4 ...
+      # ... unless it has the "lm" (long-mode) flag set, 
+      # in that case it's a Xeon with EM64T support 
+          if [ -z "$cpu_flag_lm" ]; then
+        cpu_arg="pentium4";
+          else
+        cpu_arg="nocona";
+      fi
       ;;
+    *Pentium*4*Mobile*)
+      cpu_arg="pentium4m";
+    ;;
+    *Pentium*4*)
+      cpu_arg="pentium4";
+      ;;
+    *Pentium*III*Mobile*)
+      cpu_arg="pentium3m";
+    ;;
+    *Pentium*III*)
+      cpu_arg="pentium3";
+    ;;
+    *Pentium*M*pro*)
+      cpu_arg="pentium-m";
+    ;;
+    *Athlon*64*)
+      cpu_arg="athlon64";
+      ;;
+    *Athlon*)
+      cpu_arg="athlon";
+      ;;
+
+    # Intel ia64
+    *Itanium*)
+      # Don't need to set any flags for itanium(at the moment)
+      cpu_arg="";
+      ;;
+
+    #
+    *ppc*)
+      cpu_arg='powerpc'
+      ;;
+   
+    *powerpc*)
+      cpu_arg='powerpc'
+      ;;
+
+    # unknown
     *)
-      cpu_family=`uname -m`;
-      model_name=`uname -p`;
+      cpu_arg="";
       ;;
   esac
-fi
-
-# detect CPU shortname as used by gcc options 
-# this list is not complete, feel free to add further entries
-cpu_arg=""
-case "$cpu_family--$model_name" in
-  # DEC Alpha
-  Alpha*EV6*)
-    cpu_arg="ev6";
-    ;;
-
-  # Intel ia32
-  *Xeon*)
-    # a Xeon is just another pentium4 ...
-    # ... unless it has the "lm" (long-mode) flag set, 
-    # in that case it's a Xeon with EM64T support 
-	if [ -z "$cpu_flag_lm" ]; then
-      cpu_arg="pentium4";
-	else
-      cpu_arg="nocona";
-    fi
-    ;;
-  *Pentium*4*Mobile*)
-    cpu_arg="pentium4m";
-  ;;
-  *Pentium*4*)
-    cpu_arg="pentium4";
-    ;;
-  *Pentium*III*Mobile*)
-    cpu_arg="pentium3m";
-  ;;
-  *Pentium*III*)
-    cpu_arg="pentium3";
-  ;;
-  *Pentium*M*pro*)
-    cpu_arg="pentium-m";
-  ;;
-  *Athlon*64*)
-    cpu_arg="athlon64";
-    ;;
-  *Athlon*)
-    cpu_arg="athlon";
-    ;;
-
-  # Intel ia64
-  *Itanium*)
-    # Don't need to set any flags for itanium(at the moment)
-    cpu_arg="";
-    ;;
-
-  #
-  *ppc*)
-    cpu_arg='powerpc'
-    ;;
- 
-  *powerpc*)
-    cpu_arg='powerpc'
-    ;;
-
-  # unknown
-  *)
-    cpu_arg="";
-    ;;
-esac
 
 
-if test -z "$cpu_arg"; then
-  echo "BUILD/check-cpu: Oops, could not find out what kind of cpu this machine is using."
-  check_cpu_cflags=""
-  return
-fi
-
-# different compiler versions have different option names
-# for CPU specific command line options
-if test -z "$CC" ; then
-  cc="gcc";
-else
-  cc=$CC
-fi
-
-cc_ver=`$cc --version | sed 1q`
-cc_verno=`echo $cc_ver | sed -e 's/[^0-9. ]//g;	 s/^ *//g; s/ .*//g'`
-
-case "$cc_ver--$cc_verno" in
-  *GCC*)
-      # different gcc backends (and versions) have different CPU flags
-      case `gcc -dumpmachine` in
-        i?86-*)
-   	      case "$cc_verno" in
-		    3.4*|3.5*|4.*)
-			  check_cpu_args='-mtune=$cpu_arg -march=$cpu_arg'
-			  ;;
-		    *)
-			  check_cpu_args='-mcpu=$cpu_arg -march=$cpu_arg'
-			  ;;
-          esac
-          ;;
-        ppc-*)
-		  check_cpu_args='-mcpu=$cpu_arg -mtune=$cpu_arg'
-          ;;
-        *)
-          check_cpu_cflags=""
-          return
-          ;;
-      esac
-    ;;
-  2.95.*)
-    # GCC 2.95 doesn't expose its name in --version output
-    check_cpu_args='-m$cpu_arg'
-    ;;
-  *)
+  if test -z "$cpu_arg"; then
+    echo "BUILD/check-cpu: Oops, could not find out what kind of cpu this machine is using." >&2
     check_cpu_cflags=""
     return
-    ;;
-esac
-
-# now we check whether the compiler really understands the cpu type
-touch __test.c
-
-while [ "$cpu_arg" ] ; do
-  echo -n testing $cpu_arg "... "
-	
-  # compile check
-  check_cpu_cflags=`eval echo $check_cpu_args`
-  if $cc -c $check_cpu_cflags __test.c 2>/dev/null; then
-	  echo ok
-      break;
   fi
 
-  echo failed
-  check_cpu_cflags=""
+  # different compiler versions have different option names
+  # for CPU specific command line options
+  if test -z "$CC" ; then
+    cc="gcc";
+  else
+    cc=$CC
+  fi
 
-  # if compile failed: check whether it supports a predecessor of this CPU
-  # this list is not complete, feel free to add further entries
-  case "$cpu_arg" in
-    # Intel ia32
-    nocona)     cpu_arg=pentium4    ;; 
-    prescott)   cpu_arg=pentium4    ;;
-    pentium4m)  cpu_arg=pentium4    ;;
-    pentium4)   cpu_arg=pentium3    ;;
-    pentium3m)  cpu_arg=pentium3    ;;
-    pentium3)   cpu_arg=pentium2    ;;
-    pentium2)   cpu_arg=pentiumpro  ;;
-    pentiumpro) cpu_arg=pentium     ;;
-    pentium)    cpu_arg=i486        ;;
-    i486)       cpu_arg=i386        ;;
+  cc_ver=`$cc --version | sed 1q`
+  cc_verno=`echo $cc_ver | sed -e 's/[^0-9. ]//g;	 s/^ *//g; s/ .*//g'`
 
-	# power / powerPC
-	7450)       cpu_arg=7400        ;;
-
-    *)          cpu_arg=""          ;;
+  case "$cc_ver--$cc_verno" in
+    *GCC*)
+        # different gcc backends (and versions) have different CPU flags
+        case `gcc -dumpmachine` in
+          i?86-*)
+                case "$cc_verno" in
+                      3.4*|3.5*|4.*)
+                            check_cpu_args='-mtune=$cpu_arg -march=$cpu_arg'
+                            ;;
+                      *)
+                            check_cpu_args='-mcpu=$cpu_arg -march=$cpu_arg'
+                            ;;
+            esac
+            ;;
+          ppc-*)
+                    check_cpu_args='-mcpu=$cpu_arg -mtune=$cpu_arg'
+            ;;
+          *)
+            check_cpu_cflags=""
+            return
+            ;;
+        esac
+      ;;
+    2.95.*)
+      # GCC 2.95 doesn't expose its name in --version output
+      check_cpu_args='-m$cpu_arg'
+      ;;
+    *)
+      check_cpu_cflags=""
+      return
+      ;;
   esac
-done
 
-rm __test.*
+  # now we check whether the compiler really understands the cpu type
+  touch __test.c
 
+  while [ "$cpu_arg" ] ; do
+    # FIXME: echo -n isn't portable - see contortions autoconf goes through
+    echo -n testing $cpu_arg "... " >&2
+          
+    # compile check
+    check_cpu_cflags=`eval echo $check_cpu_args`
+    if $cc -c $check_cpu_cflags __test.c 2>/dev/null; then
+            echo ok >&2
+        break;
+    fi
+
+    echo failed >&2
+    check_cpu_cflags=""
+
+    # if compile failed: check whether it supports a predecessor of this CPU
+    # this list is not complete, feel free to add further entries
+    case "$cpu_arg" in
+      # Intel ia32
+      nocona)     cpu_arg=pentium4    ;; 
+      prescott)   cpu_arg=pentium4    ;;
+      pentium4m)  cpu_arg=pentium4    ;;
+      pentium4)   cpu_arg=pentium3    ;;
+      pentium3m)  cpu_arg=pentium3    ;;
+      pentium3)   cpu_arg=pentium2    ;;
+      pentium2)   cpu_arg=pentiumpro  ;;
+      pentiumpro) cpu_arg=pentium     ;;
+      pentium)    cpu_arg=i486        ;;
+      i486)       cpu_arg=i386        ;;
+
+          # power / powerPC
+          7450)       cpu_arg=7400        ;;
+
+      *)          cpu_arg=""          ;;
+    esac
+  done
+
+  rm __test.*
+}
+
+check_cpu

From 077b649aef8c7432e8b08606465d5954d07289ed Mon Sep 17 00:00:00 2001
From: unknown <tsmith@maint2.mysql.com>
Date: Wed, 30 Aug 2006 22:39:23 +0200
Subject: [PATCH 2/2] Remove ^Z from ctype_ucs.test data, to avoid problems
 testing on Windows

---
 mysql-test/r/ctype_ucs.result | 14 +++++++-------
 mysql-test/t/ctype_ucs.test   |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/mysql-test/r/ctype_ucs.result b/mysql-test/r/ctype_ucs.result
index 3a65287ffc5..05866ea4966 100644
--- a/mysql-test/r/ctype_ucs.result
+++ b/mysql-test/r/ctype_ucs.result
@@ -726,26 +726,26 @@ drop table if exists bug20536;
 set names latin1;
 create table bug20536 (id bigint not null auto_increment primary key, name
 varchar(255) character set ucs2 not null);
-insert into `bug20536` (`id`,`name`) values (1, _latin1 x'74657374311a'), (2, "'test\\_2'");
+insert into `bug20536` (`id`,`name`) values (1, _latin1 x'7465737431'), (2, "'test\\_2'");
 select md5(name) from bug20536;
 md5(name)
-3417d830fe24ffb2f81a28e54df2d1b3
+f4b7ce8b45a20e3c4e84bef515d1525c
 48d95db0d8305c2fe11548a3635c9385
 select sha1(name) from bug20536;
 sha1(name)
-72228a6d56efb7a89a09543068d5d8fa4c330881
+e0b52f38deddb9f9e8d5336b153592794cb49baf
 677d4d505355eb5b0549b865fcae4b7f0c28aef5
 select make_set(3, name, upper(name)) from bug20536;
 make_set(3, name, upper(name))
-test1,TEST1
+test1,TEST1
 'test\_2','TEST\_2'
 select export_set(5, name, upper(name)) from bug20536;
 export_set(5, name, upper(name))
-test1,TEST1,test1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1
+test1,TEST1,test1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1
 'test\_2','TEST\_2','test\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2'
 select export_set(5, name, upper(name), ",", 5) from bug20536;
 export_set(5, name, upper(name), ",", 5)
-test1,TEST1,test1,TEST1,TEST1
+test1,TEST1,test1,TEST1,TEST1
 'test\_2','TEST\_2','test\_2','TEST\_2','TEST\_2'
 select password(name) from bug20536;
 password(name)
@@ -761,7 +761,7 @@ SA5pDi1UPZdys
 SA5pDi1UPZdys
 select quote(name) from bug20536;
 quote(name)
-??????????
+????????
 ????????????????
 drop table bug20536;
 End of 4.1 tests
diff --git a/mysql-test/t/ctype_ucs.test b/mysql-test/t/ctype_ucs.test
index 0ad38d98403..62244b3d8f5 100644
--- a/mysql-test/t/ctype_ucs.test
+++ b/mysql-test/t/ctype_ucs.test
@@ -475,7 +475,7 @@ drop table if exists bug20536;
 set names latin1;
 create table bug20536 (id bigint not null auto_increment primary key, name
 varchar(255) character set ucs2 not null);
-insert into `bug20536` (`id`,`name`) values (1, _latin1 x'74657374311a'), (2, "'test\\_2'");
+insert into `bug20536` (`id`,`name`) values (1, _latin1 x'7465737431'), (2, "'test\\_2'");
 select md5(name) from bug20536;
 select sha1(name) from bug20536;
 select make_set(3, name, upper(name)) from bug20536;