Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.1

into mysql.com:/space/my/mysql-4.1

Makefile.am

@@ -20,7 +20,7 @@ AUTOMAKE_OPTIONS =	foreign
 
 # These are built from source in the Docs directory
 EXTRA_DIST =		INSTALL-SOURCE README \
-			COPYING COPYING.LIB
+			COPYING COPYING.LIB zlib
 SUBDIRS =		. include @docs_dirs@ \
 			@readline_topdir@ sql-common \
 			@thread_dirs@ pstack @sql_client_dirs@ \

scripts/mysql_install_db.sh

@@ -128,7 +128,7 @@ fi
 
 if test ! -x $mysqld
 then
-  if test "$in_rpm" -eq 1
+  if test "$in_rpm" = 1
   then
     echo "FATAL ERROR $mysqld not found!"
     exit 1
@@ -167,7 +167,7 @@ then
   fi
 fi
 
-if test "$ip_only" -eq 1
+if test "$ip_only" = 1
 then
   ip=`echo "$resolved" | awk '/ /{print $6}'`
   hostname=$ip
@@ -187,7 +187,7 @@ then
   c_d="yes"
 fi
 
-if test $verbose -eq 1
+if test $verbose = 1
 then
   create_option="verbose"
 else