bk commit into 5.0 tree (aivanov:1.1984) BUG#12301

[Alex Ivanov]

Below is the list of changes that have just been committed into a local
5.0 repository of alexi. When alexi does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1984 05/08/16 23:11:04 aivanov@stripped +3 -0
  information_schema.test:
    Added a comment line for a test case used for bug #12301.
  information_schema.result:
    Fixed some test cases results (bug #12301).
  sql_show.cc:
    Fixed bug #12301.
    The bug was due to a missing value setting for the NUMERIC_SCALE column
     in the get_schema_column_record() function (sql_show.cc).

  mysql-test/t/information_schema.test
    1.51 05/08/16 23:07:16 aivanov@stripped +1 -0
    Added a comment line for a test case used for bug #12301.

  mysql-test/r/information_schema.result
    1.72 05/08/16 22:59:45 aivanov@stripped +7 -7
    Fixed some test cases results (bug #12301).

  sql/sql_show.cc
    1.268 05/08/16 22:09:23 aivanov@stripped +2 -0
    Fixed bug #12301.
    The bug was due to a missing value setting for the NUMERIC_SCALE column
     in the get_schema_column_record() function (sql_show.cc).

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	aivanov
# Host:	mysql.creware.com
# Root:	/home/alexi/dev/mysql-5.0-1

--- 1.267/sql/sql_show.cc	2005-08-16 13:18:29 +04:00
+++ 1.268/sql/sql_show.cc	2005-08-16 22:09:23 +04:00
@@ -2513,6 +2513,8 @@
         {
           table->field[10]->store((longlong) field->max_length() - 1);
           table->field[10]->set_notnull();
+          table->field[11]->store((longlong) 0);
+          table->field[11]->set_notnull();
           break;
         }
         case FIELD_TYPE_BIT:

--- 1.71/mysql-test/r/information_schema.result	2005-08-15 20:14:29 +04:00
+++ 1.72/mysql-test/r/information_schema.result	2005-08-16 22:59:45 +04:00
@@ -165,7 +165,7 @@
 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	mysqltest	t1	a	1	NULL	YES	int	NULL	NULL	10	NULL	NULL	NULL	int(11)			select,insert,update,references	
+NULL	mysqltest	t1	a	1	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
 show columns from mysqltest.t1 where field like "%a%";
 Field	Type	Null	Key	Default	Extra
 a	int(11)	YES		NULL	
@@ -535,7 +535,7 @@
 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	10	NULL
+g	int(11)	NULL	NULL	10	0
 h	double(10,3)	NULL	NULL	10	3
 i	double	NULL	NULL	22	NULL
 drop table t1;
@@ -941,11 +941,11 @@
 from information_schema.columns
 where table_name='t1';
 column_name	NUMERIC_PRECISION	NUMERIC_SCALE
-f1	3	NULL
-f2	5	NULL
-f3	7	NULL
-f4	10	NULL
-f5	19	NULL
+f1	3	0
+f2	5	0
+f3	7	0
+f4	10	0
+f5	19	0
 f6	1	NULL
 f7	64	NULL
 drop table t1;

--- 1.50/mysql-test/t/information_schema.test	2005-08-15 20:14:29 +04:00
+++ 1.51/mysql-test/t/information_schema.test	2005-08-16 23:07:16 +04:00
@@ -615,6 +615,7 @@
 
 #
 # Bug #11057 information_schema: columns table has some questionable contents
+# Bug #12301 information_schema: NUMERIC_SCALE must be 0 for integer columns
 #
 create table t1(f1 LONGBLOB, f2 LONGTEXT);
 select column_name,data_type,CHARACTER_OCTET_LENGTH,