Commit cad77938 authored by lenz@mysql.com's avatar lenz@mysql.com

Merge mysql.com:/space/my/mysql-4.1.13-clone

into mysql.com:/space/my/mysql-4.1-build
parents c301935e 0487cb93
...@@ -306,24 +306,28 @@ static void set_param_int64(Item_param *param, uchar **pos, ulong len) ...@@ -306,24 +306,28 @@ static void set_param_int64(Item_param *param, uchar **pos, ulong len)
static void set_param_float(Item_param *param, uchar **pos, ulong len) static void set_param_float(Item_param *param, uchar **pos, ulong len)
{ {
float data;
#ifndef EMBEDDED_LIBRARY #ifndef EMBEDDED_LIBRARY
if (len < 4) if (len < 4)
return; return;
#endif
float data;
float4get(data,*pos); float4get(data,*pos);
#else
data= *(float*) *pos;
#endif
param->set_double((double) data); param->set_double((double) data);
*pos+= 4; *pos+= 4;
} }
static void set_param_double(Item_param *param, uchar **pos, ulong len) static void set_param_double(Item_param *param, uchar **pos, ulong len)
{ {
double data;
#ifndef EMBEDDED_LIBRARY #ifndef EMBEDDED_LIBRARY
if (len < 8) if (len < 8)
return; return;
#endif
double data;
float8get(data,*pos); float8get(data,*pos);
#else
data= *(double*) *pos;
#endif
param->set_double((double) data); param->set_double((double) data);
*pos+= 8; *pos+= 8;
} }
......
...@@ -437,19 +437,20 @@ then ...@@ -437,19 +437,20 @@ then
/sbin/chkconfig --add mysql /sbin/chkconfig --add mysql
fi fi
# Create a MySQL user. Do not report any problems if it already # Create a MySQL user and group. Do not report any problems if it already
# exists. This is redhat specific and should be handled more portable # exists.
useradd -M -r -d $mysql_datadir -s /bin/bash -c "MySQL server" %{mysqld_user} 2> /dev/null || true groupadd -r -c "MySQL server" %{mysqld_user} 2> /dev/null || true
useradd -M -r -d $mysql_datadir -s /bin/bash -c "MySQL server" -g %{mysqld_user} %{mysqld_user} 2> /dev/null || true
# Change permissions so that the user that will run the MySQL daemon # Change permissions so that the user that will run the MySQL daemon
# owns all database files. # owns all database files.
chown -R %{mysqld_user} $mysql_datadir chown -R %{mysqld_user}:%{mysqld_user} $mysql_datadir
# Initiate databases # Initiate databases
%{_bindir}/mysql_install_db --rpm --user=%{mysqld_user} %{_bindir}/mysql_install_db --rpm --user=%{mysqld_user}
# Change permissions again to fix any new files. # Change permissions again to fix any new files.
chown -R %{mysqld_user} $mysql_datadir chown -R %{mysqld_user}:%{mysqld_user} $mysql_datadir
# Fix permissions for the permission database so that only the user # Fix permissions for the permission database so that only the user
# can read them. # can read them.
...@@ -667,6 +668,11 @@ fi ...@@ -667,6 +668,11 @@ fi
# itself - note that they must be ordered by date (important when # itself - note that they must be ordered by date (important when
# merging BK trees) # merging BK trees)
%changelog %changelog
* Fri Jul 15 2005 Lenz Grimmer <lenz@mysql.com>
- create a "mysql" user group and assign the mysql user account to that group
in the server postinstall section. (BUG 10984)
* Tue Jun 14 2005 Lenz Grimmer <lenz@mysql.com> * Tue Jun 14 2005 Lenz Grimmer <lenz@mysql.com>
- Do not build statically on i386 by default, only when adding either "--with - Do not build statically on i386 by default, only when adding either "--with
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment