1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00

5.5 merge

This commit is contained in:
Sergei Golubchik
2013-01-29 15:10:47 +01:00
372 changed files with 11040 additions and 2969 deletions

View File

@ -1296,7 +1296,7 @@ public:
if (tree->elements == 0)
return (ulonglong) tree->elements_in_tree();
count= 0;
tree->walk(count_distinct_walk, (void*) &count);
tree->walk(table_field->table, count_distinct_walk, (void*) &count);
return count;
}
};