5.5 merge

14 files changed, 26 insertions, 14 deletions

diff --git a/BUILD/compile-amd64-debug-max b/BUILD/compile-amd64-debug-max
index 273942df5f8..ebdf278b7d2 100755
--- a/BUILD/compile-amd64-debug-max
+++ b/BUILD/compile-amd64-debug-max
@@ -1,6 +1,7 @@
 #! /bin/sh
 
-# Copyright (C) 2005 MySQL AB
+# Copyright (c) 2005, 2006 MySQL AB
+# Use is subject to license terms
 # 
 # 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
diff --git a/BUILD/compile-amd64-max b/BUILD/compile-amd64-max
index c14f0d7104c..915129e1863 100755
--- a/BUILD/compile-amd64-max
+++ b/BUILD/compile-amd64-max
@@ -1,6 +1,7 @@
 #! /bin/sh
 
-# Copyright (C) 2005 MySQL AB
+# Copyright (c) 2005, 2006 MySQL AB
+# Use is subject to license terms
 # 
 # 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
diff --git a/BUILD/compile-darwin-mwcc b/BUILD/compile-darwin-mwcc
index 88747de77af..ad2990f2de1 100755
--- a/BUILD/compile-darwin-mwcc
+++ b/BUILD/compile-darwin-mwcc
@@ -1,6 +1,7 @@
 #! /bin/sh
 
-# Copyright (C) 2005 MySQL AB
+# Copyright (c) 2005, 2006 MySQL AB
+# Use is subject to license terms
 # 
 # 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
diff --git a/BUILD/compile-hpux11-parisc2-aCC b/BUILD/compile-hpux11-parisc2-aCC
index 5d0df465bc9..a4c9eb7abfa 100755
--- a/BUILD/compile-hpux11-parisc2-aCC
+++ b/BUILD/compile-hpux11-parisc2-aCC
@@ -1,6 +1,7 @@
 #!/bin/sh
 
-# Copyright (C) 2004, 2005 MySQL AB
+# Copyright (c) 2004, 2005, 2007 MySQL AB
+# Use is subject to license terms
 # 
 # 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
diff --git a/BUILD/compile-irix-mips64-mipspro b/BUILD/compile-irix-mips64-mipspro
index a8433c715ab..13df7ea2028 100755
--- a/BUILD/compile-irix-mips64-mipspro
+++ b/BUILD/compile-irix-mips64-mipspro
@@ -1,6 +1,7 @@
 #!/bin/sh
 
-# Copyright (C) 2004, 2005 MySQL AB
+# Copyright (c) 2004, 2005, 2007 MySQL AB
+# Use is subject to license terms
 # 
 # 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
diff --git a/BUILD/compile-ndb-autotest b/BUILD/compile-ndb-autotest
index e14855f1489..8002b4c5fad 100755
--- a/BUILD/compile-ndb-autotest
+++ b/BUILD/compile-ndb-autotest
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# Copyright (C) 2006 MySQL AB
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 # 
 # 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
diff --git a/BUILD/compile-pentium b/BUILD/compile-pentium
index 1da117541a4..fc3d070393d 100755
--- a/BUILD/compile-pentium
+++ b/BUILD/compile-pentium
@@ -1,6 +1,7 @@
 #! /bin/sh
 
-# Copyright (C) 2000, 2002 MySQL AB
+# Copyright (c) 2000-2002, 2007 MySQL AB
+# Use is subject to license terms
 # 
 # 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
diff --git a/BUILD/compile-pentium-debug-max-no-embedded b/BUILD/compile-pentium-debug-max-no-embedded
index 55aede7536f..e88542f5d24 100755
--- a/BUILD/compile-pentium-debug-max-no-embedded
+++ b/BUILD/compile-pentium-debug-max-no-embedded
@@ -1,6 +1,7 @@
 #! /bin/sh
 
-# Copyright (C) 2004, 2005 MySQL AB
+# Copyright (c) 2004-2006 MySQL AB
+# Use is subject to license terms
 # 
 # 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
diff --git a/BUILD/compile-pentium-debug-max-no-ndb b/BUILD/compile-pentium-debug-max-no-ndb
index cb8dbc7e364..3319307fc32 100755
--- a/BUILD/compile-pentium-debug-max-no-ndb
+++ b/BUILD/compile-pentium-debug-max-no-ndb
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# Copyright (C) 2005, 2007 MySQL AB
+# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
 # 
 # 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
diff --git a/BUILD/compile-pentium-max b/BUILD/compile-pentium-max
index 7bd063cd24a..77726735c79 100755
--- a/BUILD/compile-pentium-max
+++ b/BUILD/compile-pentium-max
@@ -1,6 +1,7 @@
 #! /bin/sh
 
-# Copyright (C) 2001, 2005 MySQL AB
+# Copyright (c) 2001-2006 MySQL AB
+# Use is subject to license terms
 # 
 # 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
diff --git a/BUILD/compile-ppc-debug b/BUILD/compile-ppc-debug
index 76b6bf65ce4..2ee49a9fda3 100755
--- a/BUILD/compile-ppc-debug
+++ b/BUILD/compile-ppc-debug
@@ -1,6 +1,7 @@
 #! /bin/sh
 
-# Copyright (C) 2004 MySQL AB
+# Copyright (c) 2004, 2006 MySQL AB
+# Use is subject to license terms
 # 
 # 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
diff --git a/BUILD/compile-ppc-debug-max b/BUILD/compile-ppc-debug-max
index b2c7ec18b3e..408f85f64e6 100755
--- a/BUILD/compile-ppc-debug-max
+++ b/BUILD/compile-ppc-debug-max
@@ -1,6 +1,7 @@
 #! /bin/sh
 
-# Copyright (C) 2004, 2005 MySQL AB
+# Copyright (c) 2004-2006 MySQL AB
+# Use is subject to license terms
 # 
 # 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
diff --git a/BUILD/compile-ppc-debug-max-no-ndb b/BUILD/compile-ppc-debug-max-no-ndb
index e77c517b302..958f6b09a11 100755
--- a/BUILD/compile-ppc-debug-max-no-ndb
+++ b/BUILD/compile-ppc-debug-max-no-ndb
@@ -1,6 +1,7 @@
 #! /bin/sh
 
-# Copyright (C) 2005 MySQL AB
+# Copyright (c) 2005, 2006 MySQL AB
+# Use is subject to license terms
 # 
 # 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
diff --git a/BUILD/compile-ppc-max b/BUILD/compile-ppc-max
index cd2ada87dd8..5aac6af60e9 100755
--- a/BUILD/compile-ppc-max
+++ b/BUILD/compile-ppc-max
@@ -1,6 +1,7 @@
 #! /bin/sh
 
-# Copyright (C) 2004, 2005 MySQL AB
+# Copyright (c) 2004-2006 MySQL AB
+# Use is subject to license terms
 # 
 # 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