Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0

into sinisa.nasamreza.org:/mnt/work/mysql-4.0

BUILD/SETUP.sh

@@ -71,4 +71,6 @@ else
   make=make
 fi
 
-CXX=gcc
+if test -z $CXX ; then
+  CXX=gcc
+fi

innobase/btr/Makefile.am

@@ -17,7 +17,7 @@
 
 include ../include/Makefile.i
 
-libs_LIBRARIES =	libbtr.a
+noinst_LIBRARIES =	libbtr.a
 
 libbtr_a_SOURCES =	btr0btr.c btr0cur.c btr0pcur.c btr0sea.c
 

innobase/buf/Makefile.am

@@ -17,7 +17,7 @@
 
 include ../include/Makefile.i
 
-libs_LIBRARIES =	libbuf.a
+noinst_LIBRARIES =	libbuf.a
 
 libbuf_a_SOURCES =	buf0buf.c buf0flu.c buf0lru.c buf0rea.c
 

innobase/com/Makefile.am

@@ -17,7 +17,7 @@
 
 include ../include/Makefile.i
 
-libs_LIBRARIES =	libcom.a
+noinst_LIBRARIES =	libcom.a
 
 libcom_a_SOURCES =	com0com.c com0shm.c
 

innobase/data/Makefile.am

@@ -17,7 +17,7 @@
 
 include ../include/Makefile.i
 
-libs_LIBRARIES =	libdata.a
+noinst_LIBRARIES =	libdata.a
 
 libdata_a_SOURCES =	data0data.c data0type.c
 

innobase/dict/Makefile.am

@@ -17,7 +17,7 @@
 
 include ../include/Makefile.i
 
-libs_LIBRARIES =	libdict.a
+noinst_LIBRARIES =	libdict.a
 
 libdict_a_SOURCES =	dict0boot.c dict0crea.c dict0dict.c dict0load.c\
 			dict0mem.c

innobase/dyn/Makefile.am

@@ -17,7 +17,7 @@
 
 include ../include/Makefile.i
 
-libs_LIBRARIES =	libdyn.a
+noinst_LIBRARIES =	libdyn.a
 
 libdyn_a_SOURCES =	dyn0dyn.c
 

innobase/eval/Makefile.am

@@ -17,7 +17,7 @@
 
 include ../include/Makefile.i
 
-libs_LIBRARIES =	libeval.a
+noinst_LIBRARIES =	libeval.a
 
 libeval_a_SOURCES =	eval0eval.c eval0proc.c
 

innobase/fil/Makefile.am

@@ -17,7 +17,7 @@
 
 include ../include/Makefile.i
 
-libs_LIBRARIES =	libfil.a
+noinst_LIBRARIES =	libfil.a
 
 libfil_a_SOURCES =	fil0fil.c
 

innobase/fsp/Makefile.am

@@ -18,7 +18,7 @@
 
 include ../include/Makefile.i
 
-libs_LIBRARIES =	libfsp.a
+noinst_LIBRARIES =	libfsp.a
 
 libfsp_a_SOURCES =	fsp0fsp.c
 

innobase/fut/Makefile.am

@@ -17,7 +17,7 @@
 
 include ../include/Makefile.i
 
-libs_LIBRARIES =	libfut.a
+noinst_LIBRARIES =	libfut.a
 
 libfut_a_SOURCES =	fut0fut.c fut0lst.c
 

innobase/ha/Makefile.am

@@ -17,7 +17,7 @@
 
 include ../include/Makefile.i
 
-libs_LIBRARIES =	libha.a
+noinst_LIBRARIES =	libha.a
 
 libha_a_SOURCES =	ha0ha.c hash0hash.c
 

innobase/ibuf/Makefile.am

@@ -17,7 +17,7 @@
 
 include ../include/Makefile.i
 
-libs_LIBRARIES =	libibuf.a
+noinst_LIBRARIES =	libibuf.a
 
 libibuf_a_SOURCES =	ibuf0ibuf.c
 

innobase/include/Makefile.i

 # Makefile included in Makefile.am in every subdirectory
 
-libsdir = ../libs
-
 INCLUDES =		-I$(srcdir)/../include -I$(srcdir)/../../include -I../../include
 
 # Don't update the files from bitkeeper

innobase/lock/Makefile.am

@@ -17,7 +17,7 @@
 
 include ../include/Makefile.i
 
-libs_LIBRARIES =	liblock.a
+noinst_LIBRARIES =	liblock.a
 
 liblock_a_SOURCES =	lock0lock.c
 

