Commit graph

86 commits

Author SHA1 Message Date
kaa@polly.local
71a292cac1 Fix for the bug #23814 "mysqlimport crashes"
mysqlimport.c declared the opt_use_threads variable as my_bool, but the corresponding option was defined as GET_UINT. The problem only occured on architectures with strict alignment rules.
2007-01-19 14:14:11 +03:00
kent@kent-amd64.(none)
58763e383e Merge mysql.com:/home/kent/bk/main/mysql-5.0
into  mysql.com:/home/kent/bk/main/mysql-5.1
2006-12-31 01:32:21 +01:00
kent@mysql.com/kent-amd64.(none)
6523aca729 my_strtoll10-x86.s:
Corrected spelling in copyright text
Makefile.am:
  Don't update the files from BitKeeper
Many files:
  Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
  Adjusted year(s) in copyright header 
Many files:
  Added GPL copyright text
Removed files:
  Docs/Support/colspec-fix.pl
  Docs/Support/docbook-fixup.pl
  Docs/Support/docbook-prefix.pl
  Docs/Support/docbook-split
  Docs/Support/make-docbook
  Docs/Support/make-makefile
  Docs/Support/test-make-manual
  Docs/Support/test-make-manual-de
  Docs/Support/xwf
2006-12-31 01:02:27 +01:00
kent@kent-amd64.(none)
be15e3bc15 Merge mysql.com:/home/kent/bk/main/mysql-5.0
into  mysql.com:/home/kent/bk/main/mysql-5.1
2006-12-23 20:20:40 +01:00
kent@mysql.com/kent-amd64.(none)
226a5c833f Many files:
Changed header to GPL version 2 only
2006-12-23 20:17:15 +01:00
monty@mysql.com/nosik.monty.fi
f6682e2743 Added --debug-info to most clients to detect memory leaks in mysql-test-run
Moved .progress files into the log directory
Moved 'cluster' database tables into the MySQL database, to not have 'cluster' beeing a reserved database name
Fixed bug where mysqld got a core dump when trying to use a table created by MySQL 3.23
Fixed some compiler warnings
Fixed small memory leak in libmysql
Note that this doesn't changeset doesn't include the new mysqldump.c code required to run some tests. This will be added when I merge 5.0 to 5.1
2006-11-21 22:32:58 +02:00
kostja@bodhi.local
04c97488f9 Merge bodhi.local:/opt/local/work/tmp_merge
into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
2006-08-12 21:06:51 +04:00
msvensson@neptunus.(none)
dbb5a408ea Bug#15690 mysqlimport tries to set options the server doesn't understand
- "set @@character_set_database" should be ignored by servers prior to 4.1.1
2006-07-20 17:30:44 +02:00
brian@zim.(none)
b977471e78 Cleanup of thread code (I didn't use conditionals earlier and I really should have, though there is technically no reason why the prior method would not work). This is just cleaner.
And this took under 10 minutes to change, so there is no wl or bug associated with it :)
2006-06-13 17:59:04 -07:00
jani@a193-229-222-105.elisa-laajakaista.fi
95ea2395f2 Some fixes that were not done in original merge, compilation revealed. 2006-05-11 04:11:50 +03:00
jani@ua141d10.elisa.omakaista.fi
083f8455c7 Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.1-new
2006-05-09 20:50:29 +03:00
msvensson@neptunus.(none)
a51668c74c Bug#17208 SSL: client does not verify server certificate
- Add new function 'ssl_verify_server_cert' which is used if we are 
   connecting to the server with SSL. It will compare the hostname in 
   the server's cert against the hostname that we used when connecting 
   to the server. Will reject the connection if hostname does not match.
 - Add new option "OPT_SSL_VERIFY_SERVER_CERT" to be passed to mysql_options
   which will turn on checking of servers cert.
 - Add new argument "ssl-verify-server-cert" to all mysql* clients which 
   will activate the above option.
 - Generate a new server cert with 1024 bits that has "localhost" as the server name.
