Commit db6cbba2 authored by monty@hundin.mysql.fi's avatar monty@hundin.mysql.fi
Browse files

Merge work:/my/mysql-4.0 into hundin.mysql.fi:/my/mysql-4.0

parents 4fecef14 65badfff

mysql-test/r/rpl_log.result

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ show binlog events in 'slave-bin.001' from 4; 
Log_name	Pos	Event_type	Server_id	Orig_log_pos	Info

slave-bin.001	4	Start	2	4	Server ver: VERSION, Binlog ver: 3

slave-bin.001	79	Query	1	79	use test; create table t1(n int not null auto_increment primary key)

slave-bin.001	172	Intvar	1	200	INSERT_ID=1

slave-bin.001	172	Intvar	1	172	INSERT_ID=1

slave-bin.001	200	Query	1	200	use test; insert into t1 values (NULL)

slave-bin.001	263	Query	1	263	use test; drop table t1

slave-bin.001	311	Query	1	311	use test; create table t1 (word char(20) not null)

mysql-test/r/variables.result

+4 −0
Original line number Diff line number Diff line
@@ -170,6 +170,10 @@ convert_character_set cp1251_koi8 
select @@timestamp>0;

@@timestamp>0

1

set @@rand_seed1=10000000,@@rand_seed2=1000000;

select ROUND(RAND(),5);

ROUND(RAND(),5)

0.02887

set big_tables=OFFF;

Variable 'big_tables' can't be set to the value of 'OFFF'

set big_tables="OFFF";

mysql-test/t/variables.test

+4 −0
Original line number Diff line number Diff line
@@ -93,6 +93,10 @@ set global character set default, session character set default; 
show variables like "convert_character_set";

select @@timestamp>0;



set @@rand_seed1=10000000,@@rand_seed2=1000000;

select ROUND(RAND(),5);





# The following should give errors



--error 1231

sql/field.cc

+8 −3
Original line number Diff line number Diff line
@@ -4879,6 +4879,7 @@ uint pack_length_to_packflag(uint type) 
Field *make_field(char *ptr, uint32 field_length,

		  uchar *null_pos, uchar null_bit,

		  uint pack_flag,

		  enum_field_types field_type,

		  Field::utype unireg_check,

		  TYPELIB *interval,

		  const char *field_name,
@@ -4904,6 +4905,9 @@ Field *make_field(char *ptr, uint32 field_length, 
      return new Field_blob(ptr,null_pos,null_bit,

			    unireg_check, field_name, table,

			    pack_length,f_is_binary(pack_flag) != 0);

    if (f_is_geom(pack_flag))

      return 0;



    if (interval)

    {

      if (f_is_enum(pack_flag))
@@ -4917,7 +4921,7 @@ Field *make_field(char *ptr, uint32 field_length, 
    }

  }



  switch ((enum enum_field_types) f_packtype(pack_flag)) {

  switch (field_type) {

  case FIELD_TYPE_DECIMAL:

    return new Field_decimal(ptr,field_length,null_pos,null_bit,

			     unireg_check, field_name, table,
@@ -4980,10 +4984,11 @@ Field *make_field(char *ptr, uint32 field_length, 
    return new Field_datetime(ptr,null_pos,null_bit,

			      unireg_check, field_name, table);

  case FIELD_TYPE_NULL:

    default:					// Impossible (Wrong version)

    return new Field_null(ptr,field_length,unireg_check,field_name,table);

  default:					// Impossible (Wrong version)

    break;

  }

  return 0;					// Impossible (Wrong version)

  return 0;					// Impossible

}

sql/field.h

+5 −1
Original line number Diff line number Diff line
@@ -1050,7 +1050,9 @@ class Copy_field :public Sql_alloc { 


Field *make_field(char *ptr, uint32 field_length,

		  uchar *null_pos, uchar null_bit,

		  uint pack_flag, Field::utype unireg_check,

		  uint pack_flag,

		  enum_field_types field_type,

		  Field::utype unireg_check,

		  TYPELIB *interval, const char *field_name,

		  struct st_table *table);

uint pack_length_to_packflag(uint type);
@@ -1073,6 +1075,7 @@ bool test_if_int(const char *str,int length); 
#define FIELDFLAG_INTERVAL		256

#define FIELDFLAG_BITFIELD		512	// mangled with dec!

#define FIELDFLAG_BLOB			1024	// mangled with dec!

#define FIELDFLAG_GEOM			2048

#define FIELDFLAG_LEFT_FULLSCREEN	8192

#define FIELDFLAG_RIGHT_FULLSCREEN	16384

#define FIELDFLAG_FORMAT_NUMBER		16384	// predit: ###,,## in output
@@ -1099,6 +1102,7 @@ bool test_if_int(const char *str,int length); 
#define f_is_enum(x)	((x) & FIELDFLAG_INTERVAL)

#define f_is_bitfield(x)	((x) & FIELDFLAG_BITFIELD)

#define f_is_blob(x)		(((x) & (FIELDFLAG_BLOB | FIELDFLAG_NUMBER)) == FIELDFLAG_BLOB)

#define f_is_geom(x)		((x) & FIELDFLAG_GEOM)

#define f_is_equ(x)		((x) & (1+2+FIELDFLAG_PACK+31*256))

#define f_settype(x)		(((int) x) << FIELDFLAG_PACK_SHIFT)

#define f_maybe_null(x)		(x & FIELDFLAG_MAYBE_NULL)