diff options
| author | unknown <kent@mysql.com/kent-amd64.(none)> | 2006-12-31 01:04:07 +0100 |
|---|---|---|
| committer | unknown <kent@mysql.com/kent-amd64.(none)> | 2006-12-31 01:04:07 +0100 |
| commit | 27ecbeecdc0a064d0ff5ea88abe01e786fcc5b99 (patch) | |
| tree | ccace61b3d37f7480a06ecda03b0cfc451f58474 /myisam/ft_test1.h | |
| parent | cc5abe68ebb398434db7896defacf858d2ccbe3c (diff) | |
| parent | e2765a84b174af95f1b507c7e30e136301de5bd3 (diff) | |
| download | mariadb-git-27ecbeecdc0a064d0ff5ea88abe01e786fcc5b99.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 'myisam/ft_test1.h')
| -rw-r--r-- | myisam/ft_test1.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/myisam/ft_test1.h b/myisam/ft_test1.h index 4b991ff9502..4b466818460 100644 --- a/myisam/ft_test1.h +++ b/myisam/ft_test1.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB +/* Copyright (C) 2000-2001 MySQL AB This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by |