From 8afe262ae5ab3ba2bc8f440c67341ce2ad8ad544 Mon Sep 17 00:00:00 2001 From: Murthy Narkedimilli Date: Tue, 19 Mar 2013 15:53:48 +0100 Subject: Fix for Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER --- libmysql/authentication_win/common.cc | 2 +- libmysql/authentication_win/common.h | 2 +- libmysql/authentication_win/handshake.cc | 2 +- libmysql/authentication_win/handshake.h | 2 +- libmysql/authentication_win/handshake_client.cc | 2 +- libmysql/authentication_win/log_client.cc | 2 +- libmysql/authentication_win/plugin_client.cc | 2 +- libmysql/conf_to_src.c | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) (limited to 'libmysql') diff --git a/libmysql/authentication_win/common.cc b/libmysql/authentication_win/common.cc index 9544e7734f5..30a8e0b3b13 100644 --- a/libmysql/authentication_win/common.cc +++ b/libmysql/authentication_win/common.cc @@ -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 "common.h" #include // for ConvertSidToStringSid() diff --git a/libmysql/authentication_win/common.h b/libmysql/authentication_win/common.h index 7f7aa1d2dff..415294b1ed9 100644 --- a/libmysql/authentication_win/common.h +++ b/libmysql/authentication_win/common.h @@ -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 */ #ifndef COMMON_H #define COMMON_H diff --git a/libmysql/authentication_win/handshake.cc b/libmysql/authentication_win/handshake.cc index ec665af9ef9..8e6af8408ae 100644 --- a/libmysql/authentication_win/handshake.cc +++ b/libmysql/authentication_win/handshake.cc @@ -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 "handshake.h" diff --git a/libmysql/authentication_win/handshake.h b/libmysql/authentication_win/handshake.h index 5292948b583..adab4715c99 100644 --- a/libmysql/authentication_win/handshake.h +++ b/libmysql/authentication_win/handshake.h @@ -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 */ #ifndef HANDSHAKE_H #define HANDSHAKE_H diff --git a/libmysql/authentication_win/handshake_client.cc b/libmysql/authentication_win/handshake_client.cc index 02e5483da29..c6ddbede6f2 100644 --- a/libmysql/authentication_win/handshake_client.cc +++ b/libmysql/authentication_win/handshake_client.cc @@ -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 "handshake.h" diff --git a/libmysql/authentication_win/log_client.cc b/libmysql/authentication_win/log_client.cc index 8a49c4220bb..ec7210a8a97 100644 --- a/libmysql/authentication_win/log_client.cc +++ b/libmysql/authentication_win/log_client.cc @@ -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 #include "common.h" diff --git a/libmysql/authentication_win/plugin_client.cc b/libmysql/authentication_win/plugin_client.cc index 30dc5b1493d..c7dcb92e62d 100644 --- a/libmysql/authentication_win/plugin_client.cc +++ b/libmysql/authentication_win/plugin_client.cc @@ -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 #include diff --git a/libmysql/conf_to_src.c b/libmysql/conf_to_src.c index f39a2e1856f..04a6a727029 100644 --- a/libmysql/conf_to_src.c +++ b/libmysql/conf_to_src.c @@ -14,7 +14,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 */ /* can't use -lmysys because this prog is used to create -lstrings */ -- cgit v1.2.1 From 78cc6db44a9f1344dd5c00cf4f3cdde158fe108e Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Wed, 3 Jul 2013 09:46:20 +0200 Subject: MDEV-4667 DATE('string') incompability between mysql and mariadb Cleanup: remove TIME_FUZZY_DATE. Introduce TIME_FUZZY_DATES which means "very fuzzy, the resulting value is only used for comparison. It can be invalid date, fine, as long as it can be compared". Updated many tests results (they're better now). --- libmysql/libmysql.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'libmysql') diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index e8887b81e68..2d64aa99bfa 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -3549,7 +3549,7 @@ static void fetch_string_with_conversion(MYSQL_BIND *param, char *value, case MYSQL_TYPE_TIME: { MYSQL_TIME *tm= (MYSQL_TIME *)buffer; - str_to_time(value, length, tm, TIME_FUZZY_DATE, &err); + str_to_time(value, length, tm, 0, &err); *param->error= test(err); break; } @@ -3558,7 +3558,7 @@ static void fetch_string_with_conversion(MYSQL_BIND *param, char *value, case MYSQL_TYPE_TIMESTAMP: { MYSQL_TIME *tm= (MYSQL_TIME *)buffer; - (void) str_to_datetime(value, length, tm, TIME_FUZZY_DATE, &err); + (void) str_to_datetime(value, length, tm, 0, &err); *param->error= test(err) && (param->buffer_type == MYSQL_TYPE_DATE && tm->time_type != MYSQL_TIMESTAMP_DATE); break; @@ -3681,9 +3681,7 @@ static void fetch_long_with_conversion(MYSQL_BIND *param, MYSQL_FIELD *field, case MYSQL_TYPE_DATETIME: { int error; - value= number_to_datetime(value, 0, - (MYSQL_TIME *) buffer, TIME_FUZZY_DATE, - &error); + value= number_to_datetime(value, 0, (MYSQL_TIME *) buffer, 0, &error); *param->error= test(error); break; } -- cgit v1.2.1