summaryrefslogtreecommitdiff
path: root/client
Commit message (Collapse)AuthorAgeFilesLines
* Fixed some problems for Windows buildunknown2006-06-061-1/+2
| | | | | | | | | | VC++Files/client/mysql.dsp: Fixed omission of mysys\my_conio.c. VC++Files/client/mysql_ia64.dsp: Fixed omission of mysys\my_conio.c. client/mysqldump.c: VS compiler does not accept variable declarations within blocks. Such a behaviour complies with the Standard C.
* Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2006-05-241-0/+17
|\ | | | | | | | | | | | | into production.mysql.com:/usersnfs/rkalimullin/4.1.b18351
| * Fix for bug #18351: mysqlbinlog does not set default charset?unknown2006-05-041-0/+17
| | | | | | | | | | | | | | client/mysqlbinlog.cc: Fix for bug #18351: mysqlbinlog does not set default charset? - --set-charset option added to allow one deal with old binlog files. It adds 'SET NAMES charset' to the output.
* | Fix for bug #18536: mysqldump does not maintain table orders as per --tables ↵unknown2006-05-191-33/+21
|/ | | | | | | | | | | | | | option client/mysqldump.c: Fix for bug #18536: mysqldump does not maintain table orders as per --tables option - use list to store table names instead of hash. mysql-test/r/mysqldump.result: Fix for bug #18536: mysqldump does not maintain table orders as per --tables option - test result. mysql-test/t/mysqldump.test: Fix for bug #18536: mysqldump does not maintain table orders as per --tables option - test case.
* mysqltest.c:unknown2006-03-031-4/+5
| | | | | | | | Better fix for do_sleep(). client/mysqltest.c: Better fix for do_sleep().
* mysql-test-run.sh:unknown2006-02-281-3/+4
| | | | | | | | | | | | | | | | | | | | Fix URLs. README: Fix URL. mysqltest.result: Update test result for real_sleep error message. mysqltest.c: Fix do_sleep() to print correct command name for real_sleep. client/mysqltest.c: Fix do_sleep() to print correct command name for real_sleep. mysql-test/r/mysqltest.result: Update test result for real_sleep error message. mysql-test/README: Fix URL. mysql-test/mysql-test-run.sh: Fix URLs.
* mysqltest.c:unknown2006-02-281-9/+10
| | | | | | | | Correct/clarify comments. client/mysqltest.c: Correct/clarify comments.
* mysqltest.c:unknown2006-02-281-8/+8
| | | | | | | | Fix typos. client/mysqltest.c: Fix typos.
* Merge bk-internal:/home/bk/mysql-4.1unknown2006-02-151-2/+5
|\ | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-4.1-clean
| * Merge mysql.com:/home/jimw/my/mysql-4.1-16389unknown2006-02-141-2/+5
| |\ | | | | | | | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-4.1-clean
| | * Fix mysqldump crash when encountering a VIEW (when used against aunknown2006-02-011-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | 5.0 or later server, obviously). (Bug #16389) client/mysqldump.c: Prevent dumping data from a view (and crashing when we see one)
* | | BUG#16217 fix partly backported from 5.0. It is different in mysqlbinlog part.unknown2006-02-101-1/+25
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changeset is assumed to stay in 4.1. client/mysql.cc: BUG#16217 forced to introduce a separate mysql client command. Feature is backported from 5.0, precisely ChangeSet 1.2034 06/02/09 16:23:09 aelkin@mysql.com (under second review at the moment) mysql-test/r/mysqlbinlog.result: changed in 5.0 mysql-test/t/mysqlbinlog.test: backported from 5.0. The last part of the test to mimic bug#16217 sql/log_event.cc: Inserting exclaiming comment command for mysql client made differently than in 5.0. Parsing still is cheap enough not to think to modify server code instead.
* | Bug #15302 LOAD DATA FROM MASTER -> Packets out of order (Found: 2, expected 1)unknown2006-01-311-4/+4
| | | | | | | | | | | | | | | | | | | | | | - Change "mysql_create_db" to not call "send_ok" if in silent mode i.e. called from "load_master_data" - Change mysqltest to detect when there aren't as many warnings available as was reported. client/mysqltest.c: Call "die" if warnings were reported but there weren't any warnings to retrieve sql/sql_db.cc: Don't call "send_ok" if in silent mode.
* | mysql.cc:unknown2005-12-201-1/+1
|/ | | | | | | | Typo in help message. client/mysql.cc: Typo in help message.
* Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0unknown2005-12-047-7/+7
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * A set of Netware related patches.unknown2005-12-047-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | client/mysql.cc: Fixed option name. client/mysqladmin.c: Fixed option name. client/mysqlbinlog.cc: Fixed option name. client/mysqlcheck.c: Fixed option name. client/mysqldump.c: Fixed option name. client/mysqlimport.c: Fixed option name. client/mysqlshow.c: Fixed option name. isam/isamchk.c: Fixed option name. myisam/myisamchk.c: Fixed option name. myisam/myisampack.c: Fixed option name. sql/sql_parse.cc: Fix problem with kill connection on NetWare.
* | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-11-191-3/+7
|\ \ | | | | | | | | | | | | | | | | | | | | | into mysql.com:/Users/kent/mysql/bk/mysql-4.1-distcheck configure.in: Auto merged
| * | Update out-of-date URLs in 'help' text of mysql client. (Bug #14801)unknown2005-11-111-3/+7
| | | | | | | | | | | | | | | client/mysql.cc: Update text, URLs in mysql client 'help' text
* | | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-11-041-2/+2
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/Users/kent/mysql/bk/mysql-4.1-distcheck Makefile.am: Auto merged configure.in: Auto merged mysql-test/Makefile.am: Auto merged
| * | Makefile.am, configure.in:unknown2005-09-241-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable "make distcheck" to work configure.in: Enable "make distcheck" to work Docs/Makefile.am: Enable "make distcheck" to work Makefile.am: Enable "make distcheck" to work client/Makefile.am: Enable "make distcheck" to work cmd-line-utils/libedit/Makefile.am: Enable "make distcheck" to work include/Makefile.am: Enable "make distcheck" to work libmysql/Makefile.am: Enable "make distcheck" to work libmysql_r/Makefile.am: Enable "make distcheck" to work libmysqld/Makefile.am: Enable "make distcheck" to work libmysqld/examples/Makefile.am: Enable "make distcheck" to work mysql-test/Makefile.am: Enable "make distcheck" to work ndb/docs/Makefile.am: Enable "make distcheck" to work netware/Makefile.am: Enable "make distcheck" to work pstack/Makefile.am: Enable "make distcheck" to work scripts/Makefile.am: Enable "make distcheck" to work sql-bench/Makefile.am: Enable "make distcheck" to work sql/Makefile.am: Enable "make distcheck" to work sql/share/Makefile.am: Enable "make distcheck" to work support-files/Makefile.am: Enable "make distcheck" to work
* | | Check for NULLs only if we don't replace column results,unknown2005-10-311-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | get real results after all checks. (see bug #14254: func_crypt.test fails on FreeBSD with --ps-protocol). client/mysqltest.c: Check for NULLs only if we don't replace column results, get real results after all checks.
* | | BUG# 12123unknown2005-10-251-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 #12123 Added $MYSQL_IMPORT in order to test mysqlimport bug. mysql-test/mysql-test-run.sh: BUG #12123 Added $MYSQL_IMPORT in order to test mysqlimport bug. mysql-test/r/mysqldump.result: BUG #12123 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 #12123 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)
* | | Merge mysql.com:/usr/home/bar/mysql-4.1.b13487unknown2005-10-141-5/+11
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/bar/mysql-4.1 client/mysql.cc: Auto merged
| * | | Bug#13487 Japanese data inside a comment causes the syntax errorunknown2005-09-281-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql.cc: Fixed not to copy multibyte characters to the target string if we are inside a comment. client/mysql.cc: Bug#13487 Japanese data inside a comment causes the syntax error Fixed not to copy multibyte characters to the target string if we are inside a comment. ,
* | | | The "exit" command of mysqltest is quite useful when writing tests for 4.1 ↵unknown2005-10-051-2/+7
| | | | | | | | | | | | | | | | so I'm porting it from 5.0 to 4.1.
* | | | Windows compilation fix: Added typecast (const char* to char *)unknown2005-10-041-1/+1
| | | |
* | | | Many files:unknown2005-09-291-9/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prefix regex functions/types with "my_" as our library is not compatible with normal regex lib. my_regex.h: Rename: regex/regex.h -> regex/my_regex.h client/mysqltest.c: Prefix regex functions/types with "my_" as our library is not compatible with normal regex lib. os2/MySQL-Source.icc: Prefix regex functions/types with "my_" as our library is not compatible with normal regex lib. regex/Makefile.am: Prefix regex functions/types with "my_" as our library is not compatible with normal regex lib. regex/debug.c: Prefix regex functions/types with "my_" as our library is not compatible with normal regex lib. regex/debug.ih: Prefix regex functions/types with "my_" as our library is not compatible with normal regex lib. regex/engine.c: Prefix regex functions/types with "my_" as our library is not compatible with normal regex lib. regex/engine.ih: Prefix regex functions/types with "my_" as our library is not compatible with normal regex lib. regex/main.c: Prefix regex functions/types with "my_" as our library is not compatible with normal regex lib. regex/main.ih: Prefix regex functions/types with "my_" as our library is not compatible with normal regex lib. regex/regcomp.c: Prefix regex functions/types with "my_" as our library is not compatible with normal regex lib. regex/regerror.c: Prefix regex functions/types with "my_" as our library is not compatible with normal regex lib. regex/regerror.ih: Prefix regex functions/types with "my_" as our library is not compatible with normal regex lib. regex/my_regex.h: Prefix regex functions/types with "my_" as our library is not compatible with normal regex lib. regex/regexec.c: Prefix regex functions/types with "my_" as our library is not compatible with normal regex lib. regex/regfree.c: Prefix regex functions/types with "my_" as our library is not compatible with normal regex lib. regex/reginit.c: Prefix regex functions/types with "my_" as our library is not compatible with normal regex lib. sql/item_cmpfunc.cc: Prefix regex functions/types with "my_" as our library is not compatible with normal regex lib. sql/item_cmpfunc.h: Prefix regex functions/types with "my_" as our library is not compatible with normal regex lib. sql/mysqld.cc: Prefix regex functions/types with "my_" as our library is not compatible with normal regex lib.
* | | | - compile fix: don't use C++ - style comments in .c files!unknown2005-09-281-1/+1
| | | |
* | | | Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1unknown2005-09-271-25/+29
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/fix_mysqltest/my41-fix_mysqltest client/mysqltest.c: Manual merge mysql-test/mysql-test-run.pl: patch alredy commited
| * | | BUG#12959 mysqltest crashes if testcase passed with -x optionunknown2005-09-201-8/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Enable testcases after help from Serg client/mysqltest.c: Dump output to stdout if no result file is specified Don't print verbose_msg when command fails whith expected error mysql-test/mysql-test-run.pl: Don't add all args to the MYSQL_TEST environment variable. mysql-test/r/mysqltest.result: Add test for mysqltest -x mysql-test/t/mysqltest.test: Add test for mysqltest -x
| * | | Improved outputunknown2005-09-201-1/+2
| | | | | | | | | | | | | | | | | | | | client/mysqltest.c: Don't print "At line: 0"
| * | | Clean up printout of line numbersunknown2005-09-191-16/+11
| | | | | | | | | | | | | | | | | | | | | | | | client/mysqltest.c: Only print line no if start_lineno > 0 Remove lineno in calls to verbose_msg and die, this is handled by the function.
* | | | Fixed error found during review of new pushed codeunknown2005-09-251-2/+2
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | client/mysql.cc: Don't use c_ptr() for cgets() and ensure buffer is not overwritten mysql-test/r/cast.result: More test for CAST(0x.... as signed) sql/opt_sum.cc: Fix bugs found during review - Changed code to be able to remove one if - Ensure that count == 0 only if is_exact_count == TRUE sql/sql_delete.cc: Ensure 'allow_sum_func' is reset before call to setup_conds sql/sql_lex.cc: allow_sum_func doesn't have to be reset for each query (It's to be reset in setup_fields() or before call to setup_conds() sql/sql_load.cc: Move set of auto_increment_field_not_null so that it's not set if field value is NULL sql/sql_prepare.cc: allow_sum_func doesn't have to be reset for each query (It's to be reset in setup_fields() or before call to setup_conds() sql/sql_update.cc: Ensure 'allow_sum_func' is reset before call to setup_conds
* | | Makefile.am:unknown2005-09-241-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert to shell test script for test targets mysqltest.c: Windows pclose() returns error code in low byte mysql_config.sh: Remove -Xa -xstrconst from --cflags for Sun C++ scripts/mysql_config.sh: Remove -Xa -xstrconst from --cflags for Sun C++ client/mysqltest.c: Windows pclose() returns error code in low byte Makefile.am: Revert to shell test script for test targets
* | | Bug #13384 mysqltest, no protocol when script contains only lines with evalunknown2005-09-221-0/+1
| | | | | | | | | | | | | | | client/mysqltest.c: Set query_executed also for eval, that results in a query being executed and output is likely.
* | | Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-09-201-3/+28
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | into selena.:H:/MYSQL/src/#12929-mysql-4.1 include/my_sys.h: Auto merged
| * | | Fixes bug #12929. Uses my_cgets instead of _cgets function, thus eliminatingunknown2005-09-161-3/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a restriction to 255 chars for editable buffer. VC++Files/mysys/mysys.dsp: Added my_conio.c VC++Files/mysys/mysys_ia64.dsp: Added my_conio.c include/my_sys.h: Added declarations for my_conio.c functions mysys/my_conio.c: Added _cgets() replacement that is not limited to 255 chars retrieval from win32 console.
* | | | Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0unknown2005-09-191-11/+32
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1 client/mysqltest.c: Merged from 4.0.
| * | | Fixed Bug#13275 mysqltest empty file bugunknown2005-09-191-11/+31
| | | |
* | | | Review fixes since last pullunknown2005-09-121-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix for bug #13025; Server crash in filesort because wrong call to handler::position() client/mysqltest.c: Code cleanup during review mysql-test/r/innodb.result: Added test case for bug #13025; Server crash in filesort because wrong call to handler::position() mysql-test/t/innodb.test: Added test case for bug #13025; Server crash in filesort because wrong call to handler::position() sql/filesort.cc: Don't call handler::position() if row was not found sql/item_cmpfunc.cc: Indentation changes sql/sql_select.cc: Moved variable to outer level
* | | | Merge mysql.com:/home/hartmut/projects/mysql/dev/4.0unknown2005-09-081-1/+2
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | | | | | | | | | | into mysql.com:/home/hartmut/projects/mysql/dev/4.1 client/mysqlimport.c: Auto merged
| * | fix for BUG#12958 : mysqlimport with -L option crashing on HP-UX unknown2005-09-021-1/+2
| | |
* | | Backport fixes for mysqltest.test from 5.0unknown2005-09-061-26/+51
| | | | | | | | | | | | | | | | | | | | | client/mysqltest.c: Backport from 5.0 mysql-test/t/mysqltest.test: Remove the extra ;
* | | Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1unknown2005-09-051-5/+7
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/bug12959/my41-bug12959 client/mysqltest.c: Auto merged
| * | | Bug#12959 mysqltest crashes if testcase passed with -x optionunknown2005-09-051-5/+7
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | client/mysqltest.c: Fixes for mysqltest -x <filename> mysql-test/t/mysqltest.test: Test mysqltest -x <filename> mysql-test/include/mysqltest-x.inc: New BitKeeper file ``mysql-test/include/mysqltest-x.inc''
* | | Compile error fix.unknown2005-09-021-2/+2
|/ / | | | | | | | | | | client/mysqltest.c: Have variable declarations before "DBUG_ENTER", the opposite order will fail to compile on some platforms.
* | Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1unknown2005-09-011-405/+701
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/bug11316/my41-bug11316 mysql-test/mysql-test-run.pl: Auto merged mysql-test/t/create.test: Auto merged mysql-test/t/create_select_tmp.test: Auto merged mysql-test/t/drop.test: Auto merged mysql-test/t/flush.test: Auto merged mysql-test/t/handler.test: Auto merged mysql-test/t/innodb-deadlock.test: Auto merged mysql-test/t/innodb-lock.test: Auto merged mysql-test/t/innodb.test: Auto merged mysql-test/t/ndb_autodiscover2.test: Auto merged mysql-test/t/rpl000001.test: Auto merged mysql-test/t/rpl_EE_error.test: Auto merged mysql-test/t/rpl_change_master.test: Auto merged mysql-test/t/rpl_deadlock.test: Auto merged mysql-test/t/rpl_drop.test: Auto merged mysql-test/t/rpl_drop_temp.test: Auto merged mysql-test/t/rpl_error_ignored_table.test: Auto merged mysql-test/t/rpl_flush_log_loop.test: Auto merged mysql-test/t/rpl_insert_id.test: Auto merged mysql-test/t/rpl_loaddata.test: Auto merged mysql-test/t/rpl_rotate_logs.test: Auto merged mysql-test/t/rpl_until.test: Auto merged client/mysqltest.c: Manual merge mysql-test/t/mysqltest.test: Manual merge
| * | Fix compiler warnings for mysqltest.cunknown2005-09-011-4/+2
| | | | | | | | | | | | | | | | | | client/mysqltest.c: Fix warnings Remove unused vars
| * | Bug #3131 mysqltest fails on $2=$1 assignment in testunknown2005-09-011-7/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | client/mysqltest.c: Fix function var_copy to make it possible to assign one variable to another. ex: let $1=$2 mysql-test/r/mysqltest.result: Update test result mysql-test/t/mysqltest.test: Add test cases for variable to variable assignment
| * | Bug #12471 mysqltest, --error within loop affects wrong statementunknown2005-09-011-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Move clearing of expected errors client/mysqltest.c: Move clear of expected errors to the query loop so that the expected error is reset even when the query is retrieved from the q_lines cache. mysql-test/r/mysqltest.result: Update test results mysql-test/t/mysqltest.test: Add test for bug#12471
View Lorry Controller Status