mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
Fixed INSERT DELAYED with Innobase
Fix for shutdown on NT Fixed bug when using wrong dates from blob field. BitKeeper/deleted/.del-df_crash.result~4a3dbee64843953d: Delete: mysql-test/r/df_crash.result BitKeeper/deleted/.del-df_crash.test~4c365178fe437f6: Delete: mysql-test/t/df_crash.test Docs/manual.texi: Changelog innobase/ib_config.h.in: automatic changed file innobase/ib_config.h: automatic changed file mysql-test/r/func_time.result: Test case for bug in time functions mysql-test/r/innobase.result: Test for INSERT DELAYED mysql-test/t/func_time.test: Test case for bug in time functions mysql-test/t/innobase.test: Test for INSERT DELAYED scripts/mysql_convert_table_format.sh: Added --socket and --port sql/ha_innobase.cc: Fix bug when compiling with SAFE_MUTEX Cleaner comment when using SHOW TABLE STATUS sql/mysqld.cc: Fix for shutdown on NT sql/sql_insert.cc: Fixed problem with Innobase and INSERT DELAYED sql/sql_udf.cc: Support for UDF on windows sql/time.cc: Fixed bug when using wrong dates from blob field. strings/ctype-tis620.c: Removed not used variable support-files/mysql-max.spec.sh: Removed old not used section BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
This commit is contained in:
@ -8,10 +8,12 @@ use Getopt::Long;
|
||||
$opt_help=$opt_version=$opt_verbose=$opt_force=0;
|
||||
$opt_user=$opt_database=$opt_password=undef;
|
||||
$opt_host="localhost";
|
||||
$opt_socket="";
|
||||
$opt_type="MYISAM";
|
||||
$opt_port=0;
|
||||
$exit_status=0;
|
||||
|
||||
GetOptions("force","help","host=s","password=s","user=s","type=s","verbose","version") ||
|
||||
GetOptions("force","help","host=s","password=s","user=s","type=s","verbose","version","socket=s", "port=i") ||
|
||||
usage(0);
|
||||
usage($opt_version) if ($#ARGV < 0 || $opt_help || $opt_version);
|
||||
$opt_database=shift(@ARGV);
|
||||
@ -22,7 +24,17 @@ if (uc($opt_type) eq "HEAP")
|
||||
exit(1);
|
||||
}
|
||||
|
||||
$dbh = DBI->connect("DBI:mysql:$opt_database:$opt_host",
|
||||
$connect_opt="";
|
||||
if ($opt_port)
|
||||
{
|
||||
$connect_opt.= ";port=$opt_port";
|
||||
}
|
||||
if (length($opt_socket))
|
||||
{
|
||||
$connect_opt.=";mysql_socket=$opt_socket";
|
||||
}
|
||||
|
||||
$dbh = DBI->connect("DBI:mysql:$opt_database:${opt_host}$connect_opt",
|
||||
$opt_user,
|
||||
$opt_password,
|
||||
{ PrintError => 0})
|
||||
@ -96,6 +108,12 @@ Conversion of a MySQL tables to other table types.
|
||||
--password='password'
|
||||
Password for the current user.
|
||||
|
||||
--port=port
|
||||
TCP/IP port to connect to if host is not "localhost".
|
||||
|
||||
--socket='/path/to/socket'
|
||||
Socket to connect with.
|
||||
|
||||
--type='table-type'
|
||||
Converts tables to the given table type (Default: $opt_type)
|
||||
MySQL 3.23 supports at least the BDB, ISAM and MYISAM types.
|
||||
|
Reference in New Issue
Block a user