1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge 10.0 into 10.1

Browse Source
This commit is contained in:
Marko Mäkelä 2018-01-03 20:41:34 +02:00
commit 1e89c86dd7
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_cache.cc
View File

@ -1788,7 +1788,7 @@ Query_cache::send_result_to_client(THD *thd, char *org_sql, uint query_length)
sql++; sql++;
continue; continue;
} }
/* fall trough */ /* fall through */
default: default:
break; break;
} }

14
storage/maria/ma_search.c
View File

@ -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; case 5: mi_int5store(buff,pos); break;
#else #else
case 7: *buff++=0; case 7: *buff++=0;
/* fall trough */ /* fall through */
case 6: *buff++=0; case 6: *buff++=0;
/* fall trough */ /* fall through */
case 5: *buff++=0; case 5: *buff++=0;
/* fall trough */ /* fall through */
#endif #endif
case 4: mi_int4store(buff,pos); break; case 4: mi_int4store(buff,pos); break;
case 3: mi_int3store(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; case 5: mi_int5store(buff,pos); break;
#else #else
case 8: *buff++=0; case 8: *buff++=0;
/* fall trough */ /* fall through */
case 7: *buff++=0; case 7: *buff++=0;
/* fall trough */ /* fall through */
case 6: *buff++=0; case 6: *buff++=0;
/* fall trough */ /* fall through */
case 5: *buff++=0; case 5: *buff++=0;
/* fall trough */ /* fall through */
#endif #endif
case 4: mi_int4store(buff,pos); break; case 4: mi_int4store(buff,pos); break;
case 3: mi_int3store(buff,pos); break; case 3: mi_int3store(buff,pos); break;

14
storage/myisam/mi_search.c
View File

@ -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; case 5: mi_int5store(buff,pos); break;
#else #else
case 7: *buff++=0; case 7: *buff++=0;
/* fall trough */ /* fall through */
case 6: *buff++=0; case 6: *buff++=0;
/* fall trough */ /* fall through */
case 5: *buff++=0; case 5: *buff++=0;
/* fall trough */ /* fall through */
#endif #endif
case 4: mi_int4store(buff,pos); break; case 4: mi_int4store(buff,pos); break;
case 3: mi_int3store(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; case 5: mi_int5store(buff,pos); break;
#else #else
case 8: *buff++=0; case 8: *buff++=0;
/* fall trough */ /* fall through */
case 7: *buff++=0; case 7: *buff++=0;
/* fall trough */ /* fall through */
case 6: *buff++=0; case 6: *buff++=0;
/* fall trough */ /* fall through */
case 5: *buff++=0; case 5: *buff++=0;
/* fall trough */ /* fall through */
#endif #endif
case 4: mi_int4store(buff,pos); break; case 4: mi_int4store(buff,pos); break;
case 3: mi_int3store(buff,pos); break; case 3: mi_int3store(buff,pos); break;