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
51dc566e
Commit
51dc566e
authored
Dec 21, 2009
by
Mats Kindahl
Browse files
Options
Browse Files
Download
Plain Diff
Merging with mysql-5.1-rep+2
parents
d78e5ff0
a22bc99f
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
0 deletions
+15
-0
mysql-test/extra/rpl_tests/type_conversions.test
mysql-test/extra/rpl_tests/type_conversions.test
+7
-0
mysql-test/suite/rpl/r/rpl_typeconv.result
mysql-test/suite/rpl/r/rpl_typeconv.result
+4
-0
sql/field.h
sql/field.h
+4
-0
No files found.
mysql-test/extra/rpl_tests/type_conversions.test
View file @
51dc566e
...
@@ -12,6 +12,13 @@ connection slave;
...
@@ -12,6 +12,13 @@ connection slave;
let
$if_is_lossy
=
`SELECT FIND_IN_SET('ALL_LOSSY', @@SLAVE_TYPE_CONVERSIONS)`
;
let
$if_is_lossy
=
`SELECT FIND_IN_SET('ALL_LOSSY', @@SLAVE_TYPE_CONVERSIONS)`
;
let
$if_is_non_lossy
=
`SELECT FIND_IN_SET('ALL_NON_LOSSY', @@SLAVE_TYPE_CONVERSIONS)`
;
let
$if_is_non_lossy
=
`SELECT FIND_IN_SET('ALL_NON_LOSSY', @@SLAVE_TYPE_CONVERSIONS)`
;
let
$source_type
=
GEOMETRY
;
let
$target_type
=
GEOMETRY
;
let
$source_value
=
PointFromText
(
'POINT(10 10)'
);
let
$target_value
=
PointFromText
(
'POINT(10 10)'
);
let
$can_convert
=
1
;
source
extra
/
rpl_tests
/
check_type
.
inc
;
let
$source_type
=
BIT
(
1
);
let
$source_type
=
BIT
(
1
);
let
$target_type
=
BIT
(
1
);
let
$target_type
=
BIT
(
1
);
let
$source_value
=
b
'1'
;
let
$source_value
=
b
'1'
;
...
...
mysql-test/suite/rpl/r/rpl_typeconv.result
View file @
51dc566e
...
@@ -69,6 +69,7 @@ RESET MASTER;
...
@@ -69,6 +69,7 @@ RESET MASTER;
include/start_slave.inc
include/start_slave.inc
**** Result of conversions ****
**** Result of conversions ****
Source_Type Target_Type All_Type_Conversion_Flags Value_On_Slave
Source_Type Target_Type All_Type_Conversion_Flags Value_On_Slave
GEOMETRY GEOMETRY <Correct value>
BIT(1) BIT(1) <Correct value>
BIT(1) BIT(1) <Correct value>
DATE DATE <Correct value>
DATE DATE <Correct value>
ENUM('master',' ENUM('master',' <Correct value>
ENUM('master',' ENUM('master',' <Correct value>
...
@@ -171,6 +172,7 @@ BIT(5) BIT(6) <Correct error>
...
@@ -171,6 +172,7 @@ BIT(5) BIT(6) <Correct error>
BIT(6) BIT(5) <Correct error>
BIT(6) BIT(5) <Correct error>
BIT(5) BIT(12) <Correct error>
BIT(5) BIT(12) <Correct error>
BIT(12) BIT(5) <Correct error>
BIT(12) BIT(5) <Correct error>
GEOMETRY GEOMETRY ALL_NON_LOSSY <Correct value>
BIT(1) BIT(1) ALL_NON_LOSSY <Correct value>
BIT(1) BIT(1) ALL_NON_LOSSY <Correct value>
DATE DATE ALL_NON_LOSSY <Correct value>
DATE DATE ALL_NON_LOSSY <Correct value>
ENUM('master',' ENUM('master',' ALL_NON_LOSSY <Correct value>
ENUM('master',' ENUM('master',' ALL_NON_LOSSY <Correct value>
...
@@ -273,6 +275,7 @@ BIT(5) BIT(6) ALL_NON_LOSSY <Correct value>
...
@@ -273,6 +275,7 @@ BIT(5) BIT(6) ALL_NON_LOSSY <Correct value>
BIT(6) BIT(5) ALL_NON_LOSSY <Correct error>
BIT(6) BIT(5) ALL_NON_LOSSY <Correct error>
BIT(5) BIT(12) ALL_NON_LOSSY <Correct value>
BIT(5) BIT(12) ALL_NON_LOSSY <Correct value>
BIT(12) BIT(5) ALL_NON_LOSSY <Correct error>
BIT(12) BIT(5) ALL_NON_LOSSY <Correct error>
GEOMETRY GEOMETRY ALL_LOSSY <Correct value>
BIT(1) BIT(1) ALL_LOSSY <Correct value>
BIT(1) BIT(1) ALL_LOSSY <Correct value>
DATE DATE ALL_LOSSY <Correct value>
DATE DATE ALL_LOSSY <Correct value>
ENUM('master',' ENUM('master',' ALL_LOSSY <Correct value>
ENUM('master',' ENUM('master',' ALL_LOSSY <Correct value>
...
@@ -375,6 +378,7 @@ BIT(5) BIT(6) ALL_LOSSY <Correct error>
...
@@ -375,6 +378,7 @@ BIT(5) BIT(6) ALL_LOSSY <Correct error>
BIT(6) BIT(5) ALL_LOSSY <Correct value>
BIT(6) BIT(5) ALL_LOSSY <Correct value>
BIT(5) BIT(12) ALL_LOSSY <Correct error>
BIT(5) BIT(12) ALL_LOSSY <Correct error>
BIT(12) BIT(5) ALL_LOSSY <Correct value>
BIT(12) BIT(5) ALL_LOSSY <Correct value>
GEOMETRY GEOMETRY ALL_LOSSY,ALL_NON_LOSSY <Correct value>
BIT(1) BIT(1) ALL_LOSSY,ALL_NON_LOSSY <Correct value>
BIT(1) BIT(1) ALL_LOSSY,ALL_NON_LOSSY <Correct value>
DATE DATE ALL_LOSSY,ALL_NON_LOSSY <Correct value>
DATE DATE ALL_LOSSY,ALL_NON_LOSSY <Correct value>
ENUM('master',' ENUM('master',' ALL_LOSSY,ALL_NON_LOSSY <Correct value>
ENUM('master',' ENUM('master',' ALL_LOSSY,ALL_NON_LOSSY <Correct value>
...
...
sql/field.h
View file @
51dc566e
...
@@ -1817,6 +1817,10 @@ class Field_geom :public Field_blob {
...
@@ -1817,6 +1817,10 @@ class Field_geom :public Field_blob {
uint
size_of
()
const
{
return
sizeof
(
*
this
);
}
uint
size_of
()
const
{
return
sizeof
(
*
this
);
}
int
reset
(
void
)
{
return
!
maybe_null
()
||
Field_blob
::
reset
();
}
int
reset
(
void
)
{
return
!
maybe_null
()
||
Field_blob
::
reset
();
}
geometry_type
get_geometry_type
()
{
return
geom_type
;
};
geometry_type
get_geometry_type
()
{
return
geom_type
;
};
uint
pack_length_from_metadata
(
uint
field_metadata
)
{
return
pack_length_no_ptr
();
}
};
};
#endif
/*HAVE_SPATIAL*/
#endif
/*HAVE_SPATIAL*/
...
...
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