Commit b9c6c482 authored by unknown's avatar unknown
Browse files

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

into serg.mylan:/usr/home/serg/Abk/mysql-4.1
parents 8fa1f65a e674f459

mysql-test/r/union.result

+5 −0
Original line number Diff line number Diff line
@@ -1195,3 +1195,8 @@ a b 
2	b

3	c

drop table t1;

set @val:=6;

select concat('value is: ', @val) union select 'some text';

concat('value is: ', @val)

value is: 6

some text

mysql-test/r/user_var.result

+7 −0
Original line number Diff line number Diff line
@@ -193,3 +193,10 @@ set @var= NULL ; 
select FIELD( @var,'1it','Hit') as my_column;

my_column

0

select @v, coercibility(@v);

@v	coercibility(@v)

NULL	2

set @v1=null, @v2=1, @v3=1.1, @v4=now();

select coercibility(@v1),coercibility(@v2),coercibility(@v3),coercibility(@v4);

coercibility(@v1)	coercibility(@v2)	coercibility(@v3)	coercibility(@v4)

2	2	2	2

mysql-test/t/union.test

+6 −0
Original line number Diff line number Diff line
@@ -711,3 +711,9 @@ select * from ((select * from t1 limit 1) union (select * from t1 limit 1) union 
select * from ((((select * from t1))) union (select * from t1) union (select * from t1)) a;

select * from ((select * from t1) union (((select * from t1))) union (select * from t1)) a;

drop table t1;



#

# Bugs#6519 UNION with collation binary and latin1_swedish_ci fails

#

set @val:=6;

select concat('value is: ', @val) union select 'some text';

mysql-test/t/user_var.test

+7 −0
Original line number Diff line number Diff line
@@ -122,3 +122,10 @@ drop table t1; 
#

set @var= NULL ;

select FIELD( @var,'1it','Hit') as my_column;



#

# Bug#9425 A user variable doesn't always have implicit coercibility

#

select @v, coercibility(@v);

set @v1=null, @v2=1, @v3=1.1, @v4=now();

select coercibility(@v1),coercibility(@v2),coercibility(@v3),coercibility(@v4);

ndb/src/kernel/blocks/dbdict/printSchemafile/printSchemafile.cpp→ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp

+15 −0
Original line number Diff line number Diff line 
#if 0

make -f Makefile -f - printSchemaFile <<'_eof_'

printSchemaFile: printSchemaFile.cpp

	$(CXXCOMPILE) -o $@ $@.cpp -L../../../common/util/.libs -lgeneral

_eof_

exit $?

#endif



/* Copyright (C) 2003 MySQL AB



   This program is free software; you can redistribute it and/or modify
@@ -92,6 +100,13 @@ NDB_COMMAND(printSchemafile, 
  }

  

  print(filename, (SchemaFile *)&buf[0]);



  Uint32 chk = 0, i;

  for (i = 0; i < bytes/4; i++)

    chk ^= buf[i];

  if (chk != 0)

    ndbout << "Invalid checksum!" << endl;



  delete [] buf;

  return 0;

}