Commit e4be45da authored by unknown's avatar unknown
Browse files

Merge


BitKeeper/etc/logging_ok:
  auto-union
BUILD/autorun.sh:
  Auto merged
BitKeeper/etc/config:
  Auto merged
Makefile.am:
  Auto merged
include/my_bitmap.h:
  Auto merged
libmysqld/Makefile.am:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/grant.result:
  Auto merged
mysql-test/r/ps_6bdb.result:
  Auto merged
mysql-test/r/ps_7ndb.result:
  Auto merged
mysys/Makefile.am:
  Auto merged
mysys/default.c:
  Auto merged
scripts/mysql_create_system_tables.sh:
  Auto merged
scripts/mysql_fix_privilege_tables.sql:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_acl.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_udf.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/heap/Makefile.am:
  Auto merged
storage/heap/hp_hash.c:
  Auto merged
storage/innobase/btr/btr0btr.c:
  Auto merged
storage/innobase/btr/btr0cur.c:
  Auto merged
storage/innobase/configure.in:
  Auto merged
storage/innobase/fil/fil0fil.c:
  Auto merged
storage/innobase/ibuf/ibuf0ibuf.c:
  Auto merged
storage/innobase/include/os0file.h:
  Auto merged
storage/innobase/include/page0cur.h:
  Auto merged
storage/innobase/include/row0mysql.h:
  Auto merged
storage/innobase/include/srv0srv.h:
  Auto merged
storage/innobase/include/trx0trx.h:
  Auto merged
storage/innobase/include/trx0trx.ic:
  Auto merged
storage/innobase/lock/lock0lock.c:
  Auto merged
storage/innobase/log/log0recv.c:
  Auto merged
storage/innobase/os/os0file.c:
  Auto merged
storage/innobase/page/page0cur.c:
  Auto merged
storage/innobase/page/page0page.c:
  Auto merged
storage/innobase/rem/rem0rec.c:
  Auto merged
storage/innobase/row/row0mysql.c:
  Auto merged
storage/innobase/row/row0sel.c:
  Auto merged
storage/innobase/row/row0upd.c:
  Auto merged
storage/innobase/srv/srv0srv.c:
  Auto merged
storage/innobase/trx/trx0trx.c:
  Auto merged
storage/innobase/trx/trx0undo.c:
  Auto merged
storage/myisam/Makefile.am:
  Auto merged
storage/myisam/mi_create.c:
  Auto merged
storage/myisam/mi_open.c:
  Auto merged
storage/myisam/mi_packrec.c:
  Auto merged
storage/myisam/mi_unique.c:
  Auto merged
storage/myisam/myisampack.c:
  Auto merged
storage/myisammrg/Makefile.am:
  Auto merged
storage/ndb/include/mgmcommon/ConfigRetriever.hpp:
  Auto merged
storage/ndb/include/transporter/TransporterDefinitions.hpp:
  Auto merged
storage/ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/src/mgmsrv/main.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
storage/ndb/test/ndbapi/create_tab.cpp:
  Auto merged
storage/ndb/test/ndbapi/testBlobs.cpp:
  Auto merged
strings/ctype-big5.c:
  Auto merged
strings/ctype-ucs2.c:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
configure.in:
  merge
mysql-test/t/disabled.def:
  merge
mysys/my_bitmap.c:
  SCCS merged
sql/ha_federated.cc:
  merge
sql/ha_innodb.cc:
  merge
sql/ha_ndbcluster.cc:
  merge
sql/mysqld.cc:
  e
  merge
sql/sql_insert.cc:
  merge
sql/sql_lex.h:
  merge
sql/sql_load.cc:
  merge
sql/sql_select.cc:
  merge
  e
  C
sql/sql_update.cc:
  merge
sql/table.cc:
  merge
parents f9027b7a ff7db9bf
Loading
Loading
Loading
Loading
+8 −2
Original line number Diff line number Diff line
@@ -4,8 +4,14 @@
aclocal    || (echo "Can't execute aclocal" && exit 1)
autoheader || (echo "Can't execute autoheader" && exit 1)
# --force means overwrite ltmain.sh script if it already exists 
# Added glibtoolize reference to make native OSX autotools work
if [ -f /usr/bin/glibtoolize ] ; then
  glibtoolize --automake --force \
             || (echo "Can't execute glibtoolize" && exit 1)
else
  libtoolize --automake --force \
             || (echo "Can't execute libtoolize" && exit 1)
fi
# --add-missing instructs automake to install missing auxiliary files
# and --force to overwrite them if they already exist
automake --add-missing --force \
+5 −5
Original line number Diff line number Diff line
@@ -36,22 +36,22 @@ CLEAN_FILES: $(txt_files)
GT = $(srcdir)/Support/generate-text-files.pl

../INSTALL-SOURCE:	mysql.info $(GT)
	perl -w $(GT) mysql.info "Installing" "Tutorial" > $@
	perl -w $(GT) mysql.info "installing-source" "windows-source-build" > $@

