bk commit into 5.1 tree (tomas:1.2543)

[tomas]

Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas 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-07-12 11:14:21+02:00, tomas@stripped +3 -0
  post merge fixes

  sql/sql_show.cc@stripped, 2007-07-12 11:14:18+02:00, tomas@stripped +2 -2
    post merge fixes

  sql/table.cc@stripped, 2007-07-12 11:14:19+02:00, tomas@stripped +2 -2
    post merge fixes

  sql/unireg.cc@stripped, 2007-07-12 11:14:19+02:00, tomas@stripped +6 -6
    post merge fixes

diff -Nrup a/sql/sql_show.cc b/sql/sql_show.cc
--- a/sql/sql_show.cc	2007-07-12 09:41:22 +02:00
+++ b/sql/sql_show.cc	2007-07-12 11:14:18 +02:00
@@ -3302,11 +3302,11 @@ static int get_schema_column_record(THD 
         ((field->flags >> FIELD_STORAGE_FLAGS) & STORAGE_TYPE_MASK);
       enum column_format_type column_format= (enum column_format_type)
         ((field->flags >> COLUMN_FORMAT_FLAGS) & COLUMN_FORMAT_MASK);
-      pos=(byte*) (storage_type == HA_SM_DEFAULT ? "Default" :
+      pos=(uchar*)(storage_type == HA_SM_DEFAULT ? "Default" :
                    storage_type == HA_SM_DISK ? "Disk" : "Memory");
       table->field[19]->store((const char*) pos,
                               strlen((const char*) pos), cs);
-      pos=(byte*) (column_format == COLUMN_FORMAT_TYPE_DEFAULT ? "Default" :
+      pos=(uchar*)(column_format == COLUMN_FORMAT_TYPE_DEFAULT ? "Default" :
                    column_format == COLUMN_FORMAT_TYPE_FIXED ? "Fixed" :
                                                              "Dynamic");
       table->field[20]->store((const char*) pos,
diff -Nrup a/sql/table.cc b/sql/table.cc
--- a/sql/table.cc	2007-07-12 09:56:10 +02:00
+++ b/sql/table.cc	2007-07-12 11:14:19 +02:00
@@ -936,7 +936,7 @@ static int open_binary_frm(THD *thd, TAB
        COLUMN_FORMAT DYNAMIC|FIXED and STORAGE DISK|MEMORY
        TABLESPACE name is now stored in frm
       */
-      if ((char*)next_chunk >= buff_end)
+      if (next_chunk >= buff_end)
       {
         DBUG_PRINT("error", ("Found no field extra info"));
         goto err;
@@ -950,7 +950,7 @@ static int open_binary_frm(THD *thd, TAB
 
         share->default_storage_media= (enum ha_storage_media) (flags & 0x7);
 
-        const char *tablespace= next_chunk + format_section_header_size;
+        const char *tablespace= (const char*)next_chunk + format_section_header_size;
         uint tablespace_len= strlen(tablespace);
         if (tablespace_len != 0) 
         {
diff -Nrup a/sql/unireg.cc b/sql/unireg.cc
--- a/sql/unireg.cc	2007-07-12 09:41:22 +02:00
+++ b/sql/unireg.cc	2007-07-12 11:14:19 +02:00
@@ -278,26 +278,26 @@ bool mysql_create_frm(THD *thd, const ch
       /* 2 bytes left for future use */
     }
     /* write header */
-    if (my_write(file, (const byte*)buff, format_section_header_size, MYF_RW))
+    if (my_write(file, (const uchar*)buff, format_section_header_size, MYF_RW))
       goto err;
     /* write tablespace name */
     if (tablespace_len > 0)
-      if (my_write(file, (const byte*)create_info->tablespace, tablespace_len,
MYF_RW))
+      if (my_write(file, (const uchar*)create_info->tablespace, tablespace_len,
MYF_RW))
         goto err;
     buff[0]= 0;
-    if (my_write(file, (const byte*)buff, 1, MYF_RW))
+    if (my_write(file, (const uchar*)buff, 1, MYF_RW))
       goto err;
     /* write column info, 1 byte per column */
     {
-      List_iterator<create_field> it(create_fields);
-      create_field *field;
+      List_iterator<Create_field> it(create_fields);
+      Create_field *field;
       uchar storage_type, column_format, write_byte;
       while ((field=it++))
       {
         storage_type= (uchar)field->field_storage_type();
         column_format= (uchar)field->column_format();
         write_byte= storage_type + (column_format << COLUMN_FORMAT_SHIFT);
-        if (my_write(file, (const byte*)&write_byte, 1, MYF_RW))
+        if (my_write(file, &write_byte, 1, MYF_RW))
           goto err;
       }
     }