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
7f52a616
Commit
7f52a616
authored
Apr 01, 2005
by
joerg@mysql.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Last minor things to finish MySQL 4.1.10a:
- some wordings, - RPM packaging improvements.
parent
e2a3d0da
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
18 additions
and
14 deletions
+18
-14
configure.in
configure.in
+1
-1
scripts/mysql_create_system_tables.sh
scripts/mysql_create_system_tables.sh
+1
-3
sql/mysqld.cc
sql/mysqld.cc
+2
-2
sql/sql_udf.cc
sql/sql_udf.cc
+6
-6
support-files/mysql.spec.sh
support-files/mysql.spec.sh
+8
-2
No files found.
configure.in
View file @
7f52a616
...
...
@@ -5,7 +5,7 @@ AC_INIT(sql/mysqld.cc)
AC_CANONICAL_SYSTEM
# The Docs Makefile.am parses this line!
# remember to also change ndb version below and update version.c in ndb
AM_INIT_AUTOMAKE
(
mysql, 4.1.10
)
AM_INIT_AUTOMAKE
(
mysql, 4.1.10
a
)
AM_CONFIG_HEADER
(
config.h
)
PROTOCOL_VERSION
=
10
...
...
scripts/mysql_create_system_tables.sh
View file @
7f52a616
...
...
@@ -163,9 +163,7 @@ then
INSERT INTO user (host,user) values ('localhost','');"
else
i_u
=
"
$i_u
INSERT INTO user VALUES ('%','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0);
INSERT INTO user VALUES ('localhost','','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0);
INSERT INTO user VALUES ('%','','','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','','','','',0,0,0);"
INSERT INTO user VALUES ('localhost','','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0);"
fi
fi
fi
...
...
sql/mysqld.cc
View file @
7f52a616
...
...
@@ -284,12 +284,12 @@ my_bool opt_local_infile, opt_external_locking, opt_slave_compressed_protocol;
my_bool
opt_safe_user_create
=
0
,
opt_no_mix_types
=
0
;
my_bool
opt_show_slave_auth_info
,
opt_sql_bin_update
=
0
;
my_bool
opt_log_slave_updates
=
0
;
my_bool
opt_allow_suspicious_udfs
;
my_bool
opt_console
=
0
,
opt_bdb
,
opt_innodb
,
opt_isam
,
opt_ndbcluster
;
#ifdef HAVE_NDBCLUSTER_DB
const
char
*
opt_ndbcluster_connectstring
=
0
;
my_bool
opt_ndb_shm
,
opt_ndb_optimized_node_selection
;
#endif
my_bool
opt_allow_suspicious_udfs
;
my_bool
opt_readonly
,
use_temp_pool
,
relay_log_purge
;
my_bool
opt_sync_bdb_logs
,
opt_sync_frm
;
my_bool
opt_secure_auth
=
0
;
...
...
@@ -4143,7 +4143,7 @@ struct my_option my_long_options[] =
{
"ansi"
,
'a'
,
"Use ANSI SQL syntax instead of MySQL syntax."
,
0
,
0
,
0
,
GET_NO_ARG
,
NO_ARG
,
0
,
0
,
0
,
0
,
0
,
0
},
{
"allow-suspicious-udfs"
,
OPT_ALLOW_SUSPICIOUS_UDFS
,
"Allows
use of
UDFs consisting of only one symbol xxx() "
"Allows
to use
UDFs consisting of only one symbol xxx() "
"without corresponding xxx_init() or xxx_deinit(). That also means "
"that one can load any function from any library, for example exit() "
"from libc.so"
,
...
...
sql/sql_udf.cc
View file @
7f52a616
...
...
@@ -74,7 +74,7 @@ static HASH udf_hash;
static
rw_lock_t
THR_LOCK_udf
;
static
udf_func
*
add_udf
(
char
*
name
,
Item_result
ret
,
static
udf_func
*
add_udf
(
LEX_STRING
*
name
,
Item_result
ret
,
char
*
dl
,
Item_udftype
typ
);
static
void
del_udf
(
udf_func
*
udf
);
static
void
*
find_udf_dl
(
const
char
*
dl
);
...
...
@@ -90,8 +90,8 @@ static char *init_syms(udf_func *tmp, char *nm)
if
(
tmp
->
type
==
UDFTYPE_AGGREGATE
)
{
(
void
)
strmov
(
end
,
"_
reset
"
);
if
(
!
((
tmp
->
func_
reset
=
dlsym
(
tmp
->
dlhandle
,
nm
))))
(
void
)
strmov
(
end
,
"_
clear
"
);
if
(
!
((
tmp
->
func_
clear
=
dlsym
(
tmp
->
dlhandle
,
nm
))))
return
nm
;
(
void
)
strmov
(
end
,
"_add"
);
if
(
!
((
tmp
->
func_add
=
dlsym
(
tmp
->
dlhandle
,
nm
))))
...
...
@@ -200,8 +200,9 @@ void udf_init()
continue
;
}
if
(
!
(
tmp
=
add_udf
(
&
name
,(
Item_result
)
table
->
field
[
1
]
->
val_int
(),
dl_name
,
udftype
)))
if
(
!
(
tmp
=
add_udf
(
&
name
,(
Item_result
)
table
->
field
[
1
]
->
val_int
(),
dl_name
,
udftype
)))
{
sql_print_error
(
"Can't alloc memory for udf function: '%.64s'"
,
name
.
str
);
continue
;
...
...
@@ -445,7 +446,6 @@ int mysql_create_function(THD *thd,udf_func *udf)
goto
err
;
}
}
udf
->
name
.
str
=
strdup_root
(
&
mem
,
udf
->
name
.
str
);
udf
->
dl
=
strdup_root
(
&
mem
,
udf
->
dl
);
if
(
!
(
u_d
=
add_udf
(
&
udf
->
name
,
udf
->
returns
,
udf
->
dl
,
udf
->
type
)))
...
...
support-files/mysql.spec.sh
View file @
7f52a616
...
...
@@ -276,7 +276,6 @@ sh -c "PATH=\"${MYSQL_BUILD_PATH:-$PATH}\" \
--includedir=%{_includedir}
\
--mandir=%{_mandir}
\
--enable-thread-safe-client
\
--with-comment=
\"
Official MySQL RPM
\"
\
--with-readline ;
# Add this for more debugging support
# --with-debug
...
...
@@ -333,6 +332,7 @@ BuildMySQL "--enable-shared \
--with-csv-storage-engine
\
--with-example-storage-engine
\
--with-embedded-server
\
--with-comment=
\"
MySQL Community Edition - Max (GPL)
\"
\
--with-server-suffix='-Max'"
# Save everything for debug
...
...
@@ -379,6 +379,7 @@ BuildMySQL "--disable-shared \
--with-client-ldflags='-all-static'
\
$USE_OTHER_LIBC_DIR
\
%endif
--with-comment=
\"
MySQL Community Edition - Standard (GPL)
\"
\
--with-server-suffix='%{server_suffix}'
\
--without-embedded-server
\
--without-berkeley-db
\
...
...
@@ -694,7 +695,12 @@ fi
# itself - note that they must be ordered by date (important when
# merging BK trees)
%changelog
*
Monday Feb 7 2005 Tomas Ulin <tomas@mysql.com>
*
Mon Feb 14 2005 Lenz Grimmer <lenz@mysql.com>
*
Fixed the compilation comments and moved them into the separate build sections
for
Max and Standard
*
Mon Feb 7 2005 Tomas Ulin <tomas@mysql.com>
- enabled the
"Ndbcluster"
storage engine
for
the max binary
- added extra make
install
in
ndb subdir after Max build to get ndb binaries
...
...
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