1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00

Merged the code of MWL#106 into 5.3

Resolved all conflicts, bad merges and fixed a few minor bugs in the code.
Commented out the queries from multi_update, view, subselect_sj, func_str,
derived_view, view_grant that failed either with crashes in ps-protocol or
with wrong results.
The failures are clear indications of some bugs in the code and these bugs
are to be fixed.
This commit is contained in:
Igor Babaev
2011-05-16 22:39:43 -07:00
92 changed files with 4191 additions and 1093 deletions

View File

@ -260,11 +260,13 @@ public:
list_node *node= first;
list_node *list_first= list->first;
elements=0;
while (node->info && node != list_first)
while (node != list_first)
{
prev= &node->next;
node= node->next;
elements++;
if (node == &end_of_list)
return;
}
*prev= *last;
last= prev;