Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1-new

into  krsna.patg.net:/home/patg/mysql-build/mysql-5.1-new2

client/mysql.cc

@@ -728,7 +728,7 @@ static void usage(int version)
 	 my_progname, VER, MYSQL_SERVER_VERSION, SYSTEM_TYPE, MACHINE_TYPE,
          readline, rl_library_version);
 #else
-  printf("%s  Ver %s Distrib %s, for %s (%s)", my_progname, VER,
+  printf("%s  Ver %s Distrib %s, for %s (%s)\n", my_progname, VER,
 	MYSQL_SERVER_VERSION, SYSTEM_TYPE, MACHINE_TYPE);
 #endif
 

support-files/mysql.spec.sh

@@ -706,6 +706,13 @@ fi
 # itself - note that they must be ordered by date (important when
 # merging BK trees)
 %changelog 
+* Mon Dec 05 2005 Joerg Bruehe <joerg@mysql.com>
+
+- Avoid using the "bundled" zlib on "shared" builds: 
+  As it is not installed (on the build system), this gives dependency 
+  problems with "libtool" causing the build to fail.
+  (Change was done on Nov 11, but left uncommented.)
+
 * Tue Nov 22 2005 Joerg Bruehe <joerg@mysql.com>
 
 - Extend the file existence check for "init.d/mysql" on un-install