Commit 042a3ced authored by unknown's avatar unknown
Browse files

Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 

into eagle.intranet.mysql.r18.ru:/home/gluh/MySQL/Bugs/mysql-5.0.9344


BitKeeper/etc/logging_ok:
  auto-union
sql/sql_show.cc:
  Auto merged
parents e1afce06 77d56859

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ georg@beethoven.local 
georg@beethoven.site

georg@lmy002.wdf.sap.corp

gerberb@ou800.zenez.com

gluh@eagle.intranet.mysql.r18.ru

gluh@gluh.(none)

gluh@gluh.mysql.r18.ru

gordon@zero.local.lan

mysql-test/r/information_schema.result

+32 −10
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ c varchar(64) utf8_general_ci NO select,insert,update,references 
select * from information_schema.COLUMNS where table_name="t1"

and column_name= "a";

TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	COLUMN_NAME	ORDINAL_POSITION	COLUMN_DEFAULT	IS_NULLABLE	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	CHARACTER_SET_NAME	COLLATION_NAME	COLUMN_TYPE	COLUMN_KEY	EXTRA	PRIVILEGES	COLUMN_COMMENT

NULL	testtets	t1	a	1	NULL	YES	int	11	11	11	0	NULL	NULL	int(11)			select,insert,update,references	

NULL	testtets	t1	a	1	NULL	YES	int	NULL	NULL	11	0	NULL	NULL	int(11)			select,insert,update,references	

show columns from testtets.t1 where field like "%a%";

Field	Type	Null	Key	Default	Extra

a	int(11)	YES		NULL
@@ -476,15 +476,15 @@ select COLUMN_NAME,COLUMN_TYPE, CHARACTER_MAXIMUM_LENGTH, 
CHARACTER_OCTET_LENGTH, NUMERIC_PRECISION, NUMERIC_SCALE

from information_schema.columns where table_name= 't1';

COLUMN_NAME	COLUMN_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE

a	decimal(5,3)	7	7	5	3

b	decimal(5,1)	7	7	5	1

c	float(5,2)	5	5	5	2

d	decimal(6,4)	8	8	6	4

e	float	12	12	12	NULL

f	decimal(6,3)	8	8	6	3

g	int(11)	11	11	11	0

h	double(10,3)	10	10	10	3

i	double	22	22	22	NULL

a	decimal(5,3)	NULL	NULL	5	3

b	decimal(5,1)	NULL	NULL	5	1

c	float(5,2)	NULL	NULL	5	2

d	decimal(6,4)	NULL	NULL	6	4

e	float	NULL	NULL	12	NULL

f	decimal(6,3)	NULL	NULL	6	3

g	int(11)	NULL	NULL	11	0

h	double(10,3)	NULL	NULL	10	3

i	double	NULL	NULL	22	NULL

drop table t1;

create table t115 as select table_name, column_name, column_type

from information_schema.columns where table_name = 'proc';
@@ -678,3 +678,25 @@ WHERE A.TABLE_SCHEMA = B.TABLE_SCHEMA 
AND A.TABLE_NAME = B.TABLE_NAME);

COUNT(*)

0

create table t1

( x_bigint BIGINT,

x_integer INTEGER,

x_smallint SMALLINT,

x_decimal DECIMAL(5,3),

x_numeric NUMERIC(5,3),

x_real REAL,

x_float FLOAT,

x_double_precision DOUBLE PRECISION );

SELECT COLUMN_NAME, CHARACTER_MAXIMUM_LENGTH, CHARACTER_OCTET_LENGTH

FROM INFORMATION_SCHEMA.COLUMNS

WHERE TABLE_NAME= 't1';

COLUMN_NAME	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH

x_bigint	NULL	NULL

x_integer	NULL	NULL

x_smallint	NULL	NULL

x_decimal	NULL	NULL

x_numeric	NULL	NULL

x_real	NULL	NULL

x_float	NULL	NULL

x_double_precision	NULL	NULL

drop table t1;

mysql-test/t/information_schema.test

+18 −0
Original line number Diff line number Diff line
@@ -432,3 +432,21 @@ WHERE NOT EXISTS 
(SELECT * FROM INFORMATION_SCHEMA.COLUMNS B

  WHERE A.TABLE_SCHEMA = B.TABLE_SCHEMA

  AND A.TABLE_NAME = B.TABLE_NAME);



#

# Bug #9344  INFORMATION_SCHEMA, wrong content, numeric columns

#



create table t1

( x_bigint BIGINT,

  x_integer INTEGER,

  x_smallint SMALLINT,

  x_decimal DECIMAL(5,3),

  x_numeric NUMERIC(5,3),

  x_real REAL,

  x_float FLOAT,

  x_double_precision DOUBLE PRECISION );

SELECT COLUMN_NAME, CHARACTER_MAXIMUM_LENGTH, CHARACTER_OCTET_LENGTH

FROM INFORMATION_SCHEMA.COLUMNS

WHERE TABLE_NAME= 't1';

drop table t1;

sql/sql_show.cc

+22 −8
Original line number Diff line number Diff line
@@ -2334,12 +2334,26 @@ static int get_schema_column_record(THD *thd, struct st_table_list *tables, 
                   "NO" : "YES");

      table->field[6]->store((const char*) pos,

                             strlen((const char*) pos), cs);



      switch (field->type()) {

      case FIELD_TYPE_TINY_BLOB:

      case FIELD_TYPE_MEDIUM_BLOB:

      case FIELD_TYPE_LONG_BLOB:

      case FIELD_TYPE_BLOB:

      case FIELD_TYPE_VAR_STRING:

      case FIELD_TYPE_STRING:

        if (field->has_charset())

          table->field[8]->store((longlong) field->representation_length()/

                                 field->charset()->mbmaxlen);

        else

          table->field[8]->store((longlong) field->representation_length());

        table->field[8]->set_notnull();

        table->field[9]->store((longlong) field->representation_length());

        table->field[9]->set_notnull();

        break;

      default:

        break;

      }



      {

        uint dec =field->decimals();
@@ -3515,8 +3529,8 @@ ST_FIELD_INFO columns_fields_info[]= 
  {"COLUMN_DEFAULT", NAME_LEN, MYSQL_TYPE_STRING, 0, 1, "Default"},

  {"IS_NULLABLE", 3, MYSQL_TYPE_STRING, 0, 0, "Null"},

  {"DATA_TYPE", NAME_LEN, MYSQL_TYPE_STRING, 0, 0, 0},

  {"CHARACTER_MAXIMUM_LENGTH", 21 , MYSQL_TYPE_LONG, 0, 0, 0},

  {"CHARACTER_OCTET_LENGTH", 21 , MYSQL_TYPE_LONG, 0, 0, 0},

  {"CHARACTER_MAXIMUM_LENGTH", 21 , MYSQL_TYPE_LONG, 0, 1, 0},

  {"CHARACTER_OCTET_LENGTH", 21 , MYSQL_TYPE_LONG, 0, 1, 0},

  {"NUMERIC_PRECISION", 21 , MYSQL_TYPE_LONG, 0, 1, 0},

  {"NUMERIC_SCALE", 21 , MYSQL_TYPE_LONG, 0, 1, 0},

  {"CHARACTER_SET_NAME", 64, MYSQL_TYPE_STRING, 0, 1, 0},