Commit graph

316 commits

Author SHA1 Message Date
unknown
5f6b100ed0 Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp


client/mysqlimport.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/gis.result:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/item_geofunc.cc:
  Auto merged
sql/spatial.cc:
  Auto merged
sql/spatial.h:
  Auto merged
support-files/my-huge.cnf.sh:
  Auto merged
support-files/my-innodb-heavy-4G.cnf.sh:
  Auto merged
support-files/my-large.cnf.sh:
  Auto merged
mysql-test/mysql-test-run.sh:
  Merged from 4.1.
mysql-test/r/mysqldump.result:
  Merged from 4.1.
mysql-test/t/gis.test:
  Merged from 4.1.
2005-10-31 11:54:36 +02: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
unknown
cf59103d84 BUG# 12123
Made change to mysqlimport to set character_set_database to binary to 
make importing various charsets/columns work correctly.


client/mysqlimport.c:
  BUG# 12123
  
  Added 'set @@character_set_database=binary' to make loading of tables with
  mixed charset types and non-latin characters load.
mysql-test/mysql-test-run.pl:
  BUG 
  
  Added $MYSQL_IMPORT in order to test mysqlimport bug.
mysql-test/mysql-test-run.sh:
  BUG 
  
  Added $MYSQL_IMPORT in order to test mysqlimport bug.
mysql-test/r/mysqldump.result:
  BUG 
  
  Added dumping and reloading (using mysql, mysqldump, and mysqlimport) to
  show that this fix handles dumping and reloading of non-latin1 charsets
  in table with different charset columns (mixing of charsets, also can be a
  UTF table with latin1 tables). Note the select before and after dump and 
  restore - should be exact.
mysql-test/t/mysqldump.test:
  BUG 
  
  Added dumping and reloading (using mysql, mysqldump, and mysqlimport) to
  show that this fix handles dumping and reloading of non-latin1 charsets
  in table with different charset columns (mixing of charsets, also can be a
  UTF table with latin1 tables). Note the select before and after dump and 
  restore - should be exact. (results of this)
2005-10-25 14:50:08 -07: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
unknown
a247d3a3b7 Fix being able to set default TCP port for command-line utilities
by using MYSQL_TCP_PORT variable. (Bug )


client/mysql.cc:
  Set default port to 0 so MYSQL_TCP_PORT is handled by mysql_server_init().
client/mysqladmin.cc:
  Set default port to 0 so MYSQL_TCP_PORT is handled by mysql_server_init().
client/mysqlbinlog.cc:
  Set default port to 0 so MYSQL_TCP_PORT is handled by mysql_server_init().
client/mysqlcheck.c:
  Set default port to 0 so MYSQL_TCP_PORT is handled by mysql_server_init().
client/mysqldump.c:
  Set default port to 0 so MYSQL_TCP_PORT is handled by mysql_server_init().
client/mysqlimport.c:
  Set default port to 0 so MYSQL_TCP_PORT is handled by mysql_server_init().
client/mysqlshow.c:
  Set default port to 0 so MYSQL_TCP_PORT is handled by mysql_server_init().
client/mysqltest.c:
  Set default port to 0 so MYSQL_TCP_PORT is handled by mysql_server_init().
2005-10-13 12:28:43 -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 )
2005-10-13 12:28:43 -07:00
unknown
0c51dc75d9 Merge mysql.com:/home/hartmut/projects/mysql/dev/4.1
into  mysql.com:/home/hartmut/projects/mysql/dev/5.0


client/mysqlimport.c:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
2005-09-08 00:57:02 +02: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
unknown
d8bb755f2a Merge mysql.com:/home/hartmut/projects/mysql/dev/4.0
into  mysql.com:/home/hartmut/projects/mysql/dev/4.1


client/mysqlimport.c:
  Auto merged
2005-09-08 00:50:03 +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
unknown
c66167d447 fix for BUG#12958 : mysqlimport with -L option crashing on HP-UX 2005-09-02 22:52:52 +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
unknown
9d4a4f38d0 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


