Commit graph

1205 commits

Author SHA1 Message Date
msvensson@neptunus.(none)
1437500c1b Pass location of charsets dir to mysqltest to avoid using the charsetdir locally installed on machine. 2006-11-08 22:53:40 +01:00
msvensson@shellback.(none)
15835edddd Merge bk-internal:/home/bk/mysql-4.1-maint
into  shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-11-02 23:09:32 +01:00
ramil/ram@mysql.com/myoffice.izhnet.ru
9658dc9127 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maint
into  mysql.com:/usr/home/ram/work/bug22913/my41-bug22913
2006-11-02 16:25:01 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
a072688eea Fix for bug #22913: mysql --quick doesn't report some errors.
We don't check for errors that may occur during data printing.
2006-11-02 14:32:00 +04:00
msvensson@shellback.(none)
64eb65533e Make variables static to please Netware compiler 2006-10-31 18:51:23 +01:00
msvensson@neptunus.(none)
c972edc663 Enable the ATTRIBUTE_FORMAT macros to check format of variable arg parameters 2006-10-24 13:34:10 +02:00
msvensson@neptunus.(none)
9a5b4a1151 Add command "exit" to mysqltest, it will stop processing any more
commands and go directly to result file processing
2006-10-19 13:34:09 +02:00
msvensson@neptunus.(none)
b11dee73ca Backport test cases fixes from 5.0 2006-10-19 10:54:23 +02:00
msvensson@shellback.(none)
a9e60bab29 Use char as datatype for the byte that are read with my_fgetc, fixes problem with
mysqltest.test on Solaris and Mac. write_file produced nice files with all zeroes.
2006-10-14 17:09:06 +02:00
msvensson@shellback.(none)
d8b9f7cb0e Improving debugging support in 'read_line' function 2006-10-14 17:02:43 +02:00
msvensson@shellback.(none)
de3f217e10 Use 'my_strnncoll_simple' instead of 'strncasecmp' 2006-10-13 11:38:32 +02:00
msvensson@shellback.(none)
889e7147f6 Add ATTRIBUTE_FORMAT specifier to _db_doprnt, which is used by DBUG_PRINT
This will hopefully avoiid annoying crashes when running with --debug
Fix warnings  from the above in mysqltest.c
2006-10-12 20:15:56 +02:00
msvensson@shellback.(none)
1be01ceea8 Merge bk-internal:/home/bk/mysql-4.1-maint
into  shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-10-12 18:48:03 +02:00
msvensson@shellback.(none)
6c31690bbd Move the reconnect variable to beginning of function
Fix warning about value from "*ptr++" not being used. Changed it to ptr++
2006-10-12 13:50:50 +02:00
msvensson@shellback.(none)
71cb0e8dc5 Only print cur_file->filename if cur_file->file is set
MOve DBUG_ASSERT(result_file_name) to after DBUG_ENTER
Change type of "reconnect" variable from int to my_bool, reconnect didn't work on Solaris without that
2006-10-12 10:49:59 +02:00
msvensson@shellback.(none)
5b8312986c Fixes for embedded server test 2006-10-11 21:53:43 +02:00
msvensson@shellback.(none)
f807b6e893 Fix some bad code in mysqltest.c which cause segfault 2006-10-11 11:21:44 +02:00
cmiller@zippy.cornsilk.net
0ab343a7dc Merge bk-internal.mysql.com:/home/bk/mysql-4.1-maint
into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug17583/my41-bug17583
2006-10-09 18:53:17 -04:00
cmiller@zippy.cornsilk.net
4812d81eab Bug#17583: mysql drops connection when stdout is not writable
When the client program had its stdout file descriptor closed by the calling
shell, after some amount of work (enough to fill a socket buffer) the server 
would complain about a packet error and then disconnect the client.

This is a serious security problem.  If stdout is closed before the mysql is
exec()d, then the first socket() call allocates file number 1 to communicate
with the server.  Subsequent write()s to that file number (as when printing
results that come back from the database) go back to the server instead in 
the command channel.  So, one should be able to craft data which, upon being
selected back from the server to the client, and injected into the command
stream become valid MySQL protocol to do something nasty when sent /back/ to 
the server.

The solution is to close explicitly the file descriptor that we *printf() to, 
so that the libc layer and the OS layer both agree that the file is closed.
2006-10-09 18:28:06 -04:00
msvensson@shellback.(none)
8a84753acf vsnprintf is not available on win2003-x86 host, as this is just a debug functionality - disable it for now. 2006-10-08 16:19:23 +02:00
msvensson@neptunus.(none)
65d3205959 Init "saved_expected_errors" at program start, avoids crash where --error is first command
strcmp -> strncmp
2006-10-07 20:14:21 +02:00
msvensson@neptunus.(none)
dedea59a6c Add comment and remove strange assignment in 'do_exec' 2006-10-07 19:47:42 +02:00
msvensson@neptunus.(none)
487e2506c0 Two implementations of "get_err_code_from_name", one use if mysqld_ername.h is available and oe if it's not
Declare "to_ptr" first in block
2006-10-07 19:09:40 +02:00
msvensson@neptunus.(none)
37be4fdff6 Merge neptunus.(none):/home/msvensson/mysql/same_tools/my41-same_tools
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-10-06 13:18:52 +02:00
msvensson@neptunus.(none)
ae4df31df4 Add printout of file in which warning was detected
Cleanup .progress, .reject, .log and .warnings files produced by mysqltest
2006-10-06 00:57:10 +02:00
msvensson@neptunus.(none)
02693c37d9 Add policy directive about keeping mysqltest framework tools identical in all versions 2006-10-05 22:05:42 +02:00
msvensson@neptunus.(none)
c5fba0a888 Bug #20010 mysql-test-run.pl: --record and --require conflict (test fails)
- When --record is passed to mysqltest the whole testcase should be executed
as it normally is while the output form the test is acumulating
in ds_res. When test has finished ds_res should simply be written to the
specified result file(if any) instead of comapring it against the result file.
Simplify handling of --require and also the cecking of result files by splitting
check_result function into one  function 'check_require' that is specialised in
checking require's and leave 'check_result' to do just that.
- "mysqltest --record" has been considered unsafe, but with this really simple
logic, it should be safe to use.
2006-10-05 18:00:20 +02:00
msvensson@neptunus.(none)
6e405f5888 Improve "check_eol_junk" to detect junk although there are multi line comments in the way.
I.e take advantage of the fact that a # comment is always terminated by a new line 
Add tests for the above
2006-10-05 12:25:24 +02:00
msvensson@neptunus.(none)
2d5c7c42a3 Update "get_errcode_from_name"
- add missing DBUG_RETURN
 - Change type of st_error->code to uint, that should be more than enough
   to hold the error numbers between 1000 and around 2000
2006-10-04 23:34:05 +02:00
iggy@rolltop.ignatz42.dyndns.org
8280c6baaa Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug19660/my41-bug19660
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-4.1-maint
2006-10-04 16:46:00 -04:00
msvensson@shellback.(none)
5aac9b58eb Don't print version in error message, just too messy to test 2006-10-04 12:27:05 +02:00
msvensson@neptunus.(none)
54a76f4946 Add possibility to send warnings about suspicious commands in .test file to <result_file_name>.warnings file
Move detection of "parsing enabled" to after command has been read.
Cleanup parsing enabled/disabled
2006-10-04 01:20:08 +02:00
msvensson@neptunus.(none)
89a53ef374 Fix problem when both option SSL and COMPRESS specified 2006-10-03 23:11:47 +02:00
iggy@rolltop.ignatz42.dyndns.org
728588da38 Bug#19660 mysqldump --single-transaction should be with CONSISTENT SNAPSHOT 2006-10-03 11:26:50 -04:00
msvensson@shellback.(none)
538e1881ce Fix typo
- Change con_host to ds_connection_name.str
2006-10-03 16:34:44 +02:00
msvensson@shellback.(none)
2cea0e6b13 Update mysqltest to latest version
- ie. backport from 5.1
 - also update testcase error dected by new version
2006-10-03 15:33:44 +02:00
ramil/ram@mysql.com/myoffice.izhnet.ru
7f410eed5e Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maint
into  mysql.com:/usr/home/ram/work/bug21142/my41-bug21142
2006-09-18 09:06:05 +05:00
jimw@rama.(none)
2b8f30a764 Merge bk-internal:/home/bk/mysql-4.1-maint
into  rama.(none):/home/jimw/my/mysql-4.1-21288
2006-08-31 21:23:25 -07:00
ramil/ram@mysql.com/myoffice.izhnet.ru
f25b8f20d2 Fix for bug #21142: Malformed insert causes a segmentation fault.
- possible stack overflow fixed.
2006-08-29 14:38:02 +05:00
jimw@rama.(none)
abc148000d Bug #21288: mysqldump segmentation fault when using --where
The problem was that the error handling was using a too-small buffer to
  print the error message generated. We fix this by not using a buffer at
  all, but by using fprintf() directly. There were also some problems with
  the error handling in table dumping that was exposed by this fix that were
  also corrected.
2006-08-17 14:09:24 -07:00
bar@mysql.com/bar.intranet.mysql.r18.ru
638300fa9e Merge mysql.com:/usr/home/bar/mysql-4.1
into  mysql.com:/usr/home/bar/mysql-4.1.b17939
2006-08-15 14:41:29 +05:00
cmiller@zippy.cornsilk.net
dd5eeaf676 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into  zippy.cornsilk.net:/home/cmiller/work/mysql/m41-maint--07OBQ
2006-08-02 14:57:12 -04:00
igreenhoe/greenman@anubis.greendragongames.com
940db2e976 Merge anubis.greendragongames.com:/home/greenman/workspace-mysql/mysql/mysql-4.1-maint
into  anubis.greendragongames.com:/home/greenman/workspace-mysql/mysql/pending/bug-4.1-19364
2006-07-31 12:53:47 -07:00
msvensson@neptunus.(none)
dce84a7e05 Merge 192.168.0.20:mysql/bug21217/my41-bug21217
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1
2006-07-31 14:41:29 +02:00
msvensson@shellback.(none)
eaae3b2d2b BUG#21217 "mysqltest" client is inconsistent when to log a line number
- Init start_lineno to 0
2006-07-30 19:30:20 +02:00
iggy@rolltop.ignatz42.dyndns.org
2835ebdf63 Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-4.1-maint
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-4.1-maint_bug20328
2006-07-19 17:00:39 -04:00
igreenhoe/greenman@anubis.greendragongames.com
8e3d69d986 Merge igreenhoe@bk-internal.mysql.com:/home/bk/mysql-4.1-maint
into  anubis.greendragongames.com:/home/greenman/workspace-mysql/mysql/pending/bug-4.1-15977
2006-07-13 00:33:49 -07:00
igreenhoe/greenman@anubis.greendragongames.com
a5b8596c37 Fix for Bug #19364 "mysql --help gives old informations".
Old option ordering in the help was confusing to some users.  Changed
ordering of deprecated options to be consistent, and added mention to
entry for options with a "--no-option" variant mentioning the
"--disable-option" variant.
2006-07-13 00:31:47 -07:00
tnurnberg@mysql.com/salvation.intern.azundris.com
4be51e1644 Bug#20432: mysql client interprets commands in comments
do not look for client-specific commands while inside a multi-line comment.
we will allow multi-comments pretty much anywhere within SQL-statements,
but client-specific commands (help, use, print, ...) must be the first token
in the input.
2006-07-13 09:04:06 +02:00
iggy@mysql.com
f6658356c6 Bug#20328 mysql client: dumb about trailing spaces on help command. 2006-06-29 17:06:28 -04:00