MySQL-5.5.36 merge

(without few incorrect bugfixes and with 1250 files where only a copyright year was changed)

30 files changed, 53 insertions, 39 deletions

diff --git a/mysys/md5.c b/mysys/md5.c
index 655befa546a..aefc23c1b7a 100644
--- a/mysys/md5.c
+++ b/mysys/md5.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* 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/mysys/mf_keycache.c b/mysys/mf_keycache.c
index 1ee71e55b68..8191e92bb27 100644
--- a/mysys/mf_keycache.c
+++ b/mysys/mf_keycache.c
@@ -1,5 +1,4 @@
-/*
-   Copyright (c) 2000, 2011, Oracle and/or its affiliates
+/* Copyright (c) 2000, 2013, Oracle and/or its affiliates.
 
    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/mysys/mf_qsort.c b/mysys/mf_qsort.c
index e681ac9cec4..3e91c0ac0b0 100644
--- a/mysys/mf_qsort.c
+++ b/mysys/mf_qsort.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 2000 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/mysys/mf_radix.c b/mysys/mf_radix.c
index ecaeee69d75..b0ed419e6c1 100644
--- a/mysys/mf_radix.c
+++ b/mysys/mf_radix.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, 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/mysys/mf_same.c b/mysys/mf_same.c
index b4af4cbf1b6..244dc650d8b 100644
--- a/mysys/mf_same.c
+++ b/mysys/mf_same.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, 2001, 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/mysys/mf_soundex.c b/mysys/mf_soundex.c
index b3718f20b3f..2784d112805 100644
--- a/mysys/mf_soundex.c
+++ b/mysys/mf_soundex.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, 2002, 2004, 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/mysys/mf_tempdir.c b/mysys/mf_tempdir.c
index e6b56f7d1d0..34b469b4066 100644
--- a/mysys/mf_tempdir.c
+++ b/mysys/mf_tempdir.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2010, 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
@@ -43,7 +43,7 @@ my_bool init_tmpdir(MY_TMPDIR *tmpdir, const char *pathlist)
       pathlist=getenv("TMP");
 #endif
     if (!pathlist || !pathlist[0])
-      pathlist=(char*) DEFAULT_TMPDIR;
+      pathlist= DEFAULT_TMPDIR;
   }
   do
   {
diff --git a/mysys/mf_tempfile.c b/mysys/mf_tempfile.c
index 5ff139bc92a..62b3e09747f 100644
--- a/mysys/mf_tempfile.c
+++ b/mysys/mf_tempfile.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2010, 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
@@ -111,7 +111,7 @@ File create_temp_file(char *to, const char *dir, const char *prefix,
 				    sizeof(prefix_buff)-7),"XXXXXX") -
 		     prefix_buff);
     if (!dir && ! (dir =getenv("TMPDIR")))
-      dir=DEFAULT_TMPDIR;
+      dir= DEFAULT_TMPDIR;
     if (strlen(dir)+ pfx_len > FN_REFLEN-2)
     {
       errno=my_errno= ENAMETOOLONG;
diff --git a/mysys/mf_wcomp.c b/mysys/mf_wcomp.c
index 74e6fccb5a1..fe64d06f2db 100644
--- a/mysys/mf_wcomp.c
+++ b/mysys/mf_wcomp.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, 2003, 2004 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/mysys/mulalloc.c b/mysys/mulalloc.c
index 2caac6997ee..9384ed744ad 100644
--- a/mysys/mulalloc.c
+++ b/mysys/mulalloc.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, 2002, 2003, 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/mysys/my_access.c b/mysys/my_access.c
index b96e11d9809..22f145a75c9 100644
--- a/mysys/my_access.c
+++ b/mysys/my_access.c
@@ -1,5 +1,5 @@
-/* Copyright (C) 2000 MySQL AB
-   Copyright (c) 2012, Monty Program Ab
+/* Copyright (c) 2000, 2012, Oracle and/or its affiliates
+   Copyright (c) 2012, 2014, SkySQL 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/mysys/my_aes.c b/mysys/my_aes.c
index 5c52a0b1ab5..7074f700413 100644
--- a/mysys/my_aes.c
+++ b/mysys/my_aes.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 2002 MySQL AB
+/* Copyright (c) 2002, 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/mysys/my_conio.c b/mysys/my_conio.c
index dc87b83f6b4..2480c37d039 100644
--- a/mysys/my_conio.c
+++ b/mysys/my_conio.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, 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/mysys/my_crc32.c b/mysys/my_crc32.c
index 27800098f12..0981c75755d 100644
--- a/mysys/my_crc32.c
+++ b/mysys/my_crc32.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 2004 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/mysys/my_div.c b/mysys/my_div.c
index 29f04a7a01b..660b87e5ab4 100644
--- a/mysys/my_div.c
+++ b/mysys/my_div.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, 2002, 2004, 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/mysys/my_error.c b/mysys/my_error.c
index 3302add688b..23bc06c3d9d 100644
--- a/mysys/my_error.c
+++ b/mysys/my_error.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2010, 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/mysys/my_fopen.c b/mysys/my_fopen.c
index 25846ebc050..52f61649bb3 100644
--- a/mysys/my_fopen.c
+++ b/mysys/my_fopen.c
@@ -1,5 +1,5 @@
-/* Copyright (c) 2000, 2011, Oracle and/or its affiliates.
-   Copyright (c) 1985-2011 Monty Program Ab
+/* Copyright (c) 2000, 2012, Oracle and/or its affiliates
+   Copyright (c) 1985, 2011, Monty Program 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/mysys/my_getpagesize.c b/mysys/my_getpagesize.c
index 2c2804dfab8..e1c1fcb168d 100644
--- a/mysys/my_getpagesize.c
+++ b/mysys/my_getpagesize.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 2000-2003 MySQL AB
+/* Copyright (c) 2000-2003, 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/mysys/my_libwrap.c b/mysys/my_libwrap.c
index dea4bca114e..1cbfa83030b 100644
--- a/mysys/my_libwrap.c
+++ b/mysys/my_libwrap.c
@@ -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/mysys/my_lockmem.c b/mysys/my_lockmem.c
index 2e036936c70..3e27564f100 100644
--- a/mysys/my_lockmem.c
+++ b/mysys/my_lockmem.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2010, 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/mysys/my_malloc.c b/mysys/my_malloc.c
index 570ab9675ee..5264210a6b4 100644
--- a/mysys/my_malloc.c
+++ b/mysys/my_malloc.c
@@ -1,5 +1,5 @@
-/*
-   Copyright (c) 2000, 2010, Oracle and/or its affiliates
+/* Copyright (c) 2000, 2013, Oracle and/or its affiliates
+   Copyright (c) 2009, 2014, SkySQL 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/mysys/my_memmem.c b/mysys/my_memmem.c
index 5184037ed39..5806c502b2b 100644
--- a/mysys/my_memmem.c
+++ b/mysys/my_memmem.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, 2006, 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/mysys/my_mkdir.c b/mysys/my_mkdir.c
index 0e77180cd75..5e9691f5b91 100644
--- a/mysys/my_mkdir.c
+++ b/mysys/my_mkdir.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, 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/mysys/my_once.c b/mysys/my_once.c
index b9232db9b2e..dfd5de81ac7 100644
--- a/mysys/my_once.c
+++ b/mysys/my_once.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2010, 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/mysys/my_symlink2.c b/mysys/my_symlink2.c
index e8ac1dedec1..fcaf78ccff6 100644
--- a/mysys/my_symlink2.c
+++ b/mysys/my_symlink2.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, 2001, 2003, 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/mysys/my_wincond.c b/mysys/my_wincond.c
index f88e33e17f3..6674a5d394d 100644
--- a/mysys/my_wincond.c
+++ b/mysys/my_wincond.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2010, 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
@@ -289,7 +289,7 @@ int pthread_cond_signal(pthread_cond_t *cond)
 
 
 int pthread_cond_timedwait(pthread_cond_t *cond, pthread_mutex_t *mutex,
-  struct timespec *abstime)
+  const struct timespec *abstime)
 {
   if (have_native_conditions)
   {
diff --git a/mysys/my_winthread.c b/mysys/my_winthread.c
index d7d7817d400..81fd0e7277c 100644
--- a/mysys/my_winthread.c
+++ b/mysys/my_winthread.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2010, 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/mysys/test_dir.c b/mysys/test_dir.c
index 0ac559568b1..364562a6972 100644
--- a/mysys/test_dir.c
+++ b/mysys/test_dir.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, 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/mysys/test_xml.c b/mysys/test_xml.c
index e5ff42ab2f5..56b50611498 100644
--- a/mysys/test_xml.c
+++ b/mysys/test_xml.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, 2002 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/mysys/thr_alarm.c b/mysys/thr_alarm.c
index 7fd87edda6c..d0bb2f1ef4c 100644
--- a/mysys/thr_alarm.c
+++ b/mysys/thr_alarm.c
@@ -1,6 +1,5 @@
-/*
-   Copyright (c) 2000, 2011, Oracle and/or its affiliates
-   Copyright (c) 2012, Monty Program Ab
+/* Copyright (c) 2000, 2013, Oracle and/or its affiliates
+   Copyright (c) 2012, 2014, SkySQL 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