diff options
| author | unknown <ramil@mysql.com> | 2005-03-30 17:07:40 +0500 |
|---|---|---|
| committer | unknown <ramil@mysql.com> | 2005-03-30 17:07:40 +0500 |
| commit | 72aef9c2079eef3104d18e035a5de4ee2931b6a8 (patch) | |
| tree | 351ad59ed8e657c56594971ca07904b6ba65566a /strings | |
| parent | 32ff7adeb095f4fbdfc478478e661176d1724dee (diff) | |
| parent | 633a2468ec3407d1900b6cce276cc80a89d978a6 (diff) | |
| download | mariadb-git-72aef9c2079eef3104d18e035a5de4ee2931b6a8.tar.gz | |
Merge
include/violite.h:
Auto merged
mysql-test/r/ps_7ndb.result:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Manual merge
Diffstat (limited to 'strings')
| -rw-r--r-- | strings/my_strtoll10-x86.s | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/strings/my_strtoll10-x86.s b/strings/my_strtoll10-x86.s index e89e7ff5989..c04384667a7 100644 --- a/strings/my_strtoll10-x86.s +++ b/strings/my_strtoll10-x86.s @@ -394,7 +394,7 @@ my_strtoll10: popl %ebp ret -my_strtoll10_end: +.my_strtoll10_end: .size my_strtoll10,.my_strtoll10_end-my_strtoll10 .comm res,240,32 .comm end_ptr,120,32 |