summaryrefslogtreecommitdiff
path: root/mysys
diff options
context:
space:
mode:
Diffstat (limited to 'mysys')
-rw-r--r--mysys/default.c2
-rw-r--r--mysys/md5.c2
-rw-r--r--mysys/mf_arr_appstr.c2
-rw-r--r--mysys/mf_iocache2.c6
-rw-r--r--mysys/mf_qsort.c2
-rw-r--r--mysys/mf_qsort2.c2
-rw-r--r--mysys/mf_radix.c2
-rw-r--r--mysys/mf_same.c2
-rw-r--r--mysys/mf_soundex.c2
-rw-r--r--mysys/mf_wcomp.c2
-rw-r--r--mysys/mulalloc.c2
-rw-r--r--mysys/my_access.c2
-rw-r--r--mysys/my_aes.c2
-rw-r--r--mysys/my_alarm.c2
-rw-r--r--mysys/my_bitmap.c2
-rw-r--r--mysys/my_compare.c2
-rw-r--r--mysys/my_conio.c2
-rw-r--r--mysys/my_crc32.c2
-rw-r--r--mysys/my_div.c2
-rw-r--r--mysys/my_fopen.c2
-rw-r--r--mysys/my_getopt.c2
-rw-r--r--mysys/my_getpagesize.c2
-rw-r--r--mysys/my_getsystime.c2
-rw-r--r--mysys/my_libwrap.c2
-rw-r--r--mysys/my_memmem.c2
-rw-r--r--mysys/my_mkdir.c2
-rw-r--r--mysys/my_read.c9
-rw-r--r--mysys/my_symlink2.c2
-rw-r--r--mysys/test_dir.c2
-rw-r--r--mysys/test_xml.c2
-rw-r--r--mysys/typelib.c2
31 files changed, 42 insertions, 31 deletions
diff --git a/mysys/default.c b/mysys/default.c
index db1aa111cdf..08653b1a3c4 100644
--- a/mysys/default.c
+++ b/mysys/default.c
@@ -11,7 +11,7 @@
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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
/****************************************************************************
Add all options from files named "group".cnf from the default_directories
diff --git a/mysys/md5.c b/mysys/md5.c
index 22a5e409a09..655befa546a 100644
--- a/mysys/md5.c
+++ b/mysys/md5.c
@@ -11,7 +11,7 @@
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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
/*
* This code implements the MD5 message-digest algorithm.
diff --git a/mysys/mf_arr_appstr.c b/mysys/mf_arr_appstr.c
index 1edbea9df4a..5ea0a098c5d 100644
--- a/mysys/mf_arr_appstr.c
+++ b/mysys/mf_arr_appstr.c
@@ -11,7 +11,7 @@
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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
#include "mysys_priv.h"
#include <m_string.h> /* strcmp() */
diff --git a/mysys/mf_iocache2.c b/mysys/mf_iocache2.c
index ff05b7fa485..250dc5064a9 100644
--- a/mysys/mf_iocache2.c
+++ b/mysys/mf_iocache2.c
@@ -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
@@ -63,6 +63,8 @@ my_b_copy_to_file(IO_CACHE *cache, FILE *file)
DBUG_RETURN(1);
cache->read_pos= cache->read_end;
} while ((bytes_in_cache= my_b_fill(cache)));
+ if(cache->error == -1)
+ DBUG_RETURN(1);
DBUG_RETURN(0);
}
@@ -219,6 +221,8 @@ size_t my_b_fill(IO_CACHE *info)
info->error= 0;
return 0; /* EOF */
}
+ DBUG_EXECUTE_IF ("simulate_my_b_fill_error",
+ {DBUG_SET("+d,simulate_file_read_error");});
if ((length= my_read(info->file,info->buffer,max_length,
info->myflags)) == (size_t) -1)
{
diff --git a/mysys/mf_qsort.c b/mysys/mf_qsort.c
index 9e1ee2782a4..e681ac9cec4 100644
--- a/mysys/mf_qsort.c
+++ b/mysys/mf_qsort.c
@@ -11,7 +11,7 @@
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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
/*
qsort implementation optimized for comparison of pointers
diff --git a/mysys/mf_qsort2.c b/mysys/mf_qsort2.c
index ca2bd1a4952..29f92c38926 100644
--- a/mysys/mf_qsort2.c
+++ b/mysys/mf_qsort2.c
@@ -11,7 +11,7 @@
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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
/* qsort that sends one extra argument to the compare subrutine */
diff --git a/mysys/mf_radix.c b/mysys/mf_radix.c
index 582ca76b8f8..ecaeee69d75 100644
--- a/mysys/mf_radix.c
+++ b/mysys/mf_radix.c
@@ -11,7 +11,7 @@
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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
/*
Radixsort for pointers to fixed length strings.
diff --git a/mysys/mf_same.c b/mysys/mf_same.c
index 6738dc8051e..b4af4cbf1b6 100644
--- a/mysys/mf_same.c
+++ b/mysys/mf_same.c
@@ -11,7 +11,7 @@
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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
/* Kopierar biblioteksstrukturen och extensionen fr}n ett filnamn */
diff --git a/mysys/mf_soundex.c b/mysys/mf_soundex.c
index 3a3dab52dd6..b3718f20b3f 100644
--- a/mysys/mf_soundex.c
+++ b/mysys/mf_soundex.c
@@ -11,7 +11,7 @@
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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
/****************************************************************
* SOUNDEX ALGORITHM in C *
diff --git a/mysys/mf_wcomp.c b/mysys/mf_wcomp.c
index 4786537d1a5..74e6fccb5a1 100644
--- a/mysys/mf_wcomp.c
+++ b/mysys/mf_wcomp.c
@@ -11,7 +11,7 @@
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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
/* Funktions for comparing with wild-cards */
diff --git a/mysys/mulalloc.c b/mysys/mulalloc.c
index f4ca3d9f9ab..2caac6997ee 100644
--- a/mysys/mulalloc.c
+++ b/mysys/mulalloc.c
@@ -11,7 +11,7 @@
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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
#include "mysys_priv.h"
#include <stdarg.h>
diff --git a/mysys/my_access.c b/mysys/my_access.c
index 453d3e29cdf..b96e11d9809 100644
--- a/mysys/my_access.c
+++ b/mysys/my_access.c
@@ -12,7 +12,7 @@
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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
#include "mysys_priv.h"
#include <m_string.h>
diff --git a/mysys/my_aes.c b/mysys/my_aes.c
index 575d4702dee..5c52a0b1ab5 100644
--- a/mysys/my_aes.c
+++ b/mysys/my_aes.c
@@ -11,7 +11,7 @@
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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
/*
diff --git a/mysys/my_alarm.c b/mysys/my_alarm.c
index d6a0da1bd13..31f98958f61 100644
--- a/mysys/my_alarm.c
+++ b/mysys/my_alarm.c
@@ -11,7 +11,7 @@
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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
/* Function to set a varible when we got a alarm */
/* Used by my_lock samt functions in m_alarm.h */
diff --git a/mysys/my_bitmap.c b/mysys/my_bitmap.c
index 83d03177eba..851fe2b1026 100644
--- a/mysys/my_bitmap.c
+++ b/mysys/my_bitmap.c
@@ -13,7 +13,7 @@
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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
/*
Handling of uchar arrays as large bitmaps.
diff --git a/mysys/my_compare.c b/mysys/my_compare.c
index 9e192e52fb7..82b30ab3ed3 100644
--- a/mysys/my_compare.c
+++ b/mysys/my_compare.c
@@ -12,7 +12,7 @@
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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
#include <my_global.h>
#include <m_ctype.h>
diff --git a/mysys/my_conio.c b/mysys/my_conio.c
index 5dbd31193a9..dc87b83f6b4 100644
--- a/mysys/my_conio.c
+++ b/mysys/my_conio.c
@@ -11,7 +11,7 @@
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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
#include "mysys_priv.h"
diff --git a/mysys/my_crc32.c b/mysys/my_crc32.c
index 51c553da5ea..27800098f12 100644
--- a/mysys/my_crc32.c
+++ b/mysys/my_crc32.c
@@ -11,7 +11,7 @@
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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
#include "mysys_priv.h"
diff --git a/mysys/my_div.c b/mysys/my_div.c
index d29d3668852..29f04a7a01b 100644
--- a/mysys/my_div.c
+++ b/mysys/my_div.c
@@ -11,7 +11,7 @@
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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
#include "mysys_priv.h"
diff --git a/mysys/my_fopen.c b/mysys/my_fopen.c
index 54469d2c05a..25846ebc050 100644
--- a/mysys/my_fopen.c
+++ b/mysys/my_fopen.c
@@ -12,7 +12,7 @@
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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
#include "mysys_priv.h"
#include "my_static.h"
diff --git a/mysys/my_getopt.c b/mysys/my_getopt.c
index 7905ad90877..0645e413672 100644
--- a/mysys/my_getopt.c
+++ b/mysys/my_getopt.c
@@ -12,7 +12,7 @@
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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
#include <my_global.h>
#include <m_string.h>
diff --git a/mysys/my_getpagesize.c b/mysys/my_getpagesize.c
index b0560cede35..2c2804dfab8 100644
--- a/mysys/my_getpagesize.c
+++ b/mysys/my_getpagesize.c
@@ -11,7 +11,7 @@
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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
#include "mysys_priv.h"
diff --git a/mysys/my_getsystime.c b/mysys/my_getsystime.c
index 2a23a699f69..74289556262 100644
--- a/mysys/my_getsystime.c
+++ b/mysys/my_getsystime.c
@@ -12,7 +12,7 @@
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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
#include "mysys_priv.h"
diff --git a/mysys/my_libwrap.c b/mysys/my_libwrap.c
index e72334ba806..dea4bca114e 100644
--- a/mysys/my_libwrap.c
+++ b/mysys/my_libwrap.c
@@ -11,7 +11,7 @@
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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
/*
This is needed to be able to compile with original libwrap header
diff --git a/mysys/my_memmem.c b/mysys/my_memmem.c
index c000f14bc66..5184037ed39 100644
--- a/mysys/my_memmem.c
+++ b/mysys/my_memmem.c
@@ -11,7 +11,7 @@
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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
#include <my_global.h>
#include <m_string.h>
diff --git a/mysys/my_mkdir.c b/mysys/my_mkdir.c
index 676c6c1cd51..0e77180cd75 100644
--- a/mysys/my_mkdir.c
+++ b/mysys/my_mkdir.c
@@ -11,7 +11,7 @@
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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
#include "mysys_priv.h"
#include "mysys_err.h"
diff --git a/mysys/my_read.c b/mysys/my_read.c
index 0afbf3773f3..883a1c5fdc7 100644
--- a/mysys/my_read.c
+++ b/mysys/my_read.c
@@ -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
@@ -51,6 +51,13 @@ size_t my_read(File Filedes, uchar *Buffer, size_t Count, myf MyFlags)
#else
readbytes= read(Filedes, Buffer, Count);
#endif
+ DBUG_EXECUTE_IF ("simulate_file_read_error",
+ {
+ errno= ENOSPC;
+ readbytes= (size_t) -1;
+ DBUG_SET("-d,simulate_file_read_error");
+ DBUG_SET("-d,simulate_my_b_fill_error");
+ });
if (readbytes != Count)
{
diff --git a/mysys/my_symlink2.c b/mysys/my_symlink2.c
index bc7ac751fad..e8ac1dedec1 100644
--- a/mysys/my_symlink2.c
+++ b/mysys/my_symlink2.c
@@ -11,7 +11,7 @@
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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
/*
Advanced symlink handling.
diff --git a/mysys/test_dir.c b/mysys/test_dir.c
index 54e6c99e21e..0ac559568b1 100644
--- a/mysys/test_dir.c
+++ b/mysys/test_dir.c
@@ -11,7 +11,7 @@
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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
/* TODO: Test all functions */
diff --git a/mysys/test_xml.c b/mysys/test_xml.c
index 0cb10e1c8d9..e5ff42ab2f5 100644
--- a/mysys/test_xml.c
+++ b/mysys/test_xml.c
@@ -11,7 +11,7 @@
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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
#include <stdio.h>
#include <string.h>
diff --git a/mysys/typelib.c b/mysys/typelib.c
index 402d108e51c..2c36c97c6d6 100644
--- a/mysys/typelib.c
+++ b/mysys/typelib.c
@@ -11,7 +11,7 @@
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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
/* Functions to handle typelib */
View Lorry Controller Status