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
fcaa0217
Commit
fcaa0217
authored
Dec 17, 2004
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/space/my/mysql-5.0
parents
73b36ee6
78e604cd
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
11 deletions
+13
-11
libmysql/libmysql.c
libmysql/libmysql.c
+10
-8
tests/client_test.c
tests/client_test.c
+3
-3
No files found.
libmysql/libmysql.c
View file @
fcaa0217
...
...
@@ -3813,8 +3813,9 @@ static void fetch_datetime_with_conversion(MYSQL_BIND *param,
case
MYSQL_TYPE_DOUBLE
:
{
ulonglong
value
=
TIME_to_ulonglong
(
time
);
return
fetch_float_with_conversion
(
param
,
field
,
ulonglong2double
(
value
),
DBL_DIG
);
fetch_float_with_conversion
(
param
,
field
,
ulonglong2double
(
value
),
DBL_DIG
);
break
;
}
case
MYSQL_TYPE_TINY
:
case
MYSQL_TYPE_SHORT
:
...
...
@@ -3823,7 +3824,8 @@ static void fetch_datetime_with_conversion(MYSQL_BIND *param,
case
MYSQL_TYPE_LONGLONG
:
{
longlong
value
=
(
longlong
)
TIME_to_ulonglong
(
time
);
return
fetch_long_with_conversion
(
param
,
field
,
value
);
fetch_long_with_conversion
(
param
,
field
,
value
);
break
;
}
default:
{
...
...
@@ -4140,13 +4142,13 @@ static my_bool is_binary_compatible(enum enum_field_types type1,
enum
enum_field_types
type2
)
{
static
const
enum
enum_field_types
range1
[]
=
{
MYSQL_TYPE_SHORT
,
MYSQL_TYPE_YEAR
,
0
},
range2
[]
=
{
MYSQL_TYPE_INT24
,
MYSQL_TYPE_LONG
,
0
},
range3
[]
=
{
MYSQL_TYPE_DATETIME
,
MYSQL_TYPE_TIMESTAMP
,
0
},
range1
[]
=
{
MYSQL_TYPE_SHORT
,
MYSQL_TYPE_YEAR
,
MYSQL_TYPE_NULL
},
range2
[]
=
{
MYSQL_TYPE_INT24
,
MYSQL_TYPE_LONG
,
MYSQL_TYPE_NULL
},
range3
[]
=
{
MYSQL_TYPE_DATETIME
,
MYSQL_TYPE_TIMESTAMP
,
MYSQL_TYPE_NULL
},
range4
[]
=
{
MYSQL_TYPE_ENUM
,
MYSQL_TYPE_SET
,
MYSQL_TYPE_TINY_BLOB
,
MYSQL_TYPE_MEDIUM_BLOB
,
MYSQL_TYPE_LONG_BLOB
,
MYSQL_TYPE_BLOB
,
MYSQL_TYPE_VAR_STRING
,
MYSQL_TYPE_STRING
,
MYSQL_TYPE_GEOMETRY
,
MYSQL_TYPE_DECIMAL
,
0
},
MYSQL_TYPE_DECIMAL
,
MYSQL_TYPE_NULL
},
*
range_list
[]
=
{
range1
,
range2
,
range3
,
range4
},
**
range_list_end
=
range_list
+
sizeof
(
range_list
)
/
sizeof
(
*
range_list
);
const
enum
enum_field_types
**
range
,
*
type
;
...
...
@@ -4157,7 +4159,7 @@ static my_bool is_binary_compatible(enum enum_field_types type1,
{
/* check that both type1 and type2 are in the same range */
bool
type1_found
=
FALSE
,
type2_found
=
FALSE
;
for
(
type
=
*
range
;
*
type
;
type
++
)
for
(
type
=
*
range
;
*
type
!=
MYSQL_TYPE_NULL
;
type
++
)
{
type1_found
|=
type1
==
*
type
;
type2_found
|=
type2
==
*
type
;
...
...
tests/client_test.c
View file @
fcaa0217
...
...
@@ -11936,7 +11936,7 @@ static void test_bug4172()
MYSQL_ROW
row
;
int
rc
;
char
f
[
100
],
d
[
100
],
e
[
100
];
long
f_len
,
d_len
,
e_len
;
u
long
f_len
,
d_len
,
e_len
;
myheader
(
"test_bug4172"
);
...
...
@@ -12027,8 +12027,8 @@ static void test_conversion()
mysql_stmt_bind_param
(
stmt
,
bind
);
buff
[
0
]
=
0xC3
;
buff
[
1
]
=
0xA0
;
buff
[
0
]
=
(
uchar
)
0xC3
;
buff
[
1
]
=
(
uchar
)
0xA0
;
length
=
2
;
rc
=
mysql_stmt_execute
(
stmt
);
...
...
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