1
0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00

Merge 10.5 into 10.6

This commit is contained in:
Marko Mäkelä
2024-11-29 12:37:46 +02:00
246 changed files with 2643 additions and 1635 deletions

View File

@@ -1130,10 +1130,11 @@ int mysql_prepare_delete(THD *thd, TABLE_LIST *table_list, Item **conds,
***************************************************************************/
extern "C" int refpos_order_cmp(void* arg, const void *a,const void *b)
extern "C" int refpos_order_cmp(void *arg, const void *a, const void *b)
{
handler *file= (handler*)arg;
return file->cmp_ref((const uchar*)a, (const uchar*)b);
auto file= static_cast<handler *>(arg);
return file->cmp_ref(static_cast<const uchar *>(a),
static_cast<const uchar *>(b));
}
/*