Commit graph

13 commits

Author SHA1 Message Date
unknown
69e0cc6d41 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/mysql.cc:
  Auto merged
client/mysqladmin.cc:
  Auto merged
client/mysqlbinlog.cc:
  Auto merged
client/mysqlcheck.c:
  Auto merged
client/mysqldump.c:
  Auto merged
client/mysqlimport.c:
  Auto merged
client/mysqlshow.c:
  Auto merged
isam/isamchk.c:
  Auto merged
myisam/myisamchk.c:
  Auto merged
myisam/myisampack.c:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Merged from 4.0.
2005-12-04 15:34:47 +02: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
unknown
0218ecf7af Mainly cleanups for gcc 4.0. Some small pieces from looking at -Wall. Removed a number of dumb things in ha_tina.
client/mysqladmin.cc:
  gcc 4.0 fix
sql/examples/ha_archive.cc:
  Bunch of little cleanups from -Wall and gcc 4.0 fixes
sql/examples/ha_example.cc:
  Noticed that the error call was not quite right.
sql/examples/ha_tina.cc:
  Bunch of cleanups (many of which were quite dumb of me... and I have no earthly idea how they missed everyone's notice).
sql/ha_heap.cc:
  Removed unused variable (-Wall find)
sql/item_subselect.cc:
  Removed unused label.
sql/mysqld.cc:
  Cleanup of unused function and gcc 4.0 bit.
sql/opt_range.h:
  Cleanup for gcc 4.0
sql/repl_failsafe.cc:
  Cleanup for gcc 4.0
sql/slave.cc:
  Cleanup for gcc 4.0
sql/sql_acl.cc:
  Cleanup for gcc 4.0
sql/sql_insert.cc:
  Cleanedup for gcc 4.0
sql/sql_parse.cc:
  Cleanedup for gcc 4.0
sql/sql_repl.cc:
  Removed unused variable
sql/sql_select.cc:
  Cleanedup for gcc 4.0
2005-06-01 17:34:10 -07:00
unknown
77cdf79fb4 Add 'debug' to mysqladmin --help output. (Bug #8207)
client/mysqladmin.cc:
  Add documentation for 'debug' command
2005-01-31 19:35:12 -08:00
unknown
4eec8ab1f6 Review of new pushed code
Indentation cleanup


client/mysqladmin.cc:
  Indentation cleanup
2005-01-11 18:55:53 +02:00
unknown
299d0a8775 Merge mysql.com:/home/jwinstead2/mysql-4.1-7451
into mysql.com:/home/jwinstead2/mysql-4.1-clean


client/mysqladmin.cc:
  Auto merged
2005-01-06 17:27:48 +01:00
unknown
0f00947b5d Add support for --default-character-set to mysqladmin (Bug #7524)
client/mysqladmin.cc:
  Handle default-character-set being specified
2005-01-06 01:08:03 +01:00
unknown
190f7a6f45 Fix "mysqladmin password" to use correct password scrambling function when
talking to pre-4.1 servers or 4.1 and later servers where the old_passwords
option is enabled. "mysqladmin old-password" is unchanged. (Bug #7451)


client/mysqladmin.cc:
  Check old_passwords from server, and use that to determine
  which scramble function to use (except in the case of the
  old-password command, which always use the old scramble function).
2005-01-05 21:56:18 +01:00
unknown
29b3ae4dd4 Fix for Bug#6377 "Password Generation Discrepancy"
client/mysqladmin.cc:
  Fix for Bug#6377 "Password Generation Discrepancy":
  this is not a MySQL bug.
  The problem is that Windows command line client doesn't trim single quotes
  from arguments, as any UNIX shell does.
  The fix just checks for this condition and gives a warning if it is true.
2004-12-02 14:28:59 +03:00
unknown
41ade141aa Applied some Netware related patches.
client/mysqladmin.cc:
  Added option to mysqladmin for Netware.
netware/comp_err.def:
  Copyright notice update, for Netware.
netware/isamchk.def:
  Copyright notice update, for Netware.
netware/isamlog.def:
  Copyright notice update, for Netware.
netware/libmysql.def:
  Copyright notice update, for Netware.
netware/my_print_defaults.def:
  Copyright notice update, for Netware.
netware/myisam_ftdump.def:
  Copyright notice update, for Netware.
netware/myisamchk.def:
  Copyright notice update, for Netware.
netware/myisamlog.def:
  Copyright notice update, for Netware.
netware/myisampack.def:
  Copyright notice update, for Netware.
netware/mysql.def:
  Copyright notice update, for Netware.
netware/mysql_install.def:
  Copyright notice update, for Netware.
netware/mysql_install_db.def:
  Copyright notice update, for Netware.
netware/mysql_test_run.def:
  Copyright notice update, for Netware.
netware/mysql_waitpid.def:
  Copyright notice update, for Netware.
netware/mysqladmin.def:
  Copyright notice update, for Netware.
netware/mysqlbinlog.def:
  Copyright notice update, for Netware.
netware/mysqlcheck.def:
  Copyright notice update, for Netware.
netware/mysqld.def:
  Copyright notice update, for Netware.
netware/mysqld_safe.def:
  Copyright notice update, for Netware.
netware/mysqldump.def:
  Copyright notice update, for Netware.
netware/mysqlimport.def:
  Copyright notice update, for Netware.
netware/mysqlshow.def:
  Copyright notice update, for Netware.
netware/mysqltest.def:
  Copyright notice update, for Netware.
netware/pack_isam.def:
  Copyright notice update, for Netware.
netware/perror.def:
  Copyright notice update, for Netware.
netware/replace.def:
  Copyright notice update, for Netware.
netware/resolve_stack_dump.def:
  Copyright notice update, for Netware.
netware/resolveip.def:
  Copyright notice update, for Netware.
sql/mysqld.cc:
  Changes to fix the abend on NetWare on recieving the server down and volume deactivation 
  events. Do not join for the main thread if these events occur
2004-11-29 17:41:47 +02:00
unknown
dcfd4e41d9 Merge mysql.com:/M40/mysql-4.0 into mysql.com:/M41/mysql-4.1
client/mysqladmin.cc:
  Auto merged
2004-11-24 15:29:35 +01:00
unknown
724697f54c Makefile.am, mysqladmin.cc:
reverting linking ndbclisnt to mysqladmin.cc


client/mysqladmin.cc:
  reverting linking ndbclisnt to mysqladmin.cc
client/Makefile.am:
  reverting linking ndbclisnt to mysqladmin.cc
2004-11-19 17:21:27 +00:00
unknown
75431a2e16 fix for mysqladmin link problem
.c -> .cc
    fix source dist problem for ndb
    fix type check problem for mysqladmin



client/Makefile.am:
  fix for mysqladmin link problem
   .c -> .cc
client/mysqladmin.cc:
  fix for mysqladmin link problem
   .c -> .cc
configure.in:
  fix for mysqladmin link problem
   .c -> .cc
ndb/include/Makefile.am:
  fix source dist problem for ndb
ndb/src/mgmclient/CommandInterpreter.cpp:
  fix type check problem
ndb/src/mgmclient/ndb_mgmclient.hpp:
  fix type check problem
ndb/src/mgmclient/ndb_mgmclient.h:
  fix type check problem
2004-11-18 20:28:36 +00:00
Renamed from client/mysqladmin.c (Browse further)