Commit graph

2312 commits

Author SHA1 Message Date
stewart@willster.(none)
c1a8b8daa7 BUG#20839 Illegal error code: 155 returned downgrading from 5.1.12-> 5.1.11
Post review fix:
Magnus suggested making sure that new mysqldump still worked flawlessly
with old servers.
2006-10-17 00:15:58 +10:00
msvensson@shellback.(none)
ffc9538bb4 Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-14 19:55:06 +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
kent@mysql.com/c-584072d5.010-2112-6f72651.cust.bredbandsbolaget.se
0b7132eaf1 CMakeLists.txt:
Added mysql_upgrade target to Windows CMake build
2006-10-13 21:48:27 +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)
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)
57ad872b24 Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
2006-10-12 13:53:21 +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)
1c9b35cdd7 Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
2006-10-12 11:39:41 +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
tsmith/tim@siva.hindu.god
9cb8ea76e4 Fix some bad code in mysqltest.c and mysql-test-run.pl which could cause segfault / wrong LD_LIBRARY_PATH settings. 2006-10-11 00:03:21 -06:00
lars@black.(none)
0b4e65e12b Merge mysql.com:/home/bkroot/mysql-5.1-new-rpl
into  mysql.com:/home/bk/MERGE/mysql-5.1-merge
2006-10-10 21:59:23 +02:00
jonas@perch.ndb.mysql.com
e600a3d394 Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-10-10 11:25:24 +02:00
cmiller@zippy.cornsilk.net
86c5603c72 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint
into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug17583/my51-bug17583
2006-10-09 18:55:09 -04: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
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
stewart@willster.(none)
78f976d78e BUG#20839 Illegal error code: 155 returned downgrading from 5.1.12-> 5.1.11
Update mysqldump to dump the needed tablespaces to create the tables
for either the dbs or tables we're dumping.

With --all-tablespaces, we still dump everything.
2006-10-10 00:03:46 +10: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