diff options
author | unknown <monty@narttu.mysql.fi> | 2000-11-16 00:24:11 +0200 |
---|---|---|
committer | unknown <monty@narttu.mysql.fi> | 2000-11-16 00:24:11 +0200 |
commit | c7d2c59ceb4e3548eb74e5d8fba16e0f41ffc7d9 (patch) | |
tree | 31119bae32d48d3c415144eb5aed588455eefa1a /strings/strstr-sparc.s | |
parent | dcf4e49369d91b78ab73b9de038d2729afb3a2a6 (diff) | |
parent | 9a846a52ae62f701c2d54d3f468e2ead393acf91 (diff) | |
download | mariadb-git-c7d2c59ceb4e3548eb74e5d8fba16e0f41ffc7d9.tar.gz |
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
Diffstat (limited to 'strings/strstr-sparc.s')
-rw-r--r-- | strings/strstr-sparc.s | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/strings/strstr-sparc.s b/strings/strstr-sparc.s index 141c3aa4209..1263236f107 100644 --- a/strings/strstr-sparc.s +++ b/strings/strstr-sparc.s @@ -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" - - - |