diff options
author | monty@mysql.com <> | 2004-05-05 17:05:24 +0300 |
---|---|---|
committer | monty@mysql.com <> | 2004-05-05 17:05:24 +0300 |
commit | d21d49a32a1689d2c486a449574e120d7a2f60c4 (patch) | |
tree | 3238bd16530e02dbfef96513749a73b7294880f8 /strings | |
parent | 104fdf607d312bb13f24063d28d993243bf24ca2 (diff) | |
parent | e51887b05082622a1882217b7f8ec8ae7f6b4598 (diff) | |
download | mariadb-git-d21d49a32a1689d2c486a449574e120d7a2f60c4.tar.gz |
Merge with 4.0.19
Diffstat (limited to 'strings')
-rw-r--r-- | strings/longlong2str-x86.s | 2 | ||||
-rw-r--r-- | strings/strings-x86.s | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/strings/longlong2str-x86.s b/strings/longlong2str-x86.s index 3bfd1777e18..8476bf49b75 100644 --- a/strings/longlong2str-x86.s +++ b/strings/longlong2str-x86.s @@ -142,7 +142,7 @@ longlong2str: .align 4 .globl longlong10_to_str - .type longlong10_str,@function + .type longlong10_to_str,@function longlong10_to_str: subl $80,%esp pushl %ebp diff --git a/strings/strings-x86.s b/strings/strings-x86.s index 9409657e06c..d316c34febb 100644 --- a/strings/strings-x86.s +++ b/strings/strings-x86.s @@ -412,4 +412,4 @@ next_str: movl %edx,%ebx ret .strxmov_end: - .size strxmov,strxmov_end-strxmov + .size strxmov,.strxmov_end-strxmov |