From 99645e5be59145bcab2fe36aefde4224e6e69961 Mon Sep 17 00:00:00 2001 From: Neeraj Bisht Date: Mon, 14 Jan 2013 14:59:48 +0530 Subject: BUG#14303860 - EXECUTING A SELECT QUERY WITH TOO MANY WILDCARDS CAUSES A SEGFAULT Back port from 5.6 and trunk --- include/m_ctype.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'include') diff --git a/include/m_ctype.h b/include/m_ctype.h index d58081ec19e..b36fdbe6d68 100644 --- a/include/m_ctype.h +++ b/include/m_ctype.h @@ -132,6 +132,8 @@ enum my_lex_states struct charset_info_st; +extern int (*my_string_stack_guard)(int); + /* See strings/CHARSET_INFO.txt for information about this structure */ typedef struct my_collation_handler_st { -- cgit v1.2.1 From 053d7e775c3b369debbb71e26244fc4c76688f48 Mon Sep 17 00:00:00 2001 From: Murthy Narkedimilli Date: Mon, 25 Feb 2013 15:26:00 +0100 Subject: Updated/added copyright headers. --- include/base64.h | 2 +- include/errmsg.h | 2 +- include/ft_global.h | 2 +- include/help_end.h | 2 +- include/help_start.h | 2 +- include/keycache.h | 2 +- include/m_ctype.h | 2 +- include/m_string.h | 2 +- include/my_aes.h | 2 +- include/my_alloc.h | 2 +- include/my_attribute.h | 2 +- include/my_base.h | 3 +-- include/my_compiler.h | 2 +- include/my_dir.h | 2 +- include/my_libwrap.h | 2 +- include/my_list.h | 2 +- include/my_md5.h | 2 +- include/my_net.h | 2 +- include/my_nosys.h | 2 +- include/my_sys.h | 2 +- include/my_tree.h | 2 +- include/my_trie.h | 2 +- include/my_user.h | 2 +- include/my_vle.h | 2 +- include/my_xml.h | 2 +- include/myisampack.h | 2 +- include/mysql_time.h | 2 +- include/mysql_version.h.in | 2 +- include/queues.h | 2 +- include/rijndael.h | 2 +- include/sslopt-case.h | 2 +- include/sslopt-vars.h | 2 +- include/thr_alarm.h | 2 +- include/typelib.h | 2 +- include/violite.h | 3 +-- include/welcome_copyright_notice.h | 2 +- 36 files changed, 36 insertions(+), 38 deletions(-) (limited to 'include') diff --git a/include/base64.h b/include/base64.h index 4ac0aa72ad8..52f1b6d2876 100644 --- a/include/base64.h +++ b/include/base64.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2003 MySQL AB +/* Copyright (c) 2003-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 diff --git a/include/errmsg.h b/include/errmsg.h index a6d8c770de8..c827dc1cc97 100644 --- a/include/errmsg.h +++ b/include/errmsg.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2000 MySQL AB +/* Copyright (c) 2000-2008 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 diff --git a/include/ft_global.h b/include/ft_global.h index 752371d6bc6..b9e80e56716 100644 --- a/include/ft_global.h +++ b/include/ft_global.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2000-2003 MySQL AB +/* Copyright (c) 2000-2005, 2007 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 diff --git a/include/help_end.h b/include/help_end.h index 4426cb80bce..251b7806ad7 100644 --- a/include/help_end.h +++ b/include/help_end.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2004-2005 MySQL AB +/* Copyright (c) 2004-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 diff --git a/include/help_start.h b/include/help_start.h index 3ae20eea7d7..4817edf9da9 100644 --- a/include/help_start.h +++ b/include/help_start.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2004-2005 MySQL AB +/* Copyright (c) 2004-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 diff --git a/include/keycache.h b/include/keycache.h index 1307e869717..6d41fbd0b2b 100644 --- a/include/keycache.h +++ b/include/keycache.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2003-2007 MySQL AB, 2009 Sun Microsystems, Inc. + Copyright (c) 2003-2005, 2007 MySQL AB, 2009 Sun Microsystems, Inc. Use is subject to license terms. This program is free software; you can redistribute it and/or modify diff --git a/include/m_ctype.h b/include/m_ctype.h index b36fdbe6d68..a6146333ca4 100644 --- a/include/m_ctype.h +++ b/include/m_ctype.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2000, 2013, 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/include/m_string.h b/include/m_string.h index dc916792f60..08738c9e482 100644 --- a/include/m_string.h +++ b/include/m_string.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2000, 2012, 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/include/my_aes.h b/include/my_aes.h index 1bbdf5663ea..d60c45d2a9b 100644 --- a/include/my_aes.h +++ b/include/my_aes.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2002 MySQL AB +/* Copyright (c) 2002, 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 diff --git a/include/my_alloc.h b/include/my_alloc.h index 93b7438a1df..52595e9ab76 100644 --- a/include/my_alloc.h +++ b/include/my_alloc.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2000 MySQL AB +/* Copyright (c) 2000, 2002, 2005, 2007 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 diff --git a/include/my_attribute.h b/include/my_attribute.h index 8309d85f20a..56e37abb833 100644 --- a/include/my_attribute.h +++ b/include/my_attribute.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2000-2003 MySQL AB +/* Copyright (c) 2000-2003, 2007 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 diff --git a/include/my_base.h b/include/my_base.h index ffd68046029..7a58e3397b4 100644 --- a/include/my_base.h +++ b/include/my_base.h @@ -1,6 +1,5 @@ /* - Copyright (c) 2000-2008 MySQL AB, 2009 Sun Microsystems, Inc. - Use is subject to license terms. + Copyright (c) 2000, 2012, 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/include/my_compiler.h b/include/my_compiler.h index 5f898621159..3b37d4d7cf0 100644 --- a/include/my_compiler.h +++ b/include/my_compiler.h @@ -1,7 +1,7 @@ #ifndef MY_COMPILER_INCLUDED #define MY_COMPILER_INCLUDED -/* Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2010, 2011, 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/include/my_dir.h b/include/my_dir.h index 06509a3af19..86dd5030090 100644 --- a/include/my_dir.h +++ b/include/my_dir.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2000 MySQL AB +/* Copyright (c) 2000, 2003 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 diff --git a/include/my_libwrap.h b/include/my_libwrap.h index 9a8579475fb..b71491d2776 100644 --- a/include/my_libwrap.h +++ b/include/my_libwrap.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2000 MySQL 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 diff --git a/include/my_list.h b/include/my_list.h index 775b56587b8..9d27ecad21f 100644 --- a/include/my_list.h +++ b/include/my_list.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2000 MySQL AB +/* Copyright (c) 2000, 2002-2005, 2007 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 diff --git a/include/my_md5.h b/include/my_md5.h index 6458f27c5cc..709f211fa31 100644 --- a/include/my_md5.h +++ b/include/my_md5.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2000 MySQL AB +/* Copyright (c) 2000, 2001, 2007 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 diff --git a/include/my_net.h b/include/my_net.h index 3af79ea3db5..9986fbd9c35 100644 --- a/include/my_net.h +++ b/include/my_net.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2000 MySQL AB +/* Copyright (c) 2000-2004, 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 diff --git a/include/my_nosys.h b/include/my_nosys.h index df5639b81e2..ae824f2b4d3 100644 --- a/include/my_nosys.h +++ b/include/my_nosys.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2000 MySQL AB +/* Copyright (c) 2000, 2006, 2007 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 diff --git a/include/my_sys.h b/include/my_sys.h index 1973f07ac13..e6d99547dfc 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2000, 2013, 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/include/my_tree.h b/include/my_tree.h index 24bbdd54019..f6015cadefc 100644 --- a/include/my_tree.h +++ b/include/my_tree.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2000 MySQL AB +/* Copyright (c) 2000-2002, 2004, 2006, 2007 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 diff --git a/include/my_trie.h b/include/my_trie.h index 72dd485af04..a916024f5eb 100644 --- a/include/my_trie.h +++ b/include/my_trie.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2005 MySQL AB +/* Copyright (c) 2005-2007 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 diff --git a/include/my_user.h b/include/my_user.h index 44eebf1551d..d1d09a43407 100644 --- a/include/my_user.h +++ b/include/my_user.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2005 MySQL AB +/* Copyright (c) 2005-2007 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 diff --git a/include/my_vle.h b/include/my_vle.h index c09f82229c4..30b26d9776d 100644 --- a/include/my_vle.h +++ b/include/my_vle.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2005 MySQL AB +/* Copyright (c) 2005-2007 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 diff --git a/include/my_xml.h b/include/my_xml.h index 6a453ee90be..1f7e5c554d2 100644 --- a/include/my_xml.h +++ b/include/my_xml.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2000 MySQL AB +/* Copyright (c) 2000, 2002, 2003, 2005, 2007 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 diff --git a/include/myisampack.h b/include/myisampack.h index 7d4871bd1cb..afbe83306d2 100644 --- a/include/myisampack.h +++ b/include/myisampack.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2000 MySQL AB +/* Copyright (c) 2000-2002, 2004 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 diff --git a/include/mysql_time.h b/include/mysql_time.h index 0a3f17a81fb..0a3ddccbf3c 100644 --- a/include/mysql_time.h +++ b/include/mysql_time.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2004 MySQL AB +/* Copyright (c) 2004, 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 diff --git a/include/mysql_version.h.in b/include/mysql_version.h.in index 04a43f2c968..2e1b3c6cef4 100644 --- a/include/mysql_version.h.in +++ b/include/mysql_version.h.in @@ -1,4 +1,4 @@ -/* Copyright Abandoned 1996, 1999, 2001 MySQL AB +/* Copyright (c) 1996, 1999-2004, 2007 MySQL AB This file is public domain and comes with NO WARRANTY of any kind */ /* Version numbers for protocol & mysqld */ diff --git a/include/queues.h b/include/queues.h index d01b73ba999..e5e211fb77b 100644 --- a/include/queues.h +++ b/include/queues.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2000 MySQL AB +/* Copyright (c) 2000-2005, 2007 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 diff --git a/include/rijndael.h b/include/rijndael.h index 89963a85c99..75ee8fefdf3 100644 --- a/include/rijndael.h +++ b/include/rijndael.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2002 MySQL AB +/* Copyright (c) 2002, 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 diff --git a/include/sslopt-case.h b/include/sslopt-case.h index adb9a28503b..d8faffe0249 100644 --- a/include/sslopt-case.h +++ b/include/sslopt-case.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2000 MySQL AB +/* Copyright (c) 2000-2002 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 diff --git a/include/sslopt-vars.h b/include/sslopt-vars.h index 3369f870db2..dcb6a2f0513 100644 --- a/include/sslopt-vars.h +++ b/include/sslopt-vars.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2000 MySQL AB +/* Copyright (c) 2000, 2001, 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 diff --git a/include/thr_alarm.h b/include/thr_alarm.h index fb906039269..8a5881af938 100644 --- a/include/thr_alarm.h +++ b/include/thr_alarm.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2000 MySQL AB +/* Copyright (c) 2000-2004, 2006-2008 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 diff --git a/include/typelib.h b/include/typelib.h index 46106d1bdab..fb76fe6ca4a 100644 --- a/include/typelib.h +++ b/include/typelib.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2000 MySQL AB +/* Copyright (c) 2000, 2003, 2004, 2006, 2007 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 diff --git a/include/violite.h b/include/violite.h index 5facd0911b7..0e041922bd3 100644 --- a/include/violite.h +++ b/include/violite.h @@ -1,6 +1,5 @@ /* - Copyright (c) 2000-2007 MySQL AB, 2009 Sun Microsystems, Inc. - Use is subject to license terms. + Copyright (c) 2000, 2012, 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/include/welcome_copyright_notice.h b/include/welcome_copyright_notice.h index 15d11bf3664..290e9b30eef 100644 --- a/include/welcome_copyright_notice.h +++ b/include/welcome_copyright_notice.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2011, 2012, 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 -- cgit v1.2.1