Commit graph

1644 commits

Author SHA1 Message Date
unknown
4f9100b67c Bug #18312: mysqltest: --sleep=0 doesn't disable sleep
Allow --sleep=0 to be specified to mysqltest, so that sleep calls
  can be disabled.

  Original patch from Paul DuBois.


client/mysqltest.c:
  Handle --sleep=0 being specified.
2006-04-21 10:48:53 -07:00
unknown
c1d64ccc1b Bug#17208 SSL: client does not verify server certificate
- Add new function 'ssl_verify_server_cert' which is used if we are 
   connecting to the server with SSL. It will compare the hostname in 
   the server's cert against the hostname that we used when connecting 
   to the server. Will reject the connection if hostname does not match.
 - Add new option "OPT_SSL_VERIFY_SERVER_CERT" to be passed to mysql_options
   which will turn on checking of servers cert.
 - Add new argument "ssl-verify-server-cert" to all mysql* clients which 
   will activate the above option.
 - Generate a new server cert with 1024 bits that has "localhost" as the server name.


SSL/server-cert.pem:
  Generate a new server cert that has "localhost" as CN, so that we can test to verify the hostname we connected against with the hostname in the cert
client/client_priv.h:
  Add OPT_SSL_VERIFY_CERT
client/mysql.cc:
  Pass the variable "opt_ssl_verify_server_cert" to the mysql_options function. It's processed/included by include/sslopt*.h files
client/mysqladmin.cc:
  Pass the variable "opt_ssl_verify_server_cert" to the mysql_options function. It's processed/included by include/sslopt*.h files
client/mysqldump.c:
  Pass the variable "opt_ssl_verify_server_cert" to the mysql_options function. It's processed/included by include/sslopt*.h files
client/mysqlimport.c:
  Pass the variable "opt_ssl_verify_server_cert" to the mysql_options function. It's processed/included by include/sslopt*.h files
client/mysqlshow.c:
  Pass the variable "opt_ssl_verify_server_cert" to the mysql_options function. It's processed/included by include/sslopt*.h files
client/mysqltest.c:
  Always set opt_ssl_verify_server_cert on in mysqltest if we are using SSL
include/mysql.h:
  Add variable ssl_verify_cerver_cert
include/sslopt-longopts.h:
  Add ssl-verify-server-cert options to all clients.
include/sslopt-vars.h:
  Add opt_ssl_varify_server_cert to all clients.
sql-common/client.c:
  Add ssl_vertify_server_cert function which is executed if user has set the option ssl_verify_cerver_cert
vio/viosslfactories.c:
  Ask the SSL library to verify servers cert by setting the SSL_VERIFY_PEER flag
2006-04-18 17:58:27 +02:00
unknown
a8159c71bf mysql.cc:
revert bug#16855 "fix" per Monty's request


client/mysql.cc:
  revert bug#16855 "fix" per Monty's request
2006-04-18 10:16:06 +02:00
unknown
1e2bde0d44 Only expand the empty string to the letters "NULL" if the column
does not have "NOT NULL" attribute set.  Also, calculate the padding
characters more safely, so that a negative number doesn't cause it to 
print MAXINT-n spaces.


mysql-test/r/mysql.result:
  Add test result.
mysql-test/t/mysql.test:
  Add test.
2006-04-16 17:17:36 -04:00
unknown
53e47e3bd0 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  zippy.(none):/home/cmiller/work/mysql/mysql-5.0__ready
2006-04-11 16:39:09 -04:00
unknown
6a1ec62660 Remove #if 0 2006-04-07 14:21:00 +02:00
unknown
224b63e378 Incorporate a patch to write a timestamp for every new line of the test that is executed.
This makes it possible make a graph (with for example gnuplot) of a test run and spot where most time is consumed.
Add the new code inside an "#if 0" until it's portable. 


client/mysqltest.c:
  Incorporate a patch to write a timestamp for every new line of the test that is executed.
  This makes it possible make a graph (with for example gnuplot) of a test run and spot where most time is consumed.
2006-04-05 11:47:12 +02:00
unknown
0fae7e3b01 Bug#18265: mysql client: No longer right-justifies numeric columns
Also fixes a new bug for which "NULL" wasn't printed (because the 
data it represents has length zero).  (Discovered my Paul DuBois.)


client/mysql.cc:
  Cleaned up the interactive-session table-printing function.
  
  - No longer rely on the length of the data to pad column boundries.
  - Be smarter about how we detect if the column is NULL.
  - Document how multibyte characters affect the output printing.
  - Use more descriptive variable names.
  
  More importantly, (re-)add these features that were crippled in an
  earlier change:
  - Print "NULL".
  - Right-justify numbers.
