diff options
| author | unknown <monty@mysql.com> | 2004-05-05 17:05:24 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-05-05 17:05:24 +0300 |
| commit | 3b887983bfc19585825ec528a80118f2c93f2b04 (patch) | |
| tree | 3238bd16530e02dbfef96513749a73b7294880f8 /strings/longlong2str-x86.s | |
| parent | f347b37403b7ca828537eaf2cc1d9efb363bf0b7 (diff) | |
| parent | a58aa393f2d914e3eb4e422b25fd4ef3665151a3 (diff) | |
| download | mariadb-git-3b887983bfc19585825ec528a80118f2c93f2b04.tar.gz | |
Merge with 4.0.19
BitKeeper/etc/logging_ok:
auto-union
VC++Files/client/mysqlclient.dsp:
Auto merged
VC++Files/mysql.dsw:
Auto merged
extra/perror.c:
Auto merged
extra/replace.c:
Auto merged
innobase/configure.in:
Auto merged
innobase/include/lock0lock.h:
Auto merged
innobase/include/row0mysql.h:
Auto merged
innobase/include/sync0sync.h:
Auto merged
innobase/lock/lock0lock.c:
Auto merged
ltmain.sh:
Auto merged
BitKeeper/deleted/.del-libmysqld.def~8edf7b8780ce943c:
Auto merged
innobase/os/os0file.c:
Auto merged
innobase/pars/lexyy.c:
Auto merged
innobase/row/row0mysql.c:
Auto merged
innobase/srv/srv0srv.c:
Auto merged
innobase/srv/srv0start.c:
Auto merged
innobase/sync/sync0arr.c:
Auto merged
innobase/sync/sync0sync.c:
Auto merged
innobase/trx/trx0trx.c:
Auto merged
mysql-test/r/alias.result:
Auto merged
mysql-test/t/system_mysql_db_fix-master.opt:
Auto merged
mysql-test/r/func_time.result:
Automatic merge
mysql-test/r/innodb.result:
Automatic merge
mysql-test/t/alias.test:
Automatic merge
mysql-test/t/create.test:
Automatic merge
mysql-test/t/func_time.test:
Automatic merge
sql/ha_innodb.cc:
Automatic merge
sql/mysql_priv.h:
Automatic merge
mysql-test/r/rpl_multi_update.result:
Automatic merge
mysql-test/t/rpl_error_ignored_table.test:
Automatic merge
mysql-test/t/rpl_multi_update.test:
Automatic merge
sql/slave.h:
Automatic merge
sql/sql_base.cc:
Automatic merge
sql/sql_db.cc:
Automatic merge
sql/sql_insert.cc:
Automatic merge
sql/structs.h:
Automatic merge
sql/table.cc:
Automatic merge
strings/longlong2str-x86.s:
Automatic merge
strings/strings-x86.s:
Automatic merge
support-files/my-medium.cnf.sh:
Automatic merge
Diffstat (limited to 'strings/longlong2str-x86.s')
| -rw-r--r-- | strings/longlong2str-x86.s | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/strings/longlong2str-x86.s b/strings/longlong2str-x86.s index 3bfd1777e18..8476bf49b75 100644 --- a/strings/longlong2str-x86.s +++ b/strings/longlong2str-x86.s @@ -142,7 +142,7 @@ longlong2str: .align 4 .globl longlong10_to_str - .type longlong10_str,@function + .type longlong10_to_str,@function longlong10_to_str: subl $80,%esp pushl %ebp |