Commit f3de57d9 authored by unknown's avatar unknown
Browse files

Merge bk-internal:/home/bk/mysql-5.0 

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0


mysql-test/mysql-test-run.pl:
  Auto merged
parents 224b63e3 2f2607fa

libmysql/libmysql.c

+0 −29
Original line number Diff line number Diff line
@@ -1386,35 +1386,6 @@ mysql_get_server_info(MYSQL *mysql) 
}





/*

  Get version number for server in a form easy to test on



  SYNOPSIS

    mysql_get_server_version()

    mysql		Connection



  EXAMPLE

    4.1.0-alfa ->  40100

  

  NOTES

    We will ensure that a newer server always has a bigger number.



  RETURN

   Signed number > 323000

*/



ulong STDCALL

mysql_get_server_version(MYSQL *mysql)

{

  uint major, minor, version;

  char *pos= mysql->server_version, *end_pos;

  major=   (uint) strtoul(pos, &end_pos, 10);	pos=end_pos+1;

  minor=   (uint) strtoul(pos, &end_pos, 10);	pos=end_pos+1;

  version= (uint) strtoul(pos, &end_pos, 10);

  return (ulong) major*10000L+(ulong) (minor*100+version);

}





const char * STDCALL

mysql_get_host_info(MYSQL *mysql)

{

mysql-test/r/ctype_latin1.result

+22 −0
Original line number Diff line number Diff line
@@ -369,3 +369,25 @@ ERROR 42000: You have an error in your SQL syntax; check the manual that corresp 
SELECT 'a' as str;

str

a

set @str= _latin1 'ABC ߲~    @ abc';

SELECT convert(@str collate latin1_bin using utf8);

convert(@str collate latin1_bin using utf8)

ABC ߲~    @ abc

SELECT convert(@str collate latin1_general_ci using utf8);

convert(@str collate latin1_general_ci using utf8)

ABC ߲~    @ abc

SELECT convert(@str collate latin1_german1_ci using utf8);

convert(@str collate latin1_german1_ci using utf8)

ABC ߲~    @ abc

SELECT convert(@str collate latin1_danish_ci using utf8);

convert(@str collate latin1_danish_ci using utf8)

ABC ߲~    @ abc

SELECT convert(@str collate latin1_spanish_ci using utf8);

convert(@str collate latin1_spanish_ci using utf8)

ABC ߲~    @ abc

SELECT convert(@str collate latin1_german2_ci using utf8);

convert(@str collate latin1_german2_ci using utf8)

ABC ߲~    @ abc

SELECT convert(@str collate latin1_swedish_ci using utf8);

convert(@str collate latin1_swedish_ci using utf8)

ABC ߲~    @ abc

mysql-test/r/ctype_ucs.result

+8 −0
Original line number Diff line number Diff line
@@ -719,3 +719,11 @@ lily 
river

drop table t1;

deallocate prepare stmt;

create table t1(a blob, b text charset utf8, c text charset ucs2);

select data_type, character_octet_length, character_maximum_length

from information_schema.columns where table_name='t1';

data_type	character_octet_length	character_maximum_length

blob	65535	65535

text	65535	65535

text	65535	32767

drop table t1;

mysql-test/r/func_gconcat.result

+5 −0
Original line number Diff line number Diff line
@@ -626,3 +626,8 @@ latin1 
latin1

drop table t1, t2, t3;

set names default;

create table t1 (c1 varchar(10), c2 int);

select charset(group_concat(c1 order by c2)) from t1;

charset(group_concat(c1 order by c2))

latin1

drop table t1;

mysql-test/r/information_schema.result

+0 −8
Original line number Diff line number Diff line
@@ -1041,14 +1041,6 @@ select 1 from (select 1 from test.t1) a; 
1

use test;

drop table t1;

create table t1(a blob, b text charset utf8, c text charset ucs2);

select data_type, character_octet_length, character_maximum_length 

from information_schema.columns where table_name='t1';

data_type	character_octet_length	character_maximum_length

blob	65535	65535

text	65535	65535

text	65535	32767

drop table t1;

create table t1 (f1 int(11));

create view v1 as select * from t1;

drop table t1;