Commit a01775c5 authored by monty@hundin.mysql.fi's avatar monty@hundin.mysql.fi
Browse files

Added help for --local-infile 

Fix for bug on intel where (int32) 1 << 32 == 1, which gave problems when using 32 keys.
Allow SET PASSWORD for anonymous user
parent ed8fc0b0

Docs/manual.texi

+12 −0
Original line number Diff line number Diff line
@@ -12010,6 +12010,12 @@ make sure that @file{gmalloc.o} is included in @file{libgthreads.a} and 
In FSU Pthreads, the following system calls are pthreads-aware: @code{read()},

@code{write()}, @code{getmsg()}, @code{connect()}, @code{accept()},

@code{select()}, and @code{wait()}.













@item













The CSSA-2001-SCO.35.2 (the patch is listed in custom as













erg711905-dscr_remap security patch (ver 2.0.0) breaks FSU threads and













makes mysqld instable.  You have to remove this one if you want to run













mysqld on an OpenServer 5.0.6 machine.















@end itemize





























If you want to install DBI on SCO, you have to edit the @file{Makefile} in










@@ -46890,6 +46896,12 @@ not yet 100% confident in this code.













@node News-3.23.50, News-3.23.49, News-3.23.x, News-3.23.x















@appendixsubsec Changes in release 3.23.50















@itemize @bullet













@item













Fixed problem with @code{SHOW CREATE TABLE} and @code{PRIMARY KEY} when using













32 indexes.













@item













Fixed that one can use @code{SET PASSWORD} for the anonymous user.













@item















Fixed core-dump bug when reading client groups from option files using















@code{mysql_options()}.















@item

























client/mysql.cc



+1
−0






























Original line number
Diff line number
Diff line








@@ -487,6 +487,7 @@ static void usage(int version)













  -i, --ignore-space	Ignore space after function names.\n\















  -h, --host=...	Connect to host.\n\















  -H, --html		Produce HTML output.\n\













  --local-infile=[1|0]  Enable/disable LOAD DATA LOCAL INFILE\n\















  -L, --skip-line-numbers\n\















                        Don't write line number for errors.\n");















#ifndef __WIN__

































client/mysqlimport.c



+12
−9






























Original line number
Diff line number
Diff line













/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB













/* Copyright (C) 2000 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









@@ -25,7 +25,7 @@













**			   *			   *















**			   *************************















*/













#define IMPORT_VERSION "2.7"













#define IMPORT_VERSION "2.8"































#include "client_priv.h"















#include "mysql_version.h"










@@ -397,10 +397,13 @@ static MYSQL *db_connect(char *host, char *database, char *user, char *passwd)













  mysql_init(&mysql_connection);















  if (opt_compress)















    mysql_options(&mysql_connection,MYSQL_OPT_COMPRESS,NullS);













  if (opt_local_file)













    mysql_options(&mysql_connection,MYSQL_OPT_LOCAL_INFILE,













		  (char*) &opt_local_file);















#ifdef HAVE_OPENSSL















  if (opt_use_ssl)















    mysql_ssl_set(&mysql_connection, opt_ssl_key, opt_ssl_cert, opt_ssl_ca,













		  opt_ssl_capath);













		  opt_ssl_capath, opt_ssl_cipher);















#endif















  if (!(sock= mysql_real_connect(&mysql_connection,host,user,passwd,















				 database,opt_mysql_port,opt_mysql_unix_port,

































configure.in



+1
−1






























Original line number
Diff line number
Diff line








@@ -607,7 +607,7 @@ AC_SUBST(MYSQLD_USER)













AC_MSG_CHECKING(if we should should enable LOAD DATA LOCAL by default)















AC_ARG_ENABLE(local-infile,















    [  --enable-local-infile













                          If LOAD DATA LOCAL INFILE is enabled by default.],













                          Enable LOAD DATA LOCAL INFILE (default: disabled)],















    [ ENABLED_LOCAL_INFILE=$enableval ],















    [ ENABLED_LOCAL_INFILE=no ]















    )

































include/global.h



+1
−0






























Original line number
Diff line number
Diff line








@@ -281,6 +281,7 @@ typedef unsigned short ushort;













#define set_if_bigger(a,b)  { if ((a) < (b)) (a)=(b); }















#define set_if_smaller(a,b) { if ((a) > (b)) (a)=(b); }















#define test_all_bits(a,b) (((a) & (b)) == (b))













#define set_bits(type, bit_count) (sizeof(type)*8 <= (bit_count) ? ~(type) 0 : ((((type) 1) << (bit_count)) - (type) 1))















#define array_elements(A) ((uint) (sizeof(A)/sizeof(A[0])))















#ifndef HAVE_RINT















#define rint(A) floor((A)+0.5)