Commit graph

225 commits

Author SHA1 Message Date
monty@mishka.local
a9f6aab4c9 Fixes while reviewing new code
Added option --count to mysqlshow (to show number of rows)
Fixed possible core dump in information schema
2005-05-06 11:39:30 +03:00
unknown
2189e5e7bd BUG#9391 mysqlshow prints incorrect "rows" information
- Removed use of mysql->extra_info
 - Removed unused function send_records_num


VC++Files/winmysqladmin/mysql.h:
  Comment extra_info as not used anymore
client/mysqlshow.c:
  Remove use of extra info. Instead read number of records in table using SELECT COUNT(*)
include/mysql.h:
  Comment extra_info as not used anymore
libmysqld/lib_sql.cc:
  Removed unused function send_records_num
sql-common/client.c:
  Remove use of extra_info since number of records is not sent in the protocol anymore
sql/protocol.cc:
  Removed unused function send_records_num
sql/protocol.h:
  Removed unused function send_records_num
2005-04-13 12:22:20 +02:00
msvensson@neptunus.(none)
3416e42903 BUG#9391 mysqlshow prints incorrect "rows" information
- Removed use of mysql->extra_info
 - Removed unused function send_records_num
2005-04-13 12:22:20 +02:00
unknown
b54f4c51bb Add support for showing table type to mysqlshow command. (Bug #5036)
client/mysqlshow.c:
  Add support for -t (--show-table-type) switch
mysql-test/mysql-test-run.sh:
  Add support for running mysqlshow
2005-03-15 10:46:43 -08:00
jimw@mysql.com
0a100d7464 Add support for showing table type to mysqlshow command. (Bug #5036) 2005-03-15 10:46:43 -08: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
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
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 #4998 --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 #4998 --protocol doesn't reject bad values)
2004-08-24 20:13:31 +05:00
unknown
aab7b774d5 fixed a Bug #4998 "--protocol doesn't reject bad values" 2004-08-23 20:55:09 +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
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
5810811e6a consistency fix - all help texts for command-line options should end with a dot. 2003-06-13 10:59:02 +02:00
serg@serg.mylan
9f67e10d0d consistency fix - all help texts for command-line options should end with a dot. 2003-06-13 10:59:02 +02:00
unknown
487a64963b mysqlshow and mysqldump now send their vharacter set to server
character_set_results is now the same with character_set_client by default
2003-05-30 23:09:35 +05:00
bar@bar.mysql.r18.ru
bb611fa0a2 mysqlshow and mysqldump now send their vharacter set to server
character_set_results is now the same with character_set_client by default
2003-05-30 23:09:35 +05:00
unknown
41bad531ea - fixed C++-style comments to make IBM C compiler happy
client/mysqlshow.c:
   - fixed C++-style comment to make IBM C compiler happy
2003-03-15 18:42:55 +01:00
lenz@mysql.com
efbb9d45c1 - fixed C++-style comments to make IBM C compiler happy 2003-03-15 18:42:55 +01:00
unknown
37211b4a03 - Changed C++-style comments to C-style comments to make IBM compiler happy 2003-03-06 13:51:37 +01:00
lenz@mysql.com
113e499b43 - Changed C++-style comments to C-style comments to make IBM compiler happy 2003-03-06 13:51:37 +01:00
unknown
22bbe44fd0 Removed ^M
Reported by Georg Richter as it brokes his build with mipspro


client/mysqlimport.c:
  Removed ^M
client/mysqlshow.c:
  Removed ^M
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2002-12-27 18:13:32 +02:00
salle@banica.(none)
a2e82f5ff7 Removed ^M
Reported by Georg Richter as it brokes his build with mipspro
2002-12-27 18:13:32 +02:00
unknown
33fc0d53b5 Merge with 4.0
BitKeeper/etc/gone:
  auto-union
BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/deleted/.del-.my_sys.h.swp~f6a4a7f8dae03f18:
  Auto merged
BitKeeper/etc/config:
  Auto merged
acconfig.h:
  Auto merged
acinclude.m4:
  Auto merged
Docs/manual.texi:
  Auto merged
client/mysqlcheck.c:
  Auto merged
client/mysqlshow.c:
  Auto merged
include/myisam.h:
  Auto merged
include/violite.h:
  Auto merged
isam/pack_isam.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
myisam/Makefile.am:
  Auto merged
myisam/ft_nlq_search.c:
  Auto merged
myisam/mi_open.c:
  Auto merged
myisam/mi_write.c:
  Auto merged
myisam/sort.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/fulltext.result:
  Auto merged
mysql-test/r/func_test.result:
  Auto merged
mysql-test/r/isam.result:
  Auto merged
mysql-test/r/rpl_replicate_do.result:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
mysql-test/t/func_test.test:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
mysql-test/t/rpl_rotate_logs.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
mysys/hash.c:
  Auto merged
mysys/tree.c:
  Auto merged
scripts/Makefile.am:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/gen_lex_hash.cc:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/hash_filo.h:
  Auto merged
sql/hostname.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/lex.h:
  Auto merged
sql/lock.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.h:
  Auto merged
sql/mini_client.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/opt_sum.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/slave.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_analyse.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_rename.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_udf.cc:
  Auto merged
sql/share/czech/errmsg.txt:
  Auto merged
sql/share/danish/errmsg.txt:
  Auto merged
sql/share/dutch/errmsg.txt:
  Auto merged
sql/share/english/errmsg.txt:
  Auto merged
sql/share/estonian/errmsg.txt:
  Auto merged
sql/share/french/errmsg.txt:
  Auto merged
sql/share/german/errmsg.txt:
  Auto merged
sql/share/greek/errmsg.txt:
  Auto merged
sql/share/hungarian/errmsg.txt:
  Auto merged
sql/share/italian/errmsg.txt:
  Auto merged
sql/share/japanese/errmsg.txt:
  Auto merged
sql/share/korean/errmsg.txt:
  Auto merged
sql/share/norwegian/errmsg.txt:
  Auto merged
sql/table.h:
  Auto merged
sql/unireg.cc:
  Auto merged
sql-bench/server-cfg.sh:
  Auto merged
sql/share/norwegian-ny/errmsg.txt:
  Auto merged
sql/share/polish/errmsg.txt:
  Auto merged
sql/share/portuguese/errmsg.txt:
  Auto merged
sql/share/romanian/errmsg.txt:
  Auto merged
sql/share/russian/errmsg.txt:
  Auto merged
sql/share/slovak/errmsg.txt:
  Auto merged
sql/share/spanish/errmsg.txt:
  Auto merged
sql/share/swedish/errmsg.txt:
  Auto merged
sql/share/ukrainian/errmsg.txt:
  Auto merged
sql/ha_myisam.cc:
  Merge with 4.0
  Removed some commented code
sql/sql_db.cc:
  Merge with 4.0
  Optimized the logging of the drop db call a bit
sql/sql_update.cc:
  Added comment
2002-11-21 15:56:48 +02:00
monty@mashka.mysql.fi
dac6498f9b Merge with 4.0 2002-11-21 15:56:48 +02:00
unknown
64dd949c41 Add shared memory protocol and option --protocol
client/client_priv.h:
  Add OPT_MYSQL_PROTOCOL and OPT_SHARED_MEMORY_BASE_NAME
include/config-win.h:
  Add shared memory protocol
include/errmsg.h:
  Add error codes of shared memory protocol
include/my_sys.h:
  Delete TYPELIB, moved to typelib.h
include/mysql.h:
  Add shared memory protocol
include/violite.h:
  Add shared memory protocol
libmysql/errmsg.c:
  Add texts of errors of shared memory protocol
sql/mysqld.cc:
  Add shared memory protocol and option --shared-memory, correct option --named-pipe
sql/set_var.cc:
  Add shared memory protocol variables
vio/vio.c:
  Add shared memory protocol
vio/viosocket.c:
  Add shared memory protocol
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2002-11-15 00:16:30 +05:00
wax@mysql.com
e91d1b2cbe Add shared memory protocol and option --protocol 2002-11-15 00:16:30 +05:00
unknown
91181f0905 Changes that will enable proper wildcarding of databases, plus
proper escaping of databases with '_' in their name.
More explanations in the manual.
2002-11-08 17:02:33 +02:00
Sinisa@sinisa.nasamreza.org
d54bb36df7 Changes that will enable proper wildcarding of databases, plus
proper escaping of databases with '_' in their name.
More explanations in the manual.
2002-11-08 17:02:33 +02:00
unknown
f0fbecca27 fixed so that --ssl and --skip-ssl works with the MySQL clients.
Fixed core dump bug when sending wrong string to AES_DECRYPT()


BitKeeper/deleted/.del-explain_log.sh~e570be5f63576fe1:
  Delete: scripts/explain_log.sh
Docs/manual.texi:
  Updated bug reporting. Added somew new changelog entries and changed some old
client/mysql.cc:
  Fixed so that --ssl and --skip-ssl works
client/mysqladmin.c:
  Fixed so that --ssl and --skip-ssl works
client/mysqlcheck.c:
  Fixed so that --ssl and --skip-ssl works
client/mysqldump.c:
  Fixed so that --ssl and --skip-ssl works
client/mysqlimport.c:
  Fixed so that --ssl and --skip-ssl works
client/mysqlshow.c:
  Fixed so that --ssl and --skip-ssl works
include/sslopt-case.h:
  Fixed so that --ssl and --skip-ssl works
mysql-test/r/func_str.result:
  Test of problem with AES_DECRYPT()
mysql-test/t/func_str.test:
  Test of problem with AES_DECRYPT()
mysys/my_aes.c:
  Fixed problem with wrong decrypt string.
scripts/mysql_explain_log.sh:
  Applied missed patch
sql/item_strfunc.cc:
  Fixed aes_encrypt() and aes_decrypt() to be safer and avoid some mallocs()
sql/net_pkg.cc:
  Return ER_UNKNOWN_ERROR instead of errocode 0 in some cases.
2002-09-17 23:46:53 +03:00
monty@mashka.mysql.fi
7f55d92637 fixed so that --ssl and --skip-ssl works with the MySQL clients.
Fixed core dump bug when sending wrong string to AES_DECRYPT()
2002-09-17 23:46:53 +03:00
unknown
6974c3d07a Fix for SSL and new my_getopt
Fix for syntax error bug in SET TRANSACTION ISOLATION



BitKeeper/deleted/.del-sslopt-case.h~224c80e75dad4997:
  Delete: include/sslopt-case.h
client/mysql.cc:
  Fix for SSL and new my_getopt
client/mysqladmin.c:
  Fix for SSL and new my_getopt
client/mysqlcheck.c:
  Fix for SSL and new my_getopt
client/mysqldump.c:
  Fix for SSL and new my_getopt
client/mysqlimport.c:
  Fix for SSL and new my_getopt
client/mysqlshow.c:
  Fix for SSL and new my_getopt
include/Makefile.am:
  Fix for SSL and new my_getopt
include/sslopt-longopts.h:
  Fix for SSL and new my_getopt
libmysql/libmysql.c:
  Fix for SSL and new my_getopt
mysql-test/r/innodb.result:
  Simple test of transaction isolations
mysql-test/t/innodb.test:
  Simple test of transaction isolations
sql/mini_client.cc:
  Merge of mysql_real_connect() with libmysql.c
sql/mysqld.cc:
  Simple test of transaction isolations
  Remove use of current_thd in get_options()
sql/slave.cc:
  Indentation cleanup
sql/sql_yacc.yy:
  Fix for SET TRANSACTION ...
2002-08-09 16:47:16 +03:00
monty@hundin.mysql.fi
ac6e640c4d Fix for SSL and new my_getopt
Fix for syntax error bug in SET TRANSACTION ISOLATION
2002-08-09 16:47:16 +03:00
unknown
a90b2f309e Added useful exit error code for programs using my_getopt in case
of an error in option handling. This can sometimes be useful in
scripts.

Changed some exit code names and corresponding numbers.

Fixed a bug in mysqld.cc, in replication related options.

Added a global flag in my_getopt, which can be set by any program
that is using my_getopt, which tells whether the client should
print the error message itself, or whether my_getopt should do it.
The default is that my_getopt will print the error messages.


client/mysql.cc:
  Added useful exit error code for programs using my_getopt in case
  of an error in option handling. This can sometimes be useful in
  scripts.
client/mysqladmin.c:
  Added useful exit error code for programs using my_getopt in case
  of an error in option handling. This can sometimes be useful in
  scripts.
client/mysqlbinlog.cc:
  Added useful exit error code for programs using my_getopt in case
  of an error in option handling. This can sometimes be useful in
  scripts.
client/mysqlcheck.c:
  Added useful exit error code for programs using my_getopt in case
  of an error in option handling. This can sometimes be useful in
  scripts.
client/mysqldump.c:
  Added useful exit error code for programs using my_getopt in case
  of an error in option handling. This can sometimes be useful in
  scripts.
client/mysqlimport.c:
  Added useful exit error code for programs using my_getopt in case
  of an error in option handling. This can sometimes be useful in
  scripts.
client/mysqlmanager-pwgen.c:
  Added useful exit error code for programs using my_getopt in case
  of an error in option handling. This can sometimes be useful in
  scripts.
client/mysqlmanagerc.c:
  Added useful exit error code for programs using my_getopt in case
  of an error in option handling. This can sometimes be useful in
  scripts.
client/mysqlshow.c:
  Added useful exit error code for programs using my_getopt in case
  of an error in option handling. This can sometimes be useful in
  scripts.
client/mysqltest.c:
  Added useful exit error code for programs using my_getopt in case
  of an error in option handling. This can sometimes be useful in
  scripts.
client/thread_test.c:
  Added useful exit error code for programs using my_getopt in case
  of an error in option handling. This can sometimes be useful in
  scripts.
extra/my_print_defaults.c:
  Added useful exit error code for programs using my_getopt in case
  of an error in option handling. This can sometimes be useful in
  scripts.
extra/mysql_install.c:
  Added useful exit error code for programs using my_getopt in case
  of an error in option handling. This can sometimes be useful in
  scripts.
extra/perror.c:
  Added useful exit error code for programs using my_getopt in case
  of an error in option handling. This can sometimes be useful in
  scripts.
extra/resolve_stack_dump.c:
  Added useful exit error code for programs using my_getopt in case
  of an error in option handling. This can sometimes be useful in
  scripts.
extra/resolveip.c:
  Added useful exit error code for programs using my_getopt in case
  of an error in option handling. This can sometimes be useful in
  scripts.
include/my_getopt.h:
  Added global (flag) variable which tells my_getopt whether to
  print errors or just silently exit with proper error code.
include/mysys_err.h:
  Changed exit code names and corresponding numbers.
isam/isamchk.c:
  Added useful exit error code for programs using my_getopt in case
  of an error in option handling. This can sometimes be useful in
  scripts.
isam/pack_isam.c:
  Added useful exit error code for programs using my_getopt in case
  of an error in option handling. This can sometimes be useful in
  scripts.
myisam/ft_dump.c:
  Added useful exit error code for programs using my_getopt in case
  of an error in option handling. This can sometimes be useful in
  scripts.
myisam/ft_eval.c:
  Added useful exit error code for programs using my_getopt in case
  of an error in option handling. This can sometimes be useful in
  scripts.
myisam/ft_test1.c:
  Added useful exit error code for programs using my_getopt in case
  of an error in option handling. This can sometimes be useful in
  scripts.
myisam/mi_test1.c:
  Added useful exit error code for programs using my_getopt in case
  of an error in option handling. This can sometimes be useful in
  scripts.
myisam/myisamchk.c:
  Added useful exit error code for programs using my_getopt in case
  of an error in option handling. This can sometimes be useful in
  scripts.
myisam/myisampack.c:
  Added useful exit error code for programs using my_getopt in case
  of an error in option handling. This can sometimes be useful in
  scripts.
mysys/my_getopt.c:
  Changed exit code names and corresponding numbers. Added a flag
  for checking whether my_getopt should print the error message,
  or whether it should be printed by the client itself.
sql/gen_lex_hash.cc:
  Added useful exit error code for programs using my_getopt in case
  of an error in option handling. This can sometimes be useful in
  scripts.
sql/mysqld.cc:
  Added useful exit error code for programs using my_getopt in case
  of an error in option handling. This can sometimes be useful in
  scripts.
  
  Fixed a bug when compiling in non-debug mode, some replication
  related options were not enabled while they should be. This made
  'make test' to fail in rpl000010 when --with-debug was not used.
tools/mysqlmanager.c:
  Added useful exit error code for programs using my_getopt in case
  of an error in option handling. This can sometimes be useful in
  scripts.
2002-05-29 15:07:30 +03:00
jani@hynda.(none)
c961494444 Added useful exit error code for programs using my_getopt in case
of an error in option handling. This can sometimes be useful in
scripts.

Changed some exit code names and corresponding numbers.

Fixed a bug in mysqld.cc, in replication related options.

Added a global flag in my_getopt, which can be set by any program
that is using my_getopt, which tells whether the client should
print the error message itself, or whether my_getopt should do it.
The default is that my_getopt will print the error messages.
2002-05-29 15:07:30 +03:00
unknown
2276e8aeb8 moved my_getopt.h under client_priv.h
Changed my_print_defaults, mysql_install, perror, resolve_stack_dump,
resolveip and pack_isam to use my_getopt.


client/client_priv.h:
  getopt -> my_getopt
client/mysql.cc:
  moved my_getopt.h under client_priv.h
client/mysqladmin.c:
  moved my_getopt.h under client_priv.h
client/mysqlbinlog.cc:
  moved my_getopt.h under client_priv.h
client/mysqlcheck.c:
  moved my_getopt.h under client_priv.h
client/mysqldump.c:
  moved my_getopt.h under client_priv.h
client/mysqlimport.c:
  moved my_getopt.h under client_priv.h
client/mysqlshow.c:
  moved my_getopt.h under client_priv.h
extra/my_print_defaults.c:
  Changed from getopt to use my_getopt
extra/mysql_install.c:
  Changed from getopt to use my_getopt
extra/perror.c:
  Changed from getopt to use my_getopt
extra/resolve_stack_dump.c:
  Changed from getopt to use my_getopt
extra/resolveip.c:
  Changed from getopt to use my_getopt
fs/mysqlcorbafs.c:
  Left reminder about my_getopt when this program is ready.
  Currently it's not being compiled.
isam/pack_isam.c:
  Changed from getopt to use my_getopt
2002-05-22 23:54:24 +03:00