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

BUG#14139 - Merge to 5.0

Browse Source
This commit is contained in:
sergefp@mysql.com
2005-10-31 09:22:33 +03:00
parent 09a4d0c7a7
commit 4ad3313cd7
4 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/r/create.result
View File

@ -645,10 +645,12 @@ create table t1 (
a varchar(112) charset utf8 collate utf8_bin not null,
primary key (a)
) select 'test' as a ;
Warnings:
Warning 1364 Field 'a' doesn't have a default value
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
`a` varchar(112) character set utf8 collate utf8_bin NOT NULL default '',
`a` varchar(112) character set utf8 collate utf8_bin NOT NULL,
PRIMARY KEY (`a`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1
drop table t1;

1
mysql-test/t/create.test
View File

@ -550,6 +550,7 @@ create table t1 (
a varchar(112) charset utf8 collate utf8_bin not null,
primary key (a)
) select 'test' as a ;
--warning 1364
show create table t1;
drop table t1;

5
sql/field.h
View File

@ -1373,7 +1373,10 @@ public:
max number of characters.
*/
ulong length;
ulong length;
/*
The value of 'length' before a call to create_length_to_internal_length
*/
uint32 chars_length;
uint decimals, flags, pack_length, key_length;
Field::utype unireg_check;
TYPELIB *interval; // Which interval to use

1
sql/item.h
View File

@ -526,6 +526,7 @@ public:
double val_real_from_decimal();
virtual Field *get_tmp_table_field() { return 0; }
/* This is also used to create fields in CREATE ... SELECT: */
virtual Field *tmp_table_field(TABLE *t_arg) { return 0; }
virtual const char *full_name() const { return name ? name : "???"; }