Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
cad77938
Commit
cad77938
authored
Jul 15, 2005
by
lenz@mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge mysql.com:/space/my/mysql-4.1.13-clone
into mysql.com:/space/my/mysql-4.1-build
parents
c301935e
0487cb93
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
19 additions
and
9 deletions
+19
-9
sql/sql_prepare.cc
sql/sql_prepare.cc
+8
-4
support-files/mysql.spec.sh
support-files/mysql.spec.sh
+11
-5
No files found.
sql/sql_prepare.cc
View file @
cad77938
...
@@ -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
;
}
}
...
...
support-files/mysql.spec.sh
View file @
cad77938
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment