Commit graph

2158 commits

Author SHA1 Message Date
unknown
6a7ce1eb3b Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint


client/mysqltest.c:
  Auto merged
mysql-test/lib/mtr_io.pl:
  Auto merged
mysql-test/lib/mtr_process.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/rename.test:
  Manual mereg
2006-10-31 19:08:30 +01:00
unknown
8e0113be8c Make variables static to please Netware compiler
client/mysqltest.c:
  Make the variables that are referenced from the "command_arg" arrays static to please the NetWare compiler.
  Apparently the arrays can't reference local stack variables.
2006-10-31 18:51:23 +01:00
unknown
08d43705a6 Bug#20894 Reproducible MySQL client segmentation fault
- Add two null bytes in  "buff" variable allowing us to call
   get_arg two times also for strings longer than sizeof(buff) 


client/mysql.cc:
  Make sure there are _two_ zero bytes at the end of buff, to allow 'get_arg' to be
  called twice on long strings. The first time it will mark end of string with a
  zero and the second time it will "skip ahead" to the first zero, and the find the
  second one indicating end of buff.
mysql-test/r/mysql.result:
  Update test results
mysql-test/t/mysql.test:
  Add tests for "com_connect" function in mysql
  Add test reported in bug
2006-10-26 19:51:29 +02:00
unknown
c9ef0344f8 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
2006-10-24 16:00:42 +02:00
unknown
8b3f82322e Use same type for local variables as arguments, avoid compile error on NetWare 2006-10-24 13:52:50 +02:00
unknown
7e1fcb649f Enable the ATTRIBUTE_FORMAT macros to check format of variable arg parameters 2006-10-24 13:34:10 +02:00
unknown
430a4ad32c WL#3475 merging
client/mysqltest.c:
  merging fixes
2006-10-24 15:28:16 +05:00
unknown
7e2336925f merging fix
client/mysqltest.c:
  wrong 'while' was added instead of 'if'
2006-10-24 12:35:32 +05:00
unknown
bda4032fa4 Merge mysql.com:/home/hf/work/w3475/my41-w3475
into  mysql.com:/home/hf/work/w3475/my50-w3475


mysql-test/t/flush.test:
  Auto merged
mysql-test/t/flush_block_commit.test:
  Auto merged
mysql-test/t/innodb-deadlock.test:
  Auto merged
mysql-test/t/innodb-lock.test:
  Auto merged
mysql-test/t/lock_multi.test:
  Auto merged
mysql-test/t/rename.test:
  Auto merged
mysql-test/t/show_check.test:
  Auto merged
mysql-test/t/status.test:
  Auto merged
client/mysqltest.c:
  merging
libmysql/libmysql.c:
  merging
2006-10-23 16:50:01 +05:00
unknown
4ddb48c619 WL#3475 (Threads for the embedded server in mysqltest)
Necessary code added to mysqltest.c.
Disabled tests are available now.


client/mysqltest.c:
  do_send_query function implemented, so now 'send' command will be
  run in separate thread for the embedded server.
  Mutex and condition added to the 'connection' struct for syncronisation
  purposes. Yes it'd be easier if we had pthread_join() command
libmysql/libmysql.c:
  this isn't actually needed and causes problems in embedded server
mysql-test/t/bdb-deadlock.test:
  test is available for the embedded server now
mysql-test/t/flush.test:
  test is available for the embedded server now
mysql-test/t/flush_block_commit.test:
  test is available for the embedded server now
mysql-test/t/innodb-deadlock.test:
  test is available for the embedded server now
mysql-test/t/innodb-lock.test:
  test is available for the embedded server now
mysql-test/t/lock_multi.test:
  test is available for the embedded server now
mysql-test/t/rename.test:
  test is available for the embedded server now
mysql-test/t/show_check.test:
  test is available for the embedded server now
mysql-test/t/status.test:
  test is available for the embedded server now
2006-10-23 15:02:51 +05:00
unknown
83196ad860 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


client/mysqltest.c:
  Auto merged
