merge

dcd40a68 · Vladislav Vaintroub · 154c0c19 · 567eae73 · dcd40a68 · dcd40a68
Commit dcd40a68 authored Dec 23, 2009 by Vladislav Vaintroub
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

include/atomic/x86-gcc.h include/atomic/x86-gcc.h +1 -1

libmysqld/libmysqld.def libmysqld/libmysqld.def +1 -0

No files found.
--- a/include/atomic/x86-gcc.h
+++ b/include/atomic/x86-gcc.h
@@ -108,7 +108,7 @@
  int32 ebx=(set & 0xFFFFFFFF), ecx=(set >> 32);                \
  asm volatile ("push %%ebx; movl %3, %%ebx;"                   \
                LOCK_prefix "; cmpxchg8b %0; setz %2; pop %%ebx"\
-               : "+m" (*a), "+A" (*cmp), "=q" (ret)             \
+               : "+m" (*a), "+A" (*cmp), "=c" (ret)             \
               :"m" (ebx), "c" (ecx))
 #endif


--- a/libmysqld/libmysqld.def
+++ b/libmysqld/libmysqld.def
@@ -104,3 +104,4 @@ EXPORTS
 	mysql_stmt_attr_get
 	mysql_stmt_attr_set
 	mysql_stmt_field_count
+	mysql_stmt_next_result