innobase/log/Makefile.am

@@ -17,7 +17,7 @@
 
 include ../include/Makefile.i
 
-libs_LIBRARIES =	liblog.a
+noinst_LIBRARIES =	liblog.a
 
 liblog_a_SOURCES =	log0log.c log0recv.c
 

innobase/mach/Makefile.am

@@ -17,7 +17,7 @@
 
 include ../include/Makefile.i
 
-libs_LIBRARIES =	libmach.a
+noinst_LIBRARIES =	libmach.a
 
 libmach_a_SOURCES =	mach0data.c
 

innobase/mem/Makefile.am

@@ -17,7 +17,7 @@
 
 include ../include/Makefile.i
 
-libs_LIBRARIES =	libmem.a
+noinst_LIBRARIES =	libmem.a
 
 libmem_a_SOURCES =	mem0mem.c mem0pool.c
 

innobase/mtr/Makefile.am

@@ -17,7 +17,7 @@
 
 include ../include/Makefile.i
 
-libs_LIBRARIES =	libmtr.a
+noinst_LIBRARIES =	libmtr.a
 
 libmtr_a_SOURCES =	mtr0mtr.c mtr0log.c
 

innobase/odbc/Makefile.am

@@ -17,7 +17,7 @@
 
 include ../include/Makefile.i
 
-libs_LIBRARIES =	libodbc.a
+noinst_LIBRARIES =	libodbc.a
 
 libodbc_a_SOURCES =	odbc0odbc.c
 

innobase/os/Makefile.am

@@ -17,7 +17,7 @@
 
 include ../include/Makefile.i
 
-libs_LIBRARIES =	libos.a
+noinst_LIBRARIES =	libos.a
 
 libos_a_SOURCES =	os0proc.c os0shm.c os0sync.c os0thread.c os0file.c
 

innobase/page/Makefile.am

@@ -17,7 +17,7 @@
 
 include ../include/Makefile.i
 
-libs_LIBRARIES =	libpage.a
+noinst_LIBRARIES =	libpage.a
 
 libpage_a_SOURCES =	page0page.c page0cur.c
 

innobase/pars/Makefile.am

@@ -17,7 +17,7 @@
 
 include ../include/Makefile.i
 
-libs_LIBRARIES =	libpars.a
+noinst_LIBRARIES =	libpars.a
 
 noinst_HEADERS =	pars0grm.h
 

innobase/que/Makefile.am

@@ -17,7 +17,7 @@
 
 include ../include/Makefile.i
 
-libs_LIBRARIES =	libque.a
+noinst_LIBRARIES =	libque.a
 
 libque_a_SOURCES =	que0que.c
 

innobase/read/Makefile.am

@@ -17,7 +17,7 @@
 
 include ../include/Makefile.i
 
-libs_LIBRARIES =	libread.a
+noinst_LIBRARIES =	libread.a
 
 libread_a_SOURCES =	read0read.c
 

innobase/rem/Makefile.am

@@ -17,7 +17,7 @@
 
 include ../include/Makefile.i
 
-libs_LIBRARIES =	librem.a
+noinst_LIBRARIES =	librem.a
 
 librem_a_SOURCES =	rem0rec.c rem0cmp.c
 

innobase/row/Makefile.am

@@ -17,7 +17,7 @@
 
 include ../include/Makefile.i
 
-libs_LIBRARIES =	librow.a
+noinst_LIBRARIES =	librow.a
 
 librow_a_SOURCES =	row0ins.c row0mysql.c row0purge.c row0row.c row0sel.c\
 			row0uins.c row0umod.c row0undo.c row0upd.c row0vers.c

innobase/srv/Makefile.am

@@ -17,7 +17,7 @@
 
 include ../include/Makefile.i
 
-libs_LIBRARIES =	libsrv.a
+noinst_LIBRARIES =	libsrv.a
 
 libsrv_a_SOURCES =	srv0srv.c srv0que.c srv0start.c
 

innobase/sync/Makefile.am

@@ -17,7 +17,7 @@
 
 include ../include/Makefile.i
 
-libs_LIBRARIES =	libsync.a
+noinst_LIBRARIES =	libsync.a
 
 libsync_a_SOURCES =	sync0arr.c sync0ipm.c sync0rw.c sync0sync.c
 

innobase/thr/Makefile.am

@@ -17,7 +17,7 @@
 
 include ../include/Makefile.i
 
-libs_LIBRARIES =	libthr.a
+noinst_LIBRARIES =	libthr.a
 
 libthr_a_SOURCES =	thr0loc.c
 