mysql-test/r/mysqltest.result:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
2006-10-19 17:15:49 +02:00
unknown
cd06481d65 Add command "exit" to mysqltest, it will stop processing any more
commands and go directly to result file processing


client/mysqltest.c:
  Add command "exit" to mysqltest
mysql-test/r/mysqltest.result:
  Add command "exit" to mysqltest
mysql-test/t/mysqltest.test:
  Add command "exit" to mysqltest
2006-10-19 13:34:09 +02:00
unknown
f30cb12707 Backport test cases fixes from 5.0
client/mysqldump.c:
  fflush stderr after printing of error message
mysql-test/include/have_lowercase0.inc:
  Remove extra ;
mysql-test/r/rpl000015.result:
  Update result
mysql-test/r/rpl_change_master.result:
  Update result
mysql-test/r/rpl_error_ignored_table.result:
  Update result
mysql-test/r/rpl_loaddata.result:
  Update result
mysql-test/r/rpl_log.result:
  Update result
mysql-test/r/rpl_max_relay_size.result:
  Update result
mysql-test/r/rpl_replicate_do.result:
  Update result
mysql-test/t/lowercase_table3.test:
  Backport from 5.0
mysql-test/t/mysql_protocols.test:
  Backport from 5.0
mysql-test/t/rpl000015.test:
  Backport from 5.0
mysql-test/t/rpl_change_master.test:
  Backport from 5.0
mysql-test/t/rpl_drop_db.test:
  Backport from 5.0
mysql-test/t/rpl_error_ignored_table.test:
  Backport from 5.0
mysql-test/t/rpl_loaddata.test:
  Backport from 5.0
mysql-test/t/rpl_log-master.opt:
  Use --force-restart command in master.opt to force a restart for this test case
mysql-test/t/rpl_log.test:
  Backport from 5.0
mysql-test/t/rpl_max_relay_size.test:
  Backport from 5.0
mysql-test/t/rpl_replicate_do.test:
  Backport from 5.0
2006-10-19 10:54:23 +02:00
unknown
3cb0a19dd0 Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug19745/my50-bug19745
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint


client/mysqldump.c:
  Auto merged
2006-10-18 19:27:14 -04:00
unknown
016a7d4c63 Bug#19745: mysqldump --xml produces invalid xml
The mysqldump command with both the --xml and --hex-blob options will output blob data encoded as hexBinary.  
The proper XML datatype is xs:hexBinary.  
The correct XML datatype is specified be setting the xsi_type attribute equal to xs:hexBinary for each encoded element.


client/mysqldump.c:
  Bug#19745: mysqldump --xml produces invalid xml
  - Moved hex-blob code to it's own function.
  - Rewrote print_xml_tag function to accept zero or more attribute/value
    pair(s) which are appended to a separate tag name.
  - --xml option respects the --hex-blob option by ouputting blob data in hex
    encoded format.  Each hex encoded field tag will also contain an xsi:type
    attribute with an xs:hexBinary value.
  - --extended-insert and --xml are mutually exclusive. Otherwise, the xml file
    will contain INSERT commands.
  - Minor comment cleanup.
mysql-test/r/mysqldump.result:
  Bug#19745: mysqldump --xml produces invalid xml
  -Added results.
mysql-test/t/mysqldump.test:
  Bug#19745: mysqldump --xml produces invalid xml
  -Added test.
2006-10-18 18:43:51 -04:00
unknown
b2bf4843c7 Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint


client/mysql.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
client/mysqltest.c:
  Auto merged
include/my_dbug.h:
  Auto merged
mysql-test/lib/mtr_cases.pl:
  Auto merged
mysql-test/lib/mtr_report.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/csv.result:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/t/csv.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
mysql-test/r/innodb_mysql.result:
  Manual merge
mysql-test/t/func_time.test:
  Manual merge, test already there
mysql-test/t/innodb_mysql.test:
  Manual merge
2006-10-14 19:55:06 +02:00
unknown
8ec4020e25 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.


client/mysqltest.c:
  Use char as datatype for the byte that are read with my_fgetc
mysql-test/mysql-test-run.pl:
  Fix typo, add missing $