mysql-test/r/mysql.result:
  Updated old result and added new case.
mysql-test/t/mysql.test:
  Added new test case.
2006-04-04 17:35:07 -04:00
unknown
af64d85ab9 Fix for bug #16855
BitKeeper/etc/ignore:
  Added mysql-test/r/bdb.log mysql-test/r/im_client_port.log to the ignore list
client/mysql.cc:
  If --socket is not set, provides --protocol=TCP when --port=
  is specified (and --protocol= is not specified.)
2006-03-27 17:45:06 -08:00
unknown
636064c0ba Dump result to .log file at test failure
client/mysqltest.c:
  Dump accumulated result upuntil test failure into a <testname>.log file for later examination
mysql-test/lib/mtr_report.pl:
  Inform about the <testname>.log file's existence
2006-03-23 21:48:31 +01:00
unknown
52c4dbd88b Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  shellback.(none):/home/msvensson/mysql/mysql-5.0


client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
2006-03-23 18:58:53 +01:00
unknown
de9b35ece0 Update after merge, function renamed 2006-03-23 16:21:20 +01:00
unknown
fe621bb5aa Merge shellback.(none):/home/msvensson/mysql/mysqltestrun_pl/my50-mysqltestrun_pl
into  shellback.(none):/home/msvensson/mysql/mysql-5.0


client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Merge
2006-03-23 15:30:21 +01:00
unknown
685ca4d748 Dump reject file before mysqltest in 'die'
Makes it easier to see what happened before the failure


client/mysqltest.c:
  Dump reject file before mysqltest in 'die'
2006-03-23 15:04:46 +01:00
unknown
6219f23b94 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/bug11835/my50-bug11835


client/mysqltest.c:
  Auto merged
configure.in:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/sql_udf.cc:
  Auto merged
2006-03-20 21:35:05 +01:00
unknown
dafa39f1c4 Fix version of DEFINER-clause in mysqldump.
Now DEFINER-clause in stored routines is expected to appear
in 5.0.20 release, not in 5.0.19. as it was supposed before.


client/mysqldump.c:
  Fixing version.
mysql-test/r/mysqldump.result:
  Updated the result file.
2006-03-10 22:23:04 +03:00
unknown
f53afa23e6 Improve mysqltest
Add comment's for enable/disable_query_log and enable/disable_result_log
Update comment for "check_result"
Add check in "handle_error" that detects if the server crashed when running a "require" query to check if a certain feature is available


client/mysqltest.c:
  Add comment's for enable/disable_query_log and enable/disable_result_log
  Update comment for "check_result"
  Add check in "handle_error" that detects if the server crashed when running a "require" query to check if a certain feature is available
2006-03-10 12:08:53 +01:00
unknown
e889f9efcc Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/alik/Documents/AllProgs/MySQL/devel/5.0-rt
2006-03-07 21:47:41 +03:00
unknown
f4c81a219a Fix missing call to init_tmp_sh_file
client/mysqltest.c:
  Add call to init_tmp_sh_file
2006-03-07 14:34:20 +01:00
unknown
99515a3ac8 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/alik/Documents/AllProgs/MySQL/devel/5.0-rt


mysql-test/r/sp.result:
  Auto merged
sql/sql_trigger.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
mysql-test/r/skip_grants.result:
  Merge 5.0 and 5.0-runtime.
mysql-test/t/skip_grants.test:
  Merge 5.0 and 5.0-runtime.
2006-03-07 14:28:09 +03:00
unknown
07d36fb99a Enable ifdef for windows specific functions 2006-03-07 08:57:57 +01:00
unknown
60ee2bbecb Improve error message for faulty usage of "inc" and "dec"
client/mysqltest.c:
  Improve error messages for "inc" and "dec"
mysql-test/r/mysqltest.result:
  Update test result
2006-03-07 07:50:04 +01:00
unknown
01a35c19cb Fix typo
client/mysqltest.c:
  Fix typo, add extra "s"
2006-03-06 22:18:04 +01:00
unknown
187f89a443 Remove unused var
Reduce code


client/mysqltest.c:
  Remove the "cmd" variable in do_sleep, left unintentionaly after merge
  Implement the same elegeant solution to fund the command name in do_modify_ar
2006-03-06 22:08:34 +01:00
unknown
4a311f0a50 Win fixes
- Use tmp sh file both in system and popen 


