database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

Merge tag 'mysql-5.5.44' into bb-5.5-serg

Browse Source
This commit is contained in:
Sergei Golubchik
2015-06-05 02:06:51 +02:00
parent f07b3463e7 31c803e8d0
commit f84f577aa1
27 changed files with 233 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
storage/myisam/rt_split.c
View File

@@ -1,5 +1,5 @@
/*
Copyright (c) 2002, 2010, Oracle and/or its affiliates
Copyright (c) 2002, 2015, Oracle and/or its affiliates
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -69,6 +69,10 @@ static double mbr_join_square(const double *a, const double *b, int n_dim)
b += 2;
}while (a != end);
/* Check for infinity or NaN */
if (my_isinf(square) || isnan(square))
square = DBL_MAX;
return square;
}
@@ -103,6 +107,9 @@ static void pick_seeds(SplitStruct *node, int n_entries,
double max_d = -DBL_MAX;
double d;
*seed_a = node;
*seed_b = node + 1;
for (cur1 = node; cur1 < lim1; ++cur1)
{
for (cur2=cur1 + 1; cur2 < lim2; ++cur2)