Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0

into  c-8b0ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.1


BitKeeper/etc/config:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/information_schema_db.result:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
mysys/default.c:
  Auto merged
scripts/Makefile.am:
  Auto merged
scripts/mysql_create_system_tables.sh:
  Auto merged
scripts/mysql_fix_privilege_tables.sql:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/ha_federated.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/lock.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/slave.cc:
  Auto merged
sql/slave.h:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/table.cc:
  Auto merged
sql/table.h:
  Auto merged
sql/tztime.cc:
  Auto merged
sql/unireg.cc:
  Auto merged
storage/innobase/buf/buf0buf.c:
  Auto merged
storage/innobase/include/os0file.h:
  Auto merged
storage/innobase/include/read0read.h:
  Auto merged
storage/innobase/include/read0types.h:
  Auto merged
storage/innobase/include/trx0trx.h:
  Auto merged
storage/innobase/os/os0file.c:
  Auto merged
storage/innobase/read/read0read.c:
  Auto merged
storage/innobase/row/row0sel.c:
  Auto merged
storage/innobase/srv/srv0srv.c:
  Auto merged
storage/innobase/srv/srv0start.c:
  Auto merged
storage/innobase/trx/trx0sys.c:
  Auto merged
storage/innobase/trx/trx0trx.c:
  Auto merged
storage/myisam/mi_create.c:
  Auto merged
storage/myisam/sort.c:
  Auto merged
storage/ndb/include/mgmapi/mgmapi.h:
  Auto merged
storage/ndb/include/mgmapi/mgmapi_config_parameters.h:
  Auto merged
storage/ndb/src/common/portlib/NdbMutex.c:
  Auto merged
storage/ndb/src/common/portlib/NdbThread.c:
  Auto merged
storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
  Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.hpp:
  Auto merged
strings/ctype-big5.c:
  Auto merged
strings/ctype-ucs2.c:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
configure.in:
  Manual merge 5.0 -> 5.1
mysql-test/t/alter_table.test:
  Manual merge 5.0 -> 5.1
sql/share/errmsg.txt:
  Manual merge 5.0 -> 5.1
storage/ndb/tools/Makefile.am:
  Manual merge 5.0 -> 5.1

5 files changed, 11 insertions, 192 deletions

diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 79764ab63cc..c4d0e9aba18 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -34,10 +34,13 @@ bin_SCRIPTS =		@server_scripts@ \
 			mysqld_multi \
 			mysql_create_system_tables
 
+noinst_SCRIPTS =	make_binary_distribution \
+			make_sharedlib_distribution \
+			make_win_src_distribution
+
 EXTRA_SCRIPTS =		make_binary_distribution.sh \
 			make_sharedlib_distribution.sh \
 			make_win_src_distribution.sh \
-			make_win_binary_distribution.sh \
 			msql2mysql.sh \
 			mysql_config.sh \
 			mysql_fix_privilege_tables.sh \
@@ -145,5 +148,3 @@ SUFFIXES = .sh
 
 # Don't update the files from bitkeeper
 %::SCCS/s.%