2006-10-14 17:09:06 +02:00
unknown
b0a4ec859f Improving debugging support in 'read_line' function 2006-10-14 17:02:43 +02:00
unknown
851e6fe44e Use 'my_strnncoll_simple' instead of 'strncasecmp' 2006-10-13 11:38:32 +02:00
unknown
23e9415055 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


client/mysqltest.c:
  Fix format specifier warnings in mysqltest.c
include/my_dbug.h:
  Add ATTRIBUTE_FORMAT specifier to _db_doprnt, which is used by DBUG_PRINT
  This will hopefully avoiid annoying crashes when running with --debug
2006-10-12 20:15:56 +02:00
unknown
f371303eaf 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
unknown
0e33031804 Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint-new


mysql-test/r/mysql.result:
  Auto merged
mysql-test/t/mysql.test:
  Auto merged
sql/sql_parse.cc:
  Auto merged
2006-10-12 17:37:59 +02:00
unknown
4779978bdc Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint


client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
2006-10-12 13:51:54 +02:00
unknown
7405e7792d 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
unknown
4d45abc5d2 Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint


client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/lib/mtr_process.pl:
  Auto merged
sql-common/client.c:
  Auto merged
2006-10-12 11:30:07 +02:00
unknown
1f837a5c76 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
unknown
e5c2eda470 Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint


client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
2006-10-11 21:56:09 +02:00
unknown
d6d4692372 Fixes for embedded server test
client/mysqltest.c:
  Fix typo
2006-10-11 21:53:43 +02:00
unknown
ba1f194f13 Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint


client/mysqltest.c:
  Auto merged
2006-10-11 11:39:08 +02:00
unknown
3caef95e64 Fix some bad code in mysqltest.c which cause segfault
client/mysqltest.c:
  Remove vsnprintf() and DBUG_PRINT from die() function, as it's not portable to Windows, and it's not allowed to
  call vsnprintf() and then vfprintf() with the same args.
  Can't just print the buffer here, because the buffer is a fixed size.
  If the message is longer than will fit int he buffer, it would get
  truncated on Unix, and the full thing would be printed on Windows.
  This DBUG_PRINT isn't important enough for this hassle, so just get rid
  of it.
2006-10-11 11:21:44 +02:00
unknown
87ae7cb978 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug17583/my50-bug17583


BitKeeper/etc/collapsed:
  auto-union
client/mysql.cc:
  Auto merged
2006-10-09 18:54:48 -04:00
unknown
57efa768e9 Merge bk-internal.mysql.com:/home/bk/mysql-4.1-maint
into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug17583/my41-bug17583


client/mysql.cc:
  Auto merged
2006-10-09 18:53:17 -04:00
unknown
426b0f45a6 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug17583/my41-bug17583
into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug17583/my50-bug17583


BitKeeper/deleted/.del-collapsed~fbec3523369aae99:
  Delete: BitKeeper/etc/collapsed
BitKeeper/etc/collapsed:
  'Auto converge'
client/mysql.cc:
  Auto merged
BitKeeper/deleted/.del-mysql_client.result:
  File is gone.
BitKeeper/deleted/.del-mysql_client.test:
  File is gone.
2006-10-09 18:46:28 -04:00
unknown
76b353d307 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.


BitKeeper/etc/collapsed:
  BitKeeper file /home/cmiller/work/mysql/bug17583/my41-bug17583/BitKeeper/etc/collapsed
client/mysql.cc:
  If standard output is not open (specifically, if dup() of its file number 
  fails) then we explicitly close it so that future uses of the file descriptor
  behave correctly for a closed file.
mysql-test/r/mysql_client.result:
  Prove that the problem of writing SQL output to the command socket no longer
  exists.
mysql-test/t/mysql_client.test:
  Prove that the problem of writing SQL output to the command socket no longer
  exists.
2006-10-09 18:28:06 -04:00
unknown
d078e06c54 Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint


client/mysqltest.c:
  Auto merged
2006-10-08 16:20:16 +02:00
unknown
3651933d09 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
unknown
033eed8490 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


client/mysqltest.c:
  Auto merged
