summaryrefslogtreecommitdiff
path: root/client
Commit message (Collapse)AuthorAgeFilesLines
* Always use libtool with "--preserve-dup-deps" unknown2004-02-131-13/+21
| | | | | | | | | | | | | | | | | | | | | | Always use all LOAD DATA options in replication. Fixed problem in mysqlbinlog where LOAD DATA options could be overwritten. client/mysqlbinlog.cc: Ensure that we don't call init_dynamic_array() before my_init() has been done configure.in: Always use libtool with "--preserve-dup-deps" to prevent link problems with g++ mysql-test/r/mysqlbinlog.result: new results mysql-test/r/range.result: new results mysql-test/t/range.test: add missing DROP TABLE sql/log_event.cc: Always use all LOAD DATA options. This is needed to handle commands of type "FIELDS TERMINATED BY ''" Allocate memory for Create_file_log_event options as these may be overwritten in mysqlbinlog sql/log_event.h: Free buffer
* Code cleanupsunknown2004-02-101-81/+155
| | | | | | | | | client/mysqlbinlog.cc: Ensure that errors are returned to upper levels instead of just doing 'exit/die' in sub function. sql/handler.h: Indentation cleanup sql/sql_insert.cc: Indentation cleanup
* fixed bug #1378 "mysqlbinlog for remote host is broken"unknown2004-02-061-165/+250
| | | | | | | | | | | | | | | | | | | | | client/mysqlbinlog.cc: fixed bug #1378 "mysqlbinlog for remote host is broken" by using shared part of code for local and remote variant (function process_event) mysql-test/r/mysqlbinlog.result: fixed results for remote variant (they are the same as for local now) mysql-test/t/mysqlbinlog.test: discarded note 'V. Vagin should ...' because V.Vagin done sql/log_event.cc: added special local_fname flag to Load_log_event for using in Load_log_event::check_fname_outside_temp_buf instead of ugly condition sql/log_event.h: added special local_fname flag to Load_log_event for using in Load_log_event::check_fname_outside_temp_buf instead of ugly condition
* clarify -F help text a bitunknown2004-02-041-1/+4
|
* Give error if locked table is used twice in query. This fixes strange error ↵unknown2004-02-031-1/+1
| | | | | | | | | | | message when doing LOCK TABLES t1 WRITE; INSERT TABLE t1 SELECT * from t1 (Bug #2296) client/mysqldump.c: Better help for flush-logs mysql-test/r/lock.result: Test for LOCK TABLES ; INSERT ... SELECT mysql-test/t/lock.test: Test for LOCK TABLES ; INSERT ... SELECT
* mysqldump.c:unknown2004-01-061-2/+2
| | | | | | | | Fix for UNLOCK TABLES bug #2242 client/mysqldump.c: Fix for UNLOCK TABLES bug #2242
* Some small portability fixes.unknown2003-12-301-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added support for lower_case_table_names=2, which is to be used on case insensitive file systems. This tells MySQL to preserve the used case of filenames and database names to make it esier to move files between cases sensitive can case insensitive file systems (like Windows and Linux) client/mysqltest.c: Indentation cleanup include/myisam.h: Made some pointers 'const' mysql-test/mysql-test-run.sh: Portability fix for OSX sql/filesort.cc: Safety fix (not needed for current code but needed for 5.0) sql/ha_berkeley.cc: More debugging Changed 'create' to return error number sql/ha_berkeley.h: Added HA_FILE_BASED sql/ha_innodb.cc: Added missing DBUG_RETURN sql/ha_isam.cc: Changed create to return error number sql/ha_isam.h: Added HA_FILE_BASED sql/ha_isammrg.h: Added HA_FILE_BASED sql/ha_myisam.cc: Changed create to return error number sql/ha_myisam.h: Added HA_FILE_BASED sql/ha_myisammrg.cc: Changed create to return error number sql/ha_myisammrg.h: Added HA_FILE_BASED sql/handler.cc: Ensure that table engines gets table names in lower case even if we are using lower_case_table_names Removed test for DB_TYPE_INNODB by ensuring that create method returns error number. sql/handler.h: Added HA_FILE_BASED Made some struct entries 'const' Added 'alias' for create to be able to create tables in mixed case on case insensitive file systems sql/mysql_priv.h: Support for lower_case_table_names=2 sql/mysqld.cc: Support for lower_case_table_names=2 Moved test of case insenstive file system after all mutex are created sql/set_var.cc: Support for lower_case_table_names=2 sql/sql_class.h: Indentation change sql/sql_db.cc: Support for lower_case_table_names=2 sql/sql_insert.cc: Indentation change sql/sql_parse.cc: Support for lower_case_table_names=2 sql/sql_rename.cc: Support for lower_case_table_names=2 Added missing 'unpack_filename' to RENAME which may fix a bug in RENAME TABLE on windows sql/sql_show.cc: If lower_case_table_name=2 is given, show original case in SHOW CREATE TABLE sql/sql_table.cc: Support for lower_case_table_names=2 for DROP TABLE, RENAME TABLE, ALTER TABLE and CREATE TABLE
* Code cleanupunknown2003-12-181-2/+5
| | | | | | | client/mysql.cc: Don't call mysql_close() on not initialized object sql/field.cc: code cleanup
* Portability fixes (mostly test suite)unknown2003-12-161-150/+255
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make ENGINE= an alias for TYPE= (Compabiltiy with 4.1) Fix when using symlinked data files and realpath() is not working client/mysqltest.c: Copied mysqltest from 4.1 and modified this to compile in 4.0 This was needed to get replace_columns to work. include/my_sys.h: Stop compiler warnings about alloca on freebsd myisam/mi_check.c: Fix when using symlinked data files and realpath() is not working mysql-test/r/handler.result: test engine= mysql-test/r/rpl_max_relay_size.result: Use replace_columns to replace some 'not constant' columns mysql-test/r/rpl_rotate_logs.result: Use replace_columns to replace some 'not constant' columns mysql-test/r/rpl_trunc_binlog.result: Use replace_columns to replace some 'not constant' columns mysql-test/t/handler.test: test engine= mysql-test/t/rpl_log_pos.test: Use replace_columns to replace some 'not constant' columns mysql-test/t/rpl_max_relay_size.test: Use replace_columns to replace some 'not constant' columns mysql-test/t/rpl_rotate_logs.test: Use replace_columns to replace some 'not constant' columns mysql-test/t/rpl_trunc_binlog.test: Use replace_columns to replace some 'not constant' columns mysys/my_symlink.c: More debugging sql/lex.h: Make ENGINE= an alias for TYPE= sql/mysqld.cc: Code cleanup strings/strto.c: Fix for True64 strings/strtoll.c: Fix for True64 strings/strtoull.c: Remove not needed include file
* Extend max_allowed_packet to 2G in mysql and mysqldump (Bug #2105)unknown2003-12-142-9/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't dump data for MRG_ISAM or MRG_MYISAM tables. (Bug #1846) Ensure that 'lower_case_table_names' is always set on case insensitive file systems. (Bug #1812) One can now configure MySQL as windows service as a normal user. (Bug #1802) Database names is now compared with lower case in ON clause when lower_case_table_names is set. (Bug #1736) IGNORE ... LINES option didn't work when used with fixed length rows. (Bug #1704) Change INSERT DELAYED ... SELECT... to INSERT .... SELECT (Bug #1983) Safety fix for service 'mysql start' (Bug #1815) client/mysql.cc: Extend max_allowed_packet to 2G (Bug #2105) client/mysqldump.c: Extend max_allowed_packet to 2G (Bug #2105) Don't dump data for MRG_ISAM or MRG_MYISAM tables. (Bug #1846) configure.in: Test for file linux/config.h include/my_global.h: Portability fix (Bug #1924) mysql-test/r/insert.result: Update test results mysql-test/r/loaddata.result: Update test results mysql-test/r/lowercase_table.result: Update test results mysql-test/t/insert.test: Test INSERT ... DELAYED ... SELECT mysql-test/t/loaddata.test: Added test of LOAD DATA INFILE ... IGNORE # LINES for fixed size tables mysql-test/t/lowercase_table.test: Test mixed lower/uppercase database names sql/item.cc: Made function not inline (to make it easier to modify it without recompilation of all files) sql/item.h: Moved function to item.cc sql/mysqld.cc: Merge pidfile create code Ensure that 'lower_case_table_names' is always set on case insensitive file systems. (Bug #1812) sql/nt_servc.cc: One can now configure MySQL as windows service as a normal user. (Bug #1802) sql/sql_base.cc: Database names is now compared with lower case in ON clause when lower_case_table_names is set. (Bug #1736) sql/sql_class.h: Fixed type sql/sql_load.cc: IGNORE ... LINES option didn't work when used with fixed length rows. (Bug #1704) sql/sql_parse.cc: Change INSERT DELAYED ... SELECT... to INSERT .... SELECT strings/ctype-tis620.c: Ensure that memory is freed properly (Partly becasue of bug #1770) Bar should check the proposed patch in #1770 if we can use it support-files/mysql.server.sh: Safety fix (Bug #1815)
* changed %ld on %lu for output of mysql_thread_id(&mysql)unknown2003-12-121-4/+4
| | | | | | | | as is thread_id has type ulong (bug #1951 thread id is printed as "signed" instead of "unsigned" in 'mysql')
* chk_del() should not check key delete-chainunknown2003-12-111-3/+3
| | | | | | | | | | make a test for -inf more portable (-Inf) client/mysqldump.c: make a test for -inf more portable (-Inf) myisam/mi_check.c: chk_del() should not check key delete-chain
* Added --comments mysqldump option (default value is 1).unknown2003-12-111-9/+14
| | | | | | | | | | | | Fixed mysqldump test. client/mysqldump.c: Added --comments option (default value is 1). mysql-test/r/mysqldump.result: fixed using --skip-comment option mysql-test/t/mysqldump.test: fixed using --skip-comment option
* Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2003-12-101-5/+29
|\ | | | | | | | | | | | | into gw.mysql.r18.ru:/usr/home/ram/work/4.0.b2005
| * Fix for the bugs:unknown2003-12-091-5/+29
| | | | | | | | | | | | | | | | #2005 Long decimal comparion bug. #2055 mysqldump should replace "-inf" numeric field values with "NULL"
* | Added checking of return value from my_once_alloc() in charsetunknown2003-12-101-0/+1
|/ | | | | | | | | | | | | | | | Added checking of return value from malloc() in reg_init() client/mysqltest.c: Added comment dbug/dbug.c: Removed not needed test mysys/charset.c: Added checking of return value from my_once_alloc() regex/reginit.c: Abort if out of memory in reg_init() (unlikely) sql/item_strfunc.cc: Added comment
* Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0unknown2003-10-251-1/+4
|\ | | | | | | | | | | | | into eagle.mysql.r18.ru:/home/vva/work/BUG_1348/mysql-4.0
| * added quotas for database namesunknown2003-10-241-1/+4
| | | | | | | | | | | | | | | | (fixed bug #1348) client/mysqldump.c: added quotas for database names
* | Fix for Bug #1595 "mysqlbinlog can't read a password from the console".unknown2003-10-211-3/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ** I already fixed it in 3.23; I fix it in 4.0 separately because the code is a bit different (so the changeset 1.1422 of 3.23 should not be merged here) ** Make mysqlbinlog prompt for the password if mysqlbinlog -p instead of printing the usage(). This makes mysqlbinlog behave like other clients. This new code was almost copied from mysqldump. Note that before, one could use mysqlbinlog -p pass and now one must use mysqlbinlog -ppass (putting a space will ask for the password). client/mysqlbinlog.cc: Make mysqlbinlog prompt for the password if mysqlbinlog -p instead of printing the usage(). This makes mysqlbinlog behave like other clients. This new code was almost copied from mysqldump. Note that before, one could use mysqlbinlog -p pass and now one must use mysqlbinlog -ppass (putting a space will ask for the password).
* | Merge bk-internal:/home/bk/mysql-4.0/unknown2003-10-141-17/+11
|\ \ | | | | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.0 sql/slave.cc: Auto merged
| * | Fixed test case that my last patch to mysqlbinlog broke.unknown2003-10-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed --remote to --read-from-remote-server (mysqlbinlog) client/mysqlbinlog.cc: Changed --remote to --read-from-remote-server to make option more understandable mysql-test/t/mysqlbinlog.test: Fixed test case that --remote broke
| * | Fix for option 'R' (connect to remote server) in mysqlbinlogunknown2003-10-081-17/+11
| | | | | | | | | | | | | | | client/mysqlbinlog.cc: Fix for option 'R' (connect to remote server)
* | | mergedunknown2003-10-072-2/+10
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | mysql-test/r/create.result: Auto merged sql/slave.cc: Auto merged sql/sql_parse.cc: Auto merged
| * | Simple cleanupsunknown2003-10-071-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | client/mysqlbinlog.cc: Add default handling to mysqlbinlog mysql-test/mysql-test-run.sh: Cleanup of mysqldump/mysqlbinlog argument handling scripts/Makefile.am: Remove duplicate scripts/mysql_install_db.sh: Change -eq to =
| * | Fix for the bug #1336 mysql.cc assumes DATABASE() doesn't return NULLunknown2003-10-061-1/+1
| |/
* | Merge bk-internal:/home/bk/mysql-4.0/unknown2003-10-061-1/+1
|\ \ | |/ |/| | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.0 scripts/mysql_config.sh: Auto merged sql/mysqld.cc: Auto merged
| * enum options renamed to avoid possible name conflictsunknown2003-09-291-1/+1
| |
* | Added resetting of replace_result patterns after --exec command in mysqltest ↵unknown2003-09-291-0/+4
| | | | | | | | | | | | | | | | | | (in order to be consistent with ordinary query execution). client/mysqltest.c: Now resetting replace_result patterns after --exec command (in order to be consistent with ordinary query execution). mysql-test/t/mysqlbinlog.test: Added additional replaces potentially needed after adding reset of replace conditions for exec
* | Removed random chars after filename for LOAD DATA INFILE (in mysqlbinlog)unknown2003-09-292-20/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add quoting for use `database` for mysqlbinlog Removed test ins0000001 Add support for --replace for exec in mysqltest Don't refer to install dir in mysqlbinlog.result BitKeeper/deleted/.del-ins000001.result~f45c599efdf8352b: Delete: mysql-test/r/ins000001.result BitKeeper/deleted/.del-ins000001.test~2428ee5c9b1bc483: Delete: mysql-test/t/ins000001.test client/mysqlbinlog.cc: Removed random chars after filename for LOAD DATA INFILE client/mysqltest.c: Add support for --replace for 'exec' mysql-test/r/drop_temp_table.result: Updated results after quoting change mysql-test/r/fulltext_multi.result: Updated results after quoting change mysql-test/r/fulltext_order_by.result: Updated results after quoting change mysql-test/r/insert.result: New tests mysql-test/r/insert_select.result: Updated results after quoting change mysql-test/r/mix_innodb_myisam_binlog.result: Updated results after quoting change mysql-test/r/mysqlbinlog.result: Updated results after quoting change mysql-test/r/rpl_log.result: Updated results after quoting change mysql-test/t/fulltext_multi.test: Remove 'use' mysql-test/t/fulltext_order_by.test: Remove 'use' mysql-test/t/insert.test: Merge test with ins0000001.test mysql-test/t/mysqlbinlog.test: Don't refer to install dir in result sql/log_event.cc: Add quoting for use `database` for mysqlbinlog support-files/mysql.server.sh: Move pid_file test after arguments have been parsed
* | #1169: Add --exec command to mysqltestunknown2003-09-241-0/+65
| |
* | Code cleanup of new patchesunknown2003-09-231-67/+58
| | | | | | | | | | mysys/mf_dirname.c: Added comments
* | Bugfix for bug #1340, style fix before pushunknown2003-09-191-4/+2
| | | | | | | | | | client/mysqlbinlog.cc: Small fix to avoid double initialization
* | Merge bk-internal.mysql.com:/home/bk/mysql-4.0unknown2003-09-191-7/+10
|\ \ | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/dlenev/src/mysql-4.0-bg-1340 client/mysqlbinlog.cc: Auto merged
| * | Fix for bug #1340 (More careful checks if we met proper ↵unknown2003-09-191-7/+10
| | | | | | | | | | | | | | | | | | | | | Create_file_log_event before Append or Exec event we are processing now) client/mysqlbinlog.cc: More accurate checks if Create_file_log_event is absent for this Append or Exec event...
* | | Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0unknown2003-09-191-2/+18
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | into eagle.mysql.r18.ru:/home/vva/work/BUG_1073/mysql-4.0 client/mysqlbinlog.cc: Auto merged
| * | fixed bug #1073 unknown2003-09-011-2/+18
| | | | | | | | | | | | | | | | | | | | | (Replication LOAD DATA INFILE mysqlbinlog doesn't cleanup tmp files)
* | | Fixed Bug#1291, client displays wrong prompt when in the middle ofunknown2003-09-171-2/+4
| |/ |/| | | | | | | | | | | backticks.
* | Fix for BUG#1258 (Trying to use the mysqlbinlog with -h and -u option gives ↵unknown2003-09-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | segmentation fault). Fix is just initializing "host" (and "user") with 0, not a string. client/mysqlbinlog.cc: command-line arguments should be initialized like in mysqldump.cc to not cause segfault.
* | Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2003-09-081-4/+5
|\ \ | | | | | | | | | | | | | | | | | | into eagle.mysql.r18.ru:/home/vva/work/BUG_1184/mysql-4.0
| * \ Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0unknown2003-09-081-4/+5
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | into eagle.mysql.r18.ru:/home/vva/work/BUG_1184/mysql-4.0
| | * | fixed Bug #1184 (change type of opt_ignore_lines to longlong)unknown2003-09-061-4/+5
| | | |
* | | | Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0unknown2003-09-081-1/+1
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | into eagle.mysql.r18.ru:/home/vva/work/BUG_1056/mysql-4.0 client/mysqldump.c: Auto merged
| * | | added space after first '--' in the long '----....' comment line in mysqldumpunknown2003-09-061-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | just to make it compatible with the manual (fixed bug #1056) client/mysqldump.c: added space after first '--' in the long '----....' comment line just to make it compatible with the manual (fixed bug #1056)
* | | after merge fixesunknown2003-09-051-1/+1
| | |
* | | Merge with 3.23unknown2003-09-051-71/+87
|\ \ \ | |/ / |/| |
| * | Better quoting patch for mysqldumpunknown2003-09-031-70/+85
| | | | | | | | | | | | | | | client/mysqldump.c: Better quoting patch
| * | proper obligatory quoting of identifiers in mysqldump<->server communication ↵unknown2003-09-021-25/+27
| | | | | | | | | | | | (unrelated from command-line options)
* | | Portability fixesunknown2003-08-281-59/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | client/mysqltest.c: Removed not used functions myisam/mi_dynrec.c: Added assert to avoid compilation errors mysql-test/r/isam.result: Updated results after merge sql/log_event.cc: Cleanup sql/mysql_priv.h: Cleanup sql/sql_class.cc: Moved Table_ident functions to .cc file to allow them to use table_case_convert() sql/sql_class.h: Moved Table_ident functions to .cc file to allow them to use table_case_convert()
* | | Add column names for metadata when running mysql with -Tunknown2003-08-271-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change metadata info so that that MIN() and code MAX() reports that they can return NULL. Bug #324 client/mysql.cc: Add column names for metadata when running with -T mysql-test/r/show_check.result: test case for bug fix mysql-test/t/show_check.test: test case for bug fix sql/item_sum.cc: Change metadata info so that that MIN() and code MAX() reports that they can return NULL. Bug #324 sql/sql_load.cc: Removed not needed line
* | | vio ssl structure renames (to get rid of ending _)unknown2003-08-271-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added TCP/IP read/write timeout for windows Check on windows if second server is started with same TCP/IP port BitKeeper/deleted/.del-have_openssl_2.inc~8c9f1a45676b698f: Delete: mysql-test/include/have_openssl_2.inc BitKeeper/deleted/.del-have_openssl_2.require~53bbdfc136fb514: Delete: mysql-test/r/have_openssl_2.require BitKeeper/deleted/.del-openssl_2.test~f2dfa927f19d14f8: Delete: mysql-test/t/openssl_2.test BitKeeper/etc/ignore: added libmysql/vio_priv.h libmysql_r/vio_priv.h client/mysql.cc: vio ssl structure renames include/violite.h: Cleanup violite.h interface (move things to vio_priv.h) libmysql/Makefile.am: Use vio_priv.h libmysql/Makefile.shared: Use vio_priv.h libmysqld/lib_vio.c: Added timeout for windows mysys/my_getopt.c: Indentaion cleanup sql/item_cmpfunc.cc: Remove compiler warnings sql/item_func.cc: Remove compiler warnings sql/mini_client.cc: vio ssl structure renames sql/mysqld.cc: Check on windows if second server is started with same TCP/IP port sql/net_serv.cc: Add read/write timeouts for windows sql/sql_acl.cc: vio ssl structure renames sql/sql_show.cc: vio ssl structure renames vio/vio.c: Added timeouts for windows vio/viosocket.c: Added timeouts for windows vio/viossl.c: Added timeouts for windows Cleaned up structure element names vio/viosslfactories.c: Added timeouts for windows Cleaned up structure element names