client/mysqltest.c:
  Introduce common functions to handle unix emulation on windows using a temporary sh file.
  Use it both in my_popen and my_system.
mysql-test/r/mysqltest.result:
  Update test result
mysql-test/t/mysqltest.test:
  Fix "windows paths" in three places that doesn't automatically get fixed
  Uset the output file mysqltest.sql instead of con.sql as con is not an allowed filename on Windows
  Use system for util functions
2006-03-06 22:05:39 +01:00
unknown
9281bdd47c Merge bk-internal:/home/bk/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0


client/mysqltest.c:
  SCCS merged
2006-03-06 12:00:51 +01:00
unknown
fc969bbcf0 Merge mysql.com:/home/dlenev/src/mysql-5.0-bg17866-2
into  mysql.com:/home/dlenev/src/mysql-5.0-merges


mysql-test/r/sp.result:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2006-03-04 23:58:48 +03:00
unknown
21d6e172f5 Bug#16859 involves truncating column data at NUL characters. Instead, the
client will now substitute spaces for NULs, so that the grid isn't messed up
due to silently consumed NULs and that the full field is shown.


client/mysql.cc:
  For non-numbers, print each character at a time, instead of using the 
  fprintf() facility, which interprets an array of chars as a C string, which 
  is necessarily NUL terminated.  We mustn't terminate on NULs, and since we 
  know the length of the data, we needn't.
mysql-test/r/mysql.result:
  Add a test.
mysql-test/t/mysql.test:
  Add a test.
2006-03-03 16:26:38 -05:00
unknown
91b3447c2d Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1-clone
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0-clone


client/mysqltest.c:
  Auto merged
2006-03-03 14:37:43 -06:00
unknown
d8af174ae3 mysqltest.c:
Typos.


client/mysqltest.c:
  Typos.
2006-03-03 14:34:30 -06:00
unknown
3d997647aa mysqltest.c:
Better fix for do_sleep().


client/mysqltest.c:
  Better fix for do_sleep().
2006-03-03 13:57:49 -06:00
unknown
bb60631b5f Windows fixes
- Use pipes "|"
 - Improved system command, create a temporary .sh faile that is executed  with cygwins sh(bash)
   This makes the Windows version behave exactly as the Lunix version(well almost...) 
 - Give unix path to DBUG, trace files is no produced if running ./mysql-test-run.pl --debug"


client/mysqltest.c:
  Add new function "my_system" that run the <command> a she script using cygwin bash on windows.
mysql-test/lib/mtr_misc.pl:
  Return all paths to executables in windows format "c:\src\.." when run on windows.
  This makes it possible to use the pipes "|" to pipöe the output form exeample "mysqlbinlog" into "mysql"
mysql-test/mysql-test-run.pl:
  DBUG want's a unix format strings for where it should put the tracefile(don't ask me why but it works)
  Just chop of the first "c:" from the "c:/src/.." string and DBUG will be happy
2006-03-03 14:55:05 +01:00
unknown
9f055bf881 Remove superfluous DBUG_PRINT 2006-03-02 17:33:34 +01:00
unknown
326acd57c1 Make the "system" command become executed in a bash shell in cygwin.
client/mysqltest.c:
  Prepend the command to execute by system with "sh" to make it executed by cygwin's bash
mysql-test/t/mysqldump.test:
  Change from " to ' to avoid bash's filename expanding. I.e to avoid that "[mysqltest1]" will be llok for any dirs in mysql-test/* that are named m, y, s, q etc. And ther is actually one dir called t, so we will get a match and thus echo "t" to the file.
2006-03-02 16:28:45 +01:00
unknown
9a1fed13ee Implementation of WL#2897: Complete definer support in the stored routines.
The idea is to add DEFINER-clause in CREATE PROCEDURE and CREATE FUNCTION
statements. Almost all support of definer in stored routines had been already
done before this patch.

NOTE: this patch changes behaviour of dumping stored routines in mysqldump.
Before this patch, mysqldump did not dump DEFINER-clause for stored routines
and this was documented behaviour. In order to get full information about stored
routines, one should have dumped mysql.proc table. This patch changes this
behaviour, so that DEFINER-clause is dumped.

Since DEFINER-clause is not supported in CREATE PROCEDURE | FUNCTION statements
before this patch, the clause is covered by additional version-specific comments.


client/mysqldump.c:
  Updated the code for dumping stored routines: cover DEFINER-clause
  into version-specific comment.
mysql-test/r/gis.result:
  Updated result file after adding DEFINER-clause.
mysql-test/r/information_schema.result:
  Updated result file after adding DEFINER-clause.