2006-04-18 17:58:27 +02:00
brian@zim.(none)
7234f79c4a This patch handles compiles with threads, namely if you don't have pthreads it will remove support for threads in the applications (and it is fixed in such a way that tests won't break). 2006-02-25 18:03:11 -08:00
msvensson@neptunus.(none)
4cde1d1259 Bug#17382 mysql-test-run mysqldump fails with mysqlimport 2006-02-20 13:04:40 +01:00
kent@mysql.com
4c81413932 Merge 2006-02-19 23:47:00 +01:00
brian@zim.tangent.org
faa1b42989 Fixed some threading issues that Guilhem found (and its what I get for copy and pasting from elsewhere without thinking about it). Added depracted messages to BACKUP, RESTORE, and LOAD TABLE FROM MASTER (which doesn't work well). 2006-02-19 09:41:59 -08:00
msvensson@neptunus.(none)
e592227529 Fix build failure 2006-02-18 16:18:51 +01:00
kent@mysql.com
a50023d772 mysqlimport.c:
Handle case where there is no snprintf()
libmysql.vcproj, mysqlclient.vcproj:
  Added __WIN__ symbol, needed when compiling dbug.c
dbug.vcproj:
  Changed __WIN32__ to __WIN__
dbug.c:
  Added Windows specific code to handle TIMESTAMP_ON log line format
make_win_src_distribution.sh:
  Copy plugin directory recursively
dbug.vcproj:
  Define __WIN__ for all targets
2006-02-18 08:46:18 +01:00
msvensson@neptunus.(none)
ace6f14267 Bug#17382 mysql-test-run mysqldump fails with mysqlimport: Error:client run out of memory
- Disable --use-threads option in 5.1.7
2006-02-17 18:19:29 +01:00
msvensson@neptunus.(none)
a50d87da34 Fix after review 2006-02-17 17:16:18 +01:00
msvensson@neptunus.(none)
e96353cf55 Bug#17382 mysql-test-run mysqldump fails with mysqlimport
- Remove global  MYSQL connection variable
2006-02-17 15:52:05 +01:00
paul@snake-hub.snake.net
bf683f51bc mysqlimport.c:
Revise option description for --help message.
2006-02-14 12:11:26 -06:00
kent@mysql.com
d60b10d565 mysqlimport.c:
Removed C++ comment, changed types for pthread_create() usage
2006-02-13 20:21:15 +01:00
brian@zim.tangent.org
f76c047305 Made mysqlimport link against mysys so that it could make use of the safe mutex functions. 2006-02-13 04:48:14 -08:00
brian@zim.tangent.org
a33a7e274f Cleanup's from Kostja's review. Plus I added a bit more documentation to the --lock-tables option. If selected it disables threads (since you can't quite do it with threads). 2006-02-13 04:04:53 -08:00
brian@zim.tangent.org
7f3d7af7ae Adding thread support for mysqlimport. You can now specify a number of threads to use and it will thread the loading of the database. Anyone who has had to go through the pain of loading the database will immediatly get the reason for this. 2006-02-13 00:45:59 -08:00
jimw@mysql.com
5f7e5b46c6 Merge mysql.com:/home/jimw/my/mysql-4.1-5792
into  mysql.com:/home/jimw/my/mysql-5.0-clean
2005-11-28 10:52:52 -08:00
jamppa@suse9-x86.mysql.com
a50cc250ff Netware specific changes for 5.0.16a 2005-11-18 18:25:46 +01:00
jani@ua141d10.elisa.omakaista.fi
44aea416f9 Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp
2005-10-31 11:54:36 +02:00
patg@krsna.patg.net
7243b7bb49 BUG# 12123
Made change to mysqlimport to set character_set_database to binary to 
make importing various charsets/columns work correctly.
2005-10-25 14:50:08 -07:00
jimw@mysql.com
b6dcc55969 Fix being able to set default TCP port for command-line utilities
by using MYSQL_TCP_PORT variable. (Bug #5792)
2005-10-13 12:28:43 -07:00
hartmut@mysql.com
052e9262ee Merge mysql.com:/home/hartmut/projects/mysql/dev/4.1
into  mysql.com:/home/hartmut/projects/mysql/dev/5.0
2005-09-08 00:57:02 +02:00
hartmut@mysql.com
1e1872464b Merge mysql.com:/home/hartmut/projects/mysql/dev/4.0
into  mysql.com:/home/hartmut/projects/mysql/dev/4.1
2005-09-08 00:50:03 +02:00
hartmut@mysql.com
14485e71c2 fix for BUG#12958 : mysqlimport with -L option crashing on HP-UX 2005-09-02 22:52:52 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
7b7188cea6 Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
2005-08-26 15:56:52 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
e767eb330e Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
2005-08-25 12:08:26 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
fe977b0cd0 Several fixes for Netware. 2005-08-24 22:03:34 +03:00
guilhem@mysql.com
1cbc904c59 Changing the default of libmysqlclient : it's now NO reconnection.
All our programs which use mysql_real_connect() and mysql_connect() are updated accordingly, though I have deliberately
made mysqlimport not reconnect anymore (already true for mysqldump >= 4.1.8).
All Connector devs have been warned about the change I'm doing here - which was agreed with Monty,
and fixes BUG#2555.
2004-12-09 14:44:10 +01:00
lenz@mysql.com
a524835cdd - Cleanup: removed unreferenced local variable "local_file" in mysqlimport.c 2004-10-14 16:52:00 +02:00
jani@a80-186-41-201.elisa-laajakaista.fi
724749e9a7 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1
into a80-186-41-201.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
2004-10-07 22:09:14 +03:00
jani@a80-186-41-201.elisa-laajakaista.fi
a44b6b67a5 Fixed a bug in password handling. All related to Bug#5955. 2004-10-07 22:08:17 +03:00
monty@mysql.com
1dd4bd5f6c Merge mysql.com:/home/my/mysql-4.0 into mysql.com:/home/my/mysql-4.1 2004-10-07 12:51:32 +03:00
rburnett@build.mysql.com
b4ee4d358a Bug #5829 mysqlimport garbles path of the file to be imported
Original code was checking ! unix_socket for local_file flag.  This doesn't work and so was removed.  Now
to import a local file, you must use the --local command line option.

mysqlimport.c:
  Removed check of unix_socket to set local_file
2004-10-04 20:26:43 +02:00
monty@mysql.com
054cea4ca8 Merge with 4.0 2004-09-01 04:12:09 +03:00
ram@gw.mysql.r18.ru
b93a973b12 Added global my_getopt_error_reporter function pointer which is
used in the handle_options() function (instead of using additional 
handle_option() parameter). The default value of the 
my_getopt_error_reporter is default_reporter(). One can set it to
other functions if case of need.
2004-08-31 21:27:58 +05:00
paul@kite-hub.kitebird.com
30e7217d52 Names listed as options should look like options,
not variables.
2004-08-30 11:11:10 -05:00
serg@serg.mylan
b4bb38e896 merged 2004-08-26 15:19:46 +02:00
vva@eagle.mysql.r18.ru
ffacc77f22 more accurate processing of find_type result
(Bug #4998 --protocol doesn't reject bad values)
2004-08-24 20:13:31 +05:00
vva@eagle.mysql.r18.ru
237615bc53 fixed a Bug #4998 "--protocol doesn't reject bad values" 2004-08-23 20:55:09 +05:00
rburnett@build.mysql.com
67003d1c98 mysql_priv.h:
Added declarations for print_msg_to_log and vprint_msg_to_log.  sql_print_error are simple functions that wrap calls to print_msg_to_log.  Define the different error types with MY_ERROR_TYPE, MY_WARNING_TYPE, and MY_INFORMATION_TYPE
gen_lex_hash.cc:
  Added NULL error reporting parameter to handle_options
log.cc:
  Add print_msg_to_log, print_buffer_to_log, and vprint_msg_to_log.  Print_msg_to_log will write the message to the windows event log if on NT.  We now have error, warning, and information versions of sql_print_xxxx.  T his is a variation of a similar changeset WAX did.
mysqld.cc:
  Added option_error_reporter callback function and pass that into handle_options
mysql.cc:
  Added NULL as error reporter arg to the end of handle_options
Many files:
  Added NULL error reporter parameter as the last paramter to handle_options
my_getopt.c:
  Added second function pointer to server as an error reporting callback.  Added local function report_option_error that will either write the error to stderr or to the error reporting callback.  changed all calls in handle_options from fprintf(stderr, ... ) to report_option_error
my_getopt.h:
  Changed declaration of handle_options to use typedefs for the two function pointers.  added second function pointer to server as an error reporting callback
mysqld.dsp:
  Added custom build step for compiling message file and added message resource file (output of mc)
2004-08-14 03:38:37 +02:00