[Commits] Rev 2883: compilation failures caused by adding new row format to Aria in http://bazaar.launchpad.net/~maria-captains/maria/5.3/

serg at askmonty.org serg at askmonty.org
Fri Jan 14 22:00:50 EET 2011


At http://bazaar.launchpad.net/~maria-captains/maria/5.3/

------------------------------------------------------------
revno: 2883
revision-id: sergii at pisem.net-20110114200045-obqikag8pft9itmp
parent: sergii at pisem.net-20110114110546-mc6az4n1lmg0vmsq
committer: Sergei Golubchik <sergii at pisem.net>
branch nick: 5.3-monty
timestamp: Fri 2011-01-14 21:00:45 +0100
message:
  compilation failures caused by adding new row format to Aria
-------------- next part --------------
=== modified file 'storage/maria/ma_open.c'
--- a/storage/maria/ma_open.c	2011-01-14 11:03:41 +0000
+++ b/storage/maria/ma_open.c	2011-01-14 20:00:45 +0000
@@ -467,6 +467,9 @@ MARIA_HA *maria_open(const char *name, i
     {
       DBUG_PRINT("error",("Wrong key info:  Max_key_length: %d  keys: %d  key_parts: %d", share->base.max_key_length, keys, key_parts));
       my_errno=HA_ERR_UNSUPPORTED;
+      my_error(my_errno, MYF(ME_JUST_WARNING),
+               "Wrong key info:  Max_key_length: %d  keys: %d  key_parts: %d",
+               share->base.max_key_length, keys, key_parts);
       goto err;
     }
 
@@ -488,6 +491,10 @@ MARIA_HA *maria_open(const char *name, i
                            (uint) share->base.block_size,
                            (uint) maria_block_size));
       my_errno=HA_ERR_UNSUPPORTED;
+      my_error(my_errno, MYF(ME_JUST_WARNING),
+               "Wrong block size %u; Expected %u",
+               (uint) share->base.block_size, 
+               (uint) maria_block_size);
       goto err;
     }
 

=== modified file 'storage/myisam/mi_check.c'
--- a/storage/myisam/mi_check.c	2010-11-19 21:33:47 +0000
+++ b/storage/myisam/mi_check.c	2011-01-14 20:00:45 +0000
@@ -993,9 +993,6 @@ int chk_data_link(HA_CHECK *param, MI_IN
     if (killed_ptr(param))
       goto err2;
     switch (info->s->data_file_type) {
-    case BLOCK_RECORD:
-      DBUG_ASSERT(0);                           /* Impossible */
-      break;
     case STATIC_RECORD:
       if (my_b_read(&param->read_cache,(uchar*) record,
                     info->s->base.pack_reclength))
@@ -1213,6 +1210,9 @@ int chk_data_link(HA_CHECK *param, MI_IN
       link_used+= (block_info.filepos - start_recpos);
       used+= (pos-start_recpos);
       break;
+    default:
+      DBUG_ASSERT(0);                           /* Impossible */
+      break;
     } /* switch */
     if (! got_error)
     {
@@ -3270,9 +3270,6 @@ static int sort_get_next_record(MI_SORT_
     DBUG_RETURN(1);
 
   switch (share->data_file_type) {
-  case BLOCK_RECORD:
-    DBUG_ASSERT(0);                           /* Impossible */
-    break;
   case STATIC_RECORD:
     for (;;)
     {
@@ -3666,6 +3663,9 @@ static int sort_get_next_record(MI_SORT_
                                                            record));
       DBUG_RETURN(0);
     }
+    default:
+      DBUG_ASSERT(0);                           /* Impossible */
+      break;
   }
   DBUG_RETURN(1);                               /* Impossible */
 }
@@ -3702,9 +3702,6 @@ int sort_write_record(MI_SORT_PARAM *sor
   if (sort_param->fix_datafile)
   {
     switch (sort_info->new_data_file_type) {
-    case BLOCK_RECORD:
-      DBUG_ASSERT(0);                           /* Impossible */
-      break;
     case STATIC_RECORD:
       if (my_b_write(&info->rec_cache,sort_param->record,
                      share->base.pack_reclength))
@@ -3778,6 +3775,9 @@ int sort_write_record(MI_SORT_PARAM *sor
       sort_param->filepos+=reclength+length;
       info->s->state.split++;
       break;
+    default:
+      DBUG_ASSERT(0);                           /* Impossible */
+      break;
     }
   }
   if (sort_param->master)



More information about the commits mailing list