msvensson@shellback.(none)
f807b6e893
Fix some bad code in mysqltest.c which cause segfault
2006-10-11 11:21:44 +02:00
andrey@example.com
dfa7dbf241
Merge example.com:/work/bug23074/my41-bug23074
...
into example.com:/work/bug23074/my50-bug23074
2006-10-11 11:14:42 +02:00
andrey@example.com
a846909e6a
Fix a typo regarding checking whether HA_VAR_LENGTH_KEY is
...
set. This has always worked because when flag is !=0 then
HA_VAR_LENGTH_KEY is always set. Therefore, a test case cannot
reveal a faulty behavior.
Fix for bug#23074: typo in myisam/sort.c
2006-10-11 11:07:25 +02:00
kaa@polly.local
456fe01d7e
Fix for bug #22728 "Handler_rollback value is growing".
...
The bug is present only in 4.1, will be null-merged to 5.0
For InnoDB, check value of thd->transaction.all.innodb_active_trans instead of thd->transaction.stmt.innobase_tid to see if we really need to rollback.
2006-10-11 12:44:03 +04:00
Kristofer.Pettersson@naruto.
d51e3b6cb5
Merge naruto.:C:/cpp/bug21811/my50-bug21811
...
into naruto.:C:/cpp/mysql-5.0-maint
2006-10-11 10:41:22 +02:00
Kristofer.Pettersson@naruto.
79f1355b06
Merge naruto.:C:/cpp/bug21811/my41-bug21811
...
into naruto.:C:/cpp/mysql-4.1-maint
2006-10-11 10:27:28 +02:00
msvensson@neptunus.(none)
2c7ef3ebac
Merge bk-internal:/home/bk/mysql-5.0-rpl
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-10-11 10:13:56 +02:00
lars@mysql.com/black.(none)
f28e9eb64b
Merge mysql.com:/home/bkroot/mysql-5.0-rpl
...
into mysql.com:/home/bk/MERGE/mysql-5.0-merge
2006-10-10 21:58:46 +02:00
joerg@trift2.
c1e351abdf
Merge trift2.:/MySQL/M50/clone-5.0
...
into trift2.:/MySQL/M50/push-5.0
2006-10-10 13:25:55 +02:00
cmiller@zippy.cornsilk.net
6a870d4cfc
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug17583/my50-bug17583
2006-10-09 18:54:48 -04: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
438ffa81fb
Bug#17583: mysql drops connection when stdout is not writable
...
Porting forward tests to replacement files.
2006-10-09 18:50:12 -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
tsmith/tim@siva.hindu.god
c5b6101c1b
Merge siva.hindu.god:/usr/home/tim/m/bk/b19764/50
...
into siva.hindu.god:/usr/home/tim/m/bk/tmp/50
2006-10-09 16:16:47 -06:00
Kristofer.Pettersson@naruto.
3b316569a7
Bug#23010 _my_b_read() passing illegal file handles to my_seek()
...
- The io cache flag seek_not_done was not set properly in the reinit_
io_chache function call and this led my_seek to be called despite an
invalid file handle.
- Added a test in reinit_io_cache to ensure we have a valid file handle
before setting seek_not_done flag.
2006-10-09 21:13:37 +02:00
svoj@mysql.com/april.(none)
7683b297cf
Merge mysql.com:/home/svoj/devel/mysql/engines/mysql-5.0
...
into mysql.com:/home/svoj/devel/mysql/engines/mysql-5.0-engines
2006-10-08 22:40:25 +05:00
svoj@mysql.com/april.(none)
0830486836
After merge fix.
2006-10-08 22:34:32 +05:00
msvensson@shellback.(none)
61529f6a58
Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-08 17:48:56 +02:00
msvensson@shellback.(none)
bf762c2d9e
Print names of testcases that failed check_testcase, this makes it easier
...
to run the whole testcase to find wich testcases need to be checked more carefully
and the just "copy and paste" the suspicious test case names to
a new mysql-test-run.pl command.
2006-10-08 17:48:01 +02:00
msvensson@shellback.(none)
55e6f74525
Do the check of special mysqld exe for master or slave after command line args have been parsed
2006-10-08 17:08:24 +02:00
msvensson@shellback.(none)
ca611ed679
Move list of mysqls src dirs into lib/mtr_gcov.pl as it's only used from there
2006-10-08 17:05:17 +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)
2db1fadbbe
Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-08 16:12:21 +02:00
msvensson@shellback.(none)
b896bd0a6e
When looking for client binary directories it necessary to look for the one s that are "deep down" first.
2006-10-08 16:11:55 +02:00
msvensson@shellback.(none)
9c737b9bfc
Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-08 15:51:21 +02:00
msvensson@shellback.(none)
5fa22794fd
Reorder the order of feature checks a bit
...
Make the mysqld_variables hash global so it can be used throughout the program
2006-10-08 15:50:16 +02:00
svoj@may.pils.ru
8cfef42f72
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into may.pils.ru:/home/svoj/devel/bk/mysql-5.0-engines
2006-10-08 15:14:53 +05: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)
6f3f15c7bb
Fix spelling error
2006-10-07 20:16: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)
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)
804d2effa2
Improve sort algorithm for reorder, all test with smae name except for ending digit should be run after each other.
...
Example of that is ndb_autodiscover[1-3]
2006-10-07 19:11:37 +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)
098164e601
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-06 17:17:18 +02:00
msvensson@neptunus.(none)
7ba1880369
Add error handling of failure to start server to "run_testcase_start_servers"
2006-10-06 17:15:26 +02:00
msvensson@neptunus.(none)
13ff58d716
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-06 16:27:57 +02:00
msvensson@neptunus.(none)
738ba624d3
Fix problem with specifying vardir, mysql_version_id was not yet available when vardir arguments is checked
...
Move the code to look for exe_mysqld earlier => to initial_setup
Fix warnings detected by running with "diagnostics"
Remove unused option "opt_result_ext"
Init "path_ndb_examples_dir"
2006-10-06 16:26:17 +02:00
msvensson@neptunus.(none)
e7da2a2f0e
Turn on reconnect
2006-10-06 14:15:03 +02:00
msvensson@neptunus.(none)
563405c283
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-06 13:43:52 +02:00
msvensson@neptunus.(none)
c0ceec2e7e
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:36:58 +02:00
msvensson@neptunus.(none)
076526577a
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:35:02 +02:00
msvensson@neptunus.(none)
a6ad38c50b
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 13:35:00 +02:00
msvensson@neptunus.(none)
d3bc5df837
Modify regex for parsing mysqld version as the mysqld is sometimes a libtool wrapper and
...
the "mysqld --version" command will print "/path/.libs/lt-mysqld Ver x.x.x"
2006-10-06 13:33:12 +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)
3d4cd8149c
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-06 13:14:23 +02:00
msvensson@neptunus.(none)
f10fdf4c6d
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 12:46:55 +02:00