Commit 24b9e879 authored by sasha@mysql.sashanet.com's avatar sasha@mysql.sashanet.com

Merge work:/home/bk/mysql-4.0

into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0
parents 9b163ef5 6265dfcc
No related merge requests found
...@@ -153,7 +153,7 @@ if ($opt_stage <= 1) ...@@ -153,7 +153,7 @@ if ($opt_stage <= 1)
{ {
$opt_config_options.= " --with-innodb" $opt_config_options.= " --with-innodb"
} }
check_system("$opt_config_env ./configure --prefix=/usr/local/mysql \"--with-comment=Official MySQL$version_suffix binary\" --with-extra-charsets=complex \"--with-server-suffix=$version_suffix\" $opt_config_options","Thank you for choosing MySQL"); check_system("$opt_config_env ./configure --prefix=/usr/local/mysql \"--with-comment=Official MySQL$version_suffix binary\" --with-extra-charsets=complex \"--with-server-suffix=$version_suffix\" --enable-thread-safe-client $opt_config_options","Thank you for choosing MySQL");
if (-d "$pwd/$host/include-mysql") if (-d "$pwd/$host/include-mysql")
{ {
safe_system("cp -r $pwd/$host/include-mysql/* $pwd/$host/$ver/include"); safe_system("cp -r $pwd/$host/include-mysql/* $pwd/$host/$ver/include");
...@@ -317,7 +317,7 @@ exit 0; ...@@ -317,7 +317,7 @@ exit 0;
sub usage sub usage
{ {
print <<EOF; print <<EOF;
$0 version 1.3 $0 version 1.4
$0 takes the following options: $0 takes the following options:
...@@ -549,7 +549,8 @@ sub kill_all ...@@ -549,7 +549,8 @@ sub kill_all
chop($cand); chop($cand);
($pid_user, $pid) = split(' ', $cand); ($pid_user, $pid) = split(' ', $cand);
next if $pid == $$; next if $pid == $$;
next process if (! ($cand =~ $pattern) || $pid_user ne $user) next process if (! ($cand =~ $pattern) || $pid_user ne $user);
print LOG "Killing $_\n";
&killpid($pid); &killpid($pid);
} }
} }
......
...@@ -115,7 +115,8 @@ set -x ...@@ -115,7 +115,8 @@ set -x
rm -rf $rpmdir/BUILD/mysql-* rm -rf $rpmdir/BUILD/mysql-*
rm -f $rpmdir/SOURCES/mysql-* rm -f $rpmdir/SOURCES/mysql-*
rm -f $rpmdir/SRPMS/MySQL-* rm -f $rpmdir/SRPMS/MySQL-*
rm -f $rpmdir/SPEC/mysql-* rm -f $rpmdir/SPECS/mysql-*
rm -rf /var/tmp/mysql
# Copy MySQL source and spec files # Copy MySQL source and spec files
...@@ -162,7 +163,7 @@ if [ ! x$skip_perl=x1 ]; then ...@@ -162,7 +163,7 @@ if [ ! x$skip_perl=x1 ]; then
set -x set -x
# First clean up so we do not get old versions when wildcard matching # First clean up so we do not get old versions when wildcard matching
rm -f $rpmdir/SOURCES/DBI-*.spec rm -f $rpmdir/SOURCES/DBI-*.spec $rpmdir/SOURCES/mysql*
rm -f $rpmdir/RPMS/i386/Perl-*.rpm rm -f $rpmdir/RPMS/i386/Perl-*.rpm
rm -f $rpmdir/SRPMS/Perl-*.rpm rm -f $rpmdir/SRPMS/Perl-*.rpm
rm -f $rpmdir/RPMS/i386/MySQL*-$VER_NO_DASH*.rpm rm -f $rpmdir/RPMS/i386/MySQL*-$VER_NO_DASH*.rpm
...@@ -232,5 +233,9 @@ if [ x$local_build != x1 ]; then ...@@ -232,5 +233,9 @@ if [ x$local_build != x1 ]; then
# And the perl ones # And the perl ones
#scp $owner@$bmachine:$rpmdir/RPMS/i386/Perl*-*.rpm $bpath/NEW-RPMS #scp $owner@$bmachine:$rpmdir/RPMS/i386/Perl*-*.rpm $bpath/NEW-RPMS
#scp $owner@$bmachine:$rpmdir/SRPMS/Perl*-*.rpm $bpath/NEW-RPMS #scp $owner@$bmachine:$rpmdir/SRPMS/Perl*-*.rpm $bpath/NEW-RPMS
#Remove some of the files that can interfere with future builds
rm -rf /var/tmp/mysql
fi fi
) > $log 2>&1 ) > $log 2>&1
...@@ -4033,8 +4033,13 @@ If the date is totally wrong, MySQL will store the special ...@@ -4033,8 +4033,13 @@ If the date is totally wrong, MySQL will store the special
0000-00-00 date value in the column. 0000-00-00 date value in the column.
@item @item
If you set an @code{enum} to an unsupported value, it will be set to If you set an @code{ENUM} column to an unsupported value, it will be set to
the error value 'empty string', with numeric value 0. the error value 'empty string', with numeric value 0.
@item
If you set an @cod{SET} column to an unsupported value, the value will
be ignored. @xref{Bugs}.
@end itemize @end itemize
@item @item
...@@ -4934,6 +4939,18 @@ Standard usage in PostgreSQL is closer to ANSI SQL in some cases. ...@@ -4934,6 +4939,18 @@ Standard usage in PostgreSQL is closer to ANSI SQL in some cases.
@item @item
One can speed up PostgreSQL by coding things as stored procedures. One can speed up PostgreSQL by coding things as stored procedures.
@item
For geographical data, R-TREES makes PostgreSQL better than MySQL.
@item
The PostgreSQL optimizer can do some optimization that the current MySQL
optimizer can't do. Most notable is doing joins when you don't have the
proper keys in place and doing a join where you are using different keys
combined with OR. The MySQL benchmark suite at
@uref{http://www.mysql.com/information/benchmarks.html} shows you what
kind of constructs you should watch out for when using different
databases.
@item @item
PostgreSQL has a bigger team of developers that contribute to the server. PostgreSQL has a bigger team of developers that contribute to the server.
@end itemize @end itemize
...@@ -29146,6 +29163,9 @@ specified at table creation time. For example, if a column is specified as ...@@ -29146,6 +29163,9 @@ specified at table creation time. For example, if a column is specified as
@code{SET("a","b","c","d")}, then @code{"a,d"}, @code{"d,a"}, and @code{SET("a","b","c","d")}, then @code{"a,d"}, @code{"d,a"}, and
@code{"d,a,a,d,d"} will all appear as @code{"a,d"} when retrieved. @code{"d,a,a,d,d"} will all appear as @code{"a,d"} when retrieved.
If you set a @code{SET} column to an unsupported value, the value will
be ignored.
@code{SET} values are sorted numerically. @code{NULL} values sort before @code{SET} values are sorted numerically. @code{NULL} values sort before
non-@code{NULL} @code{SET} values. non-@code{NULL} @code{SET} values.
...@@ -33790,8 +33810,10 @@ column in a table, the default value is the current date and time. ...@@ -33790,8 +33810,10 @@ column in a table, the default value is the current date and time.
@xref{Date and time types}. @xref{Date and time types}.
@item @item
For string types other than @code{ENUM}, the default value is the empty string. For string types other than @code{ENUM}, the default value is the empty
For @code{ENUM}, the default is the first enumeration value. string. For @code{ENUM}, the default is the first enumeration value (if
you haven't explicitely specified another default value with the
@code{DEFAULT} directive).
@end itemize @end itemize
Default values must be constants. This means, for example, that you cannot Default values must be constants. This means, for example, that you cannot
...@@ -47363,6 +47385,8 @@ Added documentation for @code{libmysqld}, the embedded MySQL server ...@@ -47363,6 +47385,8 @@ Added documentation for @code{libmysqld}, the embedded MySQL server
library. Also added example programs (a @code{mysql} client and library. Also added example programs (a @code{mysql} client and
@code{mysqltest} test program) which use @code{libmysqld}. @code{mysqltest} test program) which use @code{libmysqld}.
@item @item
Removed all Gemini hooks from MySQL.
@item
Removed @code{my_thread_init()} and @code{my_thread_end()} Removed @code{my_thread_init()} and @code{my_thread_end()}
from mysql_com.h, and added @code{mysql_thread_init()} and from mysql_com.h, and added @code{mysql_thread_init()} and
@code{mysql_thread_end()} to mysql.h. @code{mysql_thread_end()} to mysql.h.
...@@ -1150,9 +1150,9 @@ static void dumpTable(uint numFields, char *table) ...@@ -1150,9 +1150,9 @@ static void dumpTable(uint numFields, char *table)
} }
if (opt_lock) if (opt_lock)
fputs("UNLOCK TABLES;\n", md_result_file); fputs("UNLOCK TABLES;\n", md_result_file);
mysql_free_result(res);
if (opt_autocommit) if (opt_autocommit)
fprintf(md_result_file, "commit;\n"); fprintf(md_result_file, "commit;\n");
mysql_free_result(res);
} }
} /* dumpTable */ } /* dumpTable */
......
...@@ -66,9 +66,10 @@ for i in extra/comp_err extra/replace extra/perror extra/resolveip \ ...@@ -66,9 +66,10 @@ for i in extra/comp_err extra/replace extra/perror extra/resolveip \
myisam/myisampack sql/mysqld sql/mysqlbinlog \ myisam/myisampack sql/mysqld sql/mysqlbinlog \
client/mysql sql/mysqld client/mysqlshow client/mysqlcheck \ client/mysql sql/mysqld client/mysqlshow client/mysqlcheck \
client/mysqladmin client/mysqldump client/mysqlimport client/mysqltest \ client/mysqladmin client/mysqldump client/mysqlimport client/mysqltest \
tools/mysqlmanager \
client/.libs/mysql client/.libs/mysqlshow client/.libs/mysqladmin \ client/.libs/mysql client/.libs/mysqlshow client/.libs/mysqladmin \
client/.libs/mysqldump client/.libs/mysqlimport client/.libs/mysqltest \ client/.libs/mysqldump client/.libs/mysqlimport client/.libs/mysqltest \
client/.libs/mysqlcheck client/.libs/mysqlcheck tools/.libs/mysqlmanager
do do
if [ -f $i ] if [ -f $i ]
then then
...@@ -88,7 +89,7 @@ do ...@@ -88,7 +89,7 @@ do
fi fi
done done
for i in libmysql/.libs/libmysqlclient.a libmysql/.libs/libmysqlclient.so* libmysql/libmysqlclient.* libmysql_r/.libs/libmysqlclient_r.a libmysql_r/.libs/libmysqlclient_r.so* libmysql_r/libmysqlclient_r.* mysys/libmysys.a strings/libmystrings.a dbug/libdbug.a libmysqld/.libs/libmysqld.a libmysqld/.libs/libmysqld.so* libmysqld/libmysqld.a libmysqld/libmysqld.a for i in libmysql/.libs/libmysqlclient.a libmysql/.libs/libmysqlclient.so* libmysql/libmysqlclient.* libmysql_r/.libs/libmysqlclient_r.a libmysql_r/.libs/libmysqlclient_r.so* libmysql_r/libmysqlclient_r.* mysys/libmysys.a strings/libmystrings.a dbug/libdbug.a libmysqld/.libs/libmysqld.a libmysqld/.libs/libmysqld.so* libmysqld/libmysqld.a
do do
if [ -f $i ] if [ -f $i ]
then then
......
...@@ -360,7 +360,7 @@ fi ...@@ -360,7 +360,7 @@ fi
%attr(755, root, root) /usr/bin/mysqlbug %attr(755, root, root) /usr/bin/mysqlbug
%attr(755, root, root) /usr/bin/mysqltest %attr(755, root, root) /usr/bin/mysqltest
%attr(755, root, root) /usr/bin/mysqlhotcopy %attr(755, root, root) /usr/bin/mysqlhotcopy
%attr(755, root, root) /usr/bin/mysql_explain %attr(755, root, root) /usr/bin/mysql_explain_log
%attr(755, root, root) /usr/bin/perror %attr(755, root, root) /usr/bin/perror
%attr(755, root, root) /usr/bin/replace %attr(755, root, root) /usr/bin/replace
%attr(755, root, root) /usr/bin/resolveip %attr(755, root, root) /usr/bin/resolveip
...@@ -423,6 +423,7 @@ fi ...@@ -423,6 +423,7 @@ fi
%files bench %files bench
%attr(-, root, root) /usr/share/sql-bench %attr(-, root, root) /usr/share/sql-bench
%attr(-, root, root) /usr/share/mysql-test %attr(-, root, root) /usr/share/mysql-test
%attr(755, root, root) /usr/bin/mysqlmanager
%files Max %files Max
%attr(755, root, root) /usr/sbin/mysqld-max %attr(755, root, root) /usr/sbin/mysqld-max
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment