Commit graph

430 commits

Author SHA1 Message Date
pem@mysql.com
1137a376a7 Fixed bugs in client/mysqltest.c which made lots of "connect" commands in tests fail. 2005-10-31 19:31:05 +01:00
pem@mysql.com
81437a7286 Removed C++-isms from client/mysqltest.c 2005-10-31 17:51:48 +01:00
msvensson@neptunus.(none)
de07ac0c5a Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/wl2930/my50-wl2930
2005-10-31 13:36:03 +01:00
ramil@mysql.com
afbd0fafd3 Check for NULLs only if we don't replace column results,
get real results after all checks.
(see bug #14254: func_crypt.test fails on FreeBSD with --ps-protocol).
2005-10-31 16:28:45 +04:00
msvensson@neptunus.(none)
e5eb7cbf29 WL#2930 Adding view and cursor 'protocols' to mysqltest
- Cleanup of mysqltest.c before extending it
2005-10-31 12:25:08 +01:00
msvensson@neptunus.(none)
22c0d6489c After reiview fix
- Use msg argument to determine if param is required or not in safe_get_param
2005-10-28 10:58:57 +02:00
jimw@mysql.com
b6dcc55969 Fix being able to set default TCP port for command-line utilities
by using MYSQL_TCP_PORT variable. (Bug #5792)
2005-10-13 12:28:43 -07:00
msvensson@neptunus.(none)
7d29c2a4a1 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/ssl_test/my50-ssl_test
2005-10-12 13:59:00 +02:00
msvensson@neptunus.(none)
0ac28d3187 Always test ssl and compress
- Updated after review
2005-10-12 13:56:07 +02:00
monty@mysql.com
f5fdf3e87a Reviewing new pushed code
- CHAR() now returns binary string as default
- CHAR(X*65536+Y*256+Z) is now equal to CHAR(X,Y,Z) independent of the character set for CHAR()
- Test for both ETIMEDOUT and ETIME from pthread_cond_timedwait()
  (Some old systems returns ETIME and it's safer to test for both values
   than to try to write a wrapper for each old system)
- Fixed new introduced bug in NOT BETWEEN X and X
- Ensure we call commit_by_xid or rollback_by_xid for all engines, even if one engine has failed
- Use octet2hex() for all conversion of string to hex
- Simplify and optimize code
2005-10-12 00:58:22 +03:00
monty@mysql.com
17d7ba931d Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/my/mysql-5.0
2005-10-08 03:37:23 +03:00
monty@mysql.com
78e828d32f Review of code pushed since last 5.0 pull:
Ensure that ccache is also used for C programs
mysql: Ensure that 'delimiter' works the same way in batch mode as in normal mode
mysqldump: Change to use ;; (instead of //) as a stored procedure/trigger delimiter
Fixed test cases by adding missing DROP's and rename views to be of type 'v#'
Removed MY_UNIX_PATH from fn_format()
Removed current_db_used from TABLE_LIST
Removed usage of 'current_thd' in Item_splocal
Removed some compiler warnings
A bit faster longlong2str code
2005-10-06 17:54:43 +03:00
guilhem@mysql.com
8a291efb75 The "exit" command of mysqltest is quite useful when writing tests for 4.1 so I'm porting it from 5.0 to 4.1. 2005-10-05 12:21:53 +02:00
msvensson@neptunus.(none)
cb96f195c8 Improved testing of ssl and compression
- Added show status variable "compression" for checking that compression is turned on.
 - Updated show status variable "have_openssl" to be set to DISABLED if server supports ssl but it's not turned on to accept incoming ssl connections.  
 - Setup server to accept ssl connections from clients ig that is supported by server
 - New tests 
   - ssl - Run with ssl turned on
   - ssl_compress - Run with ssl and compression turned on
   - compress - Run with compression turned in 
 - Updated test 
   - openssl_1, rpl_openssl1 - Changed to run if server supports ssl
2005-10-04 15:43:55 +02:00
konstantin@mysql.com
1831d62a5c Fix -ansi -pedantic compilation failure. 2005-10-03 19:44:53 +04:00
msvensson@neptunus.(none)
92b1d080c9 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/bug13231/my50-bug13231
2005-09-30 16:51:35 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
43b544a968 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0-icc
2005-09-30 12:36:23 +03:00
kent@mysql.com
656b0cc15a Merge 2005-09-29 03:20:31 +02:00
kent@mysql.com
844d964f2d Many files:
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
2005-09-29 02:08:24 +02:00
lenz@mysql.com
6e10a589e1 Merge mysql.com:/space/my/mysql-4.1 into mysql.com:/space/my/mysql-5.0 2005-09-28 23:05:42 +02:00
lenz@mysql.com
972d85af8b - compile fix: don't use C++ - style comments in .c files! 2005-09-28 23:04:35 +02:00
msvensson@neptunus.(none)
fbf4a5e079 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-09-28 11:34:53 +02:00
msvensson@neptunus.(none)
1105d4293d Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
into  neptunus.(none):/home/msvensson/mysql/fix_mysqltest/my41-fix_mysqltest
2005-09-27 16:48:41 +02:00
kent@mysql.com
0cfed79ea5 Makefile.am:
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++
2005-09-24 02:42:38 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
8d3036c35e Some minor fixes revealed as warnings by
Intel compiler.
2005-09-23 21:28:56 +03:00
msvensson@neptunus.(none)
4f03ab4943 Bug #13384 mysqltest, no protocol when script contains only lines with eval 2005-09-22 21:52:04 +02:00
msvensson@neptunus.(none)
4700631aa8 Bug #13384 mysqltest, no protocol when script contains only lines with eval 2005-09-22 21:24:57 +02:00
msvensson@neptunus.(none)
0581a7f23c Bug #13231 mysqltest: fails to dectect when mysql_next_result fails
- Added functionality to check errors returned from mysql_next_result
 - Exit from mysqltest when and unexpected error occurs.
 - The above fixes reveal problems with rpl000009, sp-error and query_cache-
 - Fix sp-error by adding an expected error
 - Fix rpl000009 by not sending "ok" from mysql_create_db when called with silent flag from load_master_data
 - Fix query_cache in separate patch
2005-09-21 15:28:28 +02:00
msvensson@neptunus.(none)
523d2aad94 BUG#12959 mysqltest crashes if testcase passed with -x option
- Enable testcases after help from Serg
2005-09-20 14:11:58 +02:00
msvensson@neptunus.(none)
913f0bd610 Improved output 2005-09-20 12:13:17 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
468610635b Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
2005-09-19 20:56:14 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
7c57c41a06 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
2005-09-19 19:33:59 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
a8bdf632d3 Fixed Bug#13275 mysqltest empty file bug 2005-09-19 18:45:22 +03:00
msvensson@neptunus.(none)
c18980aeb6 Clean up printout of line numbers 2005-09-19 12:24:59 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
01ce8a8aa9 Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
2005-09-12 20:18:49 +03:00
monty@mishka.mysql.com
0965bfa832 Review fixes since last pull
Fix for bug #13025; Server crash in filesort because wrong call to handler::position()
2005-09-12 18:48:17 +03:00
msvensson@neptunus.(none)
5c8d457ec8 Backport fixes for mysqltest.test from 5.0 2005-09-06 22:03:12 +02:00
msvensson@neptunus.(none)
b39f23d2b7 Bug #12984 mysqltest.test: different output from "exec NonExistsinfComamdn"
- Common error handling regardless of --ps-protocol or not.
2005-09-06 15:41:13 +02:00
msvensson@neptunus.(none)
9c1c075da1 Detect comment with command using extra delimiter 2005-09-06 12:33:36 +02:00
msvensson@neptunus.(none)
acd68dbf41 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/bug12959/my50-bug12959
2005-09-05 17:03:25 +02:00
msvensson@neptunus.(none)
7f848c1784 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
into  neptunus.(none):/home/msvensson/mysql/bug12959/my41-bug12959
2005-09-05 17:01:15 +02:00
msvensson@neptunus.(none)
e21d8c50bf Merge neptunus.(none):/home/msvensson/mysql/bug12959/my41-bug12959
into  neptunus.(none):/home/msvensson/mysql/bug12959/my50-bug12959
2005-09-05 16:51:31 +02:00
msvensson@neptunus.(none)
72228ea825 Bug#12959 mysqltest crashes if testcase passed with -x option 2005-09-05 16:50:32 +02:00
jimw@mysql.com
3be42aabc5 Merge mysql.com:/home/jimw/my/mysql-5.0-11787
into  mysql.com:/home/jimw/my/mysql-5.0-clean
2005-09-03 09:34:34 -07:00
joerg@mysql.com
ed093d581a Compile error fix. 2005-09-02 20:07:08 +02:00
msvensson@neptunus.(none)
1026fa2fe3 Fix for spelling miss and eol junk 2005-09-01 20:02:08 +02:00
msvensson@neptunus.(none)
28f529d91f Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
into  neptunus.(none):/home/msvensson/mysql/bug11316/my41-bug11316
2005-09-01 17:21:03 +02:00
msvensson@neptunus.(none)
305dc01078 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/bug11316/my50-bug11316
2005-09-01 17:15:37 +02:00
msvensson@neptunus.(none)
4b47ebcfc9 mysqltest improvements, updates after merge + test for 5.0 2005-09-01 17:01:23 +02:00
msvensson@neptunus.(none)
61be2a143d Merge neptunus.(none):/home/msvensson/mysql/bug11316/my41-bug11316
into  neptunus.(none):/home/msvensson/mysql/bug11316/my50-bug11316
2005-09-01 12:53:23 +02:00
msvensson@neptunus.(none)
8c0f7f82d9 Bug #11286 yassl incompatible with "load data infile"
- Make sure that mysqltest always uses ssl when connecting to the server.
 - Pass a i32-bit int variable as argument to FIONREAD ioctl.
2005-09-01 11:46:43 +02:00
msvensson@neptunus.(none)
72b08b7e57 Fix compiler warnings for mysqltest.c 2005-09-01 11:11:10 +02:00
msvensson@neptunus.(none)
ced32517c7 Bug #3131 mysqltest fails on $2=$1 assignment in test 2005-09-01 10:53:33 +02:00
msvensson@neptunus.(none)
906f7c4481 Bug #12471 mysqltest, --error within loop affects wrong statement
- Move clearing of expected errors
2005-09-01 09:34:40 +02:00
msvensson@neptunus.(none)
d692f0c045 Remove syntax !$<err_no> to set an expected error code
Use !<err_no> instead
2005-08-31 18:10:26 +02:00
msvensson@neptunus.(none)
2fc6ef3a40 BUG#11316: mysqltest, problems when assigning value with '#' to $variable
- Add stricter checking of syntax in mysqltest
2005-08-31 17:16:05 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
fe977b0cd0 Several fixes for Netware. 2005-08-24 22:03:34 +03:00
msvensson@neptunus.(none)
9ed35f83fa BUG#10267 mysqltest, wrong number of loops when a script is sourced within a loop 2005-08-16 17:10:52 +02:00
acurtis@xiphis.org
b9476f7d50 Merge xiphis.org:/usr/home/antony/work2/mysql-4.1
into  xiphis.org:/usr/home/antony/work2/merge-5.0
2005-08-11 12:18:53 +01:00
jimw@mysql.com
de46ae18c2 Merge mysql.com:/home/jimw/my/mysql-5.0-11602
into  mysql.com:/home/jimw/my/mysql-5.0-clean
2005-08-02 16:50:12 -07:00
monty@mishka.local
8437e9c1be Fixes during review of new pushed code
Change bool in C code to my_bool
Added to mysqltest --enable_parsning and --disable_parsing to avoid to have to comment parts of tests
Added comparison of LEX_STRING's and use this to compare file types for view and trigger files.
2005-07-31 12:49:55 +03:00
monty@mysql.com
987edeaa9b Fixed compiler warnings 2005-07-28 21:25:05 +03:00
jimw@mysql.com
0536bd6679 Increase allowed size of stored procedure bodies to 4GB, and
produce a sensible error when that limit is exceeded. (Bug #11602)
2005-07-26 18:08:49 -07:00
konstantin@mysql.com
52b8928b09 Merge mysql.com:/home/kostja/mysql/mysql-4.1-root
into  mysql.com:/home/kostja/mysql/mysql-5.0-merge
2005-07-19 00:55:37 +04:00
jimw@mysql.com
eb785d70b8 Fix error in formatting metadata in mysqltest. 2005-07-15 12:31:57 -07:00
msvensson@neptunus.(none)
447a119407 BUG#11316 mysqltest, problems when assigning value with '#' to $variable
- Fixed problem, only detect comment if the # is on start of line AND starting line of the current command.
 - Wrote tests for most of the mysqltest commands, added stricter checking of correct syntax.
2005-07-15 17:51:43 +02:00
jimw@mysql.com
bef1c77789 Make it possible to change reconnect setting with
mysql_options(..., MYSQL_OPT_RECONNECT, ...). (Bug #11787)
2005-07-06 16:29:31 -07:00
monty@mysql.com
86d7b02199 Merge with 4.1 2005-07-03 14:17:52 +03:00
msvensson@neptunus.(none)
ead7b076dc Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-1.2310.2.2
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-07-01 15:40:42 +02:00
msvensson@neptunus.(none)
11d3c28575 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-1.2310.2.2
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-07-01 15:40:29 +02:00
msvensson@neptunus.(none)
9613c434e0 Win port fixes 2005-07-01 15:39:36 +02:00
pem@mysql.comhem.se
6fd1e8227e Fixed compiler errors (i.e. changed C++-isms into C) 2005-06-29 14:23:43 +02:00
monty@mishka.local
7398252d02 Portability fixes
Fixes while reviewing new pushed code
NULL as argument to encrypt/decrypt should return NULL without a warning
2005-06-27 20:31:00 +03:00
msvensson@neptunus.(none)
7d42249bf1 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-06-27 15:14:23 +02:00
msvensson@neptunus.(none)
87d681c7bb Include <sys/wait.h> to get WEXITSTATUS 2005-06-27 15:11:40 +02:00
msvensson@neptunus.(none)
5e703ebbbb Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-06-27 15:02:39 +02:00
msvensson@neptunus.(none)
f8472c0e49 Add "#include <stdlib.h>" to define WEXITSTATUS 2005-06-27 15:01:49 +02:00
msvensson@neptunus.(none)
85b9ffc4ca Merged from mysql-4.1 to mysql-5.0 2005-06-22 14:10:02 +02:00
msvensson@neptunus.(none)
ddeaf342a7 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-06-21 14:24:13 +02:00
msvensson@neptunus.(none)[msvensson]
39636f48f0 patch 2005-06-21 14:19:56 +02:00
lars@mysql.com
41d1c094b6 Fix of 5.0 tree 2005-06-17 14:03:27 +02:00
lars@mysql.com
869882f321 WL#2076: Added if(...) construct to mysqltest
Removed SHOW BINLOG EVENTS in test case for ps-protocol and row-based replication
2005-06-16 16:56:03 +02:00
reggie@monster.
4283fdb170 fixes for compiler warnings from VC6 2005-06-06 11:34:52 -05:00
jimw@mysql.com
b2b9485a94 Merge mysql.com:/home/jimw/my/mysql-5.0-10251
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-05-17 16:59:39 -07:00
kent@mysql.com
24b34fa9fe Merge 2005-05-16 01:25:14 +02:00
kent@mysql.com
b076cdb208 mysqltest.c:
To solve bug#8455, call mysql_affected_rows() earlier, before query to find warnings
2005-05-16 01:08:42 +02:00
kent@mysql.com
6374bfeb61 mysqltest.c:
To solve bug#6193, also reset require when using 'eval' for running query
mysql-test-run.pl:
  In cleanup, remove possible soft link to var directory
2005-05-15 20:38:54 +02:00
kent@mysql.com
bd70ce726b Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile
2005-05-15 07:06:47 +02:00
kent@mysql.com
221b1ccae8 mysqltest.c, mysql-test-run.sh:
Not to conflict with Windows return code 2 for "not found", use 62 for "skip"
mysql-test-run.sh, suppress.purify:
  Use Purify suppress file
2005-05-15 06:59:34 +02:00
jimw@mysql.com
ff2d0938dd Support quoted identifiers containing single and double quotes in
mysqltest. (Bug #10251)
2005-05-06 05:48:46 -07:00
ramil@mysql.com
9f440d2b20 Merge mysql.com:/usr/home/ram/work/mysql-4.1
into mysql.com:/usr/home/ram/work/mysql-5.0
2005-04-14 16:39:42 +05:00
ramil@mysql.com
a835045b8f Merge mysql.com:/usr/home/ram/work/mysql-4.0
into mysql.com:/usr/home/ram/work/mysql-4.1
2005-04-14 16:26:39 +05:00
ramil@mysql.com
c7a6c8de06 In order not to conflict with a Linux kernel header
set_bit replaced with internal_set_bit,
clear_bit replaced with internal_clear_bit.
2005-04-14 11:13:08 +05:00
monty@mysql.com
780202f130 Moved some old test and added a new test to only be run with mysql-test-run --big
Fixed warnings by valgrind for sum_distinct.test
Enable buffered-record-reads after filesort for InnoDB tables with short primary key
Enabled sort-with-data for MyISAM temporary files
2005-04-07 19:24:14 +03:00
jimw@mysql.com
bb215f648b Merge 2005-04-04 23:03:56 -07:00
jimw@mysql.com
1f1c44779a Merge mysql.com:/home/jimw/my/mysql-4.1-8866
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-04-04 18:26:39 -07:00
pekka@mysql.com
727015dbb3 Merge 2005-03-28 23:06:19 +02:00
jimw@mysql.com
9c86b35194 Fix reconnect when using prepared statements, and add
--disable_reconnect and --enable_reconnect to mysqltest
so that it can be tested properly. (Bug #8866)
2005-03-28 09:59:41 -08:00
serg@serg.mylan
f21f8f983f client/mysqltest.c
corrected number of fields for --enable_metadata
sql/sql_union.cc
    fixed a apparent typo in assert
2005-03-23 20:38:42 +01:00
dlenev@brandersnatch.localdomain
c87912c8da Fix for spurious failures of sp.test on many platforms (aka Bug #9161
"Warnings on 'drop procedure' platform-specific").

In mysqltest we should not issue "SHOW WARNINGS" until we have not 
read results from all statements in multi-statement.

Otherwise such "SHOW WARNINGS" will either cause "Packets out of order"
error and thus will ruin current connection (but we may not notice this as
it happened in sp.test because we ignore errors from such auxilary
SHOW WARNINGS and use auto-reconnecting connections) or will
succeed but consume first packet from next statement in multi-statement
sequence (this happens if "SHOW WARNINGS" is issued when this packet
is already received by client. Packet is thrown away by net_clear()
call which is issued when "SHOW WARNINGS" is sent to server).

In our case sp.test failed because usually we had first situation
but sometimes second situation occured causing warning to pop-up.
2005-03-20 20:29:03 +03:00