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

5.5 merge

Browse Source
This commit is contained in:
Sergei Golubchik
2013-03-27 23:41:02 +01:00
parent 1827d9591e 6599fd3e9c
commit 993ea79f2d
627 changed files with 17021 additions and 18027 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_string.cc
View File

@ -796,7 +796,7 @@ copy_and_convert(char *to, uint32 to_length, CHARSET_INFO *to_cs,
uint32 length= min(to_length, from_length), length2= length;
#if defined(__i386__)
#if defined(__i386__) || defined(__x86_64__)
/*
Special loop for i386, it allows to refer to a
non-aligned memory block as UINT32, which makes