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
ede6ba56
Commit
ede6ba56
authored
Jun 17, 2002
by
hf@bison.(none)
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Removing net emulation out of embedded library
parent
4375d827
Changes
16
Hide whitespace changes
Inline
Side-by-side
Showing
16 changed files
with
616 additions
and
297 deletions
+616
-297
BitKeeper/etc/logging_ok
BitKeeper/etc/logging_ok
+1
-0
include/mysql.h
include/mysql.h
+22
-3
include/violite.h
include/violite.h
+7
-2
libmysqld/embedded_priv.h
libmysqld/embedded_priv.h
+3
-0
libmysqld/lib_sql.cc
libmysqld/lib_sql.cc
+377
-6
libmysqld/lib_vio.c
libmysqld/lib_vio.c
+20
-7
libmysqld/libmysqld.c
libmysqld/libmysqld.c
+119
-252
sql/ha_myisam.cc
sql/ha_myisam.cc
+1
-1
sql/net_pkg.cc
sql/net_pkg.cc
+14
-0
sql/sql_acl.cc
sql/sql_acl.cc
+4
-0
sql/sql_base.cc
sql/sql_base.cc
+3
-0
sql/sql_class.cc
sql/sql_class.cc
+3
-0
sql/sql_class.h
sql/sql_class.h
+7
-0
sql/sql_parse.cc
sql/sql_parse.cc
+3
-1
sql/sql_show.cc
sql/sql_show.cc
+27
-23
sql/sql_table.cc
sql/sql_table.cc
+5
-2
No files found.
BitKeeper/etc/logging_ok
View file @
ede6ba56
...
@@ -54,3 +54,4 @@ venu@work.mysql.com
...
@@ -54,3 +54,4 @@ venu@work.mysql.com
zak@balfor.local
zak@balfor.local
zak@linux.local
zak@linux.local
ram@gw.udmsearch.izhnet.ru
ram@gw.udmsearch.izhnet.ru
hf@bison.(none)
include/mysql.h
View file @
ede6ba56
...
@@ -123,6 +123,9 @@ typedef struct st_mysql_data {
...
@@ -123,6 +123,9 @@ typedef struct st_mysql_data {
unsigned
int
fields
;
unsigned
int
fields
;
MYSQL_ROWS
*
data
;
MYSQL_ROWS
*
data
;
MEM_ROOT
alloc
;
MEM_ROOT
alloc
;
#ifdef EMBEDDED_LIBRARY
MYSQL_ROWS
**
prev_ptr
;
#endif
}
MYSQL_DATA
;
}
MYSQL_DATA
;
struct
st_mysql_options
{
struct
st_mysql_options
{
...
@@ -152,13 +155,20 @@ struct st_mysql_options {
...
@@ -152,13 +155,20 @@ struct st_mysql_options {
a read that is replication-aware
a read that is replication-aware
*/
*/
my_bool
no_master_reads
;
my_bool
no_master_reads
;
#ifdef EMBEDDED_LIBRARY
my_bool
separate_thread
;
#endif
};
};
enum
mysql_option
{
MYSQL_OPT_CONNECT_TIMEOUT
,
MYSQL_OPT_COMPRESS
,
enum
mysql_option
{
MYSQL_OPT_CONNECT_TIMEOUT
,
MYSQL_OPT_COMPRESS
,
MYSQL_OPT_NAMED_PIPE
,
MYSQL_INIT_COMMAND
,
MYSQL_OPT_NAMED_PIPE
,
MYSQL_INIT_COMMAND
,
MYSQL_READ_DEFAULT_FILE
,
MYSQL_READ_DEFAULT_GROUP
,
MYSQL_READ_DEFAULT_FILE
,
MYSQL_READ_DEFAULT_GROUP
,
MYSQL_SET_CHARSET_DIR
,
MYSQL_SET_CHARSET_NAME
,
MYSQL_SET_CHARSET_DIR
,
MYSQL_SET_CHARSET_NAME
,
MYSQL_OPT_LOCAL_INFILE
};
MYSQL_OPT_LOCAL_INFILE
,
#ifdef EMBEDDED_LIBRARY
MYSQL_OPT_USE_RESULT
#endif
};
enum
mysql_status
{
MYSQL_STATUS_READY
,
MYSQL_STATUS_GET_RESULT
,
enum
mysql_status
{
MYSQL_STATUS_READY
,
MYSQL_STATUS_GET_RESULT
,
MYSQL_STATUS_USE_RESULT
};
MYSQL_STATUS_USE_RESULT
};
...
@@ -171,12 +181,18 @@ enum mysql_status { MYSQL_STATUS_READY,MYSQL_STATUS_GET_RESULT,
...
@@ -171,12 +181,18 @@ enum mysql_status { MYSQL_STATUS_READY,MYSQL_STATUS_GET_RESULT,
enum
mysql_rpl_type
{
MYSQL_RPL_MASTER
,
MYSQL_RPL_SLAVE
,
enum
mysql_rpl_type
{
MYSQL_RPL_MASTER
,
MYSQL_RPL_SLAVE
,
MYSQL_RPL_ADMIN
};
MYSQL_RPL_ADMIN
};
struct
st_mysql_res
;
typedef
struct
st_mysql
{
typedef
struct
st_mysql
{
NET
net
;
/* Communication parameters */
NET
net
;
/* Communication parameters */
gptr
connector_fd
;
/* ConnectorFd for SSL */
gptr
connector_fd
;
/* ConnectorFd for SSL */
char
*
host
,
*
user
,
*
passwd
,
*
unix_socket
,
*
server_version
,
*
host_info
,
#ifndef _0EMBEDDED_LIBRARY
*
info
,
*
db
;
char
*
host
,
*
user
,
*
passwd
,
*
unix_socket
,
*
server_version
,
*
host_info
,
*
info
;
#endif
#ifdef EMBEDDED_LIBRARY
struct
st_mysql_res
*
result
;
#endif
char
*
db
;
struct
charset_info_st
*
charset
;
struct
charset_info_st
*
charset
;
MYSQL_FIELD
*
fields
;
MYSQL_FIELD
*
fields
;
MEM_ROOT
field_alloc
;
MEM_ROOT
field_alloc
;
...
@@ -212,6 +228,9 @@ typedef struct st_mysql {
...
@@ -212,6 +228,9 @@ typedef struct st_mysql {
typedef
struct
st_mysql_res
{
typedef
struct
st_mysql_res
{
#ifdef EMBEDDED_LIBRARY
const
char
*
query_str
;
#endif
my_ulonglong
row_count
;
my_ulonglong
row_count
;
MYSQL_FIELD
*
fields
;
MYSQL_FIELD
*
fields
;
MYSQL_DATA
*
data
;
MYSQL_DATA
*
data
;
...
...
include/violite.h
View file @
ede6ba56
...
@@ -31,8 +31,13 @@
...
@@ -31,8 +31,13 @@
extern
"C"
{
extern
"C"
{
#endif
/* __cplusplus */
#endif
/* __cplusplus */
enum
enum_vio_type
{
VIO_CLOSED
,
VIO_TYPE_TCPIP
,
VIO_TYPE_SOCKET
,
enum
enum_vio_type
{
VIO_TYPE_NAMEDPIPE
,
VIO_TYPE_SSL
};
VIO_CLOSED
,
VIO_TYPE_TCPIP
,
VIO_TYPE_SOCKET
,
VIO_TYPE_NAMEDPIPE
,
VIO_TYPE_SSL
#ifdef EMBEDDED_LIBRARY
,
VIO_SHARED_MEMORY
,
VIO_BUFFER
#endif
};
#ifndef __WIN__
#ifndef __WIN__
#define HANDLE void *
#define HANDLE void *
...
...
libmysqld/embedded_priv.h
View file @
ede6ba56
...
@@ -29,4 +29,7 @@ extern void end_embedded_connection(NET * net);
...
@@ -29,4 +29,7 @@ extern void end_embedded_connection(NET * net);
extern
void
lib_connection_phase
(
NET
*
net
,
int
phase
);
extern
void
lib_connection_phase
(
NET
*
net
,
int
phase
);
extern
bool
lib_dispatch_command
(
enum
enum_server_command
command
,
NET
*
net
,
extern
bool
lib_dispatch_command
(
enum
enum_server_command
command
,
NET
*
net
,
const
char
*
arg
,
ulong
length
);
const
char
*
arg
,
ulong
length
);
extern
void
init_embedded_mysql
(
MYSQL
*
mysql
,
int
client_flag
,
char
*
db
);
extern
void
*
create_embedded_thd
(
Vio
*
vio
,
unsigned
char
*
buff
,
int
client_flag
,
char
*
db
);
extern
NET
*
get_mysql_net
(
MYSQL
*
mysql
);
C_MODE_END
C_MODE_END
libmysqld/lib_sql.cc
View file @
ede6ba56
...
@@ -72,7 +72,7 @@ bool lib_dispatch_command(enum enum_server_command command, NET *net,
...
@@ -72,7 +72,7 @@ bool lib_dispatch_command(enum enum_server_command command, NET *net,
return
dispatch_command
(
command
,
thd
,
(
char
*
)
arg
,
length
+
1
);
return
dispatch_command
(
command
,
thd
,
(
char
*
)
arg
,
length
+
1
);
}
}
#ifdef _DUMMY
void
lib_connection_phase
(
NET
*
net
,
int
phase
)
void
lib_connection_phase
(
NET
*
net
,
int
phase
)
{
{
THD
*
thd
;
THD
*
thd
;
...
@@ -101,7 +101,7 @@ void start_embedded_conn1(NET * net)
...
@@ -101,7 +101,7 @@ void start_embedded_conn1(NET * net)
Vio
*
v
=
net
->
vio
;
Vio
*
v
=
net
->
vio
;
if
(
!
v
)
if
(
!
v
)
{
{
v
=
vio_new
(
0
,
VIO_
CLOSED
,
0
);
v
=
vio_new
(
0
,
VIO_
BUFFER
,
0
);
net
->
vio
=
v
;
net
->
vio
=
v
;
}
}
if
(
v
)
if
(
v
)
...
@@ -131,9 +131,6 @@ void start_embedded_conn1(NET * net)
...
@@ -131,9 +131,6 @@ void start_embedded_conn1(NET * net)
check_connections1
(
thd
);
check_connections1
(
thd
);
}
}
static
int
static
int
check_connections1
(
THD
*
thd
)
check_connections1
(
THD
*
thd
)
{
{
...
@@ -231,6 +228,9 @@ check_connections2(THD * thd)
...
@@ -231,6 +228,9 @@ check_connections2(THD * thd)
thd
->
password
=
test
(
passwd
[
0
]);
thd
->
password
=
test
(
passwd
[
0
]);
return
0
;
return
0
;
}
}
#else
C_MODE_END
#endif
/* _DUMMY */
static
bool
check_user
(
THD
*
thd
,
enum_server_command
command
,
const
char
*
user
,
static
bool
check_user
(
THD
*
thd
,
enum_server_command
command
,
const
char
*
user
,
const
char
*
passwd
,
const
char
*
db
,
bool
check_count
)
const
char
*
passwd
,
const
char
*
db
,
bool
check_count
)
...
@@ -588,7 +588,7 @@ void STDCALL mysql_thread_end()
...
@@ -588,7 +588,7 @@ void STDCALL mysql_thread_end()
void
start_embedded_connection
(
NET
*
net
)
void
start_embedded_connection
(
NET
*
net
)
{
{
start_embedded_conn1
(
net
);
//
start_embedded_conn1(net);
}
}
void
end_embedded_connection
(
NET
*
net
)
void
end_embedded_connection
(
NET
*
net
)
...
@@ -598,3 +598,374 @@ void end_embedded_connection(NET * net)
...
@@ -598,3 +598,374 @@ void end_embedded_connection(NET * net)
}
}
}
/* extern "C" */
}
/* extern "C" */
NET
*
get_mysql_net
(
MYSQL
*
mysql
)
{
return
&
((
THD
*
)
mysql
->
net
.
vio
->
dest_thd
)
->
net
;
}
void
init_embedded_mysql
(
MYSQL
*
mysql
,
int
client_flag
,
char
*
db
)
{
THD
*
thd
=
(
THD
*
)
mysql
->
net
.
vio
->
dest_thd
;
mysql
->
reconnect
=
1
;
/* Reconnect as default */
mysql
->
server_status
=
SERVER_STATUS_AUTOCOMMIT
;
mysql
->
protocol_version
=
::
protocol_version
;
mysql
->
thread_id
=
thd
->
thread_id
;
strmake
(
mysql
->
scramble_buff
,
thd
->
scramble
,
8
);
mysql
->
server_capabilities
=
CLIENT_LONG_FLAG
|
CLIENT_CONNECT_WITH_DB
|
CLIENT_TRANSACTIONS
;
mysql
->
server_language
=
MY_CHARSET_CURRENT
;
mysql
->
server_status
=
thd
->
server_status
;
mysql
->
client_flag
=
client_flag
|
mysql
->
options
.
client_flag
;
mysql
->
db
=
db
;
thd
->
mysql
=
mysql
;
}
static
int
embedded_thd_net_init
(
NET
*
net
,
unsigned
char
*
buff
)
{
net
->
buff
=
buff
;
if
(
net_buffer_length
>
max_allowed_packet
)
max_allowed_packet
=
net_buffer_length
;
net
->
buff_end
=
net
->
buff
+
(
net
->
max_packet
=
net_buffer_length
);
net
->
vio
=
NULL
;
net
->
no_send_ok
=
0
;
net
->
error
=
0
;
net
->
return_errno
=
0
;
net
->
return_status
=
0
;
net
->
timeout
=
(
uint
)
net_read_timeout
;
/* Timeout for read */
net
->
pkt_nr
=
net
->
compress_pkt_nr
=
0
;
net
->
write_pos
=
net
->
read_pos
=
net
->
buff
;
net
->
last_error
[
0
]
=
0
;
net
->
compress
=
0
;
net
->
reading_or_writing
=
0
;
net
->
where_b
=
net
->
remain_in_buf
=
0
;
net
->
last_errno
=
0
;
net
->
query_cache_query
=
0
;
return
0
;
}
void
*
create_embedded_thd
(
Vio
*
vio
,
unsigned
char
*
buff
,
int
client_flag
,
char
*
db
)
{
THD
*
thd
=
new
THD
;
embedded_thd_net_init
(
&
thd
->
net
,
buff
);
/* if (protocol_version>9) */
thd
->
net
.
return_errno
=
1
;
thd
->
thread_id
=
thread_id
++
;
if
(
thd
->
store_globals
())
{
fprintf
(
stderr
,
"store_globals failed.
\n
"
);
return
NULL
;
}
thd
->
mysys_var
=
my_thread_var
;
thd
->
dbug_thread_id
=
my_thread_id
();
thd
->
thread_stack
=
(
char
*
)
&
thd
;
if
(
thd
->
max_join_size
==
HA_POS_ERROR
)
thd
->
options
|=
OPTION_BIG_SELECTS
;
thd
->
proc_info
=
0
;
// Remove 'login'
thd
->
command
=
COM_SLEEP
;
thd
->
version
=
refresh_version
;
thd
->
set_time
();
init_sql_alloc
(
&
thd
->
mem_root
,
8192
,
8192
);
thd
->
client_capabilities
=
client_flag
;
thd
->
max_packet_length
=
max_allowed_packet
;
thd
->
net
.
vio
=
vio
;
if
(
thd
->
client_capabilities
&
CLIENT_INTERACTIVE
)
thd
->
inactive_timeout
=
net_interactive_timeout
;
if
(
thd
->
client_capabilities
&
CLIENT_TRANSACTIONS
)
thd
->
net
.
return_status
=
&
thd
->
server_status
;
thd
->
db
=
db
;
thd
->
db_length
=
db
?
stripp_sp
(
db
)
:
0
;
thd
->
db_access
=
DB_ACLS
;
thd
->
master_access
=
~
NO_ACCESS
;
return
thd
;
}
bool
send_fields
(
THD
*
thd
,
List
<
Item
>
&
list
,
uint
flag
)
{
List_iterator_fast
<
Item
>
it
(
list
);
Item
*
item
;
MEM_ROOT
*
alloc
;
MYSQL_FIELD
*
field
,
*
client_field
;
unsigned
int
field_count
=
list
.
elements
;
MYSQL
*
mysql
=
thd
->
mysql
;
if
(
!
(
mysql
->
result
=
(
MYSQL_RES
*
)
my_malloc
(
sizeof
(
MYSQL_RES
)
+
sizeof
(
ulong
)
*
field_count
,
MYF
(
MY_WME
|
MY_ZEROFILL
))))
goto
err
;
mysql
->
field_count
=
field_count
;
alloc
=
&
mysql
->
field_alloc
;
field
=
(
MYSQL_FIELD
*
)
alloc_root
(
alloc
,
sizeof
(
MYSQL_FIELD
)
*
list
.
elements
);
if
(
!
field
)
goto
err
;
client_field
=
field
;
while
((
item
=
it
++
))
{
Send_field
server_field
;
item
->
make_field
(
&
server_field
);
client_field
->
table
=
strdup_root
(
alloc
,
server_field
.
table_name
);
client_field
->
name
=
strdup_root
(
alloc
,
server_field
.
col_name
);
client_field
->
length
=
server_field
.
length
;
client_field
->
type
=
server_field
.
type
;
client_field
->
flags
=
server_field
.
flags
;
client_field
->
decimals
=
server_field
.
decimals
;
if
(
INTERNAL_NUM_FIELD
(
client_field
))
client_field
->
flags
|=
NUM_FLAG
;
if
(
flag
&
2
)
{
char
buff
[
80
];
String
tmp
(
buff
,
sizeof
(
buff
),
default_charset_info
),
*
res
;
if
(
!
(
res
=
item
->
val_str
(
&
tmp
)))
client_field
->
def
=
strdup_root
(
alloc
,
""
);
else
client_field
->
def
=
strdup_root
(
alloc
,
tmp
.
ptr
());
}
else
client_field
->
def
=
0
;
client_field
->
max_length
=
0
;
++
client_field
;
}
mysql
->
result
->
fields
=
field
;
if
(
!
(
mysql
->
result
->
data
=
(
MYSQL_DATA
*
)
my_malloc
(
sizeof
(
MYSQL_DATA
),
MYF
(
MY_WME
|
MY_ZEROFILL
))))
goto
err
;
init_alloc_root
(
&
mysql
->
result
->
data
->
alloc
,
8192
,
0
);
/* Assume rowlength < 8192 */
mysql
->
result
->
data
->
alloc
.
min_malloc
=
sizeof
(
MYSQL_ROWS
);
mysql
->
result
->
data
->
rows
=
0
;
mysql
->
result
->
data
->
fields
=
field_count
;
mysql
->
result
->
field_count
=
field_count
;
mysql
->
result
->
data
->
prev_ptr
=
&
mysql
->
result
->
data
->
data
;
mysql
->
result
->
field_alloc
=
mysql
->
field_alloc
;
mysql
->
result
->
current_field
=
0
;
mysql
->
result
->
current_row
=
0
;
return
0
;
err:
send_error
(
&
thd
->
net
,
ER_OUT_OF_RESOURCES
);
/* purecov: inspected */
return
1
;
/* purecov: inspected */
}
/* Get the length of next field. Change parameter to point at fieldstart */
static
ulong
net_field_length
(
uchar
**
packet
)
{
reg1
uchar
*
pos
=
*
packet
;
if
(
*
pos
<
251
)
{
(
*
packet
)
++
;
return
(
ulong
)
*
pos
;
}
if
(
*
pos
==
251
)
{
(
*
packet
)
++
;
return
NULL_LENGTH
;
}
if
(
*
pos
==
252
)
{
(
*
packet
)
+=
3
;
return
(
ulong
)
uint2korr
(
pos
+
1
);
}
if
(
*
pos
==
253
)
{
(
*
packet
)
+=
4
;
return
(
ulong
)
uint3korr
(
pos
+
1
);
}
(
*
packet
)
+=
9
;
/* Must be 254 when here */
return
(
ulong
)
uint4korr
(
pos
+
1
);
}
bool
select_send
::
send_data
(
List
<
Item
>
&
items
)
{
List_iterator_fast
<
Item
>
li
(
items
);
Item
*
item
;
String
*
packet
=
&
thd
->
packet
;
MYSQL
*
mysql
=
thd
->
mysql
;
MYSQL_DATA
*
result
=
mysql
->
result
->
data
;
MYSQL_ROWS
**
prev_ptr
=
&
mysql
->
result
->
data
->
data
;
MYSQL_ROWS
*
cur
;
MEM_ROOT
*
alloc
=
&
mysql
->
result
->
data
->
alloc
;
char
*
to
;
int
n_fields
=
items
.
elements
;
uchar
*
cp
;
MYSQL_FIELD
*
mysql_fields
=
mysql
->
result
->
fields
;
MYSQL_ROW
cur_field
,
end_field
;
ulong
len
;
DBUG_ENTER
(
"send_data"
);
thd
->
packet
.
length
(
0
);
while
((
item
=
li
++
))
{
if
(
item
->
send
(
thd
,
packet
))
{
packet
->
free
();
my_error
(
ER_OUT_OF_RESOURCES
,
MYF
(
0
));
DBUG_RETURN
(
1
);
}
}
result
->
rows
++
;
if
(
!
(
cur
=
(
MYSQL_ROWS
*
)
alloc_root
(
alloc
,
sizeof
(
MYSQL_ROWS
)))
||
!
(
cur
->
data
=
(
MYSQL_ROW
)
alloc_root
(
alloc
,
(
n_fields
+
1
)
*
sizeof
(
char
*
)
+
packet
->
length
())))
{
my_error
(
ER_OUT_OF_RESOURCES
,
MYF
(
0
));
DBUG_RETURN
(
1
);
}
*
result
->
prev_ptr
=
cur
;
result
->
prev_ptr
=
&
cur
->
next
;
to
=
(
char
*
)
(
cur
->
data
+
n_fields
+
1
);
cp
=
(
uchar
*
)
packet
->
ptr
();
end_field
=
cur
->
data
+
n_fields
;
for
(
cur_field
=
cur
->
data
;
cur_field
<
end_field
;
++
cur_field
,
++
mysql_fields
)
{
if
((
len
=
(
ulong
)
net_field_length
(
&
cp
))
==
NULL_LENGTH
)
{
*
cur_field
=
0
;
}
else
{
*
cur_field
=
to
;
memcpy
(
to
,(
char
*
)
cp
,
len
);
to
[
len
]
=
0
;
to
+=
len
+
1
;
cp
+=
len
;
if
(
mysql_fields
->
max_length
<
len
)
mysql_fields
->
max_length
=
len
;
}
}
*
cur_field
=
to
;
DBUG_RETURN
(
0
);
}
bool
do_command
(
THD
*
thd
)
{
MYSQL
*
mysql
=
thd
->
mysql
;
char
*
packet
;
uint
old_timeout
;
ulong
packet_length
;
NET
*
net
;
enum
enum_server_command
command
;
DBUG_ENTER
(
"do_command"
);
net
=
&
thd
->
net
;
thd
->
current_tablenr
=
0
;
packet
=
0
;
old_timeout
=
net
->
timeout
;
net
->
timeout
=
(
uint
)
thd
->
inactive_timeout
;
// Wait max for 8 hours
net
->
last_error
[
0
]
=
0
;
// Clear error message
net
->
last_errno
=
0
;
net_new_transaction
(
net
);
if
((
packet_length
=
my_net_read
(
net
))
==
packet_error
)
{
DBUG_PRINT
(
"info"
,(
"Got error reading command from socket %s"
,
vio_description
(
net
->
vio
)
));
return
TRUE
;
}
else
{
packet
=
(
char
*
)
net
->
read_pos
;
command
=
(
enum
enum_server_command
)
(
uchar
)
packet
[
0
];
DBUG_PRINT
(
"info"
,(
"Command on %s = %d (%s)"
,
vio_description
(
net
->
vio
),
command
,
command_name
[
command
]));
}
net
->
timeout
=
old_timeout
;
// Timeout for writing
DBUG_RETURN
(
dispatch_command
(
command
,
thd
,
packet
+
1
,
(
uint
)
packet_length
));
}
void
send_ok
(
NET
*
net
,
ha_rows
affected_rows
,
ulonglong
id
,
const
char
*
message
)
{
if
(
net
->
no_send_ok
)
// hack for re-parsing queries
return
;
DBUG_ENTER
(
"send_ok"
);
MYSQL
*
mysql
=
current_thd
->
mysql
;
mysql
->
affected_rows
=
affected_rows
;
mysql
->
insert_id
=
id
;
if
(
net
->
return_status
)
mysql
->
server_status
=
*
net
->
return_status
;
if
(
message
)
{
strmake
(
net
->
last_error
,
message
,
sizeof
(
net
->
last_error
));
mysql
->
info
=
net
->
last_error
;
}
DBUG_VOID_RETURN
;
}
int
embedded_send_row
(
THD
*
thd
,
int
n_fields
,
char
*
data
,
int
data_len
)
{
MYSQL
*
mysql
=
thd
->
mysql
;
MYSQL_DATA
*
result
=
mysql
->
result
->
data
;
MYSQL_ROWS
**
prev_ptr
=
&
mysql
->
result
->
data
->
data
;
MYSQL_ROWS
*
cur
;
MEM_ROOT
*
alloc
=
&
mysql
->
result
->
data
->
alloc
;
char
*
to
;
uchar
*
cp
;
MYSQL_FIELD
*
mysql_fields
=
mysql
->
result
->
fields
;
MYSQL_ROW
cur_field
,
end_field
;
ulong
len
;
DBUG_ENTER
(
"embedded_send_row"
);
result
->
rows
++
;
if
(
!
(
cur
=
(
MYSQL_ROWS
*
)
alloc_root
(
alloc
,
sizeof
(
MYSQL_ROWS
)))
||
!
(
cur
->
data
=
(
MYSQL_ROW
)
alloc_root
(
alloc
,
(
n_fields
+
1
)
*
sizeof
(
char
*
)
+
data_len
)))
{
my_error
(
ER_OUT_OF_RESOURCES
,
MYF
(
0
));
DBUG_RETURN
(
1
);
}
*
result
->
prev_ptr
=
cur
;
result
->
prev_ptr
=
&
cur
->
next
;
to
=
(
char
*
)
(
cur
->
data
+
n_fields
+
1
);
cp
=
(
uchar
*
)
data
;
end_field
=
cur
->
data
+
n_fields
+
1
;
for
(
cur_field
=
cur
->
data
;
cur_field
<
end_field
;
++
cur_field
,
++
mysql_fields
)
{
if
((
len
=
(
ulong
)
net_field_length
(
&
cp
))
==
NULL_LENGTH
)
{
*
cur_field
=
0
;
}
else
{
*
cur_field
=
to
;
memcpy
(
to
,(
char
*
)
cp
,
len
);
to
[
len
]
=
0
;
to
+=
len
+
1
;
cp
+=
len
;
if
(
mysql_fields
->
max_length
<
len
)
mysql_fields
->
max_length
=
len
;
}
}
DBUG_RETURN
(
0
);
}
libmysqld/lib_vio.c
View file @
ede6ba56
...
@@ -42,14 +42,7 @@
...
@@ -42,14 +42,7 @@
struct
st_vio
struct
st_vio
{
{
my_socket
sd
;
/* my_socket - real or imaginary */
HANDLE
hPipe
;
my_bool
localhost
;
/* Are we from localhost? */
int
fcntl_mode
;
/* Buffered fcntl(sd,F_GETFL) */
struct
sockaddr_in
local
;
/* Local internet address */
struct
sockaddr_in
remote
;
/* Remote internet address */
enum
enum_vio_type
type
;
/* Type of connection */
enum
enum_vio_type
type
;
/* Type of connection */
char
desc
[
30
];
/* String description */
void
*
dest_thd
;
void
*
dest_thd
;
char
*
packets
,
**
last_packet
;
char
*
packets
,
**
last_packet
;
char
*
where_in_packet
,
*
end_of_packet
;
char
*
where_in_packet
,
*
end_of_packet
;
...
@@ -57,6 +50,7 @@ struct st_vio
...
@@ -57,6 +50,7 @@ struct st_vio
MEM_ROOT
root
;
MEM_ROOT
root
;
};
};
/* Initialize the communication buffer */
/* Initialize the communication buffer */
Vio
*
vio_new
(
my_socket
sd
,
enum
enum_vio_type
type
,
my_bool
localhost
)
Vio
*
vio_new
(
my_socket
sd
,
enum
enum_vio_type
type
,
my_bool
localhost
)
...
@@ -68,6 +62,7 @@ Vio *vio_new(my_socket sd, enum enum_vio_type type, my_bool localhost)
...
@@ -68,6 +62,7 @@ Vio *vio_new(my_socket sd, enum enum_vio_type type, my_bool localhost)
init_alloc_root
(
&
vio
->
root
,
8192
,
8192
);
init_alloc_root
(
&
vio
->
root
,
8192
,
8192
);
vio
->
root
.
min_malloc
=
sizeof
(
char
*
)
+
4
;
vio
->
root
.
min_malloc
=
sizeof
(
char
*
)
+
4
;
vio
->
last_packet
=
&
vio
->
packets
;
vio
->
last_packet
=
&
vio
->
packets
;
vio
->
type
=
type
;
}
}
return
(
vio
);
return
(
vio
);
}
}
...
@@ -212,4 +207,22 @@ my_bool vio_poll_read(Vio *vio,uint timeout)
...
@@ -212,4 +207,22 @@ my_bool vio_poll_read(Vio *vio,uint timeout)
return
0
;
return
0
;
}
}
int
create_vio
(
NET
*
net
,
int
separate_thread
)
{
Vio
*
v
=
net
->
vio
;
if
(
!
v
)
{
v
=
vio_new
(
0
,
separate_thread
?
VIO_SHARED_MEMORY
:
VIO_BUFFER
,
0
);
net
->
vio
=
v
;
}
return
!
v
;
}
void
set_thd
(
Vio
*
v
,
void
*
thd
)
{
if
(
v
)
{
v
->
dest_thd
=
thd
;
}
}
#endif
/* HAVE_VIO */
#endif
/* HAVE_VIO */
libmysqld/libmysqld.c
View file @
ede6ba56
...
@@ -68,7 +68,8 @@ static MYSQL_DATA *read_rows (MYSQL *mysql,MYSQL_FIELD *fields,
...
@@ -68,7 +68,8 @@ static MYSQL_DATA *read_rows (MYSQL *mysql,MYSQL_FIELD *fields,
static
int
read_one_row
(
MYSQL
*
mysql
,
uint
fields
,
MYSQL_ROW
row
,
static
int
read_one_row
(
MYSQL
*
mysql
,
uint
fields
,
MYSQL_ROW
row
,
ulong
*
lengths
);
ulong
*
lengths
);
static
void
end_server
(
MYSQL
*
mysql
);
static
void
end_server
(
MYSQL
*
mysql
);
static
void
read_user_name
(
char
*
name
);
/*static void read_user_name(char *name);
*/
static
void
append_wild
(
char
*
to
,
char
*
end
,
const
char
*
wild
);
static
void
append_wild
(
char
*
to
,
char
*
end
,
const
char
*
wild
);
static
int
send_file_to_server
(
MYSQL
*
mysql
,
const
char
*
filename
);
static
int
send_file_to_server
(
MYSQL
*
mysql
,
const
char
*
filename
);
static
ulong
mysql_sub_escape_string
(
CHARSET_INFO
*
charset_info
,
char
*
to
,
static
ulong
mysql_sub_escape_string
(
CHARSET_INFO
*
charset_info
,
char
*
to
,
...
@@ -238,8 +239,7 @@ simple_command(MYSQL *mysql,enum enum_server_command command, const char *arg,
...
@@ -238,8 +239,7 @@ simple_command(MYSQL *mysql,enum enum_server_command command, const char *arg,
result
=
lib_dispatch_command
(
command
,
net
,
arg
,
length
);
result
=
lib_dispatch_command
(
command
,
net
,
arg
,
length
);
if
(
!
skipp_check
)
if
(
!
skipp_check
)
result
=
((
mysql
->
packet_length
=
net_safe_read
(
mysql
))
==
packet_error
?
result
=
mysql
->
net
.
last_errno
?
-
1
:
0
;
-
1
:
0
);
end:
end:
return
result
;
return
result
;
}
}
...
@@ -261,6 +261,8 @@ struct passwd *getpwuid(uid_t);
...
@@ -261,6 +261,8 @@ struct passwd *getpwuid(uid_t);
char
*
getlogin
(
void
);
char
*
getlogin
(
void
);
#endif
#endif
#ifdef _DUMMY
#if !defined(MSDOS) && ! defined(VMS) && !defined(__WIN__)
#if !defined(MSDOS) && ! defined(VMS) && !defined(__WIN__)
static
void
read_user_name
(
char
*
name
)
static
void
read_user_name
(
char
*
name
)
{
{
...
@@ -307,6 +309,7 @@ static void read_user_name(char *name)
...
@@ -307,6 +309,7 @@ static void read_user_name(char *name)
}
}
#endif
#endif
#endif
/*_DUMMY */
#ifdef __WIN__
#ifdef __WIN__
static
my_bool
is_NT
(
void
)
static
my_bool
is_NT
(
void
)
...
@@ -391,7 +394,7 @@ end_server(MYSQL *mysql)
...
@@ -391,7 +394,7 @@ end_server(MYSQL *mysql)
end_embedded_connection
(
&
mysql
->
net
);
end_embedded_connection
(
&
mysql
->
net
);
mysql
->
net
.
vio
=
0
;
/* Marker */
mysql
->
net
.
vio
=
0
;
/* Marker */
}
}
net_end
(
&
mysql
->
net
)
;
mysql
->
net
.
buff
=
NULL
;
free_old_query
(
mysql
);
free_old_query
(
mysql
);
DBUG_VOID_RETURN
;
DBUG_VOID_RETURN
;
}
}
...
@@ -782,6 +785,53 @@ mysql_connect(MYSQL *mysql,const char *host,
...
@@ -782,6 +785,53 @@ mysql_connect(MYSQL *mysql,const char *host,
}
}
int
create_vio
(
NET
*
net
,
int
separate_thread
);
void
set_thd
(
Vio
*
vio
,
void
*
thd
);
/************/
static
inline
int
mysql_init_charset
(
MYSQL
*
mysql
)
{
char
charset_name_buff
[
16
],
*
charset_name
;
if
((
charset_name
=
mysql
->
options
.
charset_name
))
{
const
char
*
save
=
charsets_dir
;
if
(
mysql
->
options
.
charset_dir
)
charsets_dir
=
mysql
->
options
.
charset_dir
;
mysql
->
charset
=
get_charset_by_name
(
mysql
->
options
.
charset_name
,
MYF
(
MY_WME
));
charsets_dir
=
save
;
}
else
if
(
mysql
->
server_language
)
{
charset_name
=
charset_name_buff
;
sprintf
(
charset_name
,
"%d"
,
mysql
->
server_language
);
/* In case of errors */
mysql
->
charset
=
get_charset
((
uint8
)
mysql
->
server_language
,
MYF
(
MY_WME
));
}
else
mysql
->
charset
=
default_charset_info
;
if
(
!
mysql
->
charset
)
{
mysql
->
net
.
last_errno
=
CR_CANT_READ_CHARSET
;
if
(
mysql
->
options
.
charset_dir
)
sprintf
(
mysql
->
net
.
last_error
,
ER
(
mysql
->
net
.
last_errno
),
charset_name
?
charset_name
:
"unknown"
,
mysql
->
options
.
charset_dir
);
else
{
char
cs_dir_name
[
FN_REFLEN
];
get_charsets_dir
(
cs_dir_name
);
sprintf
(
mysql
->
net
.
last_error
,
ER
(
mysql
->
net
.
last_errno
),
charset_name
?
charset_name
:
"unknown"
,
cs_dir_name
);
}
return
mysql
->
net
.
last_errno
;
}
return
0
;
}
/*
/*
** Note that the mysql argument must be initialized with mysql_init()
** Note that the mysql argument must be initialized with mysql_init()
** before calling mysql_real_connect !
** before calling mysql_real_connect !
...
@@ -789,19 +839,17 @@ mysql_connect(MYSQL *mysql,const char *host,
...
@@ -789,19 +839,17 @@ mysql_connect(MYSQL *mysql,const char *host,
MYSQL
*
STDCALL
MYSQL
*
STDCALL
mysql_real_connect
(
MYSQL
*
mysql
,
const
char
*
host
,
const
char
*
user
,
mysql_real_connect
(
MYSQL
*
mysql
,
const
char
*
host
,
const
char
*
user
,
const
char
*
passwd
,
const
char
*
db
,
const
char
*
passwd
__attribute__
((
unused
))
,
const
char
*
db
,
uint
port
,
const
char
*
unix_socket
,
uint
client_flag
)
uint
port
,
const
char
*
unix_socket
,
uint
client_flag
)
{
{
char
buff
[
100
],
charset_name_buff
[
16
],
*
end
,
*
host_info
,
*
charset_name
;
uint
pkt_length
;
NET
*
net
=
&
mysql
->
net
;
NET
*
net
=
&
mysql
->
net
;
char
*
db_name
;
DBUG_ENTER
(
"mysql_real_connect"
);
DBUG_ENTER
(
"mysql_real_connect"
);
DBUG_PRINT
(
"enter"
,(
"host: %s db: %s user: %s"
,
DBUG_PRINT
(
"enter"
,(
"host: %s db: %s user: %s"
,
host
?
host
:
"(Null)"
,
host
?
host
:
"(Null)"
,
db
?
db
:
"(Null)"
,
db
?
db
:
"(Null)"
,
user
?
user
:
"(Null)"
));
user
?
user
:
"(Null)"
));
net
->
vio
=
0
;
/* If something goes wrong */
/* use default options */
/* use default options */
if
(
mysql
->
options
.
my_cnf_file
||
mysql
->
options
.
my_cnf_group
)
if
(
mysql
->
options
.
my_cnf_file
||
mysql
->
options
.
my_cnf_group
)
{
{
...
@@ -814,22 +862,14 @@ mysql_real_connect(MYSQL *mysql,const char *host, const char *user,
...
@@ -814,22 +862,14 @@ mysql_real_connect(MYSQL *mysql,const char *host, const char *user,
mysql
->
options
.
my_cnf_file
=
mysql
->
options
.
my_cnf_group
=
0
;
mysql
->
options
.
my_cnf_file
=
mysql
->
options
.
my_cnf_group
=
0
;
}
}
/* Some empty-string-tests are done because of ODBC */
if
(
!
host
||
!
host
[
0
])
host
=
mysql
->
options
.
host
;
if
(
!
user
||
!
user
[
0
])
user
=
mysql
->
options
.
user
;
if
(
!
passwd
)
{
passwd
=
mysql
->
options
.
password
;
}
if
(
!
db
||
!
db
[
0
])
if
(
!
db
||
!
db
[
0
])
db
=
mysql
->
options
.
db
;
db
=
mysql
->
options
.
db
;
port
=
0
;
port
=
0
;
unix_socket
=
0
;
unix_socket
=
0
;
mysql
->
reconnect
=
1
;
/* Reconnect as default */
db_name
=
db
?
my_strdup
(
db
,
MYF
(
MY_WME
))
:
NULL
;
mysql
->
server_status
=
SERVER_STATUS_AUTOCOMMIT
;
host_info
=
(
char
*
)
ER
(
CR_EMBEDDED_CONNECTION
);
create_vio
(
net
,
mysql
->
options
.
separate_thread
);
if
(
my_net_init
(
net
,
net
->
vio
))
if
(
my_net_init
(
net
,
net
->
vio
))
{
{
vio_delete
(
net
->
vio
);
vio_delete
(
net
->
vio
);
...
@@ -838,145 +878,28 @@ mysql_real_connect(MYSQL *mysql,const char *host, const char *user,
...
@@ -838,145 +878,28 @@ mysql_real_connect(MYSQL *mysql,const char *host, const char *user,
goto
error
;
goto
error
;
}
}
/* Get version info */
set_thd
(
net
->
vio
,
create_embedded_thd
(
net
->
vio
,
net
->
buff
,
client_flag
,
db_name
));
mysql
->
protocol_version
=
PROTOCOL_VERSION
;
/* Assume this */
start_embedded_connection
(
net
);
init_embedded_mysql
(
mysql
,
client_flag
,
db_name
);
if
(
(
pkt_length
=
net_safe_read
(
mysql
))
==
packet_error
)
if
(
mysql_init_charset
(
mysql
)
)
goto
error
;
goto
error
;
/* Check if version of protocoll matches current one */
mysql
->
protocol_version
=
net
->
read_pos
[
0
];
DBUG_DUMP
(
"packet"
,(
char
*
)
net
->
read_pos
,
10
);
DBUG_PRINT
(
"info"
,(
"mysql protocol version %d, server=%d"
,
PROTOCOL_VERSION
,
mysql
->
protocol_version
));
if
(
mysql
->
protocol_version
!=
PROTOCOL_VERSION
&&
mysql
->
protocol_version
!=
PROTOCOL_VERSION
-
1
)
{
net
->
last_errno
=
CR_VERSION_ERROR
;
sprintf
(
net
->
last_error
,
ER
(
CR_VERSION_ERROR
),
mysql
->
protocol_version
,
PROTOCOL_VERSION
);
goto
error
;
}
end
=
strend
((
char
*
)
net
->
read_pos
+
1
);
mysql
->
thread_id
=
uint4korr
(
end
+
1
);
end
+=
5
;
strmake
(
mysql
->
scramble_buff
,
end
,
8
);
end
+=
9
;
if
(
pkt_length
>=
(
uint
)
(
end
+
1
-
(
char
*
)
net
->
read_pos
))
mysql
->
server_capabilities
=
uint2korr
(
end
);
if
(
pkt_length
>=
(
uint
)
(
end
+
18
-
(
char
*
)
net
->
read_pos
))
{
/* New protocol with 16 bytes to describe server characteristics */
mysql
->
server_language
=
end
[
2
];
mysql
->
server_status
=
uint2korr
(
end
+
3
);
}
/* Set character set */
if
((
charset_name
=
mysql
->
options
.
charset_name
))
{
const
char
*
save
=
charsets_dir
;
if
(
mysql
->
options
.
charset_dir
)
charsets_dir
=
mysql
->
options
.
charset_dir
;
mysql
->
charset
=
get_charset_by_name
(
mysql
->
options
.
charset_name
,
MYF
(
MY_WME
));
charsets_dir
=
save
;
}
else
if
(
mysql
->
server_language
)
{
charset_name
=
charset_name_buff
;
sprintf
(
charset_name
,
"%d"
,
mysql
->
server_language
);
/* In case of errors */
mysql
->
charset
=
get_charset
((
uint8
)
mysql
->
server_language
,
MYF
(
MY_WME
));
}
else
mysql
->
charset
=
default_charset_info
;
if
(
!
mysql
->
charset
)
{
net
->
last_errno
=
CR_CANT_READ_CHARSET
;
if
(
mysql
->
options
.
charset_dir
)
sprintf
(
net
->
last_error
,
ER
(
net
->
last_errno
),
charset_name
?
charset_name
:
"unknown"
,
mysql
->
options
.
charset_dir
);
else
{
char
cs_dir_name
[
FN_REFLEN
];
get_charsets_dir
(
cs_dir_name
);
sprintf
(
net
->
last_error
,
ER
(
net
->
last_errno
),
charset_name
?
charset_name
:
"unknown"
,
cs_dir_name
);
}
goto
error
;
}
/* Save connection information */
if
(
!
user
)
user
=
""
;
if
(
!
passwd
)
passwd
=
""
;
host
=
LOCAL_HOST
;
if
(
!
my_multi_malloc
(
MYF
(
0
),
&
mysql
->
host_info
,
(
uint
)
strlen
(
host_info
)
+
1
,
&
mysql
->
host
,
(
uint
)
strlen
(
host
)
+
1
,
&
mysql
->
unix_socket
,
unix_socket
?
(
uint
)
strlen
(
unix_socket
)
+
1
:
(
uint
)
1
,
&
mysql
->
server_version
,
(
uint
)
(
end
-
(
char
*
)
net
->
read_pos
),
NullS
)
||
!
(
mysql
->
user
=
my_strdup
(
user
,
MYF
(
0
)))
||
!
(
mysql
->
passwd
=
my_strdup
(
passwd
,
MYF
(
0
))))
{
strmov
(
net
->
last_error
,
ER
(
net
->
last_errno
=
CR_OUT_OF_MEMORY
));
goto
error
;
}
strmov
(
mysql
->
host_info
,
host_info
);
strmov
(
mysql
->
host
,
host
);
if
(
unix_socket
)
strmov
(
mysql
->
unix_socket
,
unix_socket
);
else
mysql
->
unix_socket
=
0
;
strmov
(
mysql
->
server_version
,(
char
*
)
net
->
read_pos
+
1
);
mysql
->
port
=
port
;
mysql
->
client_flag
=
client_flag
|
mysql
->
options
.
client_flag
;
DBUG_PRINT
(
"info"
,(
"Server version = '%s' capabilites: %ld status: %d"
,
mysql
->
server_version
,
mysql
->
server_capabilities
,
mysql
->
server_status
));
/* Send client information for access check */
/* Send client information for access check */
client_flag
|=
CLIENT_CAPABILITIES
;
client_flag
|=
CLIENT_CAPABILITIES
;
client_flag
&=
~
CLIENT_COMPRESS
;
client_flag
&=
~
CLIENT_COMPRESS
;
if
(
db
)
if
(
db
)
client_flag
|=
CLIENT_CONNECT_WITH_DB
;
client_flag
|=
CLIENT_CONNECT_WITH_DB
;
int2store
(
buff
,
client_flag
);
mysql
->
client_flag
=
client_flag
;
int3store
(
buff
+
2
,
max_allowed_packet
);
if
(
user
&&
user
[
0
])
strmake
(
buff
+
5
,
user
,
32
);
else
read_user_name
((
char
*
)
buff
+
5
);
#ifdef _CUSTOMCONFIG_
#include "_cust_libmysql.h";
#endif
DBUG_PRINT
(
"info"
,(
"user: %s"
,
buff
+
5
));
end
=
scramble
(
strend
(
buff
+
5
)
+
1
,
mysql
->
scramble_buff
,
passwd
,
(
my_bool
)
(
mysql
->
protocol_version
==
9
));
if
(
db
)
if
(
db
)
{
{
end
=
strmov
(
end
+
1
,
db
);
mysql
->
db
=
my_strdup
(
db
,
MYF
(
MY_WME
));
mysql
->
db
=
my_strdup
(
db
,
MYF
(
MY_WME
));
db
=
0
;
db
=
0
;
}
}
if
(
my_net_write
(
net
,
buff
,(
ulong
)
(
end
-
buff
))
||
net_flush
(
net
))
goto
error
;
lib_connection_phase
(
net
,
2
);
if
(
net_safe_read
(
mysql
)
==
packet_error
)
/****
goto
error
;
net->timeout=net_read_timeout;
if
(
db
&&
mysql_select_db
(
mysql
,
db
))
*/
goto
error
;
if
(
mysql
->
options
.
init_command
)
if
(
mysql
->
options
.
init_command
)
{
{
my_bool
reconnect
=
mysql
->
reconnect
;
my_bool
reconnect
=
mysql
->
reconnect
;
...
@@ -1119,6 +1042,15 @@ mysql_query(MYSQL *mysql, const char *query)
...
@@ -1119,6 +1042,15 @@ mysql_query(MYSQL *mysql, const char *query)
int
STDCALL
int
STDCALL
mysql_send_query
(
MYSQL
*
mysql
,
const
char
*
query
,
ulong
length
)
mysql_send_query
(
MYSQL
*
mysql
,
const
char
*
query
,
ulong
length
)
{
{
if
(
mysql
->
options
.
separate_thread
)
{
return
-
1
;
}
mysql
->
result
=
NULL
;
free_old_query
(
mysql
);
/* Free old result */
return
simple_command
(
mysql
,
COM_QUERY
,
query
,
length
,
1
);
return
simple_command
(
mysql
,
COM_QUERY
,
query
,
length
,
1
);
}
}
...
@@ -1126,50 +1058,19 @@ mysql_send_query(MYSQL* mysql, const char* query, ulong length)
...
@@ -1126,50 +1058,19 @@ mysql_send_query(MYSQL* mysql, const char* query, ulong length)
int
STDCALL
int
STDCALL
mysql_read_query_result
(
MYSQL
*
mysql
)
mysql_read_query_result
(
MYSQL
*
mysql
)
{
{
uchar
*
pos
;
NET
*
net
=
get_mysql_net
(
mysql
);
ulong
field_count
;
MYSQL_DATA
*
fields
;
uint
length
;
DBUG_ENTER
(
"mysql_read_query_result"
);
if
((
length
=
net_safe_read
(
mysql
))
==
packet_error
)
if
(
net
->
last_errno
)
DBUG_RETURN
(
-
1
);
return
-
1
;
free_old_query
(
mysql
);
/* Free old result */
get_info:
if
(
mysql
->
field_count
)
pos
=
(
uchar
*
)
mysql
->
net
.
read_pos
;
if
((
field_count
=
net_field_length
(
&
pos
))
==
0
)
{
{
mysql
->
affected_rows
=
net_field_length_ll
(
&
pos
);
mysql
->
status
=
MYSQL_STATUS_GET_RESULT
;
mysql
->
insert_id
=
net_field_length_ll
(
&
pos
);
mysql
->
affected_rows
=
mysql
->
result
->
row_count
=
mysql
->
result
->
data
->
rows
;
if
(
mysql
->
server_capabilities
&
CLIENT_TRANSACTIONS
)
mysql
->
result
->
data_cursor
=
mysql
->
result
->
data
->
data
;
{
mysql
->
server_status
=
uint2korr
(
pos
);
pos
+=
2
;
}
if
(
pos
<
mysql
->
net
.
read_pos
+
length
&&
net_field_length
(
&
pos
))
mysql
->
info
=
(
char
*
)
pos
;
DBUG_RETURN
(
0
);
}
}
if
(
field_count
==
NULL_LENGTH
)
/* LOAD DATA LOCAL INFILE */
{
int
error
=
send_file_to_server
(
mysql
,(
char
*
)
pos
);
if
((
length
=
net_safe_read
(
mysql
))
==
packet_error
||
error
)
DBUG_RETURN
(
-
1
);
goto
get_info
;
/* Get info packet */
}
if
(
!
(
mysql
->
server_status
&
SERVER_STATUS_AUTOCOMMIT
))
mysql
->
server_status
|=
SERVER_STATUS_IN_TRANS
;
mysql
->
extra_info
=
net_field_length_ll
(
&
pos
);
/* Maybe number of rec */
return
0
;
if
(
!
(
fields
=
read_rows
(
mysql
,(
MYSQL_FIELD
*
)
0
,
5
)))
DBUG_RETURN
(
-
1
);
if
(
!
(
mysql
->
fields
=
unpack_fields
(
fields
,
&
mysql
->
field_alloc
,
(
uint
)
field_count
,
0
,
(
my_bool
)
test
(
mysql
->
server_capabilities
&
CLIENT_LONG_FLAG
))))
DBUG_RETURN
(
-
1
);
mysql
->
status
=
MYSQL_STATUS_GET_RESULT
;
mysql
->
field_count
=
field_count
;
DBUG_RETURN
(
0
);
}
}
/****************************************************************************
/****************************************************************************
...
@@ -1279,8 +1180,18 @@ mysql_real_query(MYSQL *mysql, const char *query, ulong length)
...
@@ -1279,8 +1180,18 @@ mysql_real_query(MYSQL *mysql, const char *query, ulong length)
DBUG_ENTER
(
"mysql_real_query"
);
DBUG_ENTER
(
"mysql_real_query"
);
DBUG_PRINT
(
"enter"
,(
"handle: %lx"
,
mysql
));
DBUG_PRINT
(
"enter"
,(
"handle: %lx"
,
mysql
));
DBUG_PRINT
(
"query"
,(
"Query =
\"
%s
\"
"
,
query
));
DBUG_PRINT
(
"query"
,(
"Query =
\"
%s
\"
"
,
query
));
/* if (mysql->options.separate_thread)
{
DBUG_RETURN(0);
}
mysql->result= NULL;
free_old_query(mysql);
*/
if
(
mysql_send_query
(
mysql
,
query
,
length
))
if
(
mysql_send_query
(
mysql
,
query
,
length
))
DBUG_RETURN
(
-
1
);
DBUG_RETURN
(
-
1
);
DBUG_RETURN
(
mysql_read_query_result
(
mysql
));
DBUG_RETURN
(
mysql_read_query_result
(
mysql
));
}
}
...
@@ -1345,48 +1256,29 @@ send_file_to_server(MYSQL *mysql, const char *filename)
...
@@ -1345,48 +1256,29 @@ send_file_to_server(MYSQL *mysql, const char *filename)
** Alloc result struct for buffered results. All rows are read to buffer.
** Alloc result struct for buffered results. All rows are read to buffer.
** mysql_data_seek may be used.
** mysql_data_seek may be used.
**************************************************************************/
**************************************************************************/
MYSQL_RES
*
STDCALL
MYSQL_RES
*
STDCALL
mysql_store_result
(
MYSQL
*
mysql
)
mysql_store_result
(
MYSQL
*
mysql
)
{
{
MYSQL_RES
*
result
;
MYSQL_RES
*
result
=
mysql
->
result
;
DBUG_ENTER
(
"mysql_store_result"
);
if
(
!
result
)
return
0
;
if
(
!
mysql
->
fields
)
mysql
->
result
=
NULL
;
DBUG_RETURN
(
0
);
*
result
->
data
->
prev_ptr
=
0
;
if
(
mysql
->
status
!=
MYSQL_STATUS_GET_RESULT
)
result
->
eof
=
1
;
{
result
->
lengths
=
(
ulong
*
)(
result
+
1
);
strmov
(
mysql
->
net
.
last_error
,
ER
(
mysql
->
net
.
last_errno
=
CR_COMMANDS_OUT_OF_SYNC
));
DBUG_RETURN
(
0
);
}
mysql
->
status
=
MYSQL_STATUS_READY
;
/* server is ready */
if
(
!
(
result
=
(
MYSQL_RES
*
)
my_malloc
(
sizeof
(
MYSQL_RES
)
+
sizeof
(
ulong
)
*
mysql
->
field_count
,
MYF
(
MY_WME
|
MY_ZEROFILL
))))
{
mysql
->
net
.
last_errno
=
CR_OUT_OF_MEMORY
;
strmov
(
mysql
->
net
.
last_error
,
ER
(
mysql
->
net
.
last_errno
));
DBUG_RETURN
(
0
);
}
result
->
eof
=
1
;
/* Marker for buffered */
result
->
lengths
=
(
ulong
*
)
(
result
+
1
);
if
(
!
(
result
->
data
=
read_rows
(
mysql
,
mysql
->
fields
,
mysql
->
field_count
)))
{
my_free
((
gptr
)
result
,
MYF
(
0
));
DBUG_RETURN
(
0
);
}
mysql
->
affected_rows
=
result
->
row_count
=
result
->
data
->
rows
;
mysql
->
affected_rows
=
result
->
row_count
=
result
->
data
->
rows
;
result
->
data_cursor
=
result
->
data
->
data
;
result
->
data_cursor
=
result
->
data
->
data
;
result
->
fields
=
mysql
->
fields
;
result
->
field_alloc
=
mysql
->
field_alloc
;
mysql
->
status
=
MYSQL_STATUS_READY
;
/* server is ready */
result
->
field_count
=
mysql
->
field_count
;
return
result
;
result
->
current_field
=
0
;
result
->
current_row
=
0
;
/* Must do a fetch first */
mysql
->
fields
=
0
;
/* fields is now in result */
DBUG_RETURN
(
result
);
/* Data fetched */
}
}
void
_0dummy
()
{
send_file_to_server
(
NULL
,
NULL
);
net_field_length_ll
(
NULL
);
}
/**************************************************************************
/**************************************************************************
** Alloc struct for use with unbuffered reads. Data is fetched by domand
** Alloc struct for use with unbuffered reads. Data is fetched by domand
...
@@ -1401,40 +1293,12 @@ mysql_store_result(MYSQL *mysql)
...
@@ -1401,40 +1293,12 @@ mysql_store_result(MYSQL *mysql)
MYSQL_RES
*
STDCALL
MYSQL_RES
*
STDCALL
mysql_use_result
(
MYSQL
*
mysql
)
mysql_use_result
(
MYSQL
*
mysql
)
{
{
MYSQL_RES
*
result
;
DBUG_ENTER
(
"mysql_use_result"
);
DBUG_ENTER
(
"mysql_use_result"
);
if
(
mysql
->
options
.
separate_thread
)
if
(
!
mysql
->
fields
)
DBUG_RETURN
(
0
);
if
(
mysql
->
status
!=
MYSQL_STATUS_GET_RESULT
)
{
strmov
(
mysql
->
net
.
last_error
,
ER
(
mysql
->
net
.
last_errno
=
CR_COMMANDS_OUT_OF_SYNC
));
DBUG_RETURN
(
0
);
DBUG_RETURN
(
0
);
}
if
(
!
(
result
=
(
MYSQL_RES
*
)
my_malloc
(
sizeof
(
*
result
)
+
sizeof
(
ulong
)
*
mysql
->
field_count
,
MYF
(
MY_WME
|
MY_ZEROFILL
))))
DBUG_RETURN
(
0
);
result
->
lengths
=
(
ulong
*
)
(
result
+
1
);
if
(
!
(
result
->
row
=
(
MYSQL_ROW
)
my_malloc
(
sizeof
(
result
->
row
[
0
])
*
(
mysql
->
field_count
+
1
),
MYF
(
MY_WME
))))
{
/* Ptrs: to one row */
my_free
((
gptr
)
result
,
MYF
(
0
));
DBUG_RETURN
(
0
);
}
result
->
fields
=
mysql
->
fields
;
result
->
field_alloc
=
mysql
->
field_alloc
;
result
->
field_count
=
mysql
->
field_count
;
result
->
current_field
=
0
;
result
->
handle
=
mysql
;
result
->
current_row
=
0
;
mysql
->
fields
=
0
;
/* fields is now in result */
mysql
->
status
=
MYSQL_STATUS_USE_RESULT
;
DBUG_RETURN
(
result
);
/* Data is read to be fetched */
}
DBUG_RETURN
(
mysql_store_result
(
mysql
));
}
/**************************************************************************
/**************************************************************************
** Return next field of the query results
** Return next field of the query results
...
@@ -1783,6 +1647,9 @@ mysql_options(MYSQL *mysql,enum mysql_option option, const char *arg)
...
@@ -1783,6 +1647,9 @@ mysql_options(MYSQL *mysql,enum mysql_option option, const char *arg)
case
MYSQL_OPT_COMPRESS
:
case
MYSQL_OPT_COMPRESS
:
mysql
->
options
.
compress
=
1
;
/* Remember for connect */
mysql
->
options
.
compress
=
1
;
/* Remember for connect */
break
;
break
;
case
MYSQL_OPT_USE_RESULT
:
mysql
->
options
.
separate_thread
=
1
;
/* Use separate thread for query execution*/
break
;
case
MYSQL_OPT_NAMED_PIPE
:
case
MYSQL_OPT_NAMED_PIPE
:
mysql
->
options
.
named_pipe
=
1
;
/* Force named pipe */
mysql
->
options
.
named_pipe
=
1
;
/* Force named pipe */
break
;
break
;
...
@@ -1872,12 +1739,12 @@ my_ulonglong STDCALL mysql_insert_id(MYSQL *mysql)
...
@@ -1872,12 +1739,12 @@ my_ulonglong STDCALL mysql_insert_id(MYSQL *mysql)
uint
STDCALL
mysql_errno
(
MYSQL
*
mysql
)
uint
STDCALL
mysql_errno
(
MYSQL
*
mysql
)
{
{
return
(
mysql
)
->
net
.
last_errno
;
return
get_mysql_net
(
mysql
)
->
last_errno
;
}
}
const
char
*
STDCALL
mysql_error
(
MYSQL
*
mysql
)
const
char
*
STDCALL
mysql_error
(
MYSQL
*
mysql
)
{
{
return
(
mysql
)
->
net
.
last_error
;
return
get_mysql_net
(
mysql
)
->
last_error
;
}
}
const
char
*
STDCALL
mysql_info
(
MYSQL
*
mysql
)
const
char
*
STDCALL
mysql_info
(
MYSQL
*
mysql
)
...
...
sql/ha_myisam.cc
View file @
ede6ba56
...
@@ -80,7 +80,7 @@ static void mi_check_print_msg(MI_CHECK *param, const char* msg_type,
...
@@ -80,7 +80,7 @@ static void mi_check_print_msg(MI_CHECK *param, const char* msg_type,
net_store_data
(
packet
,
msg_type
);
net_store_data
(
packet
,
msg_type
);
net_store_data
(
packet
,
msgbuf
);
net_store_data
(
packet
,
msgbuf
);
if
(
my_net_write
(
&
thd
->
net
,
(
char
*
)
thd
->
packet
.
ptr
(),
thd
->
packet
.
length
()))
if
(
SEND_ROW
(
thd
,
&
thd
->
net
,
4
,
(
char
*
)
thd
->
packet
.
ptr
(),
thd
->
packet
.
length
()))
sql_print_error
(
"Failed on my_net_write, writing to stderr instead: %s
\n
"
,
sql_print_error
(
"Failed on my_net_write, writing to stderr instead: %s
\n
"
,
msgbuf
);
msgbuf
);
return
;
return
;
...
...
sql/net_pkg.cc
View file @
ede6ba56
...
@@ -48,6 +48,11 @@ void send_error(NET *net, uint sql_errno, const char *err)
...
@@ -48,6 +48,11 @@ void send_error(NET *net, uint sql_errno, const char *err)
}
}
}
}
}
}
#ifdef EMBEDDED_LIBRARY
net
->
last_errno
=
sql_errno
;
strmake
(
net
->
last_error
,
err
,
sizeof
(
net
->
last_error
)
-
1
);
#else
if
(
net
->
vio
==
0
)
if
(
net
->
vio
==
0
)
{
{
if
(
thd
&&
thd
->
bootstrap
)
if
(
thd
&&
thd
->
bootstrap
)
...
@@ -70,6 +75,7 @@ void send_error(NET *net, uint sql_errno, const char *err)
...
@@ -70,6 +75,7 @@ void send_error(NET *net, uint sql_errno, const char *err)
set_if_smaller
(
length
,
MYSQL_ERRMSG_SIZE
);
set_if_smaller
(
length
,
MYSQL_ERRMSG_SIZE
);
}
}
VOID
(
net_write_command
(
net
,(
uchar
)
255
,(
char
*
)
err
,
length
));
VOID
(
net_write_command
(
net
,(
uchar
)
255
,(
char
*
)
err
,
length
));
#endif
/* EMBEDDED_LIBRARY*/
if
(
thd
)
if
(
thd
)
thd
->
fatal_error
=
0
;
// Error message is given
thd
->
fatal_error
=
0
;
// Error message is given
DBUG_VOID_RETURN
;
DBUG_VOID_RETURN
;
...
@@ -123,6 +129,7 @@ net_printf(NET *net, uint errcode, ...)
...
@@ -123,6 +129,7 @@ net_printf(NET *net, uint errcode, ...)
length
=
sizeof
(
net
->
last_error
)
-
1
;
/* purecov: inspected */
length
=
sizeof
(
net
->
last_error
)
-
1
;
/* purecov: inspected */
va_end
(
args
);
va_end
(
args
);
#ifndef EMBEDDED_LIBRARY
if
(
net
->
vio
==
0
)
if
(
net
->
vio
==
0
)
{
{
if
(
thd
&&
thd
->
bootstrap
)
if
(
thd
&&
thd
->
bootstrap
)
...
@@ -140,11 +147,16 @@ net_printf(NET *net, uint errcode, ...)
...
@@ -140,11 +147,16 @@ net_printf(NET *net, uint errcode, ...)
if
(
offset
)
if
(
offset
)
int2store
(
text_pos
-
2
,
errcode
);
int2store
(
text_pos
-
2
,
errcode
);
VOID
(
net_real_write
(
net
,(
char
*
)
net
->
buff
,
length
+
head_length
+
1
+
offset
));
VOID
(
net_real_write
(
net
,(
char
*
)
net
->
buff
,
length
+
head_length
+
1
+
offset
));
#else
net
->
last_errno
=
errcode
;
strmake
(
net
->
last_error
,
text_pos
,
length
);
#endif
if
(
thd
)
if
(
thd
)
thd
->
fatal_error
=
0
;
// Error message is given
thd
->
fatal_error
=
0
;
// Error message is given
DBUG_VOID_RETURN
;
DBUG_VOID_RETURN
;
}
}
#ifndef EMBEDDED_LIBRARY
void
void
send_ok
(
NET
*
net
,
ha_rows
affected_rows
,
ulonglong
id
,
const
char
*
message
)
send_ok
(
NET
*
net
,
ha_rows
affected_rows
,
ulonglong
id
,
const
char
*
message
)
...
@@ -172,6 +184,8 @@ send_ok(NET *net,ha_rows affected_rows,ulonglong id,const char *message)
...
@@ -172,6 +184,8 @@ send_ok(NET *net,ha_rows affected_rows,ulonglong id,const char *message)
DBUG_VOID_RETURN
;
DBUG_VOID_RETURN
;
}
}
#endif
/* EMBEDDED_LIBRARY */
void
void
send_eof
(
NET
*
net
,
bool
no_flush
)
send_eof
(
NET
*
net
,
bool
no_flush
)
{
{
...
...
sql/sql_acl.cc
View file @
ede6ba56
...
@@ -2512,8 +2512,12 @@ uint get_table_grant(THD *thd, TABLE_LIST *table)
...
@@ -2512,8 +2512,12 @@ uint get_table_grant(THD *thd, TABLE_LIST *table)
GRANT_TABLE
*
grant_table
;
GRANT_TABLE
*
grant_table
;
pthread_mutex_lock
(
&
LOCK_grant
);
pthread_mutex_lock
(
&
LOCK_grant
);
#ifdef EMBEDDED_LIBRARY
grant_table
=
NULL
;
#else
grant_table
=
table_hash_search
(
thd
->
host
,
thd
->
ip
,
db
,
user
,
grant_table
=
table_hash_search
(
thd
->
host
,
thd
->
ip
,
db
,
user
,
table
->
real_name
,
0
);
table
->
real_name
,
0
);
#endif
table
->
grant
.
grant_table
=
grant_table
;
// Remember for column test
table
->
grant
.
grant_table
=
grant_table
;
// Remember for column test
table
->
grant
.
version
=
grant_version
;
table
->
grant
.
version
=
grant_version
;
if
(
grant_table
)
if
(
grant_table
)
...
...
sql/sql_base.cc
View file @
ede6ba56
...
@@ -180,6 +180,8 @@ OPEN_TABLE_LIST *list_open_tables(THD *thd, const char *wild)
...
@@ -180,6 +180,8 @@ OPEN_TABLE_LIST *list_open_tables(THD *thd, const char *wild)
}
}
#ifndef EMBEDDED_LIBRARY
/******************************************************************************
/******************************************************************************
** Send name and type of result to client.
** Send name and type of result to client.
** Sum fields has table name empty and field_name.
** Sum fields has table name empty and field_name.
...
@@ -264,6 +266,7 @@ send_fields(THD *thd,List<Item> &list,uint flag)
...
@@ -264,6 +266,7 @@ send_fields(THD *thd,List<Item> &list,uint flag)
return
1
;
/* purecov: inspected */
return
1
;
/* purecov: inspected */
}
}
#endif
/* EMBEDDED_LIBRARY */
/*****************************************************************************
/*****************************************************************************
* Functions to free open table cache
* Functions to free open table cache
...
...
sql/sql_class.cc
View file @
ede6ba56
...
@@ -383,6 +383,8 @@ bool select_send::send_fields(List<Item> &list,uint flag)
...
@@ -383,6 +383,8 @@ bool select_send::send_fields(List<Item> &list,uint flag)
}
}
#ifndef EMBEDDED_LIBRARY
/* Send data to client. Returns 0 if ok */
/* Send data to client. Returns 0 if ok */
bool
select_send
::
send_data
(
List
<
Item
>
&
items
)
bool
select_send
::
send_data
(
List
<
Item
>
&
items
)
...
@@ -411,6 +413,7 @@ bool select_send::send_data(List<Item> &items)
...
@@ -411,6 +413,7 @@ bool select_send::send_data(List<Item> &items)
bool
error
=
my_net_write
(
&
thd
->
net
,(
char
*
)
packet
->
ptr
(),
packet
->
length
());
bool
error
=
my_net_write
(
&
thd
->
net
,(
char
*
)
packet
->
ptr
(),
packet
->
length
());
DBUG_RETURN
(
error
);
DBUG_RETURN
(
error
);
}
}
#endif
/* EMBEDDED_LIBRARY */
bool
select_send
::
send_eof
()
bool
select_send
::
send_eof
()
{
{
...
...
sql/sql_class.h
View file @
ede6ba56
...
@@ -273,6 +273,10 @@ class delayed_insert;
...
@@ -273,6 +273,10 @@ class delayed_insert;
#define THD_SENTRY_MAGIC 0xfeedd1ff
#define THD_SENTRY_MAGIC 0xfeedd1ff
#define THD_SENTRY_GONE 0xdeadbeef
#define THD_SENTRY_GONE 0xdeadbeef
#ifdef EMBEDDED_LIBRARY
typedef
struct
st_mysql
;
#endif
#define THD_CHECK_SENTRY(thd) DBUG_ASSERT(thd->dbug_sentry == THD_SENTRY_MAGIC)
#define THD_CHECK_SENTRY(thd) DBUG_ASSERT(thd->dbug_sentry == THD_SENTRY_MAGIC)
/* For each client connection we create a separate thread with THD serving as
/* For each client connection we create a separate thread with THD serving as
...
@@ -287,6 +291,9 @@ class THD :public ilink {
...
@@ -287,6 +291,9 @@ class THD :public ilink {
String
packet
;
// dynamic string buffer used for network I/O
String
packet
;
// dynamic string buffer used for network I/O
struct
sockaddr_in
remote
;
// client socket address
struct
sockaddr_in
remote
;
// client socket address
struct
rand_struct
rand
;
// used for authentication
struct
rand_struct
rand
;
// used for authentication
#ifdef EMBEDDED_LIBRARY
struct
st_mysql
*
mysql
;
#endif
/* query points to the current query,
/* query points to the current query,
thread_stack is a pointer to the stack frame of handle_one_connection(),
thread_stack is a pointer to the stack frame of handle_one_connection(),
...
...
sql/sql_parse.cc
View file @
ede6ba56
...
@@ -791,8 +791,9 @@ int mysql_table_dump(THD* thd, char* db, char* tbl_name, int fd)
...
@@ -791,8 +791,9 @@ int mysql_table_dump(THD* thd, char* db, char* tbl_name, int fd)
}
}
/* Execute one command from socket (query or simple command) */
#ifndef EMBEDDED_LIBRARY
/* Execute one command from socket (query or simple command) */
bool
do_command
(
THD
*
thd
)
bool
do_command
(
THD
*
thd
)
{
{
char
*
packet
;
char
*
packet
;
...
@@ -830,6 +831,7 @@ bool do_command(THD *thd)
...
@@ -830,6 +831,7 @@ bool do_command(THD *thd)
DBUG_RETURN
(
dispatch_command
(
command
,
thd
,
packet
+
1
,
(
uint
)
packet_length
));
DBUG_RETURN
(
dispatch_command
(
command
,
thd
,
packet
+
1
,
(
uint
)
packet_length
));
}
}
#endif
/* EMBEDDED_LIBRARY */
bool
dispatch_command
(
enum
enum_server_command
command
,
THD
*
thd
,
bool
dispatch_command
(
enum
enum_server_command
command
,
THD
*
thd
,
char
*
packet
,
uint
packet_length
)
char
*
packet
,
uint
packet_length
)
...
...
sql/sql_show.cc
View file @
ede6ba56
...
@@ -52,8 +52,6 @@ extern struct st_VioSSLAcceptorFd * ssl_acceptor_fd;
...
@@ -52,8 +52,6 @@ extern struct st_VioSSLAcceptorFd * ssl_acceptor_fd;
** Send list of databases
** Send list of databases
** A database is a directory in the mysql_data_home directory
** A database is a directory in the mysql_data_home directory
****************************************************************************/
****************************************************************************/
int
int
mysqld_show_dbs
(
THD
*
thd
,
const
char
*
wild
)
mysqld_show_dbs
(
THD
*
thd
,
const
char
*
wild
)
{
{
...
@@ -85,8 +83,8 @@ mysqld_show_dbs(THD *thd,const char *wild)
...
@@ -85,8 +83,8 @@ mysqld_show_dbs(THD *thd,const char *wild)
{
{
thd
->
packet
.
length
(
0
);
thd
->
packet
.
length
(
0
);
net_store_data
(
&
thd
->
packet
,
thd
->
convert_set
,
file_name
);
net_store_data
(
&
thd
->
packet
,
thd
->
convert_set
,
file_name
);
if
(
my_net_write
(
&
thd
->
net
,
(
char
*
)
thd
->
packet
.
ptr
(),
if
(
SEND_ROW
(
thd
,
&
thd
->
net
,
field_list
.
elements
,
thd
->
packet
.
length
()))
(
char
*
)
thd
->
packet
.
ptr
(),
thd
->
packet
.
length
()))
DBUG_RETURN
(
-
1
);
DBUG_RETURN
(
-
1
);
}
}
}
}
...
@@ -123,8 +121,9 @@ int mysqld_show_open_tables(THD *thd,const char *wild)
...
@@ -123,8 +121,9 @@ int mysqld_show_open_tables(THD *thd,const char *wild)
net_store_data
(
&
thd
->
packet
,
convert
,
open_list
->
table
);
net_store_data
(
&
thd
->
packet
,
convert
,
open_list
->
table
);
net_store_data
(
&
thd
->
packet
,
open_list
->
in_use
);
net_store_data
(
&
thd
->
packet
,
open_list
->
in_use
);
net_store_data
(
&
thd
->
packet
,
open_list
->
locked
);
net_store_data
(
&
thd
->
packet
,
open_list
->
locked
);
if
(
my_net_write
(
&
thd
->
net
,(
char
*
)
thd
->
packet
.
ptr
(),
thd
->
packet
.
length
()))
if
(
SEND_ROW
(
thd
,
&
thd
->
net
,
field_list
.
elements
,
DBUG_RETURN
(
-
1
);
(
char
*
)
thd
->
packet
.
ptr
(),
thd
->
packet
.
length
()))
DBUG_RETURN
(
-
1
);
}
}
send_eof
(
&
thd
->
net
);
send_eof
(
&
thd
->
net
);
...
@@ -162,8 +161,9 @@ int mysqld_show_tables(THD *thd,const char *db,const char *wild)
...
@@ -162,8 +161,9 @@ int mysqld_show_tables(THD *thd,const char *db,const char *wild)
{
{
thd
->
packet
.
length
(
0
);
thd
->
packet
.
length
(
0
);
net_store_data
(
&
thd
->
packet
,
thd
->
convert_set
,
file_name
);
net_store_data
(
&
thd
->
packet
,
thd
->
convert_set
,
file_name
);
if
(
my_net_write
(
&
thd
->
net
,(
char
*
)
thd
->
packet
.
ptr
(),
thd
->
packet
.
length
()))
if
(
SEND_ROW
(
thd
,
&
thd
->
net
,
field_list
.
elements
,
DBUG_RETURN
(
-
1
);
(
char
*
)
thd
->
packet
.
ptr
(),
thd
->
packet
.
length
()))
DBUG_RETURN
(
-
1
);
}
}
send_eof
(
&
thd
->
net
);
send_eof
(
&
thd
->
net
);
DBUG_RETURN
(
0
);
DBUG_RETURN
(
0
);
...
@@ -411,9 +411,9 @@ int mysqld_extend_show_tables(THD *thd,const char *db,const char *wild)
...
@@ -411,9 +411,9 @@ int mysqld_extend_show_tables(THD *thd,const char *db,const char *wild)
}
}
close_thread_tables
(
thd
,
0
);
close_thread_tables
(
thd
,
0
);
}
}
if
(
my_net_write
(
&
thd
->
net
,(
char
*
)
packet
->
ptr
(),
if
(
SEND_ROW
(
thd
,
&
thd
->
net
,
field_list
.
elements
,
packet
->
length
()))
(
char
*
)
thd
->
packet
.
ptr
(),
thd
->
packet
.
length
()))
DBUG_RETURN
(
-
1
);
DBUG_RETURN
(
-
1
);
}
}
send_eof
(
&
thd
->
net
);
send_eof
(
&
thd
->
net
);
DBUG_RETURN
(
0
);
DBUG_RETURN
(
0
);
...
@@ -424,7 +424,6 @@ int mysqld_extend_show_tables(THD *thd,const char *db,const char *wild)
...
@@ -424,7 +424,6 @@ int mysqld_extend_show_tables(THD *thd,const char *db,const char *wild)
/***************************************************************************
/***************************************************************************
** List all columns in a table
** List all columns in a table
***************************************************************************/
***************************************************************************/
int
int
mysqld_show_fields
(
THD
*
thd
,
TABLE_LIST
*
table_list
,
const
char
*
wild
,
mysqld_show_fields
(
THD
*
thd
,
TABLE_LIST
*
table_list
,
const
char
*
wild
,
bool
verbose
)
bool
verbose
)
...
@@ -523,8 +522,8 @@ mysqld_show_fields(THD *thd, TABLE_LIST *table_list,const char *wild,
...
@@ -523,8 +522,8 @@ mysqld_show_fields(THD *thd, TABLE_LIST *table_list,const char *wild,
if
(
verbose
)
if
(
verbose
)
{
{
/* Add grant options */
/* Add grant options */
col_access
=
get_column_grant
(
thd
,
table_list
,
field
)
&
COL_ACLS
;
end
=
tmp
;
end
=
tmp
;
col_access
=
get_column_grant
(
thd
,
table_list
,
field
)
&
COL_ACLS
;
for
(
uint
bitnr
=
0
;
col_access
;
col_access
>>=
1
,
bitnr
++
)
for
(
uint
bitnr
=
0
;
col_access
;
col_access
>>=
1
,
bitnr
++
)
{
{
if
(
col_access
&
1
)
if
(
col_access
&
1
)
...
@@ -535,8 +534,9 @@ mysqld_show_fields(THD *thd, TABLE_LIST *table_list,const char *wild,
...
@@ -535,8 +534,9 @@ mysqld_show_fields(THD *thd, TABLE_LIST *table_list,const char *wild,
}
}
net_store_data
(
packet
,
convert
,
tmp
+
1
,
end
==
tmp
?
0
:
(
uint
)
(
end
-
tmp
-
1
));
net_store_data
(
packet
,
convert
,
tmp
+
1
,
end
==
tmp
?
0
:
(
uint
)
(
end
-
tmp
-
1
));
}
}
if
(
my_net_write
(
&
thd
->
net
,(
char
*
)
packet
->
ptr
(),
packet
->
length
()))
if
(
SEND_ROW
(
thd
,
&
thd
->
net
,
field_list
.
elements
,
DBUG_RETURN
(
1
);
(
char
*
)
thd
->
packet
.
ptr
(),
thd
->
packet
.
length
()))
DBUG_RETURN
(
-
1
);
}
}
}
}
}
}
...
@@ -591,8 +591,9 @@ mysqld_show_create(THD *thd, TABLE_LIST *table_list)
...
@@ -591,8 +591,9 @@ mysqld_show_create(THD *thd, TABLE_LIST *table_list)
int3store
(
p
,
create_len
);
int3store
(
p
,
create_len
);
// now we are in business :-)
// now we are in business :-)
if
(
my_net_write
(
&
thd
->
net
,
(
char
*
)
packet
->
ptr
(),
packet
->
length
()))
if
(
SEND_ROW
(
thd
,
&
thd
->
net
,
field_list
.
elements
,
DBUG_RETURN
(
1
);
(
char
*
)
thd
->
packet
.
ptr
(),
thd
->
packet
.
length
()))
DBUG_RETURN
(
-
1
);
}
}
send_eof
(
&
thd
->
net
);
send_eof
(
&
thd
->
net
);
DBUG_RETURN
(
0
);
DBUG_RETURN
(
0
);
...
@@ -714,8 +715,9 @@ mysqld_show_keys(THD *thd, TABLE_LIST *table_list)
...
@@ -714,8 +715,9 @@ mysqld_show_keys(THD *thd, TABLE_LIST *table_list)
net_store_data
(
packet
,
convert
,
table
->
file
->
index_type
(
i
));
net_store_data
(
packet
,
convert
,
table
->
file
->
index_type
(
i
));
/* Comment */
/* Comment */
net_store_data
(
packet
,
convert
,
""
);
net_store_data
(
packet
,
convert
,
""
);
if
(
my_net_write
(
&
thd
->
net
,(
char
*
)
packet
->
ptr
(),
packet
->
length
()))
if
(
SEND_ROW
(
thd
,
&
thd
->
net
,
field_list
.
elements
,
DBUG_RETURN
(
1
);
/* purecov: inspected */
(
char
*
)
thd
->
packet
.
ptr
(),
thd
->
packet
.
length
()))
DBUG_RETURN
(
-
1
);
}
}
}
}
send_eof
(
&
thd
->
net
);
send_eof
(
&
thd
->
net
);
...
@@ -1126,8 +1128,9 @@ void mysqld_list_processes(THD *thd,const char *user, bool verbose)
...
@@ -1126,8 +1128,9 @@ void mysqld_list_processes(THD *thd,const char *user, bool verbose)
net_store_data
(
packet
,
convert
,
thd_info
->
query
);
net_store_data
(
packet
,
convert
,
thd_info
->
query
);
else
else
net_store_null
(
packet
);
net_store_null
(
packet
);
if
(
my_net_write
(
&
thd
->
net
,(
char
*
)
packet
->
ptr
(),
packet
->
length
()))
if
(
SEND_ROW
(
thd
,
&
thd
->
net
,
field_list
.
elements
,
break
;
/* purecov: inspected */
(
char
*
)
thd
->
packet
.
ptr
(),
thd
->
packet
.
length
()))
break
;
}
}
send_eof
(
&
thd
->
net
);
send_eof
(
&
thd
->
net
);
DBUG_VOID_RETURN
;
DBUG_VOID_RETURN
;
...
@@ -1372,8 +1375,9 @@ int mysqld_show(THD *thd, const char *wild, show_var_st *variables)
...
@@ -1372,8 +1375,9 @@ int mysqld_show(THD *thd, const char *wild, show_var_st *variables)
#endif
/* HAVE_OPENSSL */
#endif
/* HAVE_OPENSSL */
}
}
if
(
my_net_write
(
&
thd
->
net
,
(
char
*
)
packet2
.
ptr
(),
packet2
.
length
()))
if
(
SEND_ROW
(
thd
,
&
thd
->
net
,
field_list
.
elements
,
goto
err
;
/* purecov: inspected */
(
char
*
)
packet2
.
ptr
(),
packet2
.
length
()))
goto
err
;
}
}
}
}
pthread_mutex_unlock
(
&
LOCK_status
);
pthread_mutex_unlock
(
&
LOCK_status
);
...
...
sql/sql_table.cc
View file @
ede6ba56
...
@@ -1060,6 +1060,9 @@ static int mysql_admin_table(THD* thd, TABLE_LIST* tables,
...
@@ -1060,6 +1060,9 @@ static int mysql_admin_table(THD* thd, TABLE_LIST* tables,
thd
->
open_options
|=
extra_open_options
;
thd
->
open_options
|=
extra_open_options
;
table
->
table
=
open_ltable
(
thd
,
table
,
lock_type
);
table
->
table
=
open_ltable
(
thd
,
table
,
lock_type
);
#ifdef EMBEDDED_LIBRARY
thd
->
net
.
last_errno
=
0
;
// these errors shouldn't get client
#endif
thd
->
open_options
&=
~
extra_open_options
;
thd
->
open_options
&=
~
extra_open_options
;
packet
->
length
(
0
);
packet
->
length
(
0
);
if
(
prepare_func
)
if
(
prepare_func
)
...
@@ -1174,8 +1177,8 @@ static int mysql_admin_table(THD* thd, TABLE_LIST* tables,
...
@@ -1174,8 +1177,8 @@ static int mysql_admin_table(THD* thd, TABLE_LIST* tables,
table
->
table
->
real_name
);
table
->
table
->
real_name
);
close_thread_tables
(
thd
);
close_thread_tables
(
thd
);
table
->
table
=
0
;
// For query cache
table
->
table
=
0
;
// For query cache
if
(
my_net_write
(
&
thd
->
net
,
(
char
*
)
packet
->
ptr
(),
if
(
SEND_ROW
(
thd
,
&
thd
->
net
,
field_list
.
elements
,
packet
->
length
()))
(
char
*
)
thd
->
packet
.
ptr
(),
thd
->
packet
.
length
()))
goto
err
;
goto
err
;
}
}
...
...
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