diff options
| -rw-r--r-- | Docs/manual.texi | 18 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | myisam/mi_create.c | 2 | ||||
| -rw-r--r-- | scripts/safe_mysqld.sh | 8 |
4 files changed, 16 insertions, 14 deletions
diff --git a/Docs/manual.texi b/Docs/manual.texi index 47e2f79887a..365f80bd549 100644 --- a/Docs/manual.texi +++ b/Docs/manual.texi @@ -5966,8 +5966,8 @@ Add support for UNICODE. Allow @code{select a from crash_me left join crash_me2 using (a)}; In this case a is assumed to come from the crash_me table. @item -Fix that @code{ON} and @code{USING} works with the @code{JOIN} and -@code{INNER JOIN} join types. +Fix that @code{ON} and @code{USING} works with the @code{JOIN} +join type. @item Oracle like @code{CONNECT BY PRIOR ...} to search hierarchy structures. @item @@ -32327,7 +32327,7 @@ restrict which rows you have in the result set. If you want to restrict which rows should be in the result, you have to do this in the @code{WHERE} clause. -Note that in versions before Version 3.23.16, the @code{INNER JOIN} didn't +Note that in versions before Version 3.23.17, the @code{INNER JOIN} didn't take a @code{join_condition}! @cindex ODBC compatibility @@ -32346,11 +32346,6 @@ mysql> select t1.name, t2.salary from employee AS t1, info AS t2 @end example @item -@code{INNER JOIN} and @code{,} (comma) are semantically equivalent. -Both do a full join between the tables used. Normally, you specify how -the tables should be linked in the @code{WHERE} condition. - -@item The @code{ON} conditional is any conditional of the form that may be used in a @code{WHERE} clause. @@ -46734,9 +46729,12 @@ Fixed coredump during @code{REPAIR} of some particularly broken tables. @item Fixed bug in @code{InnoDB} and @code{AUTO_INCREMENT} columns. @item +Fixed bug in @code{InnoDB} and @code{RENAME TABLE} columns. +@item Fixed critical bug in @code{InnoDB} and @code{BLOB} columns. If one has -used @code{BLOB} columns larger than 8K in an @code{InnoDB} table, one must -dump the table with @code{mysqldump}, drop it and restore it from the dump. +used @code{BLOB} columns larger than 8000 bytes in an @code{InnoDB} +table, one must dump the table with @code{mysqldump}, drop it and +restore it from the dump. @item Applied large patch for OS/2 from Yuri Dario. @item diff --git a/configure.in b/configure.in index 79cd35b5678..121d54009f1 100644 --- a/configure.in +++ b/configure.in @@ -559,7 +559,7 @@ AC_ARG_WITH(mysqld-user, [ --with-mysqld-user=username What user the mysqld daemon shall be run as.], [ MYSQLD_USER=$withval ], - [ MYSQLD_USER=root ] + [ MYSQLD_USER=mysql ] ) AC_SUBST(MYSQLD_USER) diff --git a/myisam/mi_create.c b/myisam/mi_create.c index 6de13f8f84a..7abf274d621 100644 --- a/myisam/mi_create.c +++ b/myisam/mi_create.c @@ -63,7 +63,7 @@ int mi_create(const char *name,uint keys,MI_KEYDEF *keydefs, ci=&tmp_create_info; } - if (keys + uniques > MI_MAX_KEY) + if (keys + uniques > MI_MAX_KEY || columns == 0) { DBUG_RETURN(my_errno=HA_WRONG_CREATE_OPTION); } diff --git a/scripts/safe_mysqld.sh b/scripts/safe_mysqld.sh index 59d7dcc5cfc..e7418819604 100644 --- a/scripts/safe_mysqld.sh +++ b/scripts/safe_mysqld.sh @@ -31,7 +31,7 @@ parse_arguments() { --basedir=*) MY_BASEDIR_VERSION=`echo "$arg" | sed -e "s;--[^=]*=;;"` ;; --datadir=*) DATADIR=`echo "$arg" | sed -e "s;--[^=]*=;;"` ;; --pid-file=*) pid_file=`echo "$arg" | sed -e "s;--[^=]*=;;"` ;; - --user=*) user=`echo "$arg" | sed -e "s;--[^=]*=;;"` ;; + --user=*) user=`echo "$arg" | sed -e "s;--[^=]*=;;"` ; SET_USER=1 ;; # these two might have been set in a [safe_mysqld] section of my.cnf # they get passed via environment variables to safe_mysqld @@ -108,6 +108,7 @@ fi # these rely on $DATADIR by default, so we'll set them later on pid_file= err_log= +SET_USER=0 # Get first arguments from the my.cnf file, groups [mysqld] and [safe_mysqld] # and then merge with the command line arguments @@ -167,7 +168,10 @@ fi USER_OPTION="" if test -w / then - USER_OPTION="--user=$user" + if test "$user" != "root" -o $SET_USER = 1 + then + USER_OPTION="--user=$user" + fi # If we are root, change the err log to the right user. touch $err_log; chown $user $err_log if test -n "$open_files" |