Merge 10.2 into bb-10.2-ext

MariaDB · Jan 3, 2018 · 3fcbeb4 · 3fcbeb4
2 parents f7fd6ac + af0ba43
commit 3fcbeb4
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 17 deletions.
diff --git a/sql/sql_cache.cc b/sql/sql_cache.cc
@@ -1815,7 +1815,7 @@ Query_cache::send_result_to_client(THD *thd, char *org_sql, uint query_length)
           sql++;
           continue;
         }
-        /* fall trough */
+        /* fall through */
       default:
         break;
       }

diff --git a/sql/sql_trigger.cc b/sql/sql_trigger.cc
@@ -1601,7 +1601,7 @@ bool Table_triggers_list::check_n_load(THD *thd, const char *db,
       thd->spcont= save_spcont;
       thd->variables.sql_mode= save_sql_mode;
       thd->reset_db(save_db.str, save_db.length);
-      /* Fall trough to error */
+      /* Fall through to error */
     }
   }
 

diff --git a/sql/table.cc b/sql/table.cc
@@ -7431,7 +7431,6 @@ int TABLE::update_virtual_fields(handler *h, enum_vcol_update_mode update_mode)
       swap_values= 1;
       break;
     case VCOL_UPDATE_FOR_DELETE:
-      /* Fall trough */
     case VCOL_UPDATE_FOR_WRITE:
       update= bitmap_is_set(vcol_set, vf->field_index);
       break;

diff --git a/storage/maria/ma_search.c b/storage/maria/ma_search.c
@@ -745,11 +745,11 @@ void _ma_kpointer(register MARIA_HA *info, register uchar *buff, my_off_t pos)
   case 5: mi_int5store(buff,pos); break;
 #else
   case 7: *buff++=0;
-    /* fall trough */
+    /* fall through */
   case 6: *buff++=0;
-    /* fall trough */
+    /* fall through */
   case 5: *buff++=0;
-    /* fall trough */
+    /* fall through */
 #endif
   case 4: mi_int4store(buff,pos); break;
   case 3: mi_int3store(buff,pos); break;
@@ -881,13 +881,13 @@ void _ma_dpointer(MARIA_SHARE *share, uchar *buff, my_off_t pos)
   case 5: mi_int5store(buff,pos); break;
 #else
   case 8: *buff++=0;
-    /* fall trough */
+    /* fall through */
   case 7: *buff++=0;
-    /* fall trough */
+    /* fall through */
   case 6: *buff++=0;
-    /* fall trough */
+    /* fall through */
   case 5: *buff++=0;
-    /* fall trough */
+    /* fall through */
 #endif
   case 4: mi_int4store(buff,pos); break;
   case 3: mi_int3store(buff,pos); break;

diff --git a/storage/myisam/mi_search.c b/storage/myisam/mi_search.c
@@ -607,11 +607,11 @@ void _mi_kpointer(register MI_INFO *info, register uchar *buff, my_off_t pos)
   case 5: mi_int5store(buff,pos); break;
 #else
   case 7: *buff++=0;
-    /* fall trough */
+    /* fall through */
   case 6: *buff++=0;
-    /* fall trough */
+    /* fall through */
   case 5: *buff++=0;
-    /* fall trough */
+    /* fall through */
 #endif
   case 4: mi_int4store(buff,pos); break;
   case 3: mi_int3store(buff,pos); break;
@@ -728,13 +728,13 @@ void _mi_dpointer(MI_INFO *info, uchar *buff, my_off_t pos)
   case 5: mi_int5store(buff,pos); break;
 #else
   case 8: *buff++=0;
-    /* fall trough */
+    /* fall through */
   case 7: *buff++=0;
-    /* fall trough */
+    /* fall through */
   case 6: *buff++=0;
-    /* fall trough */
+    /* fall through */
   case 5: *buff++=0;
-    /* fall trough */
+    /* fall through */
 #endif
   case 4: mi_int4store(buff,pos); break;
   case 3: mi_int3store(buff,pos); break;