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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
90ff32ab
Commit
90ff32ab
authored
Jan 02, 2003
by
peter@mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge mysql.com:/home/pz/mysql/mysql-4.1-root
into mysql.com:/home/pz/mysql/mysql-4.1
parents
61e08cad
4a8cc4ec
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
14 deletions
+14
-14
sql/mysqld.cc
sql/mysqld.cc
+0
-1
sql/sql_udf.cc
sql/sql_udf.cc
+14
-13
No files found.
sql/mysqld.cc
View file @
90ff32ab
...
...
@@ -182,7 +182,6 @@ static char szPipeName [ 257 ];
static
SECURITY_ATTRIBUTES
saPipeSecurity
;
static
SECURITY_DESCRIPTOR
sdPipeDescriptor
;
static
HANDLE
hPipe
=
INVALID_HANDLE_VALUE
;
static
uint
handler_count
;
static
bool
opt_enable_named_pipe
=
0
;
#endif
#ifdef __WIN__
...
...
sql/sql_udf.cc
View file @
90ff32ab
...
...
@@ -33,6 +33,7 @@
#endif
#include "mysql_priv.h"
#include <my_pthread.h>
#ifdef HAVE_DLOPEN
extern
"C"
...
...
@@ -70,7 +71,7 @@ extern "C"
static
bool
initialized
=
0
;
static
MEM_ROOT
mem
;
static
HASH
udf_hash
;
static
pthread_mutex
_t
THR_LOCK_udf
;
static
rw_lock
_t
THR_LOCK_udf
;
static
udf_func
*
add_udf
(
char
*
name
,
Item_result
ret
,
char
*
dl
,
...
...
@@ -122,7 +123,7 @@ void udf_init()
if
(
initialized
)
DBUG_VOID_RETURN
;
pthread_mutex_init
(
&
THR_LOCK_udf
,
MY_MUTEX_INIT_SLOW
);
my_rwlock_init
(
&
THR_LOCK_udf
,
NULL
);
init_sql_alloc
(
&
mem
,
1024
,
0
);
THD
*
new_thd
=
new
THD
;
...
...
@@ -262,7 +263,7 @@ static void del_udf(udf_func *udf)
void
free_udf
(
udf_func
*
udf
)
{
DBUG_ENTER
(
"free_udf"
);
pthread_mutex_
lock
(
&
THR_LOCK_udf
);
rw_wr
lock
(
&
THR_LOCK_udf
);
if
(
!--
udf
->
usage_count
)
{
/*
...
...
@@ -274,7 +275,7 @@ void free_udf(udf_func *udf)
if
(
!
find_udf_dl
(
udf
->
dl
))
dlclose
(
udf
->
dlhandle
);
}
pthread_mutex
_unlock
(
&
THR_LOCK_udf
);
rw
_unlock
(
&
THR_LOCK_udf
);
DBUG_VOID_RETURN
;
}
...
...
@@ -287,7 +288,7 @@ udf_func *find_udf(const char *name,uint length,bool mark_used)
DBUG_ENTER
(
"find_udf"
);
/* TODO: This should be changed to reader locks someday! */
pthread_mutex_lock
(
&
THR_LOCK_udf
);
rw_rdlock
(
&
THR_LOCK_udf
);
if
((
udf
=
(
udf_func
*
)
hash_search
(
&
udf_hash
,(
byte
*
)
name
,
length
?
length
:
(
uint
)
strlen
(
name
))))
{
...
...
@@ -296,7 +297,7 @@ udf_func *find_udf(const char *name,uint length,bool mark_used)
else
if
(
mark_used
)
udf
->
usage_count
++
;
}
pthread_mutex
_unlock
(
&
THR_LOCK_udf
);
rw
_unlock
(
&
THR_LOCK_udf
);
DBUG_RETURN
(
udf
);
}
...
...
@@ -375,7 +376,7 @@ int mysql_create_function(THD *thd,udf_func *udf)
DBUG_RETURN
(
1
);
}
pthread_mutex_
lock
(
&
THR_LOCK_udf
);
rw_wr
lock
(
&
THR_LOCK_udf
);
if
((
hash_search
(
&
udf_hash
,(
byte
*
)
udf
->
name
,
udf
->
name_length
)))
{
net_printf
(
thd
,
ER_UDF_EXISTS
,
udf
->
name
);
...
...
@@ -438,13 +439,13 @@ int mysql_create_function(THD *thd,udf_func *udf)
del_udf
(
u_d
);
goto
err
;
}
pthread_mutex
_unlock
(
&
THR_LOCK_udf
);
rw
_unlock
(
&
THR_LOCK_udf
);
DBUG_RETURN
(
0
);
err:
if
(
new_dl
)
dlclose
(
dl
);
pthread_mutex
_unlock
(
&
THR_LOCK_udf
);
rw
_unlock
(
&
THR_LOCK_udf
);
DBUG_RETURN
(
1
);
}
...
...
@@ -460,7 +461,7 @@ int mysql_drop_function(THD *thd,const char *udf_name)
send_error
(
thd
,
ER_OUT_OF_RESOURCES
,
ER
(
ER_OUT_OF_RESOURCES
));
DBUG_RETURN
(
1
);
}
pthread_mutex_lock
(
&
THR_LOCK_udf
);
rw_wrlock
(
&
THR_LOCK_udf
);
if
(
!
(
udf
=
(
udf_func
*
)
hash_search
(
&
udf_hash
,(
byte
*
)
udf_name
,
(
uint
)
strlen
(
udf_name
))))
{
...
...
@@ -490,10 +491,10 @@ int mysql_drop_function(THD *thd,const char *udf_name)
}
close_thread_tables
(
thd
);
pthread_mutex_unlock
(
&
THR_LOCK_udf
);
rw_unlock
(
&
THR_LOCK_udf
);
DBUG_RETURN
(
0
);
err:
pthread_mutex
_unlock
(
&
THR_LOCK_udf
);
rw
_unlock
(
&
THR_LOCK_udf
);
DBUG_RETURN
(
1
);
}
...
...
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