mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 03:52:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 10.1 into 10.2

Browse source
This commit is contained in:
Marko Mäkelä 2018-01-03 20:42:09 +02:00
commit fcde91114d
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

@ -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;
}

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;
#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;

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;
#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;