Merge with 5.2.

no_error handling for select (used by INSERT ... SELECT) still needs to be fixed, but I will do that in a separate commit

1 files changed, 18 insertions, 2 deletions

diff --git a/sql/message.h b/sql/message.h
index 0e7c282d5a1..f0acc03b9bb 100644
--- a/sql/message.h
+++ b/sql/message.h
@@ -1,3 +1,19 @@
+/* Copyright (c) 2008 Sun Microsystems, Inc.

+   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

+   the Free Software Foundation; version 2 of the License.

+

+   This program is distributed in the hope that it will be useful,

+   but WITHOUT ANY WARRANTY; without even the implied warranty of

+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+   GNU General Public License for more details.

+

+   You should have received a copy of the GNU General Public License

+   along with this program; if not, write to the Free Software

+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */

+

 /*

   To change or add messages mysqld writes to the Windows error log, run

    mc.exe message.mc

@@ -48,8 +64,8 @@
 // MessageText:

 //

 //  %1For more information, see Help and Support Center at http://www.mysql.com.

-//  
-//  
+//  

+//  

 //

 #define MSG_DEFAULT                      0xC0000064L