-
-all: make_win_src_distribution make_binary_distribution make_sharedlib_distribution
diff --git a/scripts/make_win_binary_distribution.sh b/scripts/make_win_binary_distribution.sh
deleted file mode 100644
index c611454450c..00000000000
--- a/scripts/make_win_binary_distribution.sh
+++ /dev/null
@@ -1,185 +0,0 @@
-#!/bin/sh
-
-#
-# Script to create a Windows binary package
-#
-# This is intended to be used under Cygwin, and will generate
-# an archive named in the form mysql<suffix>-<version>-noinstall.zip
-
-version=@VERSION@
-
-DEBUG=0
-SUFFIX=""
-DIRNAME=""
-EXTRA=""
-
-#
-# This script must run from MySQL top directory
-#
-
-if [ ! -f scripts/make_win_binary_distribution ]; then
-  echo "ERROR : You must run this script from the MySQL top-level directory"
-  exit 1
-fi
-
-#
-# Debug print of the status
-#
-
-print_debug()
-{
-  for statement
-  do
-    if [ "$DEBUG" = "1" ] ; then
-      echo $statement
-    fi
-  done
-}
-
-#
-# Usage of the script
-#
-
-show_usage()
-{
-  echo "MySQL utility script to create a Windows binary package"
-  echo ""
-  echo "This is intended to be used under Cygwin, and will generate"
-  echo "an archive named in the form mysql<suffix>-<version>-noinstall.zip"
-  echo "Takes the following arguments:"
-  echo ""
-  echo "  --dirname  Directory to use for copying files"
-  echo "  --extra    Directory to get extra files from"
-  echo "  --suffix   Name to append to 'mysql' for this binary"
-  echo "  --help     Show this help message"
-  exit 0
-}
-
-#
-# Parse the input arguments
-#
-
-parse_arguments() {
-  for arg do
-    case "$arg" in
-      --debug)    DEBUG=1;;
-      --extra=*) EXTRA=`echo "$arg" | sed -e "s;--extra=;;"` ;;
-      --suffix=*) SUFFIX=`echo "$arg" | sed -e "s;--suffix=;;"` ;;
-      --dirname=*) DIRNAME=`echo "$arg" | sed -e "s;--dirname=;;"` ;;
-      --help)     show_usage ;;
-      *)
-  echo "Unknown argument '$arg'"
-  exit 1
-      ;;
-    esac
-  done
-}
-
-parse_arguments "$@"
-
-if [ -z "$DIRNAME" ]; then
-  $DIRNAME="dist"
-fi
-
-print_debug "Making directories"
-mkdir $DIRNAME
-$DIRNAME="$DIRNAME/mysql-$version"
-mkdir $DIRNAME
-
-for dir in bin lib lib/opt lib/debug Embedded Embedded/DLL Embedded/DLL/debug Embedded/DLL/release Embedded/static Embedded/static/release examples examples/libmysqltest
-do
-  mkdir $DIRNAME/$dir
-done
-
-if [ $EXTRA ]; then
-  print_debug "Copying extra files"
-  cp -fr $EXTRA/* $DIRNAME
-fi
-
-# Dirs to be copied as-is
-for dir in data Docs include scripts share
-do
-  print_debug "Copying $dir to $DIRNAME/"
-  cp -fr $dir $DIRNAME
-done
-
-print_debug "Copying tests to $DIRNAME/examples/"
-cp -fr tests $DIRNAME/examples
-
-print_debug "Copying sql-bench to $DIRNAME/bench"
-mkdir $DIRNAME/bench
-cp -fr sql-bench/* $DIRNAME/bench
-
-print_debug "Copying mysql-test to $DIRNAME/mysql-test"
-mkdir $DIRNAME/mysql-test
-cp -fr mysql-test/* $DIRNAME/mysql-test
-
-print_debug "Copying support-files to $DIRNAME"
-cp support-files/* $DIRNAME
-
-# Files for bin
-for i in client_release/* client_debug/mysqld.exe lib_release/libmySQL.dll
-do
-  print_debug "Copying $i to $DIRNAME/bin"
-  cp $i $DIRNAME/bin
-done
-
-# Files for include
-for i in libmysql/libmysql.def libmysqld/libmysqld.def
-do
-  print_debug "Copying $i to $DIRNAME/include"
-  cp $i $DIRNAME/include
-done
-
-# Windows users are used to having dbug.h ?
-cp include/my_dbug.h $DIRNAME/include/dbug.h
-
-# Libraries found in lib_release and lib_debug
-for i in libmySQL.dll libmysql.lib zlib.lib mysqlclient.lib mysys.lib regex.lib strings.lib
-do
-  print_debug "Copying lib_release/$i to $DIRNAME/lib/opt"
-  cp lib_release/$i $DIRNAME/lib/opt
-  print_debug "Copying lib_debug/$i to $DIRNAME/lib/debug"
-  cp lib_debug/$i $DIRNAME/lib/debug
-done
-
-print_debug "Copying lib_release/mysys-max.lib to $DIRNAME/lib/opt"
-cp lib_release/mysys-max.lib $DIRNAME/lib/opt
-
-# Embedded server
-for i in libmysqld.dll libmysqld.lib libmysqld.exp
-do
-  print_debug "Copying lib_release/$i to $DIRNAME/Embedded/DLL/release"
-  cp lib_release/$i $DIRNAME/Embedded/DLL/release
-  print_debug "Copying lib_debug/$i to $DIRNAME/Embedded/DLL/debug"
-  cp lib_debug/$i $DIRNAME/Embedded/DLL/debug
-done
-
-# Static embedded
-print_debug "Copying lib_release/mysqlserver.lib to $DIRNAME/Embedded/static/release"
-cp lib_release/mysqlserver.lib $DIRNAME/Embedded/static/release
-
-# libmysqltest
-for i in mytest.c mytest.dsp mytest.dsw mytest.exe
-do
-  print_debug "Copying libmysqltest/release/$i to $DIRNAME/examples/libmysqltest"
-  cp libmysqltest/release/$i $DIRNAME/examples/libmysqltest
-done
-
-print_debug "Copying README.txt"
-cp README.txt $DIRNAME
-
-if [ -f MySQLEULA.txt ]; then
-  print_debug "Commercial version: copying MySQLEULA.txt"
-  cp MySQLEULA.txt $DIRNAME
-  rm $DIRNAME/Docs/COPYING
-else
-  print_debug "GPL version: copying COPYING"
-  cp Docs/COPYING $DIRNAME
-fi
-
-print_debug "Invoking zip to package the binary"
-zip -r mysql$SUFFIX-$version-win-noinstall.zip $DIRNAME
-
-print_debug "Deleting intermediate directory"
-rm -rf $DIRNAME
diff --git a/scripts/make_win_src_distribution.sh b/scripts/make_win_src_distribution.sh
index c79433f97c1..8183370f220 100644
--- a/scripts/make_win_src_distribution.sh
+++ b/scripts/make_win_src_distribution.sh
@@ -202,7 +202,7 @@ copy_dir_files()
     for i in *.c *.cpp *.h *.ih *.i *.ic *.asm *.def *.hpp *.dsp *.dsw \
              README INSTALL* LICENSE AUTHORS NEWS ChangeLog \
              *.inc *.test *.result *.pem Moscow_leap des_key_file \
-             *.dat *.000001 *.require *.opt
+             *.vcproj *.sln *.dat *.000001 *.require *.opt
     do
       if [ -f $i ]
       then
@@ -343,7 +343,9 @@ mv $BASE/sql/sql_yacc.cpp-new $BASE/sql/sql_yacc.cpp
 # Search the tree for plain text files and adapt the line end marker
 #
 find $BASE \( -name "*.dsp" -o -name "*.dsw" -o -name "*.cnf" -o -name "*.ini" \
-           -o -name COPYING -o -name ChangeLog -o -name EXCEPTIONS-CLIENT -o -name "INSTALL*" -o -name LICENSE -o -name "README*" \) -type f -print \
+           -o -name COPYING -o -name ChangeLog -o -name EXCEPTIONS-CLIENT 
+           -o -name "INSTALL*" -o -name LICENSE -o -name "README*" 
+           -o -name "*.vcproj" -o -name "*.sln" \) -type f -print \
 | while read v
   do
     unix_to_dos $v
diff --git a/scripts/mysql_create_system_tables.sh b/scripts/mysql_create_system_tables.sh
index a3036b5c10b..383f8b80dc8 100644
--- a/scripts/mysql_create_system_tables.sh
+++ b/scripts/mysql_create_system_tables.sh
@@ -683,7 +683,7 @@ then
   c_p="$c_p   security_type     enum('INVOKER','DEFINER') DEFAULT 'DEFINER' NOT NULL,"
   c_p="$c_p   param_list        blob DEFAULT '' NOT NULL,"
   c_p="$c_p   returns           char(64) DEFAULT '' NOT NULL,"
-  c_p="$c_p   body              blob DEFAULT '' NOT NULL,"
+  c_p="$c_p   body              longblob DEFAULT '' NOT NULL,"
   c_p="$c_p   definer           char(77) collate utf8_bin DEFAULT '' NOT NULL,"
   c_p="$c_p   created           timestamp,"
   c_p="$c_p   modified          timestamp,"
diff --git a/scripts/mysql_fix_privilege_tables.sql b/scripts/mysql_fix_privilege_tables.sql
index bc9da056758..00e02455673 100644
--- a/scripts/mysql_fix_privilege_tables.sql
+++ b/scripts/mysql_fix_privilege_tables.sql
@@ -425,7 +425,7 @@ CREATE TABLE IF NOT EXISTS proc (
   security_type     enum('INVOKER','DEFINER') DEFAULT 'DEFINER' NOT NULL,
   param_list        blob DEFAULT '' NOT NULL,
   returns           char(64) DEFAULT '' NOT NULL,
-  body              blob DEFAULT '' NOT NULL,
+  body              longblob DEFAULT '' NOT NULL,
   definer           char(77) collate utf8_bin DEFAULT '' NOT NULL,
   created           timestamp,
   modified          timestamp,
@@ -476,6 +476,7 @@ ALTER TABLE proc MODIFY name char(64) DEFAULT '' NOT NULL,
                              'READS_SQL_DATA',
                              'MODIFIES_SQL_DATA'
                             ) DEFAULT 'CONTAINS_SQL' NOT NULL,
+                 MODIFY body longblob DEFAULT '' NOT NULL,
                  MODIFY sql_mode
                         set('REAL_AS_FLOAT',
                             'PIPES_AS_CONCAT',