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
681acdf055
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug17583/my50-bug17583
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug17583/my51-bug17583
2006-10-09 18:51:02 -04:00
cmiller@zippy.cornsilk.net
4d0023edf6
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug17583/my41-bug17583
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug17583/my50-bug17583
2006-10-09 18:46:28 -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)
25449f6756
Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
...
into shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
2006-10-08 16:21:19 +02:00
msvensson@shellback.(none)
65a3ddee6a
Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-08 16:20:16 +02: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@shellback.(none)
197f17481f
Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
...
into shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
2006-10-08 15:59:06 +02:00
msvensson@neptunus.(none)
577242e085
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-07 20:19:57 +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)
fdbdc679ca
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-10-07 19:14:30 +02:00
msvensson@neptunus.(none)
3faa1fcd4f
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-07 19:12:10 +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
mats@romeo.(none)
d4d26ba7d5
Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl
...
into romeo.(none):/home/bk/b19459-mysql-5.1-new
2006-10-06 15:31:05 +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)
5a15eeca7c
Merge neptunus.(none):/home/msvensson/mysql/same_tools/my50-same_tools
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-06 13:16:57 +02:00
msvensson@neptunus.(none)
6273db415e
Merge neptunus.(none):/home/msvensson/mysql/same_tools/my51-same_tools
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-10-06 13:12:53 +02:00
mats@romeo.(none)
e762328b54
BUG#19459 (BINLOG RBR command does not lock tables correctly causing
...
crash for, e.g., NDB):
Before, mysqlbinlog printed table map events as a separate statement, so
when executing the event, the opened table was subsequently closed
when the statement ended. Instead, the row-based events that make up
a statement are now printed as *one* BINLOG statement, which means
that the table maps and the following *_rows_log_event events are
executed fully before the statement ends.
Changing implementation of BINLOG statement to be able to read the
emitted format, which now consists of several chunks of BASE64-encoded
data.
2006-10-06 10:17:02 +02:00
msvensson@neptunus.(none)
e2496d3016
Merge neptunus.(none):/home/msvensson/mysql/same_tools/my50-same_tools
...
into neptunus.(none):/home/msvensson/mysql/same_tools/my51-same_tools
2006-10-06 01:06:02 +02:00
msvensson@neptunus.(none)
3eaeeca6de
Merge neptunus.(none):/home/msvensson/mysql/same_tools/my41-same_tools
...
into neptunus.(none):/home/msvensson/mysql/same_tools/my50-same_tools
2006-10-06 01:00:35 +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)
1f8ac39af1
Merge neptunus.(none):/home/msvensson/mysql/same_tools/my50-same_tools
...
into neptunus.(none):/home/msvensson/mysql/same_tools/my51-same_tools
2006-10-05 22:07:34 +02:00
msvensson@neptunus.(none)
7fb9bac13a
Merge neptunus.(none):/home/msvensson/mysql/same_tools/my41-same_tools
...
into neptunus.(none):/home/msvensson/mysql/same_tools/my50-same_tools
2006-10-05 22:06:51 +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)
a9e0652189
Merge neptunus.(none):/home/msvensson/mysql/same_tools/my50-same_tools
...
into neptunus.(none):/home/msvensson/mysql/same_tools/my51-same_tools
2006-10-05 18:52:30 +02:00
msvensson@neptunus.(none)
b7d7f25083
Merge neptunus.(none):/home/msvensson/mysql/same_tools/my41-same_tools
...
into neptunus.(none):/home/msvensson/mysql/same_tools/my50-same_tools
2006-10-05 18:45:40 +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)
ea4bee3dfa
Merge neptunus.(none):/home/msvensson/mysql/same_tools/my50-same_tools
...
into neptunus.(none):/home/msvensson/mysql/same_tools/my51-same_tools
2006-10-05 12:45:09 +02:00
msvensson@neptunus.(none)
ad967609a9
Merge neptunus.(none):/home/msvensson/mysql/same_tools/my41-same_tools
...
into neptunus.(none):/home/msvensson/mysql/same_tools/my50-same_tools
2006-10-05 12:42:39 +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)
9be910079f
Merge neptunus.(none):/home/msvensson/mysql/same_tools/my50-same_tools
...
into neptunus.(none):/home/msvensson/mysql/same_tools/my51-same_tools
2006-10-04 23:51:36 +02:00
msvensson@neptunus.(none)
a915d6951e
Merge neptunus.(none):/home/msvensson/mysql/same_tools/my41-same_tools
...
into neptunus.(none):/home/msvensson/mysql/same_tools/my50-same_tools
2006-10-04 23:49:22 +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
iggy@rolltop.ignatz42.dyndns.org
5ed44ed09f
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug19660/my50-bug19660
...
into rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint
2006-10-04 16:44:51 -04:00
iggy@rolltop.ignatz42.dyndns.org
6ff8998d3c
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug19660/my51-bug19660
...
into rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.1-maint
2006-10-04 16:41:45 -04:00
iggy@rolltop.ignatz42.dyndns.org
9977eea685
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug19660/my50-bug19660
...
into rolltop.ignatz42.dyndns.org:/mnt/storeage/bug19660/my51-bug19660
2006-10-04 15:34:03 -04:00
iggy@rolltop.ignatz42.dyndns.org
71ace9598d
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug19660/my41-bug19660
...
into rolltop.ignatz42.dyndns.org:/mnt/storeage/bug19660/my50-bug19660
2006-10-04 15:31:14 -04:00
stewart@willster.(none)
276aaa2164
BUG#20809 mysqldump does not backup TS and LG information correctly
...
restore of the dump (ndb_dd_dump test) was failing for probably a merge problem. fixed now.
2006-10-05 00:56:06 +10:00
msvensson@neptunus.(none)
8929b7a03b
Merge neptunus.(none):/home/msvensson/mysql/same_tools/my50-same_tools
...
into neptunus.(none):/home/msvensson/mysql/same_tools/my51-same_tools
2006-10-04 16:35:40 +02:00
msvensson@neptunus.(none)
6b15f7680a
Merge neptunus.(none):/home/msvensson/mysql/same_tools/my41-same_tools
...
into neptunus.(none):/home/msvensson/mysql/same_tools/my50-same_tools
2006-10-04 16:30:56 +02: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)
5cb71d48d2
Merge neptunus.(none):/home/msvensson/mysql/same_tools/my41-same_tools
...
into neptunus.(none):/home/msvensson/mysql/same_tools/my50-same_tools
2006-10-04 01:21:03 +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)
5cdbeab88c
Merge neptunus.(none):/home/msvensson/mysql/same_tools/my41-same_tools
...
into neptunus.(none):/home/msvensson/mysql/same_tools/my50-same_tools
2006-10-03 23:13:19 +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)
1a9db6b7fd
Merge shellback.(none):/home/msvensson/mysql/same_tools/my41-same_tools
...
into shellback.(none):/home/msvensson/mysql/same_tools/my50-same_tools
2006-10-03 16:36:26 +02:00
msvensson@shellback.(none)
51b04fe458
Add mysys/my_copy.c as sources for mysqltest
2006-10-03 16:35:46 +02:00