diff options
| author | unknown <istruewing@chilla.local> | 2007-01-03 08:52:50 +0100 |
|---|---|---|
| committer | unknown <istruewing@chilla.local> | 2007-01-03 08:52:50 +0100 |
| commit | 5be1fda5b9ac1b55042c14c40b8c8c57dd01d981 (patch) | |
| tree | ea90140f6a6294213c207d5029e87254a2a9434e /sql/sql_update.cc | |
| parent | 4518b47aafa36342c15ff7a8063a2de1dc300f74 (diff) | |
| parent | 2e99ee900ac48cfb406f88b9418bfd99a55d3f55 (diff) | |
| download | mariadb-git-5be1fda5b9ac1b55042c14c40b8c8c57dd01d981.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into chilla.local:/home/mydev/mysql-5.0-axmrg
myisam/mi_dynrec.c:
Auto merged
myisam/mi_locking.c:
Auto merged
myisam/mi_open.c:
Auto merged
myisam/mi_update.c:
Auto merged
myisam/mi_write.c:
Auto merged
myisam/myisamdef.h:
Auto merged
sql/lock.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/table.cc:
Auto merged
Diffstat (limited to 'sql/sql_update.cc')
| -rw-r--r-- | sql/sql_update.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_update.cc b/sql/sql_update.cc index b92066ddece..4043fe17a46 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -1,4 +1,4 @@ -/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB +/* Copyright (C) 2000-2006 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 |