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

Merge with 5.1-release.

Browse Source 
- Fixed problem with oqgraph and 'make dist'

Note that after this merge we have a problem show in join_outer where we examine too many rows in one specific case (related to BUG#57024).
This will be fixed when mwl#128 is merged into 5.3.
This commit is contained in:
Michael Widenius
2010-12-06 10:25:44 +02:00
parent ab5e4eefd5 b3c72b9a02
commit b7b25dc666
604 changed files with 12868 additions and 6394 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_load.cc
View File

@ -1152,7 +1152,7 @@ READ_INFO::~READ_INFO()
if (need_end_io_cache)
::end_io_cache(&cache);
}
my_free((uchar*) buffer,MYF(MY_ALLOW_ZERO_PTR));
my_free(buffer, MYF(MY_ALLOW_ZERO_PTR));
}