mysql-test/r/mysqldump.result:
  Updated result file after adding DEFINER-clause.
mysql-test/r/rpl_ddl.result:
  Updated result file after adding DEFINER-clause.
mysql-test/r/rpl_sp.result:
  Updated result file after adding DEFINER-clause.
mysql-test/r/rpl_trigger.result:
  Updated result file after adding DEFINER-clause.
mysql-test/r/sp-security.result:
  Updated result file after adding DEFINER-clause.
mysql-test/r/sp.result:
  Updated result file after adding DEFINER-clause.
mysql-test/r/sql_mode.result:
  Updated result file after adding DEFINER-clause.
mysql-test/t/sp-security.test:
  Updated result file after adding DEFINER-clause.
sql/sp.cc:
  Added DEFINER-clause.
sql/sp_head.cc:
  Added a new convenient variant of set_definer() operation.
sql/sp_head.h:
  Updated result file after adding DEFINER-clause.
sql/sql_lex.h:
  Renamed trigger_definition_begin into stmt_definition_begin to be used for
  triggers and stored routines.
sql/sql_parse.cc:
  Check DEFINER-clause.
sql/sql_trigger.cc:
  Renamed trigger_definition_begin into stmt_definition_begin to be used for
  triggers and stored routines.
sql/sql_yacc.yy:
  Added DEFINER-clause.
2006-03-02 15:18:49 +03:00
unknown
6164a44bf0 Make do_block return void, return value never used.
client/mysqltest.c:
  Make do_block return "void", will never return from "die" if error is detected
2006-03-02 11:10:29 +01:00
unknown
97443c15d8 Fix unsigned warning on windows
client/mysqltest.c:
  Fix unsigned warning
2006-03-02 11:08:43 +01:00
unknown
618bd0a5e5 mysqltest.c:
expand tab


client/mysqltest.c:
  expand tab
2006-02-28 15:11:44 -06:00
unknown
74ee3a125c Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0


client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/mysqltest.result:
  Auto merged
2006-02-28 15:09:45 -06:00
unknown
8d5f0fcddc mysql-test-run.sh:
Fix URLs.
README:
  Fix URL.
mysqltest.result:
  Update test result for real_sleep error message.
mysqltest.c:
  Fix do_sleep() to print correct command name for real_sleep.


client/mysqltest.c:
  Fix do_sleep() to print correct command name for real_sleep.
mysql-test/r/mysqltest.result:
  Update test result for real_sleep error message.
mysql-test/README:
  Fix URL.
mysql-test/mysql-test-run.sh:
  Fix URLs.
2006-02-28 15:08:16 -06:00
unknown
046530d5bc mysqltest.c:
Fix reference to incorrect (non-existent) options in comment.


client/mysqltest.c:
  Fix reference to incorrect (non-existent) options in comment.
2006-02-28 14:04:21 -06:00
unknown
df0cab0b69 Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0


client/mysqltest.c:
  Auto merged
2006-02-28 14:01:16 -06:00
unknown
9099fb2d06 mysqltest.c:
Correct/clarify comments.


client/mysqltest.c:
  Correct/clarify comments.
2006-02-28 14:00:17 -06:00
unknown
773c1e049a mysqltest.c:
Fix typos.


client/mysqltest.c:
  Fix typos.
2006-02-28 12:19:30 -06:00
unknown
71dd60573e Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0


client/mysqltest.c:
  y
  manual merge
2006-02-28 12:10:38 -06:00
unknown
46c82ab153 mysqltest.c:
Fix typos.


client/mysqltest.c:
  Fix typos.
2006-02-28 12:01:24 -06:00
unknown
399617efe6 Look for and "convert" paths that start with $MYSQL_TMP_DIR
client/mysqltest.c:
  Also look for "$MYSQL_TMP_DIR" when looking for paths to convert
mysql-test/mysql-test-run.pl:
  Export $MYSQL_TMP_DIR
mysql-test/mysql-test-run.sh:
  Export $MYSQL_TMP_DIR
2006-02-26 19:54:09 +01:00
unknown
ef1316fadd mysqltest.c:
Rearrange out of order options in option struct.


client/mysqltest.c:
  Rearrange out of order options in option struct.
2006-02-23 13:54:55 -06:00
unknown
7262273457 Change snprintf to my_snprintf
client/mysqldump.c:
  snprintf =>  my_snprintf
2006-02-23 16:08:28 +01:00
unknown
24c44a9bea Aix52 build fix
client/mysqldump.c:
  Declare variable in start of function
2006-02-23 14:06:29 +01:00