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
bf0c6ffd
Commit
bf0c6ffd
authored
Mar 01, 2005
by
jimw@mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge mysql.com:/home/jimw/my/mysql-5.0-8678
into mysql.com:/home/jimw/my/mysql-5.0-clean
parents
2904f4d0
775f6a47
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
25 additions
and
20 deletions
+25
-20
sql/item_func.cc
sql/item_func.cc
+25
-20
No files found.
sql/item_func.cc
View file @
bf0c6ffd
...
...
@@ -2365,26 +2365,6 @@ longlong Item_func_bit_count::val_int()
#ifdef HAVE_DLOPEN
udf_handler
::~
udf_handler
()
{
if
(
!
not_original
)
{
if
(
initialized
)
{
if
(
u_d
->
func_deinit
!=
NULL
)
{
void
(
*
deinit
)(
UDF_INIT
*
)
=
(
void
(
*
)(
UDF_INIT
*
))
u_d
->
func_deinit
;
(
*
deinit
)(
&
initid
);
}
free_udf
(
u_d
);
}
if
(
buffers
)
// Because of bug in ecc
delete
[]
buffers
;
}
}
bool
udf_handler
::
fix_fields
(
THD
*
thd
,
TABLE_LIST
*
tables
,
Item_result_field
*
func
,
uint
arg_count
,
Item
**
arguments
)
...
...
@@ -2774,6 +2754,31 @@ String *Item_func_udf_str::val_str(String *str)
return
res
;
}
/*
This has to come last in the udf_handler methods, or the compiler for IBM
AIX fails to compile with debugging enabled. (Yes, really.)
*/
udf_handler
::~
udf_handler
()
{
if
(
!
not_original
)
{
if
(
initialized
)
{
if
(
u_d
->
func_deinit
!=
NULL
)
{
void
(
*
deinit
)(
UDF_INIT
*
)
=
(
void
(
*
)(
UDF_INIT
*
))
u_d
->
func_deinit
;
(
*
deinit
)(
&
initid
);
}
free_udf
(
u_d
);
}
if
(
buffers
)
// Because of bug in ecc
delete
[]
buffers
;
}
}
#else
bool
udf_handler
::
get_arguments
()
{
return
0
;
}
#endif
/* HAVE_DLOPEN */
...
...
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