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
c1a92f9c
Commit
c1a92f9c
authored
May 26, 2011
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
innodb compatibility fix
parent
34c94288
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
4 deletions
+15
-4
mysql-test/suite/innodb_plugin/r/innodb_information_schema.result
...st/suite/innodb_plugin/r/innodb_information_schema.result
+4
-4
storage/innobase/handler/ha_innodb.cc
storage/innobase/handler/ha_innodb.cc
+5
-0
storage/innodb_plugin/handler/ha_innodb.cc
storage/innodb_plugin/handler/ha_innodb.cc
+6
-0
No files found.
mysql-test/suite/innodb_plugin/r/innodb_information_schema.result
View file @
c1a92f9c
...
@@ -7,10 +7,10 @@ X RECORD `test`.```t'\"_str` `PRIMARY` 4 '3', 'abc', '\\abc', 'abc\\', 'a\\bc',
...
@@ -7,10 +7,10 @@ X RECORD `test`.```t'\"_str` `PRIMARY` 4 '3', 'abc', '\\abc', 'abc\\', 'a\\bc',
X RECORD `test`.```t'\"_str` `PRIMARY` 4 '3', 'abc', '\\abc', 'abc\\', 'a\\bc', 'a\\bc\\', '\\abc\\\\'
X RECORD `test`.```t'\"_str` `PRIMARY` 4 '3', 'abc', '\\abc', 'abc\\', 'a\\bc', 'a\\bc\\', '\\abc\\\\'
X RECORD `test`.```t'\"_str` `PRIMARY` 5 '4', 'abc', '\0abc', 'abc\0', 'a\0bc', 'a\0bc\0', 'a\0bc\0\0'
X RECORD `test`.```t'\"_str` `PRIMARY` 5 '4', 'abc', '\0abc', 'abc\0', 'a\0bc', 'a\0bc\0', 'a\0bc\0\0'
X RECORD `test`.```t'\"_str` `PRIMARY` 5 '4', 'abc', '\0abc', 'abc\0', 'a\0bc', 'a\0bc\0', 'a\0bc\0\0'
X RECORD `test`.```t'\"_str` `PRIMARY` 5 '4', 'abc', '\0abc', 'abc\0', 'a\0bc', 'a\0bc\0', 'a\0bc\0\0'
X RECORD `test`.`t_min` `PRIMARY` 2 -128, 0
x00
, -32768, 0, -8388608, 0, -2147483648, 0, -9223372036854775808, 0
X RECORD `test`.`t_min` `PRIMARY` 2 -128, 0, -32768, 0, -8388608, 0, -2147483648, 0, -9223372036854775808, 0
X RECORD `test`.`t_min` `PRIMARY` 2 -128, 0
x00
, -32768, 0, -8388608, 0, -2147483648, 0, -9223372036854775808, 0
X RECORD `test`.`t_min` `PRIMARY` 2 -128, 0, -32768, 0, -8388608, 0, -2147483648, 0, -9223372036854775808, 0
X RECORD `test`.`t_max` `PRIMARY` 2 127,
0xFF
, 32767, 65535, 8388607, 16777215, 2147483647, 4294967295, 9223372036854775807, 18446744073709551615
X RECORD `test`.`t_max` `PRIMARY` 2 127,
-1
, 32767, 65535, 8388607, 16777215, 2147483647, 4294967295, 9223372036854775807, 18446744073709551615
X RECORD `test`.`t_max` `PRIMARY` 2 127,
0xFF
, 32767, 65535, 8388607, 16777215, 2147483647, 4294967295, 9223372036854775807, 18446744073709551615
X RECORD `test`.`t_max` `PRIMARY` 2 127,
-1
, 32767, 65535, 8388607, 16777215, 2147483647, 4294967295, 9223372036854775807, 18446744073709551615
X RECORD `test`.```t'\"_str` `PRIMARY` 1 supremum pseudo-record
X RECORD `test`.```t'\"_str` `PRIMARY` 1 supremum pseudo-record
X RECORD `test`.```t'\"_str` `PRIMARY` 1 supremum pseudo-record
X RECORD `test`.```t'\"_str` `PRIMARY` 1 supremum pseudo-record
lock_table COUNT(*)
lock_table COUNT(*)
...
...
storage/innobase/handler/ha_innodb.cc
View file @
c1a92f9c
...
@@ -3210,6 +3210,11 @@ get_innobase_type_from_mysql_type(
...
@@ -3210,6 +3210,11 @@ get_innobase_type_from_mysql_type(
case
HA_KEYTYPE_DOUBLE
:
case
HA_KEYTYPE_DOUBLE
:
return
(
DATA_DOUBLE
);
return
(
DATA_DOUBLE
);
case
HA_KEYTYPE_BINARY
:
case
HA_KEYTYPE_BINARY
:
if
(
field
->
type
()
==
MYSQL_TYPE_TINY
)
{
// compatibility workaround
*
unsigned_flag
=
1
;
return
DATA_INT
;
}
return
(
DATA_FIXBINARY
);
return
(
DATA_FIXBINARY
);
case
HA_KEYTYPE_VARBINARY2
:
case
HA_KEYTYPE_VARBINARY2
:
if
(
field
->
type
()
!=
MYSQL_TYPE_VARCHAR
)
if
(
field
->
type
()
!=
MYSQL_TYPE_VARCHAR
)
...
...
storage/innodb_plugin/handler/ha_innodb.cc
View file @
c1a92f9c
...
@@ -3919,6 +3919,12 @@ get_innobase_type_from_mysql_type(
...
@@ -3919,6 +3919,12 @@ get_innobase_type_from_mysql_type(
case
HA_KEYTYPE_DOUBLE
:
case
HA_KEYTYPE_DOUBLE
:
return
(
DATA_DOUBLE
);
return
(
DATA_DOUBLE
);
case
HA_KEYTYPE_BINARY
:
case
HA_KEYTYPE_BINARY
:
if
(
field
->
type
()
==
MYSQL_TYPE_TINY
)
if
(
field
->
type
()
==
MYSQL_TYPE_TINY
)
{
// compatibility workaround
*
unsigned_flag
=
1
;
return
DATA_INT
;
}
return
(
DATA_FIXBINARY
);
return
(
DATA_FIXBINARY
);
case
HA_KEYTYPE_VARBINARY2
:
case
HA_KEYTYPE_VARBINARY2
:
if
(
field
->
type
()
!=
MYSQL_TYPE_VARCHAR
)
if
(
field
->
type
()
!=
MYSQL_TYPE_VARCHAR
)
...
...
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