database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Bug fixes, TRUNCATE, safer passwords on command line and connect timeout

Browse Source 
Docs/manual.texi:
  Update of safe_mysqld, TRUNCATE and changes for 3.23.28
client/mysql.cc:
  Added --timeout
client/mysqladmin.c:
  Safer password handling
client/mysqldump.c:
  Safer password handling
client/mysqlimport.c:
  Safer password handling
client/mysqlshow.c:
  Safer password handling
configure.in:
  Fixes for Darwin and added test of poll
include/my_pthread.h:
  Fixes for darwin
include/violite.h:
  Added test for polling
libmysql/libmysql.c:
  connect timeout
libmysql/violite.c:
  connect timeout
mysys/hash.c:
  Fix when delting from empty table
scripts/safe_mysqld.sh:
  Added --open-files, --core-file-size and --timezone
sql-bench/bench-init.pl.sh:
  Function print_time
sql-bench/crash-me.sh:
  Added test of truncate
sql-bench/test-insert.sh:
  More "estimated" tests
sql-bench/test-select.sh:
  More "estimated" tests
sql/filesort.cc:
  Removed allocation of extra memory
sql/ha_berkeley.cc:
  Better estimation of number of rows
sql/item_create.cc:
  Truncate
sql/item_create.h:
  Truncate
sql/item_strfunc.cc:
  Removed usage of MY_FAE
sql/lex.h:
  Truncate
sql/lock.cc:
  Fixed possible loop bug
sql/log.cc:
  Removed usage of FILE:s
sql/mysqld.cc:
  Print of more server variables
sql/sql_class.h:
  Changed FILE -> File
sql/sql_insert.cc:
  Fixed bug in temptable handling
sql/sql_lex.h:
  Cleanup
sql/sql_load.cc:
  Removed usage of MY_FAE
sql/sql_parse.cc:
  Cleanup + TRUNCATE
sql/sql_select.cc:
  Cleanup + fix for INSERT ... SELECT
sql/sql_yacc.yy:
  TRUNCATE
sql/violite.c:
  Merge with client/violite.c
strings/strstr-sparc.s:
  Fixed wrong register usage
This commit is contained in:
unknown
2000-11-13 23:55:10 +02:00
parent 675d31ee9a
commit f3d2341f1f
35 changed files with 795 additions and 435 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
client/mysqlimport.c
View File

@ -25,7 +25,7 @@
** * *
** *************************
*/
#define IMPORT_VERSION "2.4"
#define IMPORT_VERSION "2.5"
#include <global.h>
#include <my_sys.h>
@ -45,7 +45,7 @@ static my_bool verbose=0,lock_tables=0,ignore_errors=0,delete=0,
replace=0,silent=0,ignore=0,opt_compress=0,opt_local_file=0;
static MYSQL mysql_connection;
static char *password=0, *current_user=0,
static char *opt_password=0, *current_user=0,
*current_host=0, *current_db=0, *fields_terminated=0,
*lines_terminated=0, *enclosed=0, *opt_enclosed=0,
*escaped=0, opt_low_priority=0, *opt_columns=0;
@ -202,9 +202,12 @@ static int get_options(int *argc, char ***argv)
case 'p':
if (optarg)
{
my_free(password,MYF(MY_ALLOW_ZERO_PTR));
password= my_strdup(optarg,MYF(MY_FAE));
char *start=optarg;
my_free(opt_password,MYF(MY_ALLOW_ZERO_PTR));
opt_password=my_strdup(optarg,MYF(MY_FAE));
while (*optarg) *optarg++= 'x'; /* Destroy argument */
if (*start)
start[1]=0; /* Cut length of argument */
}
else
tty_password= 1;
@ -276,7 +279,7 @@ static int get_options(int *argc, char ***argv)
current_db= *((*argv)++);
(*argc)--;
if (tty_password)
password=get_tty_password(NullS);
opt_password=get_tty_password(NullS);
return(0);
}
@ -504,7 +507,7 @@ int main(int argc, char **argv)
argv_to_free= argv;
if (get_options(&argc, &argv))
return(1);
if (!(sock= db_connect(current_host,current_db,current_user,password)))
if (!(sock= db_connect(current_host,current_db,current_user,opt_password)))
return(1); /* purecov: deadcode */
if (lock_tables)
lock_table(sock, argc, argv);
@ -513,7 +516,7 @@ int main(int argc, char **argv)
if (exitcode == 0)
exitcode = error;
db_disconnect(current_host, sock);
my_free(password,MYF(MY_ALLOW_ZERO_PTR));
my_free(opt_password,MYF(MY_ALLOW_ZERO_PTR));
free_defaults(argv_to_free);
my_end(0);
return(exitcode);