mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 22:12:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
This commit is contained in:
Sinisa@sinisa.nasamreza.org 2003-04-10 21:58:05 +03:00
commit 4644cefd7d
37 changed files with 175 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
BUILD/SETUP.sh
View file

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

2
innobase/btr/Makefile.am
View file

@ -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

2
innobase/buf/Makefile.am
View file

@ -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

2
innobase/com/Makefile.am
View file

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

2
innobase/data/Makefile.am
View file

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

2
innobase/dict/Makefile.am
View file

@ -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

2
innobase/dyn/Makefile.am
View file

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

2
innobase/eval/Makefile.am
View file

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

2
innobase/fil/Makefile.am
View file

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

2
innobase/fsp/Makefile.am
View file

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

2
innobase/fut/Makefile.am
View file

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

2
innobase/ha/Makefile.am
View file

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

2
innobase/ibuf/Makefile.am
View file

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

2
innobase/include/Makefile.i
View file

@ -1,7 +1,5 @@
# 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

2
innobase/lock/Makefile.am
View file

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

2
innobase/log/Makefile.am
View file

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

2
innobase/mach/Makefile.am
View file

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

2
innobase/mem/Makefile.am
View file

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

2
innobase/mtr/Makefile.am
View file

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

2
innobase/odbc/Makefile.am
View file

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

2
innobase/os/Makefile.am
View file

@ -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

2
innobase/page/Makefile.am
View file

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

2
innobase/pars/Makefile.am
View file

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

2
innobase/que/Makefile.am
View file

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

2
innobase/read/Makefile.am
View file

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

2
innobase/rem/Makefile.am
View file

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

2
innobase/row/Makefile.am
View file

@ -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

2
innobase/srv/Makefile.am
View file

@ -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

2
innobase/sync/Makefile.am
View file

@ -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

2
innobase/thr/Makefile.am
View file

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

2
innobase/trx/Makefile.am
View file

@ -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

2
innobase/usr/Makefile.am
View file

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

2
innobase/ut/Makefile.am
View file

@ -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

24
scripts/mysql_fix_privilege_tables.sh
View file

@ -1,14 +1,5 @@
#!/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;

54
support-files/my-huge.cnf.sh
View file

@ -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/

49
support-files/my-large.cnf.sh
View file

@ -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

41
support-files/my-medium.cnf.sh
View file

@ -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