database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext

Browse Source
This commit is contained in:
Alexander Barkov
2017-10-18 14:11:55 +04:00
parent 75aabd03d5 3bc094d32a
commit 30e7d6709f
243 changed files with 10228 additions and 1301 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_test.cc
View File

@ -172,7 +172,7 @@ TEST_join(JOIN *join)
in order not to garble the tabular output below.
*/
String ref_key_parts[MAX_TABLES];
int tables_in_range= jt_range->end - jt_range->start;
int tables_in_range= (int)(jt_range->end - jt_range->start);
for (i= 0; i < tables_in_range; i++)
{
JOIN_TAB *tab= jt_range->start + i;