Commit graph

1068 commits

Author SHA1 Message Date
unknown
935585a336 After review fixes
client/mysql.cc:
  check for "error" added
sql/sql_db.cc:
  typo fixed
2005-02-02 15:52:19 +04:00
unknown
84405cbaa8 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/home/ram/work/4.1.b4802


client/mysql.cc:
  Auto merged
include/mysql_com.h:
  Auto merged
sql/sql_db.cc:
  Auto merged
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2005-02-02 15:06:36 +04:00
unknown
c53184ebb7 Proper fix for comparision with ' '
(Bug #7788 "Table is full" occurs during a multitable update")


client/mysqldump.c:
  Style fixes
innobase/include/univ.i:
  UNIV_DEBUG should not depend on configure --debug but on --debug=full
mysql-test/r/compare.result:
  Added test to find bug in previous bugfix
mysql-test/t/compare.test:
  Added test to find bug in previous bugfix
mysys/my_handler.c:
  Proper fix for comparision with ' '
strings/ctype-big5.c:
  Proper fix for comparision with ' '
strings/ctype-bin.c:
  Proper fix for comparision with ' '
strings/ctype-gbk.c:
  Proper fix for comparision with ' '
strings/ctype-latin1.c:
  Proper fix for comparision with ' '
strings/ctype-mb.c:
  Proper fix for comparision with ' '
strings/ctype-simple.c:
  Proper fix for comparision with ' '
strings/ctype-sjis.c:
  Proper fix for comparision with ' '
strings/ctype-tis620.c:
  Proper fix for comparision with ' '
strings/ctype-ucs2.c:
  Proper fix for comparision with ' '
strings/ctype-utf8.c:
  Proper fix for comparision with ' '
2005-02-01 16:27:08 +02: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
20745ec65f Merge mysql.com:/home/jimw/my/mysql-4.1-8148
into mysql.com:/home/jimw/my/mysql-4.1-clean


client/mysqldump.c:
  Auto merged
2005-01-31 15:28:33 -08:00
unknown
79016ecb2c Bug #5185 mysqldump for windows database gets table names with different case
mysqldump.c:
  Trimmed some lines to be less than 80 chars.  Using just NAME_LEN now for table name buffers


client/mysqldump.c:
  Trimmed some lines to be less than 80 chars.  Using just NAME_LEN now for table name buffers
2005-01-29 09:25:56 -06:00
unknown
d848286e70 Use single quotes to set SQL_MODE in mysqldump output in case ANSI_QUOTES
was already defined on the server the dump is loaded into. (Bug #8148)


client/mysqldump.c:
  Use single quotes when setting SQL_MODE
2005-01-28 11:16:49 -08:00
unknown
b8cac71494 Bug #5185 mysqldump for windows database gets table names with different case
Added the get_actual_table_name function that issues a SHOW TABLES LIKE '%s'.  This will get the table 
name in the proper case.  We use this table name rather than the one given on the command line.  This will
prevent problems when importing SQL on Linux that was generated on a Windows platform where case can be
an issue.

mysqldump.c:
  call get_actual_table_name to get the table name in the proper case


client/mysqldump.c:
  call get_actual_table_name to get the table name in the proper case
2005-01-27 14:48:26 -06:00
unknown
c2a2f5afb8 Cleanups during review
BitKeeper/etc/ignore:
  added libmysqld/examples/mysqltest_embedded
client/mysqlbinlog.cc:
  Call mysql_close() before die()
innobase/include/eval0eval.ic:
  Remove assert that fails on 64 bit machines
  (Tested with BUILD/compile-pentium64-valgrind-max on 64 bit Intel CPU)
sql/mysqld.cc:
  Force lower_case_table_names to 0 if set to 2 on case insensitive file name
sql/sql_select.cc:
  Remove #if 0
2005-01-25 21:27:51 +02:00
unknown
ba3b78d968 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1


mysys/mf_keycache.c:
  Auto merged
sql/item.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/table.cc:
  Auto merged
2005-01-24 15:50:13 +01:00
unknown
8bdb500105 fixes/cleanups according to Coverity report 2005-01-24 15:48:25 +01:00
unknown
e46d235a08 Cleanups in Makefile.ams
client/Makefile.am:
  Remove  explicit _DEPENDENCIES, they are not needed with automatic
   dependency tracking wich we started using several months ago.
  Don't use relative paths in makefiles.
regex/Makefile.am:
  Remove  explicit _DEPENDENCIES, they are not needed with automatic
   dependency tracking wich we started using several months ago.
  Don't use relative paths.
strings/Makefile.am:
  Remove dead rule.
2005-01-18 17:26:04 +03:00
unknown
5847d10712 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1
into bob.(none):/home/reggie/bk/mysql-4.1


BitKeeper/etc/logging_ok:
  auto-union
client/mysql.cc:
  Auto merged
2005-01-17 14:08:36 -06:00
unknown
7f69f44f0a mysqldump.c:
Move out-of-order option.


client/mysqldump.c:
  Move out-of-order option.
2005-01-17 00:09:47 -06:00
unknown
30cddcc187 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-clean
2005-01-16 21:39:20 +01:00
unknown
31457a6258 Bug #7922 prompt \p fails on Windows for shared-memory connections
Fixed bug by adding code that displays the contents of mysql.host when \p is added as part of the prompt.

mysql.cc:
  Added code to display mysql.host as prompt when using shared memory


client/mysql.cc:
  Added code to display mysql.host as prompt when using shared memory
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2005-01-15 23:19:34 -06:00
unknown
60c1541524 protect against malicious server trying to crash command-line client :) 2005-01-14 22:46:04 +01:00
unknown
5f533a3682 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-clean


sql/log_event.cc:
  Auto merged
2005-01-14 10:59:37 +01:00
unknown
d62ca95951 Fix for BUG#7850: force the transaction isolation level to REPEATABLE READ when --single-transaction
client/mysqldump.c:
  force the transaction isolation level to REPEATABLE READ when --single-transaction
2005-01-13 00:44:13 +01:00
unknown
28b783eada Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1


sql/sql_class.h:
  Auto merged
2005-01-11 19:35:00 +02:00
unknown
4eec8ab1f6 Review of new pushed code
Indentation cleanup


client/mysqladmin.cc:
  Indentation cleanup
2005-01-11 18:55:53 +02:00
unknown
427bdc28ee Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.5920


client/mysql.cc:
  Auto merged
2005-01-11 19:58:52 +04:00
unknown
4c8d52aa80 few harmless warnings from automated code-checking tools fixed
client/mysql.cc:
  few harmless warnings from automated code-checking tools fixed
  cleanup
2005-01-08 21:25:31 +01:00
unknown
d3faf620ac Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
2005-01-06 20:49:27 +02:00
unknown
babb77767a postreview changes
client/mysqldump.c:
  fixed comment
  fixed compiler warning
2005-01-06 20:47:08 +02:00
unknown
928c20f8e3 fixed comparation with string constant on some platform (BUG#7651)
client/mysqldump.c:
  fixed comparation with string constant on some platform
2005-01-06 19:13:58 +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
d3be3cbcfd fix for bug #5920 (embedded-server mysql doesn't handle --defaults-file)
client/mysql.cc:
  bug #5920 (embedded-server mysql doesn't handle --defaults-file)
  defaults files handled
include/my_sys.h:
  bug #5920 (embedded-server mysql doesn't handle --defaults-file)
  get_defaults_file interface added
libmysqld/libmysqld.c:
  just small fix, not related to the bug.
mysys/default.c:
  bug #5920 (embedded-server mysql doesn't handle --defaults-file)
  get_defaults_files implementation
2005-01-03 19:21:54 +04:00
unknown
842cde98c7 Merge mysql.com:/home/wax/mysql/mysql-4.1
into mysql.com:/home/wax/mysql/mysql-4.1test2
2005-01-02 20:01:08 +05:00
unknown
55d9781de3 WL#964
move my_end() after free_used_memory()


client/mysqltest.c:
  move my_end() after free_used_memory()
2005-01-02 19:58:49 +05:00
unknown
0ebb5292f8 client/mysqldump.c
compilation failure fixed
    cleanup


client/mysqldump.c:
  compilation failure fixed
  cleanup
2004-12-28 17:33:49 +01:00
unknown
0ab90532cc WL#2319 V2: Exclude tables from dump
- Added a hash to keep track of database-table pairs.
- Specified database-table tables do not get dumped


client/client_priv.h:
  WL#2319 V2: Exclude tables from dump
client/mysqldump.c:
  WL#2319 V2: Exclude tables from dump
mysql-test/r/mysqldump.result:
  WL#2319 V2: Exclude tables from dump
mysql-test/t/mysqldump.test:
  WL#2319 V2: Exclude tables from dump
2004-12-27 19:10:30 +01:00
unknown
cce8d0456d Bug#7020: mysqldump --compatible=mysql40 still dumps in UTF8
See mysqldump.test comments for more details
2004-12-22 16:02:27 +04:00
unknown
b824756c00 mysql.cc:
Fix up mysql help messages.


client/mysql.cc:
  Fix up mysql help messages.
2004-12-18 14:30:00 -06:00
unknown
9a202517f5 Fix for BUG#7358: removing warning reporting of mysqldump 4.1.8 when calling SHOW CREATE DATABASE, as we deal almost gracefully with it
(back to behaviour of 4.1.7). Warning was not fatal: mysqldump continued. And the good thing is that it helped spot that starting from 4.1.7,
SHOW CREATE DATABASE failed (if --single-transaction and first db has non-empty InnoDB table and there is a second db) and thus mysqldump
produced CREATE DATABASE statements missing the CHARACTER SET clause. Removing the bug which was in the server, and the warning reporting in
mysqldump (compatibility with old servers).


client/mysqldump.c:
  don't report errors as we deal almost gracefully with them (back to code of 4.1.7)
mysql-test/r/flush_block_commit.result:
  result update
mysql-test/t/flush_block_commit.test:
  let's verify that SHOW CREATE DATABASE succeeds even if connection has open transaction.
sql/sql_parse.cc:
  There is no reason to forbid SHOW CREATE DATABASE if connection has an open transaction
2004-12-17 23:37:43 +01:00
unknown
820d68d903 corrected mysqltest.dsp
corrected mysql_test_run_new.dsp
added dependency
corrected path of mysql_test_run_new.dsp
fixed wrong code
added my_create_tables.c
removed command_line
fixed #elif
restored NAME_MAX and MAX_FNAME
added create_system_files()
added compare() for windows
added all files of testes in script
added mysql-test in script


BitKeeper/etc/ignore:
  Added mysql-4.1.8-win-src.zip to the ignore list
VC++Files/client/mysqltest.dsp:
  corrected dsp file
VC++Files/mysql-test/mysql_test_run_new.dsp:
  corrected mysql_test_run_new.dsp
VC++Files/mysql.dsw:
  added dependency
  corrected path of mysql_test_run_new.dsp
client/mysqltest.c:
  fixed wrong code
mysql-test/Makefile.am:
  added my_create_tables.c
mysql-test/my_manage.c:
  removed command_line
  fixed #elif
mysql-test/my_manage.h:
  restored NAME_MAX and MAX_FNAME
mysql-test/mysql_test_run_new.c:
  added create_system_files()
  added compare for windows
scripts/make_win_src_distribution.sh:
  added all files of testes
  added mysql-test
2004-12-14 18:46:55 +05:00
unknown
d408a4aad1 Makefile.am:
Moved "../regex/libregex.a" before "../libmysql/libmysqlclient.la"
  when linking. For -all-static linking libtool put -lc after the .la
  file and this put the libc regex functions before our regex functions
  when linking on Linux.


client/Makefile.am:
  Moved "../regex/libregex.a" before "../libmysql/libmysqlclient.la"
  when linking, for static linking libtool put -lc after the .la
  and this put the libc regex functions before out regex functions
  in the link on Linux.
2004-12-10 13:06:58 +01:00
unknown
3e221a83f4 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1


client/mysqldump.c:
  Auto merged
2004-12-09 12:50:37 +02:00
unknown
5535fa96fb Ensure that we free memory used with --order-by-primary (in mysqldump)
Simple, non critical, fix to mysql_fix_privilege_tables


client/mysqldump.c:
  Ensure that we free memory used with --order-by-primary
mysql-test/t/system_mysql_db_fix.test:
  Remove warnings when compiled with support for ISAM
scripts/mysql_fix_privilege_tables.sh:
  Ensure that 'my_print_defaults' is called correctly
sql/set_var.cc:
  Code style cleanups
sql/sql_db.cc:
  Fixed comments
sql/udf_example.cc:
  Fixed comments
2004-12-09 12:47:20 +02:00
unknown
b6aa3489fe help text corrected 2004-12-04 10:06:38 +01:00
unknown
fc9d5dee42 Merge bk-internal:/home/bk/mysql-4.1
into build.mysql.com:/users/tsmith/m/41/b


client/mysqldump.c:
  Auto merged
2004-12-02 15:33:12 +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
0dacdfcc75 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b6101


client/mysqldump.c:
  Auto merged
2004-11-30 12:27:17 +04:00
unknown
62b43e530d Merge
client/client_priv.h:
  SCCS merged
client/mysqldump.c:
  SCCS merged
2004-11-30 03:24:17 +01:00
unknown
b4779bbb8c mysqldump.c:
minor cleanup to the --order-by-primary feature code


client/mysqldump.c:
  minor cleanup to the --order-by-primary feature code
2004-11-30 02:26:24 +01: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
55ea7c8b0e Ensure consistent sources up to 5.0 where a C++ problem occurs.
client/mysqladmin.c:
  Cast to overcome a C vs. C++ signature problem, occurring in 5.0 where this is a C++ file.
2004-11-24 15:24:23 +01:00