summaryrefslogtreecommitdiff
path: root/strings/strings.asm
diff options
context:
space:
mode:
authorunknown <kent@mysql.com/kent-amd64.(none)>2006-12-31 01:04:07 +0100
committerunknown <kent@mysql.com/kent-amd64.(none)>2006-12-31 01:04:07 +0100
commit428833ab34db61186acbaf2fad1718a5f703b9e3 (patch)
treeccace61b3d37f7480a06ecda03b0cfc451f58474 /strings/strings.asm
parent371513975168820bce024e052dc619e010ea187e (diff)
parent19aa05de5d601385c9f724ab171b461068520da1 (diff)
downloadmariadb-git-428833ab34db61186acbaf2fad1718a5f703b9e3.tar.gz
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/kent/bk/main/mysql-5.0 myisam/mi_check.c: Auto merged myisam/mi_dynrec.c: Auto merged myisam/mi_packrec.c: Auto merged myisam/mi_range.c: Auto merged myisam/mi_test1.c: Auto merged myisam/mi_write.c: Auto merged myisam/rt_split.c: Auto merged sql/opt_range.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_insert.cc: Auto merged
Diffstat (limited to 'strings/strings.asm')
-rw-r--r--strings/strings.asm2
1 files changed, 1 insertions, 1 deletions
diff --git a/strings/strings.asm b/strings/strings.asm
index c6481b065fc..2224025cc72 100644
--- a/strings/strings.asm
+++ b/strings/strings.asm
@@ -1,4 +1,4 @@
-; Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+; Copyright (C) 2000, 2003 MySQL AB
;
; This library is free software; you can redistribute it and/or
; modify it under the terms of the GNU Library General Public