mirror of
https://github.com/MariaDB/server.git
synced 2026-05-09 08:34:28 +02:00
merge
configure.in: Auto merged include/my_sys.h: Auto merged libmysql/libmysql.c: Auto merged sql/ha_berkeley.cc: Auto merged sql/handler.h: Auto merged sql/item_strfunc.cc: Auto merged sql/lex.h: Auto merged sql/mysqld.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_insert.cc: Auto merged sql/sql_lex.h: Auto merged sql/sql_select.cc: Auto merged sql/sql_string.h: Auto merged BitKeeper/etc/logging_ok: Auto merged
This commit is contained in:
commit
c7d2c59ceb
56 changed files with 1942 additions and 1502 deletions
|
|
@ -31,7 +31,7 @@ strstr:
|
|||
! if (*str++ == *search) {
|
||||
! i=(char*) str; j=(char*) search+1;
|
||||
|
||||
ldsb [%o1],%o2 ! g6= First char of search
|
||||
ldsb [%o1],%o2 ! o2= First char of search
|
||||
.top:
|
||||
ldsb [%o0],%g3 ! g3= First char of rest of str
|
||||
cmp %g3,0
|
||||
|
|
@ -70,6 +70,3 @@ strstr:
|
|||
.strstr_end:
|
||||
.size strstr,.strstr_end-strstr
|
||||
.ident "Matt Wagner & Monty"
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue