merge

configure.in:
  Auto merged
Docs/manual.texi:
  Auto merged
myisam/mi_create.c:
  Auto merged

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
@@ -32345,11 +32345,6 @@ mysql> select t1.name, t2.salary from employee AS t1, info AS t2
            where t1.name = t2.name;
 @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

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)
 

myisam/mi_create.c

@@ -64,7 +64,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);
   }

scripts/mysqld_safe.sh

@@ -36,7 +36,7 @@ parse_arguments() {
       --basedir=*) MY_BASEDIR_VERSION=`echo "$arg" | sed -e "s;--basedir=;;"` ;;
       --datadir=*) DATADIR=`echo "$arg" | sed -e "s;--datadir=;;"` ;;
       --pid-file=*) pid_file=`echo "$arg" | sed -e "s;--pid-file=;;"` ;;
-      --user=*)    user=`echo "$arg" | sed -e "s;--user=;;"` ;;
+      --user=*)    user=`echo "$arg" | sed -e "s;--[^=]*=;;"` ; SET_USER=1 ;;
 
       # these two might have been set in a [mysqld_safe] section of my.cnf
       # they get passed via environment variables to mysqld_safe
@@ -113,6 +113,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 [mysqld_safe]
 # and then merge with the command line arguments
@@ -172,7 +173,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"