summaryrefslogtreecommitdiff
path: root/sql/field.h
diff options
context:
space:
mode:
authorunknown <cmiller@zippy.cornsilk.net>2007-01-11 09:43:44 -0500
committerunknown <cmiller@zippy.cornsilk.net>2007-01-11 09:43:44 -0500
commitc97f7e7cb9b47d3ab14ae1e04f8c376dec7e537f (patch)
tree34d41ad8c284475b2d4ee62fc50423f81db6a9ae /sql/field.h
parente9f6b35391d569c43a4ea37f1fee559b4145db43 (diff)
parent50361d9a44ddce3d0253feba9c658a17b2b0a517 (diff)
downloadmariadb-git-c97f7e7cb9b47d3ab14ae1e04f8c376dec7e537f.tar.gz
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint include/my_global.h: Auto merged mysql-test/Makefile.am: Auto merged mysql-test/lib/mtr_cases.pl: Auto merged mysql-test/lib/mtr_process.pl: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/t/myisam.test: Auto merged mysql-test/t/mysqladmin.test: Auto merged mysql-test/t/rpl_rotate_logs.test: Auto merged scripts/make_binary_distribution.sh: Auto merged scripts/mysqlbug.sh: Auto merged sql/field.cc: Auto merged sql/field.h: Auto merged sql/item_sum.h: Auto merged sql/mysqld.cc: Auto merged sql/opt_range.cc: Auto merged sql/sql_class.h: Auto merged Makefile.am: manual merge mysql-test/t/trigger.test: manual merge strings/ctype-extra.c: manual merge
Diffstat (limited to 'sql/field.h')
-rw-r--r--sql/field.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/field.h b/sql/field.h
index 8214848c169..6656ddb36c3 100644
--- a/sql/field.h
+++ b/sql/field.h
@@ -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