innobase/trx/Makefile.am

@@ -17,7 +17,7 @@
 
 include ../include/Makefile.i
 
-libs_LIBRARIES =	libtrx.a
+noinst_LIBRARIES =	libtrx.a
 
 libtrx_a_SOURCES =	trx0purge.c trx0rec.c trx0roll.c trx0rseg.c\
 			trx0sys.c trx0trx.c trx0undo.c

innobase/usr/Makefile.am

@@ -17,7 +17,7 @@
 
 include ../include/Makefile.i
 
-libs_LIBRARIES =	libusr.a
+noinst_LIBRARIES =	libusr.a
 
 libusr_a_SOURCES =	usr0sess.c
 

innobase/ut/Makefile.am

@@ -17,7 +17,7 @@
 
 include ../include/Makefile.i
 
-libs_LIBRARIES =	libut.a
+noinst_LIBRARIES =	libut.a
 
 libut_a_SOURCES =	ut0byte.c ut0dbg.c ut0mem.c ut0rnd.c ut0ut.c
 

scripts/mysql_fix_privilege_tables.sh

 #!/bin/sh
 
-echo "This scripts updates the mysql.user, mysql.db, mysql.host and the"
-echo "mysql.func tables to MySQL 3.22.14 and above."
-echo ""
-echo "This is needed if you want to use the new GRANT functions,"
-echo "CREATE AGGREGATE FUNCTION or want to use the more secure passwords in 3.23"
-echo ""
-echo "If you get 'Access denied' errors, you should run this script again"
-echo "and give the MySQL root user password as an argument!"
-
 root_password="$1"
 host="localhost"
 user="root"
@@ -20,6 +11,21 @@ else
   cmd="@bindir@/mysql -f --user=$user --password=$root_password --host=$host mysql"
 fi
 
+# Debian addition
+if [ "$1" = "--sql-only" ]; then
+  root_password=""
+  cmd="/usr/share/mysql/echo_stderr"
+fi
+
+echo "This scripts updates the mysql.user, mysql.db, mysql.host and the"
+echo "mysql.func tables to MySQL 3.22.14 and above."
+echo ""
+echo "This is needed if you want to use the new GRANT functions,"
+echo "CREATE AGGREGATE FUNCTION or want to use the more secure passwords in 3.23"
+echo ""
+echo "If you get 'Access denied' errors, you should run this script again"
+echo "and give the MySQL root user password as an argument!"
+
 echo "Converting all privilege tables to MyISAM format"
 $cmd <<END_OF_DATA
 ALTER TABLE user type=MyISAM;

support-files/my-huge.cnf.sh

@@ -31,27 +31,53 @@ set-variable	= max_allowed_packet=1M
 set-variable	= table_cache=512
 set-variable	= sort_buffer=2M
 set-variable	= record_buffer=2M
+set-variable	= myisam_sort_buffer_size=64M
 set-variable	= thread_cache=8
 # Try number of CPU's*2 for thread_concurrency
 set-variable	= thread_concurrency=8
-set-variable	= myisam_sort_buffer_size=64M
+
+# Don't listen on a TCP/IP port at all. This can be a security enhancement,
+# if all processes that need to connect to mysqld run on the same host.
+# All interaction with mysqld must be made via Unix sockets or named pipes.
+# Note that using this option without enabling named pipes on Windows
+# (via the "pipe" option) will render mysqld useless!
+# 
+#skip-networking
 
 # Replication Master Server (default)
-log-bin             # required for replication
-server-id	= 1 # required unique id between 1 and 2^32 - 1
-                    # defaults to 1 if master-host is not set
-                    # but will not function as a master if omitted
+# binary logging is required for replication
+log-bin
+
+# required unique id between 1 and 2^32 - 1
+# defaults to 1 if master-host is not set
+# but will not function as a master if omitted
+server-id	= 1
 
 # Replication Slave Server (comment out master section to use this)
-#master-host     =   # MUST BE SET
-#master-user     =   # MUST BE SET
-#master-password =   # MUST BE SET
-#master-port     =   # optional--defaults to 3306
-#log-bin             # not required for slaves, but recommended
-#server-id       = 2 # required unique id between 2 and 2^32 - 1
-                    # (and different from the master)
-                    # defaults to 2 if master-host is set
-                    # but will not function as a slave if omitted
+#
+# required unique id between 2 and 2^32 - 1
+# (and different from the master)
+# defaults to 2 if master-host is set
+# but will not function as a slave if omitted
+#server-id       = 2
+#
+# The replication master for this slave - required
+#master-host     =   <hostname>
+#
+# The username the slave will use for authentication when connecting
+# to the master - required
+#master-user     =   <username>
+#
+# The password the slave will authenticate with when connecting to
+# the master - required
+#master-password =   <password>
+#
+# The port the master is listening on.
+# optional - defaults to 3306
+#master-port     =  <port>
+#
+# binary logging - not required for slaves, but recommended
+#log-bin
 
 # Point the following paths to different dedicated disks
 #tmpdir		= /tmp/		

