mirror of
https://github.com/MariaDB/server.git
synced 2026-05-14 19:07:15 +02:00
Merge MySQL->MariaDB
* Finished Monty and Jani's merge * Some InnoDB tests still fail (because it's old xtradb code run against newer testsuite). They are expected to go after mergning with the latest xtradb.
This commit is contained in:
Sergey Petrunya
commit
29f0dcb563
1190 changed files with 268606 additions and 17715 deletions
|
|
@ -4,7 +4,7 @@ rm -f TAGS
|
|||
filter='\.cc$\|\.c$\|\.h$\|\.yy$'
|
||||
|
||||
list="find . -type f"
|
||||
bzr root >/dev/null 2>/dev/null && list="bzr ls --recursive --kind=file --versioned"
|
||||
bzr root >/dev/null 2>/dev/null && list="bzr ls --from-root --kind=file --versioned"
|
||||
|
||||
$list |grep $filter |while read f;
|
||||
do
|
||||
|
|
|
|||
|
|
@ -26,9 +26,9 @@ socket = @MYSQL_UNIX_ADDR@
|
|||
port = @MYSQL_TCP_PORT@
|
||||
socket = @MYSQL_UNIX_ADDR@
|
||||
skip-locking
|
||||
key_buffer = 384M
|
||||
key_buffer_size = 384M
|
||||
max_allowed_packet = 1M
|
||||
table_cache = 512
|
||||
table_open_cache = 512
|
||||
sort_buffer_size = 2M
|
||||
read_buffer_size = 2M
|
||||
read_rnd_buffer_size = 8M
|
||||
|
|
@ -46,9 +46,6 @@ thread_concurrency = 8
|
|||
#
|
||||
#skip-networking
|
||||
|
||||
# Disable Federated by default
|
||||
skip-federated
|
||||
|
||||
# Replication Master Server (default)
|
||||
# binary logging is required for replication
|
||||
log-bin=mysql-bin
|
||||
|
|
@ -143,14 +140,8 @@ no-auto-rehash
|
|||
# Remove the next comment character if you are not familiar with SQL
|
||||
#safe-updates
|
||||
|
||||
[isamchk]
|
||||
key_buffer = 256M
|
||||
sort_buffer_size = 256M
|
||||
read_buffer = 2M
|
||||
write_buffer = 2M
|
||||
|
||||
[myisamchk]
|
||||
key_buffer = 256M
|
||||
key_buffer_size = 256M
|
||||
sort_buffer_size = 256M
|
||||
read_buffer = 2M
|
||||
write_buffer = 2M
|
||||
|
|
|
|||
|
|
@ -80,7 +80,7 @@ max_connect_errors = 10
|
|||
# Therefore you have to make sure to set the amount of open files
|
||||
# allowed to at least 4096 in the variable "open-files-limit" in
|
||||
# section [mysqld_safe]
|
||||
table_cache = 2048
|
||||
table_open_cache = 2048
|
||||
|
||||
# Enable external file level locking. Enabled file locking will have a
|
||||
# negative impact on performance, so only use it in case you have
|
||||
|
|
@ -167,7 +167,7 @@ ft_min_word_len = 4
|
|||
|
||||
# Table type which is used by default when creating new tables, if not
|
||||
# specified differently during the CREATE TABLE statement.
|
||||
default_table_type = MYISAM
|
||||
default-storage-engine = MYISAM
|
||||
|
||||
# Thread stack size to use. This amount of memory is always reserved at
|
||||
# connection time. MySQL itself usually needs no more than 64K of
|
||||
|
|
@ -211,10 +211,10 @@ binlog_format=mixed
|
|||
|
||||
# Log slow queries. Slow queries are queries which take more than the
|
||||
# amount of time defined in "long_query_time" or which do not use
|
||||
# indexes well, if log_long_format is enabled. It is normally good idea
|
||||
# indexes well, if log_short_format is not enabled. It is normally good idea
|
||||
# to have this turned on if you frequently add new queries to the
|
||||
# system.
|
||||
log_slow_queries
|
||||
slow_query_log
|
||||
|
||||
# All queries taking more than this amount of time (in seconds) will be
|
||||
# trated as slow. Do not use "1" as a value here, as this will result in
|
||||
|
|
@ -222,11 +222,6 @@ log_slow_queries
|
|||
# currently measures time with second accuracy only).
|
||||
long_query_time = 2
|
||||
|
||||
# Log more information in the slow query log. Normally it is good to
|
||||
# have this turned on. This will enable logging of queries that are not
|
||||
# using indexes in addition to long running queries.
|
||||
log_long_format
|
||||
|
||||
# The directory used by MySQL for storing temporary files. For example,
|
||||
# it is used to perform disk based large sorts, as well as for internal
|
||||
# and explicit temporary tables. It might be good to put it on a
|
||||
|
|
@ -345,12 +340,6 @@ myisam_sort_buffer_size = 128M
|
|||
# through the key cache (which is slower).
|
||||
myisam_max_sort_file_size = 10G
|
||||
|
||||
# If the temporary file used for fast index creation would be bigger
|
||||
# than using the key cache by the amount specified here, then prefer the
|
||||
# key cache method. This is mainly used to force long character keys in
|
||||
# large tables to use the slower key cache method to create the index.
|
||||
myisam_max_extra_sort_file_size = 10G
|
||||
|
||||
# If a table has more than one index, MyISAM can use more than one
|
||||
# thread to repair them by sorting in parallel. This makes sense if you
|
||||
# have multiple CPUs and plenty of memory.
|
||||
|
|
@ -359,7 +348,6 @@ myisam_repair_threads = 1
|
|||
# Automatically check and repair not properly closed MyISAM tables.
|
||||
myisam_recover
|
||||
|
||||
|
||||
# *** INNODB Specific options ***
|
||||
|
||||
# Use this option if you have a MySQL server with InnoDB support enabled
|
||||
|
|
@ -482,14 +470,8 @@ no-auto-rehash
|
|||
# Only allow UPDATEs and DELETEs that use keys.
|
||||
#safe-updates
|
||||
|
||||
[isamchk]
|
||||
key_buffer = 512M
|
||||
sort_buffer_size = 512M
|
||||
read_buffer = 8M
|
||||
write_buffer = 8M
|
||||
|
||||
[myisamchk]
|
||||
key_buffer = 512M
|
||||
key_buffer_size = 512M
|
||||
sort_buffer_size = 512M
|
||||
read_buffer = 8M
|
||||
write_buffer = 8M
|
||||
|
|
|
|||
|
|
@ -26,9 +26,9 @@ socket = @MYSQL_UNIX_ADDR@
|
|||
port = @MYSQL_TCP_PORT@
|
||||
socket = @MYSQL_UNIX_ADDR@
|
||||
skip-locking
|
||||
key_buffer = 256M
|
||||
key_buffer_size = 256M
|
||||
max_allowed_packet = 1M
|
||||
table_cache = 256
|
||||
table_open_cache = 256
|
||||
sort_buffer_size = 1M
|
||||
read_buffer_size = 1M
|
||||
read_rnd_buffer_size = 4M
|
||||
|
|
@ -46,9 +46,6 @@ thread_concurrency = 8
|
|||
#
|
||||
#skip-networking
|
||||
|
||||
# Disable Federated by default
|
||||
skip-federated
|
||||
|
||||
# Replication Master Server (default)
|
||||
# binary logging is required for replication
|
||||
log-bin=mysql-bin
|
||||
|
|
@ -143,14 +140,8 @@ no-auto-rehash
|
|||
# Remove the next comment character if you are not familiar with SQL
|
||||
#safe-updates
|
||||
|
||||
[isamchk]
|
||||
key_buffer = 128M
|
||||
sort_buffer_size = 128M
|
||||
read_buffer = 2M
|
||||
write_buffer = 2M
|
||||
|
||||
[myisamchk]
|
||||
key_buffer = 128M
|
||||
key_buffer_size = 128M
|
||||
sort_buffer_size = 128M
|
||||
read_buffer = 2M
|
||||
write_buffer = 2M
|
||||
|
|
|
|||
|
|
@ -27,9 +27,9 @@ socket = @MYSQL_UNIX_ADDR@
|
|||
port = @MYSQL_TCP_PORT@
|
||||
socket = @MYSQL_UNIX_ADDR@
|
||||
skip-locking
|
||||
key_buffer = 16M
|
||||
key_buffer_size = 16M
|
||||
max_allowed_packet = 1M
|
||||
table_cache = 64
|
||||
table_open_cache = 64
|
||||
sort_buffer_size = 512K
|
||||
net_buffer_length = 8K
|
||||
read_buffer_size = 256K
|
||||
|
|
@ -44,9 +44,6 @@ myisam_sort_buffer_size = 8M
|
|||
#
|
||||
#skip-networking
|
||||
|
||||
# Disable Federated by default
|
||||
skip-federated
|
||||
|
||||
# Replication Master Server (default)
|
||||
# binary logging is required for replication
|
||||
log-bin=mysql-bin
|
||||
|
|
@ -141,14 +138,8 @@ no-auto-rehash
|
|||
# Remove the next comment character if you are not familiar with SQL
|
||||
#safe-updates
|
||||
|
||||
[isamchk]
|
||||
key_buffer = 20M
|
||||
sort_buffer_size = 20M
|
||||
read_buffer = 2M
|
||||
write_buffer = 2M
|
||||
|
||||
[myisamchk]
|
||||
key_buffer = 20M
|
||||
key_buffer_size = 20M
|
||||
sort_buffer_size = 20M
|
||||
read_buffer = 2M
|
||||
write_buffer = 2M
|
||||
|
|
|
|||
|
|
@ -27,9 +27,9 @@ socket = @MYSQL_UNIX_ADDR@
|
|||
port = @MYSQL_TCP_PORT@
|
||||
socket = @MYSQL_UNIX_ADDR@
|
||||
skip-locking
|
||||
key_buffer = 16K
|
||||
key_buffer_size = 16K
|
||||
max_allowed_packet = 1M
|
||||
table_cache = 4
|
||||
table_open_cache = 4
|
||||
sort_buffer_size = 64K
|
||||
read_buffer_size = 256K
|
||||
read_rnd_buffer_size = 256K
|
||||
|
|
@ -74,12 +74,8 @@ no-auto-rehash
|
|||
# Remove the next comment character if you are not familiar with SQL
|
||||
#safe-updates
|
||||
|
||||
[isamchk]
|
||||
key_buffer = 8M
|
||||
sort_buffer_size = 8M
|
||||
|
||||
[myisamchk]
|
||||
key_buffer = 8M
|
||||
key_buffer_size = 8M
|
||||
sort_buffer_size = 8M
|
||||
|
||||
[mysqlhotcopy]
|
||||
|
|
|
|||
|
|
@ -358,11 +358,18 @@ case "$mode" in
|
|||
if test -s "$pid_file"
|
||||
then
|
||||
mysqlmanager_pid=`cat $pid_file`
|
||||
echo $echo_n "Shutting down MySQL"
|
||||
kill $mysqlmanager_pid
|
||||
# mysqlmanager should remove the pid_file when it exits, so wait for it.
|
||||
wait_for_pid removed "$mysqlmanager_pid"; return_value=$?
|
||||
|
||||
|
||||
if (kill -0 $mysqlmanager_pid 2>/dev/null)
|
||||
then
|
||||
echo $echo_n "Shutting down MySQL"
|
||||
kill $mysqlmanager_pid
|
||||
# mysqlmanager should remove the pid_file when it exits, so wait for it.
|
||||
wait_for_pid removed "$mysqlmanager_pid"; return_value=$?
|
||||
else
|
||||
log_failure_msg "MySQL manager or server process #$mysqlmanager_pid is not running!"
|
||||
rm $pid_file
|
||||
fi
|
||||
|
||||
# delete lock for RedHat / SuSE
|
||||
if test -f $lock_dir
|
||||
then
|
||||
|
|
|
|||
|
|
@ -31,6 +31,20 @@
|
|||
%{?_with_yassl:%define YASSL_BUILD 1}
|
||||
%{!?_with_yassl:%define YASSL_BUILD 0}
|
||||
|
||||
# ----------------------------------------------------------------------
|
||||
# use "rpmbuild --with bundled_zlib" or "rpm --define '_with_bundled_zlib 1'"
|
||||
# (for RPM 3.x) to build using the bundled zlib (off by default)
|
||||
# ----------------------------------------------------------------------
|
||||
%{?_with_bundled_zlib:%define WITH_BUNDLED_ZLIB 1}
|
||||
%{!?_with_bundled_zlib:%define WITH_BUNDLED_ZLIB 0}
|
||||
|
||||
# ----------------------------------------------------------------------
|
||||
# use "rpmbuild --without innodb_plugin" or "rpm --define '_without_innodb_plugin 1'"
|
||||
# (for RPM 3.x) to not build the innodb plugin (on by default with innodb builds)
|
||||
# ----------------------------------------------------------------------
|
||||
%{?_without_innodb_plugin:%define WITHOUT_INNODB_PLUGIN 1}
|
||||
%{!?_without_innodb_plugin:%define WITHOUT_INNODB_PLUGIN 0}
|
||||
|
||||
# use "rpmbuild --with cluster" or "rpm --define '_with_cluster 1'" (for RPM 3.x)
|
||||
# to build with cluster support (off by default)
|
||||
%{?_with_cluster:%define CLUSTER_BUILD 1}
|
||||
|
|
@ -317,6 +331,9 @@ sh -c "PATH=\"${MYSQL_BUILD_PATH:-$PATH}\" \
|
|||
--enable-thread-safe-client \
|
||||
--with-readline \
|
||||
--with-innodb \
|
||||
%if %{WITHOUT_INNODB_PLUGIN}
|
||||
--without-plugin-innodb_plugin \
|
||||
%endif
|
||||
%if %{CLUSTER_BUILD}
|
||||
--with-ndbcluster \
|
||||
%else
|
||||
|
|
@ -326,8 +343,13 @@ sh -c "PATH=\"${MYSQL_BUILD_PATH:-$PATH}\" \
|
|||
--with-csv-storage-engine \
|
||||
--with-blackhole-storage-engine \
|
||||
--with-federated-storage-engine \
|
||||
--without-plugin-daemon_example \
|
||||
--without-plugin-example \
|
||||
--with-partition \
|
||||
--with-big-tables \
|
||||
%if %{WITH_BUNDLED_ZLIB}
|
||||
--with-zlib-dir=bundled \
|
||||
%endif
|
||||
--enable-shared \
|
||||
"
|
||||
make
|
||||
|
|
@ -461,7 +483,7 @@ install -d $RBR%{_sbindir}
|
|||
|
||||
|
||||
# Install all binaries
|
||||
(cd $MBD && make install DESTDIR=$RBR benchdir_root=%{_datadir})
|
||||
(cd $MBD && make install DESTDIR=$RBR testroot=%{_datadir})
|
||||
# Old packages put shared libs in %{_libdir}/ (not %{_libdir}/mysql), so do
|
||||
# the same here.
|
||||
mv $RBR/%{_libdir}/mysql/*.so* $RBR/%{_libdir}/
|
||||
|
|
@ -728,6 +750,8 @@ fi
|
|||
%attr(755, root, root) %{_bindir}/resolve_stack_dump
|
||||
%attr(755, root, root) %{_bindir}/resolveip
|
||||
|
||||
%attr(755, root, root) %{_libdir}/plugin/*.so*
|
||||
|
||||
%attr(755, root, root) %{_sbindir}/mysqld
|
||||
%attr(755, root, root) %{_sbindir}/mysqld-debug
|
||||
%attr(755, root, root) %{_sbindir}/mysqlmanager
|
||||
|
|
@ -853,6 +877,8 @@ fi
|
|||
%{_libdir}/mysql/libvio.a
|
||||
%{_libdir}/mysql/libz.a
|
||||
%{_libdir}/mysql/libz.la
|
||||
%{_libdir}/plugin/*.a
|
||||
%{_libdir}/plugin/*.la
|
||||
|
||||
%files shared
|
||||
%defattr(-, root, root, 0755)
|
||||
|
|
@ -882,6 +908,19 @@ fi
|
|||
# itself - note that they must be ordered by date (important when
|
||||
# merging BK trees)
|
||||
%changelog
|
||||
* Mon Aug 24 2009 Jonathan Perkin <jperkin@sun.com>
|
||||
|
||||
- Add conditionals for bundled zlib and innodb plugin
|
||||
|
||||
* Fri Aug 21 2009 Jonathan Perkin <jperkin@sun.com>
|
||||
|
||||
- Install plugin libraries in appropriate packages.
|
||||
- Disable example plugins.
|
||||
|
||||
* Thu Aug 20 2009 Jonathan Perkin <jperkin@stripped>
|
||||
|
||||
- Update variable used for mysql-test suite location to match source.
|
||||
|
||||
* Fri Nov 07 2008 Joerg Bruehe <joerg@mysql.com>
|
||||
|
||||
- Correct yesterday's fix, so that it also works for the last flag,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue