database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-09-02 09:41:40 +03:00
Code Activity

innodb compatibility fix

Browse Source
This commit is contained in:
Sergei Golubchik
2011-05-26 19:16:10 +02:00
parent 34c9428871
commit c1a92f9cae
3 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mysql-test/suite/innodb_plugin/r/innodb_information_schema.result
View File

@@ -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, 0x00, -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, 0x00, -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(*)

5
storage/innobase/handler/ha_innodb.cc
View File

@@ -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)

6
storage/innodb_plugin/handler/ha_innodb.cc
View File

@@ -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)