database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge

Browse Source 
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
This commit is contained in:
unknown
2005-03-30 17:07:40 +05:00
parent 32ff7adeb0 633a2468ec
commit 72aef9c207
9 changed files with 31 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
strings/my_strtoll10-x86.s
View File

@ -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