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

Merge magare.gmz:/home/kgeorge/mysql/work/mysql-5.0-opt

Browse Source 
into  magare.gmz:/home/kgeorge/mysql/work/merge-5.1-opt
This commit is contained in:
gkodinov/kgeorge@magare.gmz
2007-11-23 12:26:19 +02:00
parent 5f1966d172 3f163915bf
commit 784b5d7b72
17 changed files with 236 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/sql_string.cc
View File

@ -846,7 +846,7 @@ outp:
with optional left padding (for binary -> UCS2 conversion)
SYNOPSIS
well_formed_copy_nhars()
well_formed_copy_nchars()
to Store result here
to_length Maxinum length of "to" string
to_cs Character set of "to" string
@ -983,7 +983,10 @@ outp:
goto outp;
}
else
{
from= from_prev;
break;
}
}
*from_end_pos= from;
res= to - to_start;