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
b67706b1
Commit
b67706b1
authored
Jun 11, 2004
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.4014
parents
e914e6c7
c56613fb
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
1 deletion
+4
-1
libmysqld/lib_sql.cc
libmysqld/lib_sql.cc
+1
-0
sql/protocol.h
sql/protocol.h
+3
-1
No files found.
libmysqld/lib_sql.cc
View file @
b67706b1
...
@@ -511,6 +511,7 @@ int check_embedded_connection(MYSQL *mysql)
...
@@ -511,6 +511,7 @@ int check_embedded_connection(MYSQL *mysql)
thd
->
host
=
(
char
*
)
my_localhost
;
thd
->
host
=
(
char
*
)
my_localhost
;
thd
->
host_or_ip
=
thd
->
host
;
thd
->
host_or_ip
=
thd
->
host
;
thd
->
user
=
my_strdup
(
mysql
->
user
,
MYF
(
0
));
thd
->
user
=
my_strdup
(
mysql
->
user
,
MYF
(
0
));
thd
->
priv_user
=
thd
->
user
;
return
check_user
(
thd
,
COM_CONNECT
,
NULL
,
0
,
thd
->
db
,
true
);
return
check_user
(
thd
,
COM_CONNECT
,
NULL
,
0
,
thd
->
db
,
true
);
}
}
...
...
sql/protocol.h
View file @
b67706b1
...
@@ -35,8 +35,10 @@ protected:
...
@@ -35,8 +35,10 @@ protected:
enum
enum_field_types
*
field_types
;
enum
enum_field_types
*
field_types
;
#endif
#endif
uint
field_count
;
uint
field_count
;
#ifndef EMBEDDED_LIBRARY
bool
net_store_data
(
const
char
*
from
,
uint
length
);
bool
net_store_data
(
const
char
*
from
,
uint
length
);
#ifdef EMBEDDED_LIBRARY
#else
virtual
bool
net_store_data
(
const
char
*
from
,
uint
length
);
char
**
next_field
;
char
**
next_field
;
MYSQL_FIELD
*
next_mysql_field
;
MYSQL_FIELD
*
next_mysql_field
;
MEM_ROOT
*
alloc
;
MEM_ROOT
*
alloc
;
...
...
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