database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

Merge 5.3 -> 5.5

Browse Source
This commit is contained in:
Sergey Petrunya
2012-06-20 15:01:28 +04:00
parent 0b93b444b6 584d923c32
commit 8c762965d3
24 changed files with 556 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_class.h
View File

@@ -3525,7 +3525,8 @@ public:
if (copy_field) /* Fix for Intel compiler */
{
delete [] copy_field;
save_copy_field= copy_field= 0;
save_copy_field= copy_field= NULL;
save_copy_field_end= copy_field_end= NULL;
}
}
};