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
baeea12b
Commit
baeea12b
authored
Nov 30, 2007
by
holyfoot/hf@hfmain.(none)
Browse files
Options
Browse Files
Download
Plain Diff
Merge mysql.com:/home/hf/work/30430/my51-30430
into mysql.com:/home/hf/work/mrg/my51-mrg
parents
6ebd599c
1446f74d
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
73 additions
and
38 deletions
+73
-38
libmysqld/emb_qcache.cc
libmysqld/emb_qcache.cc
+69
-34
libmysqld/emb_qcache.h
libmysqld/emb_qcache.h
+2
-2
mysql-test/r/func_misc.result
mysql-test/r/func_misc.result
+1
-1
mysql-test/t/func_misc.test
mysql-test/t/func_misc.test
+1
-1
No files found.
libmysqld/emb_qcache.cc
View file @
baeea12b
...
@@ -19,7 +19,7 @@
...
@@ -19,7 +19,7 @@
#include "emb_qcache.h"
#include "emb_qcache.h"
#include "embedded_priv.h"
#include "embedded_priv.h"
void
Querycache_stream
::
store_
char
(
char
c
)
void
Querycache_stream
::
store_
uchar
(
u
char
c
)
{
{
if
(
data_end
==
cur_data
)
if
(
data_end
==
cur_data
)
use_next_block
(
TRUE
);
use_next_block
(
TRUE
);
...
@@ -142,7 +142,7 @@ void Querycache_stream::store_safe_str(const char *str, uint str_len)
...
@@ -142,7 +142,7 @@ void Querycache_stream::store_safe_str(const char *str, uint str_len)
store_int
(
0
);
store_int
(
0
);
}
}
char
Querycache_stream
::
load_
char
()
uchar
Querycache_stream
::
load_u
char
()
{
{
if
(
cur_data
==
data_end
)
if
(
cur_data
==
data_end
)
use_next_block
(
FALSE
);
use_next_block
(
FALSE
);
...
@@ -301,8 +301,8 @@ uint emb_count_querycache_size(THD *thd)
...
@@ -301,8 +301,8 @@ uint emb_count_querycache_size(THD *thd)
*
data
->
embedded_info
->
prev_ptr
=
NULL
;
// this marks the last record
*
data
->
embedded_info
->
prev_ptr
=
NULL
;
// this marks the last record
cur_row
=
data
->
data
;
cur_row
=
data
->
data
;
n_rows
=
data
->
rows
;
n_rows
=
data
->
rows
;
/* n_fields + n_rows +
(field_info + strlen * n_rows)
* n_fields */
/* n_fields + n_rows +
field_info
* n_fields */
result
+=
(
uint
)
(
4
+
8
+
(
42
+
4
*
n_rows
)
*
data
->
fields
);
result
+=
(
uint
)
(
4
+
8
+
42
*
data
->
fields
);
for
(;
field
<
field_end
;
field
++
)
for
(;
field
<
field_end
;
field
++
)
{
{
...
@@ -313,6 +313,15 @@ uint emb_count_querycache_size(THD *thd)
...
@@ -313,6 +313,15 @@ uint emb_count_querycache_size(THD *thd)
result
+=
field
->
def_length
;
result
+=
field
->
def_length
;
}
}
if
(
thd
->
protocol
==
&
thd
->
protocol_binary
)
{
result
+=
(
uint
)
(
4
*
n_rows
);
for
(;
cur_row
;
cur_row
=
cur_row
->
next
)
result
+=
cur_row
->
length
;
}
else
{
result
+=
(
uint
)
(
4
*
n_rows
*
data
->
fields
);
for
(;
cur_row
;
cur_row
=
cur_row
->
next
)
for
(;
cur_row
;
cur_row
=
cur_row
->
next
)
{
{
MYSQL_ROW
col
=
cur_row
->
data
;
MYSQL_ROW
col
=
cur_row
->
data
;
...
@@ -321,6 +330,7 @@ uint emb_count_querycache_size(THD *thd)
...
@@ -321,6 +330,7 @@ uint emb_count_querycache_size(THD *thd)
if
(
*
col
)
if
(
*
col
)
result
+=
*
(
uint
*
)((
*
col
)
-
sizeof
(
uint
));
result
+=
*
(
uint
*
)((
*
col
)
-
sizeof
(
uint
));
}
}
}
return
result
;
return
result
;
}
}
...
@@ -353,10 +363,10 @@ void emb_store_querycache_result(Querycache_stream *dst, THD *thd)
...
@@ -353,10 +363,10 @@ void emb_store_querycache_result(Querycache_stream *dst, THD *thd)
{
{
dst
->
store_int
((
uint
)
field
->
length
);
dst
->
store_int
((
uint
)
field
->
length
);
dst
->
store_int
((
uint
)
field
->
max_length
);
dst
->
store_int
((
uint
)
field
->
max_length
);
dst
->
store_
char
((
char
)
field
->
type
);
dst
->
store_
uchar
((
u
char
)
field
->
type
);
dst
->
store_short
((
ushort
)
field
->
flags
);
dst
->
store_short
((
ushort
)
field
->
flags
);
dst
->
store_short
((
ushort
)
field
->
charsetnr
);
dst
->
store_short
((
ushort
)
field
->
charsetnr
);
dst
->
store_
char
((
char
)
field
->
decimals
);
dst
->
store_
uchar
((
u
char
)
field
->
decimals
);
dst
->
store_str
(
field
->
name
,
field
->
name_length
);
dst
->
store_str
(
field
->
name
,
field
->
name_length
);
dst
->
store_str
(
field
->
table
,
field
->
table_length
);
dst
->
store_str
(
field
->
table
,
field
->
table_length
);
dst
->
store_str
(
field
->
org_name
,
field
->
org_name_length
);
dst
->
store_str
(
field
->
org_name
,
field
->
org_name_length
);
...
@@ -366,6 +376,13 @@ void emb_store_querycache_result(Querycache_stream *dst, THD *thd)
...
@@ -366,6 +376,13 @@ void emb_store_querycache_result(Querycache_stream *dst, THD *thd)
dst
->
store_safe_str
(
field
->
def
,
field
->
def_length
);
dst
->
store_safe_str
(
field
->
def
,
field
->
def_length
);
}
}
if
(
thd
->
protocol
==
&
thd
->
protocol_binary
)
{
for
(;
cur_row
;
cur_row
=
cur_row
->
next
)
dst
->
store_str
((
char
*
)
cur_row
->
data
,
cur_row
->
length
);
}
else
{
for
(;
cur_row
;
cur_row
=
cur_row
->
next
)
for
(;
cur_row
;
cur_row
=
cur_row
->
next
)
{
{
MYSQL_ROW
col
=
cur_row
->
data
;
MYSQL_ROW
col
=
cur_row
->
data
;
...
@@ -376,6 +393,7 @@ void emb_store_querycache_result(Querycache_stream *dst, THD *thd)
...
@@ -376,6 +393,7 @@ void emb_store_querycache_result(Querycache_stream *dst, THD *thd)
dst
->
store_safe_str
(
*
col
,
len
);
dst
->
store_safe_str
(
*
col
,
len
);
}
}
}
}
}
DBUG_ASSERT
(
emb_count_querycache_size
(
thd
)
==
dst
->
stored_size
);
DBUG_ASSERT
(
emb_count_querycache_size
(
thd
)
==
dst
->
stored_size
);
DBUG_VOID_RETURN
;
DBUG_VOID_RETURN
;
}
}
...
@@ -408,10 +426,10 @@ int emb_load_querycache_result(THD *thd, Querycache_stream *src)
...
@@ -408,10 +426,10 @@ int emb_load_querycache_result(THD *thd, Querycache_stream *src)
{
{
field
->
length
=
src
->
load_int
();
field
->
length
=
src
->
load_int
();
field
->
max_length
=
(
unsigned
int
)
src
->
load_int
();
field
->
max_length
=
(
unsigned
int
)
src
->
load_int
();
field
->
type
=
(
enum
enum_field_types
)
src
->
load_char
();
field
->
type
=
(
enum
enum_field_types
)
src
->
load_
u
char
();
field
->
flags
=
(
unsigned
int
)
src
->
load_short
();
field
->
flags
=
(
unsigned
int
)
src
->
load_short
();
field
->
charsetnr
=
(
unsigned
int
)
src
->
load_short
();
field
->
charsetnr
=
(
unsigned
int
)
src
->
load_short
();
field
->
decimals
=
(
unsigned
int
)
src
->
load_
char
();
field
->
decimals
=
src
->
load_u
char
();
if
(
!
(
field
->
name
=
src
->
load_str
(
f_alloc
,
&
field
->
name_length
))
||
if
(
!
(
field
->
name
=
src
->
load_str
(
f_alloc
,
&
field
->
name_length
))
||
!
(
field
->
table
=
src
->
load_str
(
f_alloc
,
&
field
->
table_length
))
||
!
(
field
->
table
=
src
->
load_str
(
f_alloc
,
&
field
->
table_length
))
||
...
@@ -423,16 +441,32 @@ int emb_load_querycache_result(THD *thd, Querycache_stream *src)
...
@@ -423,16 +441,32 @@ int emb_load_querycache_result(THD *thd, Querycache_stream *src)
goto
err
;
goto
err
;
}
}
data
->
rows
=
rows
;
if
(
!
rows
)
goto
return_ok
;
if
(
thd
->
protocol
==
&
thd
->
protocol_binary
)
{
uint
length
;
row
=
(
MYSQL_ROWS
*
)
alloc_root
(
&
data
->
alloc
,
rows
*
sizeof
(
MYSQL_ROWS
));
end_row
=
row
+
rows
;
data
->
data
=
row
;
for
(
prev_row
=
&
row
->
next
;
row
<
end_row
;
prev_row
=
&
row
->
next
,
row
++
)
{
*
prev_row
=
row
;
row
->
data
=
(
MYSQL_ROW
)
src
->
load_str
(
&
data
->
alloc
,
&
length
);
row
->
length
=
length
;
}
}
else
{
row
=
(
MYSQL_ROWS
*
)
alloc_root
(
&
data
->
alloc
,
row
=
(
MYSQL_ROWS
*
)
alloc_root
(
&
data
->
alloc
,
(
uint
)
(
rows
*
sizeof
(
MYSQL_ROWS
)
+
(
uint
)
(
rows
*
sizeof
(
MYSQL_ROWS
)
+
rows
*
(
data
->
fields
+
1
)
*
sizeof
(
char
*
)));
rows
*
(
data
->
fields
+
1
)
*
sizeof
(
char
*
)));
end_row
=
row
+
rows
;
end_row
=
row
+
rows
;
columns
=
(
MYSQL_ROW
)
end_row
;
columns
=
(
MYSQL_ROW
)
end_row
;
data
->
rows
=
rows
;
data
->
data
=
row
;
data
->
data
=
row
;
if
(
!
rows
)
goto
return_ok
;
for
(
prev_row
=
&
row
->
next
;
row
<
end_row
;
prev_row
=
&
row
->
next
,
row
++
)
for
(
prev_row
=
&
row
->
next
;
row
<
end_row
;
prev_row
=
&
row
->
next
,
row
++
)
{
{
...
@@ -444,6 +478,7 @@ int emb_load_querycache_result(THD *thd, Querycache_stream *src)
...
@@ -444,6 +478,7 @@ int emb_load_querycache_result(THD *thd, Querycache_stream *src)
*
(
columns
++
)
=
NULL
;
*
(
columns
++
)
=
NULL
;
}
}
}
*
prev_row
=
NULL
;
*
prev_row
=
NULL
;
data
->
embedded_info
->
prev_ptr
=
prev_row
;
data
->
embedded_info
->
prev_ptr
=
prev_row
;
return_ok:
return_ok:
...
...
libmysqld/emb_qcache.h
View file @
baeea12b
...
@@ -58,7 +58,7 @@ class Querycache_stream
...
@@ -58,7 +58,7 @@ class Querycache_stream
data_end
=
cur_data
+
(
block
->
used
-
headers_len
);
data_end
=
cur_data
+
(
block
->
used
-
headers_len
);
}
}
void
store_
char
(
char
c
);
void
store_
uchar
(
u
char
c
);
void
store_short
(
ushort
s
);
void
store_short
(
ushort
s
);
void
store_int
(
uint
i
);
void
store_int
(
uint
i
);
void
store_ll
(
ulonglong
ll
);
void
store_ll
(
ulonglong
ll
);
...
@@ -66,7 +66,7 @@ class Querycache_stream
...
@@ -66,7 +66,7 @@ class Querycache_stream
void
store_str
(
const
char
*
str
,
uint
str_len
);
void
store_str
(
const
char
*
str
,
uint
str_len
);
void
store_safe_str
(
const
char
*
str
,
uint
str_len
);
void
store_safe_str
(
const
char
*
str
,
uint
str_len
);
char
load_
char
();
uchar
load_u
char
();
ushort
load_short
();
ushort
load_short
();
uint
load_int
();
uint
load_int
();
ulonglong
load_ll
();
ulonglong
load_ll
();
...
...
mysql-test/r/func_misc.result
View file @
baeea12b
DROP TABLE IF EXISTS t1;
DROP TABLE IF EXISTS t1
, t2
;
select format(1.5555,0),format(123.5555,1),format(1234.5555,2),format(12345.55555,3),format(123456.5555,4),format(1234567.5555,5),format("12345.2399",2);
select format(1.5555,0),format(123.5555,1),format(1234.5555,2),format(12345.55555,3),format(123456.5555,4),format(1234567.5555,5),format("12345.2399",2);
format(1.5555,0) format(123.5555,1) format(1234.5555,2) format(12345.55555,3) format(123456.5555,4) format(1234567.5555,5) format("12345.2399",2)
format(1.5555,0) format(123.5555,1) format(1234.5555,2) format(12345.55555,3) format(123456.5555,4) format(1234567.5555,5) format("12345.2399",2)
2 123.6 1,234.56 12,345.556 123,456.5555 1,234,567.55550 12,345.24
2 123.6 1,234.56 12,345.556 123,456.5555 1,234,567.55550 12,345.24
...
...
mysql-test/t/func_misc.test
View file @
baeea12b
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
#
#
--
disable_warnings
--
disable_warnings
DROP
TABLE
IF
EXISTS
t1
;
DROP
TABLE
IF
EXISTS
t1
,
t2
;
--
enable_warnings
--
enable_warnings
select
format
(
1.5555
,
0
),
format
(
123.5555
,
1
),
format
(
1234.5555
,
2
),
format
(
12345.55555
,
3
),
format
(
123456.5555
,
4
),
format
(
1234567.5555
,
5
),
format
(
"12345.2399"
,
2
);
select
format
(
1.5555
,
0
),
format
(
123.5555
,
1
),
format
(
1234.5555
,
2
),
format
(
12345.55555
,
3
),
format
(
123456.5555
,
4
),
format
(
1234567.5555
,
5
),
format
(
"12345.2399"
,
2
);
...
...
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