../INSTALL-WIN-SOURCE:	mysql.info $(GT)
	perl -w $(GT) mysql.info "Windows source build" "Post-installation" > $@
	perl -w $(GT) mysql.info "windows-source-build" "post-installation" > $@

# We put the description for the binary installation here so that
# people who download source wont have to see it. It is moved up to
# the toplevel by the script that makes the binary tar files.
INSTALL-BINARY:	mysql.info $(GT)
	perl -w $(GT) mysql.info "Installing binary" "Installing source" > $@
	perl -w $(GT) mysql.info "installing-binary" "installing-source" > $@

../EXCEPTIONS-CLIENT: mysql.info $(GT)
	perl -w $(GT) mysql.info "MySQL FLOSS License Exception" "Function Index" > $@
	perl -w $(GT) mysql.info "mysql-floss-license-exception" "function-index" > $@

../support-files/MacOSX/ReadMe.txt:	mysql.info $(GT)
	perl -w $(GT) mysql.info "Mac OS X installation" "NetWare installation" > $@
	perl -w $(GT) mysql.info "mac-os-x-installation" "netware-installation" > $@

# Don't update the files from bitkeeper
%::SCCS/s.%

Docs/README.1st

deleted100644 → 0
+0 −76
Original line number Diff line number Diff line
This ALPHA build of MySQL 4.1 for the Windows platform does not come
with an installer. A full-featured installer is being developed for the
4.1 series, and it is scheduled to be released with MySQL 4.1 BETA.

** FRESH INSTALL **

To install MySQL 4.1 as a 'fresh' install, unzip this archive to a directory
of your choice (we suggest 'c:\', which will cause MySQL to be installed in 
a directory named 'mysql' in 'c:\'). You should then follow the directions
in the user manual for starting/stopping MySQL:

(Windows 9x/ME) http://www.mysql.com/doc/en/Win95_start.html
(Windows NT/2000/XP) http://www.mysql.com/doc/en/NT_start.html

** UPGRADE INSTALL **

To install MySQL 4.1 as an upgrade to your current version of MySQL, you need
to perform the following steps:

* Back up your original installation (always a good idea!)

* Unzip the 4.1 archive to a directory that is different than where your
  current MySQL installation is located. (Or, if you do unzip this
  archive into the same location as your existing installation, do NOT
  unpack the 'data' subdirectory. If you unpack the 'data' directory,
  your existing databases will be overwritten.)
  
* Shut down all MySQL server processes/services.

* Remove the Win32 MySQL service (if appropriate for your OS):

	c:\mysql\bin\mysqld-nt --remove
	
* Exit 'WinMySQLAdmin' (if it is running).

* If you unzipped this archive into a directory different than that
  of your existing MySQL installation, copy from the archive all its
  directories and their contents EXCEPT the 'data' directory into the
  existing installation.

* Start the MySQL server with the '--skip-grant-tables' option. Assuming
  your MySQL installation is located at 'c:\mysql', the command looks like
  this:

	c:\mysql\bin\mysqld-opt --skip-grant-tables

  If your installation is located in some other directory, adjust the
  pathname in that command (and in the following commands).
	
* Execute the 'mysql_fix_privilege_tables.sql' script that is located in
  the 'scripts' directory:
  
  	c:\mysql\bin\mysql -f mysql < c:\mysql\scripts\mysql_fix_privilege_tables.sql

  This script performs any actions necessary to convert your grant tables
  to the current format. You may see some "duplicate column" warnings as
  it runs; these can be ignored.
  	
* Stop the server:

	c:\mysql\bin\mysqladmin -u root shutdown
	
* Re-install the Win32 MySQL service (if required):

	c:\mysql\bin\mysqld-nt --install
	
* Re-start the server or service using your normal startup procedure.

** Further Questions **

You can find further information about running MySQL on Windows in the
manual that ships in the 'Doc' subdirectory, or online at the MySQL AB
web site:

http://www.mysql.com/doc/en/Windows.html

Docs/Support/generate-flag-images

deleted100755 → 0
+0 −31
Original line number Diff line number Diff line
#!/bin/sh

flags=`grep @image mirrors.texi | cut -d" " -f1 | cut -d/ -f2 | tr -d "}" | sort | uniq`

set -x
cd Flags

for c in $flags
do
  # For PNM, to be used later
  giftopnm ../Raw-Flags/$c.gif | pnmscale -xsize 30 > $c-tmp.pnm
  pnmpaste $c-tmp.pnm 1 1 ../Images/flag-background.pnm > $c.pnm
  rm -f $c-tmp.pnm

  # For GIF version
  ppmtogif $c.pnm > $c.gif
  # or cjpeg -optimize -quality 70 -outfile $c.jpg

  # For EPS version
  pnmtops -noturn $c.pnm > $c.eps

  # For PDF version
  ps2pdf $c.eps $c.pdf

  # For text version
  echo -n "" > $c.txt

  # PNM isn't really needed
  rm -f $c.pnm

done
+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ while (<IN>)
{
  if ($in)
  {
    if (/Node: $tnode,/)
    if (/Node: $tnode,/ || /\[index/)
    {
      $in = 0;
    }
Loading