mysql-test/t/rpl_slave_status.test:
  Auto merged
mysql-test/t/system_mysql_db_fix.test:
  Auto merged
2006-10-07 20:19:57 +02:00
unknown
13da57d0f1 Init "saved_expected_errors" at program start, avoids crash where --error is first command
strcmp -> strncmp
2006-10-07 20:14:21 +02:00
unknown
4f7097035f Add comment and remove strange assignment in 'do_exec' 2006-10-07 19:47:42 +02:00
unknown
a3a0510458 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


client/mysqltest.c:
  Auto merged
mysql-test/lib/mtr_cases.pl:
  Auto merged
2006-10-07 19:12:10 +02:00
unknown
40e44f0e56 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
unknown
b66640ffbb Merge neptunus.(none):/home/msvensson/mysql/same_tools/my41-same_tools
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint


mysql-test/r/subselect.result:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
2006-10-06 13:18:52 +02:00
unknown
471798a137 Merge neptunus.(none):/home/msvensson/mysql/same_tools/my50-same_tools
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


mysql-test/r/mysqltest.result:
  Auto merged
mysql-test/r/ps_2myisam.result:
  Auto merged
mysql-test/r/ps_3innodb.result:
  Auto merged
mysql-test/r/ps_4heap.result:
  Auto merged
mysql-test/r/ps_5merge.result:
  Auto merged
BitKeeper/deleted/.del-mtr_stress.pl:
  Auto merged
mysql-test/r/ps_6bdb.result:
  Auto merged
mysql-test/r/ps_7ndb.result:
  Auto merged
mysql-test/r/query_cache.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
BitKeeper/deleted/.del-mtr_im.pl:
  Delete: mysql-test/lib/mtr_im.pl
client/mysqltest.c:
  Use remote
mysql-test/mysql-test-run.pl:
  Use remote
mysql-test/lib/mtr_process.pl:
  Use remote
2006-10-06 13:16:57 +02:00
unknown
5c8da50596 Merge neptunus.(none):/home/msvensson/mysql/same_tools/my41-same_tools
into  neptunus.(none):/home/msvensson/mysql/same_tools/my50-same_tools


client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
Makefile.am:
  Manual merge
2006-10-06 01:00:35 +02:00
unknown
78c5bc62c5 Add printout of file in which warning was detected
Cleanup .progress, .reject, .log and .warnings files produced by mysqltest


client/mysqltest.c:
  Add printout of file in which warning was detected
mysql-test/include/ctype_like_escape.inc:
  Remove warnings, convert -- comments to # comments
mysql-test/mysql-test-run.pl:
  Cleanup all files produced by mysqltest before starting mysqltest again
2006-10-06 00:57:10 +02:00
unknown
5bdc88183a Merge neptunus.(none):/home/msvensson/mysql/same_tools/my41-same_tools
into  neptunus.(none):/home/msvensson/mysql/same_tools/my50-same_tools


client/mysqltest.c:
  Auto merged
mysql-test/lib/mtr_io.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
2006-10-05 22:06:51 +02:00
unknown
93a9883bed Add policy directive about keeping mysqltest framework tools identical in all versions
mysql-test/mysql-test-run.pl:
  Add policy directive about keeping mysqltest framework tools identical in all versions
  Cleanup the initial comment to reflect current state
2006-10-05 22:05:42 +02:00
unknown
03e129fa6d Merge neptunus.(none):/home/msvensson/mysql/same_tools/my41-same_tools
into  neptunus.(none):/home/msvensson/mysql/same_tools/my50-same_tools


client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/rpl_loaddatalocal.result:
  Auto merged
2006-10-05 18:45:40 +02:00
unknown
6d89bcbcff 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.


client/mysqltest.c:
  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.
2006-10-05 18:00:20 +02:00
unknown
c69e8f009f Merge neptunus.(none):/home/msvensson/mysql/same_tools/my41-same_tools
into  neptunus.(none):/home/msvensson/mysql/same_tools/my50-same_tools


client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/mysqltest.result:
  Auto merged
2006-10-05 12:42:39 +02:00