diff options
| -rwxr-xr-x | Build-tools/Do-compile | 7 | ||||
| -rw-r--r-- | Docs/manual.texi | 28 | ||||
| -rw-r--r-- | client/mysqldump.c | 2 | ||||
| -rw-r--r-- | scripts/make_binary_distribution.sh | 5 | ||||
| -rw-r--r-- | support-files/mysql.spec.sh | 1 |
5 files changed, 34 insertions, 9 deletions
diff --git a/Build-tools/Do-compile b/Build-tools/Do-compile index c03ca84c29d..10d97dfbe82 100755 --- a/Build-tools/Do-compile +++ b/Build-tools/Do-compile @@ -153,7 +153,7 @@ if ($opt_stage <= 1) { $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") { safe_system("cp -r $pwd/$host/include-mysql/* $pwd/$host/$ver/include"); @@ -317,7 +317,7 @@ exit 0; sub usage { print <<EOF; -$0 version 1.3 +$0 version 1.4 $0 takes the following options: @@ -549,7 +549,8 @@ sub kill_all chop($cand); ($pid_user, $pid) = split(' ', $cand); 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); } } diff --git a/Docs/manual.texi b/Docs/manual.texi index 28219eabcaf..fb8ca189e19 100644 --- a/Docs/manual.texi +++ b/Docs/manual.texi @@ -4033,8 +4033,13 @@ If the date is totally wrong, MySQL will store the special 0000-00-00 date value in the column. @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. + +@item +If you set an @cod{SET} column to an unsupported value, the value will +be ignored. @xref{Bugs}. + @end itemize @item @@ -4935,6 +4940,18 @@ Standard usage in PostgreSQL is closer to ANSI SQL in some cases. 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 PostgreSQL has a bigger team of developers that contribute to the server. @end itemize @@ -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{"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 non-@code{NULL} @code{SET} values. @@ -33790,8 +33810,10 @@ column in a table, the default value is the current date and time. @xref{Date and time types}. @item -For string types other than @code{ENUM}, the default value is the empty string. -For @code{ENUM}, the default is the first enumeration value. +For string types other than @code{ENUM}, the default value is the empty +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 Default values must be constants. This means, for example, that you cannot diff --git a/client/mysqldump.c b/client/mysqldump.c index 894286f8896..64e7ae0fd82 100644 --- a/client/mysqldump.c +++ b/client/mysqldump.c @@ -1150,9 +1150,9 @@ static void dumpTable(uint numFields, char *table) } if (opt_lock) fputs("UNLOCK TABLES;\n", md_result_file); - mysql_free_result(res); if (opt_autocommit) fprintf(md_result_file, "commit;\n"); + mysql_free_result(res); } } /* dumpTable */ diff --git a/scripts/make_binary_distribution.sh b/scripts/make_binary_distribution.sh index 35be819cd2e..c002179a393 100644 --- a/scripts/make_binary_distribution.sh +++ b/scripts/make_binary_distribution.sh @@ -66,9 +66,10 @@ for i in extra/comp_err extra/replace extra/perror extra/resolveip \ myisam/myisampack sql/mysqld sql/mysqlbinlog \ client/mysql sql/mysqld client/mysqlshow client/mysqlcheck \ client/mysqladmin client/mysqldump client/mysqlimport client/mysqltest \ + tools/mysqlmanager \ client/.libs/mysql client/.libs/mysqlshow client/.libs/mysqladmin \ client/.libs/mysqldump client/.libs/mysqlimport client/.libs/mysqltest \ - client/.libs/mysqlcheck + client/.libs/mysqlcheck tools/.libs/mysqlmanager do if [ -f $i ] then @@ -88,7 +89,7 @@ do fi 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 if [ -f $i ] then diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index b136fbf5bf6..1bc92e9b7e2 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -423,6 +423,7 @@ fi %files bench %attr(-, root, root) /usr/share/sql-bench %attr(-, root, root) /usr/share/mysql-test +%attr(755, root, root) /usr/bin/mysqlmanager %files Max %attr(755, root, root) /usr/sbin/mysqld-max |