summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortim@sand.box <>2004-04-12 08:05:15 -0600
committertim@sand.box <>2004-04-12 08:05:15 -0600
commitcfc019af6ef889d049ef73be6c8f6ddaf4e2027f (patch)
tree368c3643259fca3ecfdaba886b234d80f330599b
parent7d3e633edc5db31c0698660ed644d7a18faea41c (diff)
downloadmariadb-git-cfc019af6ef889d049ef73be6c8f6ddaf4e2027f.tar.gz
Fix typos that resulted in adding names to the global namespace that
were never defined. This potentially caused problems when trying to link libmysqld with shared libraries.
-rw-r--r--BitKeeper/etc/logging_ok1
-rw-r--r--strings/longlong2str-x86.s2
-rw-r--r--strings/strings-x86.s2
3 files changed, 3 insertions, 2 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index 0e69c4151b4..9287f9a47fe 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -119,6 +119,7 @@ tfr@sarvik.tfr.cafe.ee
tim@bitch.mysql.fi
tim@black.box
tim@hundin.mysql.fi
+tim@sand.box
tim@threads.polyesthetic.msg
tim@white.box
tim@work.mysql.com
diff --git a/strings/longlong2str-x86.s b/strings/longlong2str-x86.s
index 98e60acbafb..03a61d312dd 100644
--- a/strings/longlong2str-x86.s
+++ b/strings/longlong2str-x86.s
@@ -132,7 +132,7 @@ longlong2str:
.size longlong2str,.Lfe3-longlong2str
.globl longlong10_to_str
- .type longlong10_str,@function
+ .type longlong10_to_str,@function
longlong10_to_str:
jmp longlong2str
diff --git a/strings/strings-x86.s b/strings/strings-x86.s
index 8b29a2db7f1..d4f303d9b16 100644
--- a/strings/strings-x86.s
+++ b/strings/strings-x86.s
@@ -402,4 +402,4 @@ next_str:
movl %edx,%ebx
ret
.strxmov_end:
- .size strxmov,strxmov_end-strxmov
+ .size strxmov,.strxmov_end-strxmov