BitKeeper/deleted/.del-isamchk.c~c0f59c2687d2248f:
  Auto merged
BitKeeper/etc/config:
  Auto merged
client/mysql.cc:
  Auto merged
client/mysqlcheck.c:
  Auto merged
BitKeeper/deleted/.del-pack_isam.c~43801f0df7504834:
  Auto merged
client/mysqldump.c:
  Auto merged
client/mysqlimport.c:
  Auto merged
client/mysqlshow.c:
  Auto merged
client/mysqltest.c:
  Auto merged
extra/my_print_defaults.c:
  Auto merged
extra/perror.c:
  Auto merged
extra/resolve_stack_dump.c:
  Auto merged
include/help_end.h:
  Auto merged
include/help_start.h:
  Auto merged
myisam/myisamchk.c:
  Auto merged
myisam/myisamlog.c:
  Auto merged
myisam/myisampack.c:
  Auto merged
netware/myisamchk.def:
  Auto merged
netware/mysql.def:
  Auto merged
netware/mysql_test_run.c:
  Auto merged
netware/mysqladmin.def:
  Auto merged
netware/mysqlbinlog.def:
  Auto merged
netware/mysqlcheck.def:
  Auto merged
netware/mysqld_safe.c:
  Auto merged
netware/mysqldump.def:
  Auto merged
netware/mysqlimport.def:
  Auto merged
netware/mysqlshow.def:
  Auto merged
sql/ha_blackhole.cc:
  Auto merged
sql/ha_blackhole.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
client/client_priv.h:
  Merged from 4.1
client/mysqladmin.cc:
  Merged from 4.1
client/mysqlbinlog.cc:
  Merged from 4.1
mysys/charset.c:
  Merged from 4.1
2005-08-26 15:56:52 +03: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
unknown
ea09b97036 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


client/mysqlcheck.c:
  Auto merged
client/mysqlimport.c:
  Auto merged
client/mysqltest.c:
  Auto merged
extra/my_print_defaults.c:
  Auto merged
extra/perror.c:
  Auto merged
extra/resolve_stack_dump.c:
  Auto merged
include/help_end.h:
  Auto merged
include/help_start.h:
  Auto merged
isam/isamchk.c:
  Auto merged
isam/pack_isam.c:
  Auto merged
myisam/myisamlog.c:
  Auto merged
netware/myisamchk.def:
  Auto merged
netware/mysql.def:
  Auto merged
netware/mysqladmin.def:
  Auto merged
netware/mysqlbinlog.def:
  Auto merged
netware/mysqlcheck.def:
  Auto merged
netware/mysqldump.def:
  Auto merged
netware/mysqlimport.def:
  Auto merged
netware/mysqlshow.def:
  Auto merged
client/client_priv.h:
  Merged from 4.0.
client/mysql.cc:
  Merged from 4.0.
client/mysqladmin.cc:
  Merged from 4.0.
client/mysqlbinlog.cc:
  Merged from 4.0.
client/mysqldump.c:
  Merged from 4.0.
client/mysqlshow.c:
  Merged from 4.0.
myisam/myisamchk.c:
  Merged from 4.0.
myisam/myisampack.c:
  Merged from 4.0.
netware/mysql_test_run.c:
  Merged from 4.0.
netware/mysqld_safe.c:
  Merged from 4.0.
sql/mysqld.cc:
  Merged from 4.0.
2005-08-25 12:08:26 +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
unknown
97dbe8dbe3 Several fixes for Netware.
client/client_priv.h:
  Added option auto close for Netware.
client/mysql.cc:
  Added option auto close for Netware.
client/mysqladmin.c:
  Added option auto close for Netware.
client/mysqlbinlog.cc:
  Added option auto close for Netware.
client/mysqlcheck.c:
  Added option auto close for Netware.
client/mysqldump.c:
  Added option auto close for Netware.
