Merge bk-internal.mysql.com:/home/bk/mysql-4.1

into mysql.com:/my/mysql-4.1

support-files/MacOSX/postinstall.sh

@@ -10,7 +10,7 @@
 
 if cd @prefix@ ; then
 	if [ ! -f data/mysql/db.frm ] ; then
-		./scripts/mysql_install_db -IN-RPM
+		./scripts/mysql_install_db --rpm
 	fi
 
 	if [ -d data ] ; then

support-files/mysql.spec.sh

@@ -470,6 +470,7 @@ fi
 %attr(755, root, root) %{_bindir}/myisamlog
 %attr(755, root, root) %{_bindir}/myisampack
 %attr(755, root, root) %{_bindir}/mysql_convert_table_format
+%attr(755, root, root) %{_bindir}/mysql_create_system_tables
 %attr(755, root, root) %{_bindir}/mysql_explain_log
 %attr(755, root, root) %{_bindir}/mysql_fix_extensions
 %attr(755, root, root) %{_bindir}/mysql_fix_privilege_tables
@@ -568,6 +569,10 @@ fi
 # The spec file changelog only includes changes made to the spec file
 # itself
 %changelog 
+* Fri Dec 05 2003 Lenz Grimmer <lenz@mysql.com>
+
+- added missing file mysql_create_system_tables to the server subpackage
+
 * Fri Nov 21 2003 Lenz Grimmer <lenz@mysql.com>
 
 - removed dependency on MySQL-client from the MySQL-devel subpackage

tests/client_test.c

@@ -7955,7 +7955,12 @@ static void test_ts()
 
 /*
   Test for bug #1500.
+  XXX: despite that this bug is fixed, it spots mysqld code which is not
+  working correctly yet: to fix all things  properly we need to implement
+  Item::cleanup() method for all items (as described in bugs #1663 and
+  #1749). So don't be surprised in case valgrind barks on it.
 */
+
 static void test_bug1500()
 {
   MYSQL_STMT *stmt;