1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix to not running mysqld as root by default

Browse Source 
Docs/manual.texi:
  Small changes for INNER JOIN
configure.in:
  Use 'mysql' as the default MySQL user
myisam/mi_create.c:
  Test for right create information
This commit is contained in:
unknown 2001-09-02 20:42:07 +03:00
parent 1e97b27ee2
commit 76ec780f0e
4 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Docs/manual.texi
View File

@ -5966,8 +5966,8 @@ Add support for UNICODE.
Allow @code{select a from crash_me left join crash_me2 using (a)}; In this 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. case a is assumed to come from the crash_me table.
@item @item
Fix that @code{ON} and @code{USING} works with the @code{JOIN} and Fix that @code{ON} and @code{USING} works with the @code{JOIN}
@code{INNER JOIN} join types. join type.
@item @item
Oracle like @code{CONNECT BY PRIOR ...} to search hierarchy structures. Oracle like @code{CONNECT BY PRIOR ...} to search hierarchy structures.
@item @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} which rows should be in the result, you have to do this in the @code{WHERE}
clause. 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}! take a @code{join_condition}!
@cindex ODBC compatibility @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; where t1.name = t2.name;
@end example @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 @item
The @code{ON} conditional is any conditional of the form that may be used in The @code{ON} conditional is any conditional of the form that may be used in
a @code{WHERE} clause. a @code{WHERE} clause.
@ -46734,9 +46729,12 @@ Fixed coredump during @code{REPAIR} of some particularly broken tables.
@item @item
Fixed bug in @code{InnoDB} and @code{AUTO_INCREMENT} columns. Fixed bug in @code{InnoDB} and @code{AUTO_INCREMENT} columns.
@item @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 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 used @code{BLOB} columns larger than 8000 bytes in an @code{InnoDB}
dump the table with @code{mysqldump}, drop it and restore it from the dump. table, one must dump the table with @code{mysqldump}, drop it and
restore it from the dump.
@item @item
Applied large patch for OS/2 from Yuri Dario. Applied large patch for OS/2 from Yuri Dario.
@item @item

2
configure.in
View File

@ -559,7 +559,7 @@ AC_ARG_WITH(mysqld-user,
[ --with-mysqld-user=username [ --with-mysqld-user=username
What user the mysqld daemon shall be run as.], What user the mysqld daemon shall be run as.],
[ MYSQLD_USER=$withval ], [ MYSQLD_USER=$withval ],
[ MYSQLD_USER=root ] [ MYSQLD_USER=mysql ]
) )
AC_SUBST(MYSQLD_USER) AC_SUBST(MYSQLD_USER)

2
myisam/mi_create.c
View File

@ -63,7 +63,7 @@ int mi_create(const char *name,uint keys,MI_KEYDEF *keydefs,
ci=&tmp_create_info; 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); DBUG_RETURN(my_errno=HA_WRONG_CREATE_OPTION);
} }

8
scripts/safe_mysqld.sh
View File

@ -31,7 +31,7 @@ parse_arguments() {
--basedir=*) MY_BASEDIR_VERSION=`echo "$arg" | sed -e "s;--[^=]*=;;"` ;; --basedir=*) MY_BASEDIR_VERSION=`echo "$arg" | sed -e "s;--[^=]*=;;"` ;;
--datadir=*) DATADIR=`echo "$arg" | sed -e "s;--[^=]*=;;"` ;; --datadir=*) DATADIR=`echo "$arg" | sed -e "s;--[^=]*=;;"` ;;
--pid-file=*) pid_file=`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 # these two might have been set in a [safe_mysqld] section of my.cnf
# they get passed via environment variables to safe_mysqld # 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 # these rely on $DATADIR by default, so we'll set them later on
pid_file= pid_file=
err_log= err_log=
SET_USER=0
# Get first arguments from the my.cnf file, groups [mysqld] and [safe_mysqld] # Get first arguments from the my.cnf file, groups [mysqld] and [safe_mysqld]
# and then merge with the command line arguments # and then merge with the command line arguments
@ -167,7 +168,10 @@ fi
USER_OPTION="" USER_OPTION=""
if test -w / if test -w /
then 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. # If we are root, change the err log to the right user.
touch $err_log; chown $user $err_log touch $err_log; chown $user $err_log
if test -n "$open_files" if test -n "$open_files"