Skip to content

M
mariadb
Commit 76eb2197 authored by monty@mysql.com's avatar monty@mysql.com
Browse files
Options

Merge bk-internal.mysql.com:/home/bk/mysql-4.1 

into mysql.com:/my/mysql-4.1
parents 6e4329cb 27427015
Show whitespace changes
Inline Side-by-side
Showing with 145 additions and 73 deletions
heap/hp_hash.c
View file @ 76eb2197
...@@ -566,50 +566,87 @@ my_bool hp_if_null_in_key(HP_KEYDEF *keydef, const byte *record) ...@@ -566,50 +566,87 @@ my_bool hp_if_null_in_key(HP_KEYDEF *keydef, const byte *record)
return 0; return 0;
} }
/*
Update auto_increment info
SYNOPSIS
update_auto_increment()
info MyISAM handler
record Row to update
IMPLEMENTATION
Only replace the auto_increment value if it is higher than the previous
one. For signed columns we don't update the auto increment value if it's
less than zero.
*/
void heap_update_auto_increment(HP_INFO *info, const byte *record) void heap_update_auto_increment(HP_INFO *info, const byte *record)
{ {
ulonglong value; ulonglong value= 0; /* Store unsigned values here */
longlong s_value= 0; /* Store signed values here */
HA_KEYSEG *keyseg= info->s->keydef[info->s->auto_key - 1].seg; HA_KEYSEG *keyseg= info->s->keydef[info->s->auto_key - 1].seg;
const uchar *key= (uchar*) record + keyseg->start; const uchar *key= (uchar*) record + keyseg->start;
switch (info->s->auto_key_type) { switch (info->s->auto_key_type) {
case HA_KEYTYPE_INT8: case HA_KEYTYPE_INT8:
s_value= (longlong) *(char*)key;
break;
case HA_KEYTYPE_BINARY: case HA_KEYTYPE_BINARY:
value= (ulonglong) *(uchar*) key; value=(ulonglong) *(uchar*) key;
break; break;
case HA_KEYTYPE_SHORT_INT: case HA_KEYTYPE_SHORT_INT:
s_value= (longlong) sint2korr(key);
break;
case HA_KEYTYPE_USHORT_INT: case HA_KEYTYPE_USHORT_INT:
value= (ulonglong) uint2korr(key); value=(ulonglong) uint2korr(key);
break; break;
case HA_KEYTYPE_LONG_INT: case HA_KEYTYPE_LONG_INT:
s_value= (longlong) sint4korr(key);
break;
case HA_KEYTYPE_ULONG_INT: case HA_KEYTYPE_ULONG_INT:
value= (ulonglong) uint4korr(key); value=(ulonglong) uint4korr(key);
break; break;
case HA_KEYTYPE_INT24: case HA_KEYTYPE_INT24:
s_value= (longlong) sint3korr(key);
break;
case HA_KEYTYPE_UINT24: case HA_KEYTYPE_UINT24:
value= (ulonglong) uint3korr(key); value=(ulonglong) uint3korr(key);
break; break;
case HA_KEYTYPE_FLOAT: /* This shouldn't be used */ case HA_KEYTYPE_FLOAT: /* This shouldn't be used */
{ {
float f_1; float f_1;
float4get(f_1, key); float4get(f_1,key);
value= (ulonglong) f_1; /* Ignore negative values */
value = (f_1 < (float) 0.0) ? 0 : (ulonglong) f_1;
break; break;
} }
case HA_KEYTYPE_DOUBLE: /* This shouldn't be used */ case HA_KEYTYPE_DOUBLE: /* This shouldn't be used */
{ {
double f_1; double f_1;
float8get(f_1, key); float8get(f_1,key);
value= (ulonglong) f_1; /* Ignore negative values */
value = (f_1 < 0.0) ? 0 : (ulonglong) f_1;
break; break;
} }
case HA_KEYTYPE_LONGLONG: case HA_KEYTYPE_LONGLONG:
s_value= sint8korr(key);
break;
case HA_KEYTYPE_ULONGLONG: case HA_KEYTYPE_ULONGLONG:
value= uint8korr(key); value= uint8korr(key);
break; break;
default: default:
value= 0; /* Error */ DBUG_ASSERT(0);
value=0; /* Error */
break; break;
} }
set_if_bigger(info->s->auto_increment, value);
/*
The following code works becasue if s_value < 0 then value is 0
and if s_value == 0 then value will contain either s_value or the
correct value.
*/
set_if_bigger(info->s->auto_increment,
(s_value > 0) ? (ulonglong) s_value : value);
} }
mysql-test/r/create.result
View file @ 76eb2197
...@@ -407,6 +407,28 @@ a b c d e f g h dd ...@@ -407,6 +407,28 @@ a b c d e f g h dd
1 -7 7 2000-01-01 b 2000-01-01 00:00:00 05:04:03 yet another binary data 02:00:00 1 -7 7 2000-01-01 b 2000-01-01 00:00:00 05:04:03 yet another binary data 02:00:00
2 -2 2 1825-12-14 a 2003-01-01 03:02:01 04:03:02 binary data 02:00:00 2 -2 2 1825-12-14 a 2003-01-01 03:02:01 04:03:02 binary data 02:00:00
drop table t1, t2; drop table t1, t2;
create table t1 (a tinyint, b smallint, c mediumint, d int, e bigint, f float(3,2), g double(4,3), h decimal(5,4), i year, j date, k timestamp, l datetime, m enum('a','b'), n set('a','b'), o char(10));
create table t2 select ifnull(a,a), ifnull(b,b), ifnull(c,c), ifnull(d,d), ifnull(e,e), ifnull(f,f), ifnull(g,g), ifnull(h,h), ifnull(i,i), ifnull(j,j), ifnull(k,k), ifnull(l,l), ifnull(m,m), ifnull(n,n), ifnull(o,o) from t1;
show create table t2;
Table Create Table
t2 CREATE TABLE `t2` (
`ifnull(a,a)` tinyint(4) default NULL,
`ifnull(b,b)` smallint(6) default NULL,
`ifnull(c,c)` mediumint(9) default NULL,
`ifnull(d,d)` int(11) default NULL,
`ifnull(e,e)` bigint(20) default NULL,
`ifnull(f,f)` float(3,2) default NULL,
`ifnull(g,g)` double(4,3) default NULL,
`ifnull(h,h)` decimal(5,4) default NULL,
`ifnull(i,i)` year(4) default NULL,
`ifnull(j,j)` date default NULL,
`ifnull(k,k)` datetime NOT NULL default '0000-00-00 00:00:00',
`ifnull(l,l)` datetime default NULL,
`ifnull(m,m)` char(1) default NULL,
`ifnull(n,n)` char(3) default NULL,
`ifnull(o,o)` char(10) default NULL
) TYPE=MyISAM DEFAULT CHARSET=latin1
drop table t1,t2;
create table t1(str varchar(10) default 'def',strnull varchar(10),intg int default '10',rel double default '3.14'); create table t1(str varchar(10) default 'def',strnull varchar(10),intg int default '10',rel double default '3.14');
insert into t1 values ('','',0,0.0); insert into t1 values ('','',0,0.0);
describe t1; describe t1;
......
mysql-test/t/create.test
View file @ 76eb2197
...@@ -318,11 +318,17 @@ select ...@@ -318,11 +318,17 @@ select
addtime(cast('1:0:0' as time),cast('1:0:0' as time)) as dd addtime(cast('1:0:0' as time),cast('1:0:0' as time)) as dd
from t1; from t1;
explain t2; explain t2;
select * from t2; select * from t2;
drop table t1, t2; drop table t1, t2;
create table t1 (a tinyint, b smallint, c mediumint, d int, e bigint, f float(3,2), g double(4,3), h decimal(5,4), i year, j date, k timestamp, l datetime, m enum('a','b'), n set('a','b'), o char(10));
create table t2 select ifnull(a,a), ifnull(b,b), ifnull(c,c), ifnull(d,d), ifnull(e,e), ifnull(f,f), ifnull(g,g), ifnull(h,h), ifnull(i,i), ifnull(j,j), ifnull(k,k), ifnull(l,l), ifnull(m,m), ifnull(n,n), ifnull(o,o) from t1;
show create table t2;
drop table t1,t2;
#
# Test of default()
#
create table t1(str varchar(10) default 'def',strnull varchar(10),intg int default '10',rel double default '3.14'); create table t1(str varchar(10) default 'def',strnull varchar(10),intg int default '10',rel double default '3.14');
insert into t1 values ('','',0,0.0); insert into t1 values ('','',0,0.0);
describe t1; describe t1;
......
sql/field.h
View file @ 76eb2197
...@@ -327,11 +327,6 @@ public: ...@@ -327,11 +327,6 @@ public:
unireg_check_arg, field_name_arg, table_arg, unireg_check_arg, field_name_arg, table_arg,
dec_arg, zero_arg,unsigned_arg) dec_arg, zero_arg,unsigned_arg)
{} {}
Field_decimal(uint32 len_arg,bool maybe_null_arg, const char *field_name_arg,
struct st_table *table_arg,bool unsigned_arg)
:Field_num((char*) 0, len_arg, maybe_null_arg ? (uchar*) "": 0,0,
NONE, field_name_arg, table_arg,0,0,unsigned_arg)
{}
enum_field_types type() const { return FIELD_TYPE_DECIMAL;} enum_field_types type() const { return FIELD_TYPE_DECIMAL;}
enum ha_base_keytype key_type() const enum ha_base_keytype key_type() const
{ return zerofill ? HA_KEYTYPE_BINARY : HA_KEYTYPE_NUM; } { return zerofill ? HA_KEYTYPE_BINARY : HA_KEYTYPE_NUM; }
...@@ -362,11 +357,6 @@ public: ...@@ -362,11 +357,6 @@ public:
unireg_check_arg, field_name_arg, table_arg, unireg_check_arg, field_name_arg, table_arg,
0, zero_arg,unsigned_arg) 0, zero_arg,unsigned_arg)
{} {}
Field_tiny(uint32 len_arg,bool maybe_null_arg, const char *field_name_arg,
struct st_table *table_arg,bool unsigned_arg)
:Field_num((char*) 0, len_arg, maybe_null_arg ? (uchar*) "": 0,0,
NONE, field_name_arg, table_arg,0,0,unsigned_arg)
{}
enum Item_result result_type () const { return INT_RESULT; } enum Item_result result_type () const { return INT_RESULT; }
enum_field_types type() const { return FIELD_TYPE_TINY;} enum_field_types type() const { return FIELD_TYPE_TINY;}
enum ha_base_keytype key_type() const enum ha_base_keytype key_type() const
...@@ -608,13 +598,9 @@ public: ...@@ -608,13 +598,9 @@ public:
:Field_str(ptr_arg, len_arg, null, 1, :Field_str(ptr_arg, len_arg, null, 1,
unireg_check_arg, field_name_arg, table_arg, cs) unireg_check_arg, field_name_arg, table_arg, cs)
{} {}
Field_null(uint32 len_arg, const char *field_name_arg,
struct st_table *table_arg, CHARSET_INFO *cs)
:Field_str((char*) 0, len_arg, null, 1,
NONE, field_name_arg, table_arg, cs)
{}
enum_field_types type() const { return FIELD_TYPE_NULL;} enum_field_types type() const { return FIELD_TYPE_NULL;}
int store(const char *to, uint length, CHARSET_INFO *cs) { null[0]=1; return 0; } int store(const char *to, uint length, CHARSET_INFO *cs)
{ null[0]=1; return 0; }
int store(double nr) { null[0]=1; return 0; } int store(double nr) { null[0]=1; return 0; }
int store(longlong nr) { null[0]=1; return 0; } int store(longlong nr) { null[0]=1; return 0; }
void reset(void) {} void reset(void) {}
...@@ -684,10 +670,6 @@ public: ...@@ -684,10 +670,6 @@ public:
:Field_tiny(ptr_arg, len_arg, null_ptr_arg, null_bit_arg, :Field_tiny(ptr_arg, len_arg, null_ptr_arg, null_bit_arg,
unireg_check_arg, field_name_arg, table_arg, 1, 1) unireg_check_arg, field_name_arg, table_arg, 1, 1)
{} {}
Field_year(uint32 len_arg,bool maybe_null_arg, const char *field_name_arg,
struct st_table *table_arg)
:Field_tiny(len_arg,maybe_null_arg,field_name_arg,table_arg,1)
{}
enum_field_types type() const { return FIELD_TYPE_YEAR;} enum_field_types type() const { return FIELD_TYPE_YEAR;}
int store(const char *to,uint length,CHARSET_INFO *charset); int store(const char *to,uint length,CHARSET_INFO *charset);
int store(double nr); int store(double nr);
......
sql/item.cc
View file @ 76eb2197
...@@ -995,35 +995,42 @@ enum_field_types Item::field_type() const ...@@ -995,35 +995,42 @@ enum_field_types Item::field_type() const
Field *Item::tmp_table_field_from_field_type(TABLE *table) Field *Item::tmp_table_field_from_field_type(TABLE *table)
{ {
switch (field_type()) /*
{ The field functions defines a field to be not null if null_ptr is not 0
*/
uchar *null_ptr= maybe_null ? (uchar*) "" : 0;
switch (field_type()) {
case MYSQL_TYPE_DECIMAL: case MYSQL_TYPE_DECIMAL:
return new Field_decimal(max_length, maybe_null, name, table, return new Field_decimal((char*) 0, max_length, null_ptr, 0, Field::NONE,
unsigned_flag); name, table, decimals, 0, unsigned_flag);
case MYSQL_TYPE_TINY: case MYSQL_TYPE_TINY:
return new Field_tiny(max_length, maybe_null, name, table, return new Field_tiny((char*) 0, max_length, null_ptr, 0, Field::NONE,
unsigned_flag); name, table, 0, unsigned_flag);
case MYSQL_TYPE_SHORT: case MYSQL_TYPE_SHORT:
return new Field_short(max_length, maybe_null, name, table, return new Field_short((char*) 0, max_length, null_ptr, 0, Field::NONE,
unsigned_flag); name, table, 0, unsigned_flag);
case MYSQL_TYPE_LONG: case MYSQL_TYPE_LONG:
return new Field_long(max_length, maybe_null, name, table, return new Field_long((char*) 0, max_length, null_ptr, 0, Field::NONE,
unsigned_flag); name, table, 0, unsigned_flag);
case MYSQL_TYPE_FLOAT:
return new Field_float(max_length, maybe_null, name, table, decimals);
case MYSQL_TYPE_DOUBLE:
return new Field_double(max_length, maybe_null, name, table, decimals);
case MYSQL_TYPE_NULL:
return new Field_null(max_length, name, table, &my_charset_bin);
#ifdef HAVE_LONG_LONG #ifdef HAVE_LONG_LONG
case MYSQL_TYPE_LONGLONG: case MYSQL_TYPE_LONGLONG:
return new Field_longlong(max_length, maybe_null, name, table, return new Field_longlong((char*) 0, max_length, null_ptr, 0, Field::NONE,
unsigned_flag); name, table, 0, unsigned_flag);
#endif #endif
case MYSQL_TYPE_FLOAT:
return new Field_float((char*) 0, max_length, null_ptr, 0, Field::NONE,
name, table, decimals, 0, unsigned_flag);
case MYSQL_TYPE_DOUBLE:
return new Field_double((char*) 0, max_length, null_ptr, 0, Field::NONE,
name, table, decimals, 0, unsigned_flag);
case MYSQL_TYPE_NULL:
return new Field_null((char*) 0, max_length, Field::NONE,
name, table, &my_charset_bin);
case MYSQL_TYPE_NEWDATE: case MYSQL_TYPE_NEWDATE:
case MYSQL_TYPE_INT24: case MYSQL_TYPE_INT24:
return new Field_long(max_length, maybe_null, name, table, return new Field_medium((char*) 0, max_length, null_ptr, 0, Field::NONE,
unsigned_flag); name, table, 0, unsigned_flag);
case MYSQL_TYPE_DATE: case MYSQL_TYPE_DATE:
return new Field_date(maybe_null, name, table, &my_charset_bin); return new Field_date(maybe_null, name, table, &my_charset_bin);
case MYSQL_TYPE_TIME: case MYSQL_TYPE_TIME:
...@@ -1032,34 +1039,38 @@ Field *Item::tmp_table_field_from_field_type(TABLE *table) ...@@ -1032,34 +1039,38 @@ Field *Item::tmp_table_field_from_field_type(TABLE *table)
case MYSQL_TYPE_DATETIME: case MYSQL_TYPE_DATETIME:
return new Field_datetime(maybe_null, name, table, &my_charset_bin); return new Field_datetime(maybe_null, name, table, &my_charset_bin);
case MYSQL_TYPE_YEAR: case MYSQL_TYPE_YEAR:
return new Field_year(max_length, maybe_null, name, table); return new Field_year((char*) 0, max_length, null_ptr, 0, Field::NONE,
name, table);
default:
/* This case should never be choosen */
DBUG_ASSERT(0);
/* If something goes awfully wrong, it's better to get a string than die */
case MYSQL_TYPE_ENUM: case MYSQL_TYPE_ENUM:
case MYSQL_TYPE_SET: case MYSQL_TYPE_SET:
return new Field_long(max_length, maybe_null, name, table, case MYSQL_TYPE_VAR_STRING:
unsigned_flag); if (max_length > 255)
break; // If blob
return new Field_varstring(max_length, maybe_null, name, table,
collation.collation);
case MYSQL_TYPE_STRING:
if (max_length > 255) // If blob
break;
return new Field_string(max_length, maybe_null, name, table,
collation.collation);
case MYSQL_TYPE_TINY_BLOB: case MYSQL_TYPE_TINY_BLOB:
case MYSQL_TYPE_MEDIUM_BLOB: case MYSQL_TYPE_MEDIUM_BLOB:
case MYSQL_TYPE_LONG_BLOB: case MYSQL_TYPE_LONG_BLOB:
case MYSQL_TYPE_BLOB: case MYSQL_TYPE_BLOB:
case MYSQL_TYPE_GEOMETRY: case MYSQL_TYPE_GEOMETRY:
return new Field_blob(max_length, maybe_null, name, table, collation.collation); break; // Blob handled outside of case
case MYSQL_TYPE_VAR_STRING:
if (max_length > 255)
return new Field_blob(max_length, maybe_null, name, table, collation.collation);
else
return new Field_varstring(max_length, maybe_null, name, table, collation.collation);
case MYSQL_TYPE_STRING:
if (max_length > 255)
return new Field_blob(max_length, maybe_null, name, table, collation.collation);
else
return new Field_string(max_length, maybe_null, name, table, collation.collation);
default:
// This case should never be choosen
DBUG_ASSERT(0);
return 0;
} }
/* blob is special as it's generated for both blobs and long strings */
return new Field_blob(max_length, maybe_null, name, table,
collation.collation);
} }
/* ARGSUSED */ /* ARGSUSED */
void Item_field::make_field(Send_field *tmp_field) void Item_field::make_field(Send_field *tmp_field)
{ {
......
sql/mysqld.cc
View file @ 76eb2197
...@@ -2787,6 +2787,9 @@ int main(int argc, char **argv) ...@@ -2787,6 +2787,9 @@ int main(int argc, char **argv)
int2str((int) GetCurrentProcessId(),strmov(shutdown_event_name, int2str((int) GetCurrentProcessId(),strmov(shutdown_event_name,
"MySQLShutdown"), 10); "MySQLShutdown"), 10);
/* Must be initialized early for comparison of service name */
system_charset_info= &my_charset_utf8_general_ci;
if (Service.GetOS()) /* true NT family */ if (Service.GetOS()) /* true NT family */
{ {
char file_path[FN_REFLEN]; char file_path[FN_REFLEN];
......
vio/vio.c
View file @ 76eb2197
...@@ -55,6 +55,7 @@ void vio_reset(Vio* vio, enum enum_vio_type type, ...@@ -55,6 +55,7 @@ void vio_reset(Vio* vio, enum enum_vio_type type,
vio->in_addr =vio_in_addr; vio->in_addr =vio_in_addr;
vio->vioblocking =vio_blocking; vio->vioblocking =vio_blocking;
vio->is_blocking =vio_is_blocking; vio->is_blocking =vio_is_blocking;
vio->timeout =vio_ignore_timeout;
} }
else /* default is VIO_TYPE_TCPIP */ else /* default is VIO_TYPE_TCPIP */
#endif #endif
...@@ -73,6 +74,7 @@ void vio_reset(Vio* vio, enum enum_vio_type type, ...@@ -73,6 +74,7 @@ void vio_reset(Vio* vio, enum enum_vio_type type,
vio->in_addr =vio_in_addr; vio->in_addr =vio_in_addr;
vio->vioblocking =vio_blocking; vio->vioblocking =vio_blocking;
vio->is_blocking =vio_is_blocking; vio->is_blocking =vio_is_blocking;
vio->timeout =vio_ignore_timeout;
} }
else else
#endif #endif
......
vio/vio_priv.h
View file @ 76eb2197
...@@ -23,6 +23,8 @@ ...@@ -23,6 +23,8 @@
#include <m_string.h> #include <m_string.h>
#include <violite.h> #include <violite.h>
void vio_ignore_timeout(Vio *vio, uint timeout);
#ifdef HAVE_OPENSSL #ifdef HAVE_OPENSSL
#include "my_net.h" /* needed because of struct in_addr */ #include "my_net.h" /* needed because of struct in_addr */
......
vio/viosocket.c
View file @ 76eb2197
...@@ -355,6 +355,13 @@ int vio_close_pipe(Vio * vio) ...@@ -355,6 +355,13 @@ int vio_close_pipe(Vio * vio)
DBUG_RETURN(r); DBUG_RETURN(r);
} }
void vio_ignore_timeout(Vio *vio __attribute__((unused)),
uint timeout __attribute__((unused)))
{
}
#ifdef HAVE_SMEM #ifdef HAVE_SMEM
int vio_read_shared_memory(Vio * vio, gptr buf, int size) int vio_read_shared_memory(Vio * vio, gptr buf, int size)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7