support-files/my-large.cnf.sh

@@ -35,9 +35,54 @@ set-variable	= myisam_sort_buffer_size=64M
 set-variable	= thread_cache=8
 # Try number of CPU's*2 for thread_concurrency
 set-variable	= thread_concurrency=8
+
+# Don't listen on a TCP/IP port at all. This can be a security enhancement,
+# if all processes that need to connect to mysqld run on the same host.
+# All interaction with mysqld must be made via Unix sockets or named pipes.
+# Note that using this option without enabling named pipes on Windows
+# (via the "pipe" option) will render mysqld useless!
+# 
+#skip-networking
+
+# Replication Master Server (default)
+# binary logging is required for replication
 log-bin
+
+# required unique id between 1 and 2^32 - 1
+# defaults to 1 if master-host is not set
+# but will not function as a master if omitted
 server-id	= 1
 
+# Replication Slave Server (comment out master section to use this)
+#
+# required unique id between 2 and 2^32 - 1
+# (and different from the master)
+# defaults to 2 if master-host is set
+# but will not function as a slave if omitted
+#server-id       = 2
+#
+# The replication master for this slave - required
+#master-host     =   <hostname>
+#
+# The username the slave will use for authentication when connecting
+# to the master - required
+#master-user     =   <username>
+#
+# The password the slave will authenticate with when connecting to
+# the master - required
+#master-password =   <password>
+#
+# The port the master is listening on.
+# optional - defaults to 3306
+#master-port     =  <port>
+#
+# binary logging - not required for slaves, but recommended
+#log-bin
+
+# Point the following paths to different dedicated disks
+#tmpdir		= /tmp/		
+#log-update 	= /path-to-dedicated-directory/hostname
+
 # Uncomment the following if you are using BDB tables
 #set-variable	= bdb_cache_size=64M
 #set-variable	= bdb_max_lock=100000
@@ -57,10 +102,6 @@ server-id	= 1
 #innodb_flush_log_at_trx_commit=1
 #set-variable = innodb_lock_wait_timeout=50
 
-# Point the following paths to different dedicated disks
-#tmpdir		= /tmp/		
-#log-update 	= /path-to-dedicated-directory/hostname
-
 [mysqldump]
 quick
 set-variable	= max_allowed_packet=16M

support-files/my-medium.cnf.sh

@@ -33,9 +33,50 @@ set-variable	= table_cache=64
 set-variable	= sort_buffer=512K
 set-variable	= net_buffer_length=8K
 set-variable	= myisam_sort_buffer_size=8M
+
+# Don't listen on a TCP/IP port at all. This can be a security enhancement,
+# if all processes that need to connect to mysqld run on the same host.
+# All interaction with mysqld must be made via Unix sockets or named pipes.
+# Note that using this option without enabling named pipes on Windows
+# (via the "pipe" option) will render mysqld useless!
+# 
+#skip-networking
+
+# Replication Master Server (default)
+# binary logging is required for replication
 log-bin
+
+# required unique id between 1 and 2^32 - 1
+# defaults to 1 if master-host is not set
+# but will not function as a master if omitted
 server-id	= 1
 
+# Replication Slave Server (comment out master section to use this)
+#
+# required unique id between 2 and 2^32 - 1
+# (and different from the master)
+# defaults to 2 if master-host is set
+# but will not function as a slave if omitted
+#server-id       = 2
+#
+# The replication master for this slave - required
+#master-host     =   <hostname>
+#
+# The username the slave will use for authentication when connecting
+# to the master - required
+#master-user     =   <username>
+#
+# The password the slave will authenticate with when connecting to
+# the master - required
+#master-password =   <password>
+#
+# The port the master is listening on.
+# optional - defaults to 3306
+#master-port     =  <port>
+#
+# binary logging - not required for slaves, but recommended
+#log-bin
+
 # Point the following paths to different dedicated disks
 #tmpdir		= /tmp/		
 #log-update 	= /path-to-dedicated-directory/hostname