mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 19:41:47 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
35386 commits 2793 branches 343 tags 1.7 GiB
Commit graph

1938 commits

Author SHA1 Message Date
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)
1b06c7c78e Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint-new
 2006-10-12 17:37:59 +02:00
msvensson@shellback.(none)
925220627c Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-10-12 13:51:54 +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)
5741683d12 Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-10-12 11:30:07 +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)
0eb2fff749 Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-10-11 21:56:09 +02:00
msvensson@shellback.(none)
5b8312986c Fixes for embedded server test 2006-10-11 21:53:43 +02:00
msvensson@shellback.(none)
eb6cb97a4d Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-10-11 11:39:08 +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
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
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)
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@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)
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
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)
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)
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)
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)
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)
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
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
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
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)
de8bc06266 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:14:23 +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
msvensson@neptunus.(none)
3f8edc3706 Merge bk-internal:/home/bk/mysql-5.0-rpl 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-10-03 14:24:43 +02:00
jpipes@shakedown.(none)
b57051381a Fix for Bug #21412 (client allows DELIMITER with backslash character) 2006-10-02 11:45:48 -04:00