client/mysqlimport.c:
  Added option auto close for Netware.
client/mysqlshow.c:
  Added option auto close for Netware.
client/mysqltest.c:
  Fixed help messages for Netware.
extra/my_print_defaults.c:
  Fixed help messages for Netware.
extra/perror.c:
  Fixed help messages for Netware.
extra/resolve_stack_dump.c:
  Fixed help messages for Netware.
include/help_end.h:
  Fixed help messages for Netware.
include/help_start.h:
  Fixed help messages for Netware.
isam/isamchk.c:
  Added auto close of window for Netware
isam/pack_isam.c:
  Added auto close of window for Netware
myisam/myisamchk.c:
  Added auto close of window for Netware
myisam/myisamlog.c:
  Added help for Netware.
myisam/myisampack.c:
  Added auto close for Netware.
netware/myisamchk.def:
  Scrollable screen patch.
netware/mysql.def:
  Scrollable screen patch.
netware/mysql_test_run.c:
  Fixed strindex for Netware.
netware/mysqladmin.def:
  Scrollable screen patch.
netware/mysqlbinlog.def:
  Scrollable screen patch.
netware/mysqlcheck.def:
  Scrollable screen patch.
netware/mysqld_safe.c:
  Removed debug message for Netware.
netware/mysqldump.def:
  Scrollable screen patch.
netware/mysqlimport.def:
  Scrollable screen patch.
netware/mysqlshow.def:
  Scrollable screen patch.
sql/mysqld.cc:
  Abnormal end patch when shutting down and volume not ready.
2005-08-24 22:03:34 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
fe977b0cd0 Several fixes for Netware. 2005-08-24 22:03:34 +03:00
unknown
40c2a8870b 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.


VC++Files/libmysqltest/mytest.c:
  explicit mention of reconnect (no behaviour change)
VC++Files/mysqlmanager/mysqlmanagerview.cpp:
  explicit mention of reconnect (no behaviour change)
VC++Files/test1/mysql_thr.c:
  explicit mention of reconnect (no behaviour change)
VC++Files/winmysqladmin/main.cpp:
  explicit mention of reconnect (no behaviour change)
client/mysql.cc:
  explicit mention of reconnect if embedded (no behaviour change)
client/mysqladmin.cc:
  explicit mention of reconnect (no behaviour change)
client/mysqlbinlog.cc:
  explicit mention of reconnect (no behaviour change)
client/mysqlcheck.c:
  explicit mention of reconnect (no behaviour change)
client/mysqlimport.c:
  explicit mention of NO reconnect (behaviour change). As most time is passed in LOAD DATA INFILE,
  and as it does not make sense to reconnect after a partly failed LOAD... And as mysqlimport sometimes
  does LOCK TABLES where we mustn't reconnect...
client/mysqlshow.c:
  explicit mention of reconnect (no behaviour change)
