bk commit into 5.2 tree (gluh:1.2594)

[gluh]

Below is the list of changes that have just been committed into a local
5.2 repository of gluh. When gluh 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@stripped, 2007-09-20 17:34:29+05:00, gluh@stripped +2 -0
  after merge fix

  mysql-test/suite/rpl_ndb/r/rpl_ndb_extraColMaster.result@stripped, 2007-09-20 17:34:27+05:00, gluh@stripped +4 -4
    result fix

  sql/sql_show.cc@stripped, 2007-09-20 17:34:27+05:00, gluh@stripped +0 -6
    after merge fix

diff -Nrup a/mysql-test/suite/rpl_ndb/r/rpl_ndb_extraColMaster.result b/mysql-test/suite/rpl_ndb/r/rpl_ndb_extraColMaster.result
--- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_extraColMaster.result	2007-09-14 14:20:43 +05:00
+++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_extraColMaster.result	2007-09-20 17:34:27 +05:00
@@ -562,7 +562,7 @@ Replicate_Do_Table	
 Replicate_Ignore_Table	
 Replicate_Wild_Do_Table	
 Replicate_Wild_Ignore_Table	
-Last_Errno	1533
+Last_Errno	1534
 Last_Error	Table definition on master and slave does not match: Column 2 type mismatch - received type 5, test.t10 has type 254
 Skip_Counter	0
 Exec_Master_Log_Pos	#
@@ -580,7 +580,7 @@ Seconds_Behind_Master	#
 Master_SSL_Verify_Server_Cert	No
 Last_IO_Errno	#
 Last_IO_Error	#
-Last_SQL_Errno	1533
+Last_SQL_Errno	1534
 Last_SQL_Error	Table definition on master and slave does not match: Column 2 type mismatch - received type 5, test.t10 has type 254
 SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
 START SLAVE;
@@ -637,7 +637,7 @@ Replicate_Do_Table	
 Replicate_Ignore_Table	
 Replicate_Wild_Do_Table	
 Replicate_Wild_Ignore_Table	
-Last_Errno	1533
+Last_Errno	1534
 Last_Error	Table definition on master and slave does not match: Column 2 type mismatch - received type 252, test.t11 has type 15
 Skip_Counter	0
 Exec_Master_Log_Pos	#
@@ -655,7 +655,7 @@ Seconds_Behind_Master	#
 Master_SSL_Verify_Server_Cert	No
 Last_IO_Errno	#
 Last_IO_Error	#
-Last_SQL_Errno	1533
+Last_SQL_Errno	1534
 Last_SQL_Error	Table definition on master and slave does not match: Column 2 type mismatch - received type 252, test.t11 has type 15
 SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
 START SLAVE;
diff -Nrup a/sql/sql_show.cc b/sql/sql_show.cc
--- a/sql/sql_show.cc	2007-09-20 16:41:48 +05:00
+++ b/sql/sql_show.cc	2007-09-20 17:34:27 +05:00
@@ -3803,12 +3803,6 @@ static int get_schema_column_record(THD 
     table->field[3]->store(field->field_name, strlen(field->field_name),
                            cs);
     table->field[4]->store((longlong) count, TRUE);
-    field->sql_type(type);
-    table->field[14]->store(type.ptr(), type.length(), cs);		
-    tmp_buff= strchr(type.ptr(), '(');
-    table->field[7]->store(type.ptr(),
-                           (tmp_buff ? tmp_buff - type.ptr() :
-                            type.length()), cs);
 
     if (get_field_default_value(thd, show_table, field, &type, 0))
     {