database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0

Browse Source 
into mysql.com:/usr/home/ram/work/5.0.bit_class
This commit is contained in:
unknown
2005-04-14 14:33:28 +05:00
parent de8b49912c 27b2b1fad3
commit 0a72f99e86
4 changed files with 38 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
mysql-test/r/type_bit_innodb.result
View File

@ -380,3 +380,25 @@ drop table t1;
create table t1(a int, b bit not null) engine=innodb; create table t1(a int, b bit not null) engine=innodb;
alter table t1 add primary key (a); alter table t1 add primary key (a);
drop table t1; drop table t1;
create table t1 (a bit, b bit(10)) engine=innodb;
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
`a` bit(1) default NULL,
`b` bit(10) default NULL
) ENGINE=InnoDB DEFAULT CHARSET=latin1
alter table t1 engine=heap;
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
`a` bit(1) default NULL,
`b` bit(10) default NULL
) ENGINE=MEMORY DEFAULT CHARSET=latin1
alter table t1 engine=innodb;
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
`a` bit(1) default NULL,
`b` bit(10) default NULL
) ENGINE=InnoDB DEFAULT CHARSET=latin1
drop table t1;

12
mysql-test/t/type_bit_innodb.test
View File

@ -121,3 +121,15 @@ drop table t1;
create table t1(a int, b bit not null) engine=innodb; create table t1(a int, b bit not null) engine=innodb;
alter table t1 add primary key (a); alter table t1 add primary key (a);
drop table t1; drop table t1;
#
# altering tables
#
create table t1 (a bit, b bit(10)) engine=innodb;
show create table t1;
alter table t1 engine=heap;
show create table t1;
alter table t1 engine=innodb;
show create table t1;
drop table t1;

4
sql/field.cc
View File

@ -8358,7 +8358,9 @@ create_field::create_field(Field *old_field,Field *orig_field)
break; break;
#endif #endif
case FIELD_TYPE_BIT: case FIELD_TYPE_BIT:
length= ((Field_bit *) old_field)->bit_len + length * 8; length= (old_field->key_type() == HA_KEYTYPE_BIT) ?
((Field_bit *) old_field)->bit_len + length * 8 :
((Field_bit_as_char *) old_field)->create_length;
break; break;
default: default:
break; break;

3
sql/field.h
View File

@ -1313,9 +1313,8 @@ public:
class Field_bit_as_char: public Field_bit { class Field_bit_as_char: public Field_bit {
protected:
uchar create_length;
public: public:
uchar create_length;
Field_bit_as_char(char *ptr_arg, uint32 len_arg, uchar *null_ptr_arg, Field_bit_as_char(char *ptr_arg, uint32 len_arg, uchar *null_ptr_arg,
uchar null_bit_arg, uchar *bit_ptr_arg, uchar bit_ofs_arg, uchar null_bit_arg, uchar *bit_ptr_arg, uchar bit_ofs_arg,
enum utype unireg_check_arg, const char *field_name_arg, enum utype unireg_check_arg, const char *field_name_arg,