database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

merge

Browse Source 
mysql-test/r/bdb.result:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
sql/sql_select.cc:
  Merge
This commit is contained in:
unknown
2002-11-12 13:28:58 +02:00
parent 3559b2f158 e1c1abd0e1
commit 5b53010f85
16 changed files with 183 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/mysqld_safe.sh
View File

@@ -204,7 +204,7 @@ else
fi
USER_OPTION=""
if test "x$USER" = "xroot"
if test -w / -o "$USER" = "root"
then
if test "$user" != "root" -o $SET_USER = 1
then