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
95bf984d
Commit
95bf984d
authored
21 years ago
by
hf@deer.(none)
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix for #1210
i fixed this in 4.1 in slightly different way
parent
045eb3d8
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
3 deletions
+17
-3
libmysqld/lib_sql.cc
libmysqld/lib_sql.cc
+4
-3
libmysqld/libmysqld.c
libmysqld/libmysqld.c
+13
-0
No files found.
libmysqld/lib_sql.cc
View file @
95bf984d
...
...
@@ -306,7 +306,8 @@ char **copy_arguments(int argc, char **argv)
extern
"C"
{
static
my_bool
inited
,
org_my_init_done
;
static
my_bool
org_my_init_done
;
my_bool
server_inited
;
ulong
max_allowed_packet
,
net_buffer_length
;
char
**
copy_arguments_ptr
=
0
;
...
...
@@ -338,9 +339,9 @@ int STDCALL mysql_server_init(int argc, char **argv, char **groups)
my_umask_dir
=
0700
;
// Default umask for new directories
/* Only call MY_INIT() if it hasn't been called before */
if
(
!
inited
)
if
(
!
server_
inited
)
{
inited
=
1
;
server_
inited
=
1
;
org_my_init_done
=
my_init_done
;
}
if
(
!
org_my_init_done
)
...
...
This diff is collapsed.
Click to expand it.
libmysqld/libmysqld.c
View file @
95bf984d
...
...
@@ -74,6 +74,8 @@ static int send_file_to_server(MYSQL *mysql,const char *filename);
static
ulong
mysql_sub_escape_string
(
CHARSET_INFO
*
charset_info
,
char
*
to
,
const
char
*
from
,
ulong
length
);
extern
char
server_inited
;
#define init_sigpipe_variables
#define set_sigpipe(mysql)
#define reset_sigpipe(mysql)
...
...
@@ -802,6 +804,17 @@ mysql_real_connect(MYSQL *mysql,const char *host, const char *user,
db
?
db
:
"(Null)"
,
user
?
user
:
"(Null)"
));
/*
Check mysql_server_init was called.
This code shouldn't be merged to 4.1
*/
if
(
!
server_inited
)
{
net
->
last_errno
=
CR_UNKNOWN_ERROR
;
strmov
(
net
->
last_error
,
ER
(
net
->
last_errno
));
goto
error
;
}
net
->
vio
=
0
;
/* If something goes wrong */
/* use default options */
if
(
mysql
->
options
.
my_cnf_file
||
mysql
->
options
.
my_cnf_group
)
...
...
This diff is collapsed.
Click to expand it.
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