client/mysqltest.c:
  explicit mention of reconnect (no behaviour change).
  Normally we should not reconnect (it's not good to have silent reconnection in the middle of a test),
  but 5.0 is too touchy to change it now. I'm marking it TODO.
libmysql/libmysql.c:
  explicit mention of reconnect (no behaviour change)
libmysqld/examples/builder-sample/emb_samples.cpp:
  explicit mention of reconnect (no behaviour change)
ndb/test/ndbapi/flex_bench_mysql.cpp:
  explicit mention of reconnect (no behaviour change)
ndb/tools/restore/consumer_restorem.cpp:
  explicit mention of reconnect (no behaviour change)
sql-common/client.c:
  Changing the default of libmysqlclient : it's now NO reconnection.
sql/repl_failsafe.cc:
  explicit mention of reconnect (no behaviour change)
sql/slave.cc:
  explicit mention of reconnect (no behaviour change)
tests/client_test.c:
  explicit mention of reconnect (no behaviour change)
tests/connect_test.c:
  explicit mention of reconnect (no behaviour change)
tests/deadlock_test.c:
  explicit mention of reconnect (no behaviour change)
tests/insert_test.c:
  explicit mention of reconnect (no behaviour change)
tests/list_test.c:
  explicit mention of reconnect (no behaviour change)
tests/select_test.c:
  explicit mention of reconnect (no behaviour change)
tests/showdb_test.c:
  explicit mention of reconnect (no behaviour change)
tests/ssl_test.c:
  explicit mention of reconnect (no behaviour change)
tests/thread_test.c:
  explicit mention of reconnect (no behaviour change)
tools/mysqlmanager.c:
  explicit mention of reconnect (no behaviour change)
2004-12-09 14:44:10 +01: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
unknown
f35377c6cc - Cleanup: removed unreferenced local variable "local_file" in mysqlimport.c
client/mysqlimport.c:
   - Cleanup: removed unreferenced local variable "local_file"
2004-10-14 16:52:00 +02:00
lenz@mysql.com
a524835cdd - Cleanup: removed unreferenced local variable "local_file" in mysqlimport.c 2004-10-14 16:52:00 +02:00
unknown
26f348c910 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


BitKeeper/etc/logging_ok:
  auto-union
client/mysqladmin.c:
  Auto merged
client/mysqldump.c:
  Auto merged
client/mysqlimport.c:
  Auto merged
2004-10-07 22:09:14 +03: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
unknown
d39ea1fdad Fixed a bug in password handling. All related to Bug#5955.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2004-10-07 22:08:17 +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
unknown
9232c91d39 Merge mysql.com:/home/my/mysql-4.0 into mysql.com:/home/my/mysql-4.1
client/mysqlimport.c:
  Auto merged
myisam/mi_locking.c:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_handler.cc:
  Auto merged
2004-10-07 12:51:32 +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
unknown
bb6fe04c93 Bug 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


client/mysqlimport.c:
  Removed check of unix_socket to set local_file
2004-10-04 20:26:43 +02:00
rburnett@build.mysql.com
b4ee4d358a Bug 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
unknown
fe937a2b1b Merge with 4.0
BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/deleted/.del-acconfig.h~8d2e3113fc8056da:
  Auto merged
BitKeeper/deleted/.del-convert.cc~437689acaffb7446:
  Auto merged
BitKeeper/deleted/.del-flush_block_commit-master.opt~3bcd295d5bf68796:
  Auto merged
BitKeeper/deleted/.del-message.mc:
  Delete: VC++Files/sql/message.mc
BitKeeper/deleted/.del-mysql_install.c~8c089740d79a92:
  Auto merged
BitKeeper/deleted/.del-win1251.conf~b6bb6681f02917b6:
  Auto merged
Build-tools/Bootstrap:
  Auto merged
client/mysql.cc:
  Auto merged
client/mysqladmin.c:
  Auto merged
client/mysqlbinlog.cc:
  Auto merged
client/mysqlcheck.c:
  Auto merged
client/mysqldump.c:
  Auto merged
client/mysqlimport.c:
  Auto merged
client/mysqlmanager-pwgen.c:
  Auto merged
client/mysqlshow.c:
  Auto merged
client/mysqltest.c:
  Auto merged
extra/my_print_defaults.c:
  Auto merged
extra/perror.c:
  Auto merged
extra/resolve_stack_dump.c:
  Auto merged
extra/resolveip.c:
  Auto merged
include/m_string.h:
  Auto merged
include/my_getopt.h:
  Auto merged
isam/isamchk.c:
  Auto merged
isam/pack_isam.c:
  Auto merged
myisam/mi_test1.c:
  Auto merged
myisam/myisamchk.c:
  Auto merged
myisam/myisampack.c:
  Auto merged
sql/field.cc:
  Auto merged
sql/gen_lex_hash.cc:
  Auto merged
strings/strto.c:
  Auto merged
strings/strtol.c:
  Auto merged
strings/strtoll.c:
  Auto merged
strings/strtoull.c:
  Auto merged
support-files/Makefile.am:
  Auto merged
tools/mysqlmanager.c:
  Auto merged
2004-09-01 04:12:09 +03:00
monty@mysql.com
054cea4ca8 Merge with 4.0 2004-09-01 04:12:09 +03:00
unknown
c9394a0f0d 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.


client/mysql.cc:
  Removed extra handle_optins()'s parameter.
client/mysqladmin.c:
  Removed extra handle_optins()'s parameter.
client/mysqlbinlog.cc:
  Removed extra handle_optins()'s parameter.
client/mysqlcheck.c:
  Removed extra handle_optins()'s parameter.
client/mysqldump.c:
  Removed extra handle_optins()'s parameter.
client/mysqlimport.c:
  Removed extra handle_optins()'s parameter.
client/mysqlmanager-pwgen.c:
  Removed extra handle_optins()'s parameter.
client/mysqlmanagerc.c:
  Removed extra handle_optins()'s parameter.
client/mysqlshow.c:
  Removed extra handle_optins()'s parameter.
client/mysqltest.c:
  Removed extra handle_optins()'s parameter.
extra/my_print_defaults.c:
  Removed extra handle_optins()'s parameter.
extra/mysql_install.c:
  Removed extra handle_optins()'s parameter.
extra/mysql_waitpid.c:
  Removed extra handle_optins()'s parameter.
extra/perror.c:
  Removed extra handle_optins()'s parameter.
extra/resolve_stack_dump.c:
  Removed extra handle_optins()'s parameter.
extra/resolveip.c:
  Removed extra handle_optins()'s parameter.
include/my_getopt.h:
  Removed extra handle_optins()'s parameter.
isam/isamchk.c:
  Removed extra handle_optins()'s parameter.
isam/pack_isam.c:
  Removed extra handle_optins()'s parameter.
myisam/mi_test1.c:
  Removed extra handle_optins()'s parameter.
myisam/myisam_ftdump.c:
  Removed extra handle_optins()'s parameter.
myisam/myisamchk.c:
  Removed extra handle_optins()'s parameter.
myisam/myisampack.c:
  Removed extra handle_optins()'s parameter.
sql/gen_lex_hash.cc:
  Removed extra handle_optins()'s parameter.
sql/mysqld.cc:
  Removed extra handle_optins()'s parameter.
tools/mysqlmanager.c:
  Removed extra handle_optins()'s parameter.
2004-08-31 21:27:58 +05: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
unknown
e2f697bec0 Names listed as options should look like options,
not variables.
2004-08-30 11:11:10 -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
unknown
e8d41a5b1b merged
BitKeeper/etc/logging_ok:
  auto-union
VC++Files/sql/mysqld.dsp:
  Auto merged
client/mysql.cc:
  Auto merged
client/mysqladmin.c:
  Auto merged
BitKeeper/deleted/.del-mysql_install.c~8c089740d79a92:
  Auto merged
client/mysqlbinlog.cc:
  Auto merged
client/mysqlcheck.c:
  Auto merged
client/mysqldump.c:
  Auto merged
client/mysqlimport.c:
  Auto merged
client/mysqlmanager-pwgen.c:
  Auto merged
client/mysqlshow.c:
  Auto merged
client/mysqltest.c:
  Auto merged
extra/my_print_defaults.c:
  Auto merged
extra/perror.c:
  Auto merged
extra/resolve_stack_dump.c:
  Auto merged
extra/resolveip.c:
  Auto merged
include/my_getopt.h:
  Auto merged
innobase/buf/buf0rea.c:
  Auto merged
isam/isamchk.c:
  Auto merged
isam/pack_isam.c:
  Auto merged
libmysqld/Makefile.am:
  Auto merged
myisam/mi_test1.c:
  Auto merged
myisam/myisamchk.c:
  Auto merged
myisam/myisampack.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
sql/gen_lex_hash.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
tools/mysqlmanager.c:
  Auto merged
2004-08-26 15:19:46 +02:00
serg@serg.mylan
b4bb38e896 merged 2004-08-26 15:19:46 +02:00
unknown
84648dfbdd more accurate processing of find_type result
(Bug  --protocol doesn't reject bad values)


client/mysql.cc:
  more accurate processing of find_type result
client/mysqladmin.c:
  more accurate processing of find_type result
client/mysqlbinlog.cc:
  more accurate processing of find_type result
client/mysqlcheck.c:
  more accurate processing of find_type result
client/mysqldump.c:
  more accurate processing of find_type result
client/mysqlimport.c:
  more accurate processing of find_type result
client/mysqlshow.c:
  more accurate processing of find_type result
sql-common/client.c:
  more accurate processing of find_type result
2004-08-24 20:13:31 +05:00
vva@eagle.mysql.r18.ru
ffacc77f22 more accurate processing of find_type result
(Bug  --protocol doesn't reject bad values)
2004-08-24 20:13:31 +05:00
unknown
aab7b774d5 fixed a Bug "--protocol doesn't reject bad values" 2004-08-23 20:55:09 +05:00
vva@eagle.mysql.r18.ru
237615bc53 fixed a Bug "--protocol doesn't reject bad values" 2004-08-23 20:55:09 +05:00
unknown
767d880f9c 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)


VC++Files/sql/mysqld.dsp:
  Added custom build step for compiling message file and added message resource file (output of mc)
client/mysqladmin.c:
  Added NULL error reporter parameter as the last paramter to handle_options
client/mysqlcheck.c:
  Added NULL error reporter parameter as the last paramter to handle_options
client/mysqldump.c:
  Added NULL error reporter parameter as the last paramter to handle_options
client/mysqlimport.c:
  Added NULL error reporter parameter as the last paramter to handle_options
client/mysqlmanager-pwgen.c:
  Added NULL error reporter parameter as the last paramter to handle_options
client/mysqlmanagerc.c:
  Added NULL error reporter parameter as the last paramter to handle_options
client/mysqlbinlog.cc:
  Added NULL error reporter parameter as the last paramter to handle_options
client/mysqlshow.c:
  Added NULL error reporter parameter as the last paramter to handle_options
client/mysqltest.c:
  Added NULL error reporter parameter as the last paramter to handle_options
extra/my_print_defaults.c:
  Added NULL error reporter parameter as the last paramter to handle_options
extra/mysql_install.c:
  Added NULL error reporter parameter as the last paramter to handle_options
extra/mysql_waitpid.c:
  Added NULL error reporter parameter as the last paramter to handle_options
extra/perror.c:
  Added NULL error reporter parameter as the last paramter to handle_options
extra/resolve_stack_dump.c:
  Added NULL error reporter parameter as the last paramter to handle_options
extra/resolveip.c:
  Added NULL error reporter parameter as the last paramter to handle_options
isam/isamchk.c:
  Added NULL error reporter parameter as the last paramter to handle_options
isam/pack_isam.c:
  Added NULL error reporter parameter as the last paramter to handle_options
myisam/mi_test1.c:
  Added NULL error reporter parameter as the last paramter to handle_options
myisam/myisam_ftdump.c:
  Added NULL error reporter parameter as the last paramter to handle_options
myisam/myisamchk.c:
  Added NULL error reporter parameter as the last paramter to handle_options
myisam/myisampack.c:
  Added NULL error reporter parameter as the last paramter to handle_options
include/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
mysys/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
tools/mysqlmanager.c:
  Added NULL error reporter parameter as the last paramter to handle_options
client/mysql.cc:
  Added NULL as error reporter arg to the end of handle_options
sql/mysqld.cc:
  Added option_error_reporter callback function and pass that into handle_options
sql/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.
sql/gen_lex_hash.cc:
  Added NULL error reporting parameter to handle_options
sql/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
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2004-08-14 03:38:37 +02: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
unknown
a9b481d3cd merge with 4.0 to get Netware patches and fixes for libmysqld.dll
configure.in:
  Auto merged
Build-tools/Do-compile:
  Auto merged
client/mysql.cc:
  Auto merged
client/mysqladmin.c:
  Auto merged
client/mysqlcheck.c:
  Auto merged
client/mysqldump.c:
  Auto merged
client/mysqlimport.c:
  Auto merged
client/mysqlshow.c:
  Auto merged
client/mysqltest.c:
  Auto merged
include/my_global.h:
  Auto merged
include/thr_alarm.h:
  Auto merged
innobase/include/trx0roll.h:
  Auto merged
innobase/include/trx0trx.h:
  Auto merged
innobase/que/que0que.c:
  Auto merged
innobase/srv/srv0srv.c:
  Auto merged
innobase/trx/trx0purge.c:
  Auto merged
innobase/trx/trx0roll.c:
  Auto merged
innobase/trx/trx0trx.c:
  Auto merged
innobase/usr/usr0sess.c:
  Auto merged
isam/isamchk.c:
  Auto merged
myisam/myisam_ftdump.c:
  Auto merged
myisam/myisamchk.c:
  Auto merged
myisam/myisampack.c:
  Auto merged
mysys/default.c:
  Auto merged
mysys/my_getopt.c:
  Auto merged
mysys/my_init.c:
  Auto merged
mysys/my_pthread.c:
  Auto merged
netware/Makefile.am:
  Auto merged
netware/init_db.sql:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
tools/mysqlmanager.c:
  Auto merged
VC++Files/dbug/dbug.dsp:
  Auto merged
VC++Files/heap/heap.dsp:
  Auto merged
VC++Files/isam/isam.dsp:
  Auto merged
VC++Files/libmysql/libmysql.dsp:
  Auto merged
VC++Files/myisam/myisam.dsp:
  Auto merged
VC++Files/myisammrg/myisammrg.dsp:
  Auto merged
VC++Files/mysys/mysys.dsp:
  Auto merged
VC++Files/libmysqld/libmysqld.dsp:
  merge
client/mysqlbinlog.cc:
  merge
extra/perror.c:
  merge
include/mysql_com.h:
  merge
libmysqld/Makefile.am:
  merge
netware/BUILD/mwenv:
  merge
sql/mysqld.cc:
  merge
2004-05-25 22:54:00 +03:00
monty@mysql.com
390d9898f9 merge with 4.0 to get Netware patches and fixes for libmysqld.dll 2004-05-25 22:54:00 +03:00
unknown
b3851363ba Added patches from Novell
Build-tools/Do-compile:
  Fixed indentation
configure.in:
  Added patches from Novell
  Added C_EXTRA_FLAGS as an easy way to pass flags to both CFLAGS and CXXFLAGS
extra/perror.c:
  Fixed error number reporting to not report 'Unknown error'
include/my_global.h:
  Defines to make NETWARE patches cleaner
include/thr_alarm.h:
  Fixed wrong macro
netware/mysql_install_db.c:
  Indentation fix
2004-05-25 22:00:14 +03:00
monty@mysql.com
f2e1e3ce4c Added patches from Novell 2004-05-25 22:00:14 +03:00
unknown
24e3862cb8 mysqlimport.c, mysqldump.c, mysqlcheck.c, mysql.cc:
No needs to load charset index if the character set is build-in.


client/mysql.cc:
  No needs to load charset index if the character set is build-in.
client/mysqlcheck.c:
  No needs to load charset index if the character set is build-in.
client/mysqldump.c:
  No needs to load charset index if the character set is build-in.
client/mysqlimport.c:
  No needs to load charset index if the character set is build-in.
2004-02-11 15:15:39 +04:00
bar@bar.intranet.mysql.r18.ru
251bf4ab85 mysqlimport.c, mysqldump.c, mysqlcheck.c, mysql.cc:
No needs to load charset index if the character set is build-in.
2004-02-11 15:15:39 +04:00