Commit graph

533 commits

Author SHA1 Message Date
kostja@bodhi.local
04c97488f9 Merge bodhi.local:/opt/local/work/tmp_merge
into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
2006-08-12 21:06:51 +04:00
msvensson@neptunus.(none)
4131be777e Bug#20439 mysqltest: remove unused options
-Remove leftovers of server_stop and server_start commands
2006-08-01 09:36:27 +02:00
msvensson@neptunus.(none)
39130d15eb Merge neptunus.(none):/home/msvensson/mysql/my51-m-bug19535
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-08-01 09:33:00 +02:00
msvensson@neptunus.(none)
bc0c886ded Merge 192.168.0.20:mysql/bug21217/my51-bug21217
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-07-31 14:43:49 +02:00
msvensson@neptunus.(none)
5f78c492ec Merge 192.168.0.20:mysql/bug21217/my50-bug21217
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-07-31 14:42:06 +02:00
msvensson@shellback.(none)
25a5678e4e Merge shellback.(none):/home/msvensson/mysql/bug21217/my50-bug21217
into  shellback.(none):/home/msvensson/mysql/bug21217/my51-bug21217
2006-07-30 19:35:29 +02:00
msvensson@shellback.(none)
5a710e8613 Merge shellback.(none):/home/msvensson/mysql/bug21217/my41-bug21217
into  shellback.(none):/home/msvensson/mysql/bug21217/my50-bug21217
2006-07-30 19:33:48 +02:00
msvensson@shellback.(none)
eaae3b2d2b BUG#21217 "mysqltest" client is inconsistent when to log a line number
- Init start_lineno to 0
2006-07-30 19:30:20 +02:00
msvensson@neptunus.(none)
2bb5f5662f Bug#19890 mysqltest: "query" command is broken
- Allow "query" to be used as a prefix for focing a command to be sent to server
 - Add testcases
2006-07-26 14:02:24 +02:00
msvensson@neptunus.(none)
9c676b3d1d Bug#21188 mysqlimport returns random exit code
- Only handle return codes from 'pclose' greater than zero as errors.
 - It appears pclose can return -1 with errno set to ECHILD although the executin
process completed successfully.
2006-07-21 16:53:08 +02:00
msvensson@neptunus.(none)
c40e953db5 Bug#19535 mysql-test-run cannot handle crashing test cases
- Make mysql-test-run.pl restart a crashed/stopped process if it was expected it should crash.
 - Added testcase for "crash_commit_before", which tests behaviour when server crashes just before commit.
  * The testcase first write a small var/tmp/master0.expect file indicating expected crash
  * Then sets "DEBUG" variable to for example "d,crash_commit_before" and then executes a commit.
  * The server will crash and be brought back up by mysql-test-run.pl
  * Test case will then wait for the process to come back online before continuing.
2006-07-20 13:23:45 +02:00
msvensson@neptunus.(none)
a9572e07e9 Update 'abort_not_supported_test' to print a reason why the test was aborted
and use it in mysql-test-run.pl
Use standard defines as last argument to 'fn_format'
2006-07-19 14:25:52 +02:00
msvensson@neptunus.(none)
685a932ea3 Remove code in mysqltest that requires the no longer existing "manager"
Remove the four test cases that require manager
2006-07-19 10:38:43 +02:00
cmiller@zippy.(none)
91b8b26411 Merge zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1
into  zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new-maint
2006-07-05 16:16:09 -04:00
monty@mysql.com
4697deb436 Remove compiler warnings
Fixed wrong table flags type in ndbcluster that caused previous commit to fail
2006-06-23 02:49:19 +03:00
msvensson@shellback.(none)
c1897c1e9d Merge bk-internal:/home/bk/mysql-5.1-new-maint
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-06-15 11:24:02 +02:00
msvensson@shellback.(none)
579bce8a74 Add mark-progress option
Update 'mark_progress' tpo save the log to a dynamic string and dump 
it using the already available functions at end of test run
2006-06-15 11:20:34 +02:00
msvensson@neptunus.(none)
2c538f6cde Merge bk-internal:/home/bk/mysql-5.1
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-06-10 20:33:50 +02:00
monty@mysql.com
e50412ef38 Re-apply missing changeset, orignally pushed by elliot
Add define YASSL_PREFIX when compiling yassl

Import patch from yaSSL
- avoid allocating memory for each call to 'EVP_md5' and 
  'EVP_des_ede3_cbc' which were not released until server was stopped
- Those functions are used from the SQL function 'des_encrypt' and
  'des_decrypt'.

Add new define YASSL_PREFIX beforee including ssl.h to activate inclusion of prefix_*.h files

Bug#20022 mysql-test-run can't be run with secure connections turned on for all testcases
- Part 1, fixes rpl- and federated-tests where connection is made to 127.0.0.1

- Include prefix files that renames all public functions in yaSSLs
  OpenSSL API to ya<function_name>. They will otherwise conflict
  with OpenSSL functions if loaded by an application that uses OpenSSL
  as well as libmysqlclient with yaSSL support.

Bug#18235: assertion/crash when windows mysqld is ended with ctrl-c
  
Two threads both try a shutdown sequence which creates a race to the
de-init/free of certain resources.
  
This exists in similar form in the client as 17926: "mysql.exe crashes
when ctrl-c is pressed in windows."

Update after merge to 5.0

BUG#18669: Session COM_STATISTICS breaks mysqladmin status.
Changed COM_STATISTICS to display the global status, instead of thead status, for slow queries and table opens.

- In function 'handle_grant_struct' when searching the memory structures for an 
  entry to modify, convert all entries here host.hostname is NULL to "" and compare that 
  with the host passed in argument "user_from".
- A user created with hostname "" is stored in "mysql.user" table as host="" but when loaded into 
  memory it'll be stored as host.hostname NULL. Specifiying "" as hostname means
  that "any host" can connect. Thus is's correct to turn on allow_all_hosts
  when such a user is found. 
- Review and fix other places where host.hostname may be NULL.

BUG#19394 OPT_INNODB_THREAD_CONCURRENCY duplicated
Removed duplication (not a user-visible change)
2006-06-06 14:21:07 +03:00
msvensson@shellback.(none)
fe0e91d501 Bug#20022 mysql-test-run can't be run with secure connections turned on for all testcases
- Part 1, fixes rpl- and federated-tests where connection is made to 127.0.0.1
2006-05-31 16:28:03 +02:00
msvensson@shellback.(none)
ea218b4450 Make safe_connect retry faster after connect failure 2006-05-18 23:36:55 +02:00
jani@ua141d10.elisa.omakaista.fi
083f8455c7 Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.1-new
2006-05-09 20:50:29 +03:00
msvensson@neptunus.(none)
27c64c715f Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-05-09 08:26:25 +02:00
monty@mysql.com
86b2be8d35 After merge fixes
Remove compiler warnings
Fix some broken tests
Workaround for syncronization bug in NDB (Bug #16445)
2006-05-04 06:28:24 +03:00
msvensson@neptunus.(none)
7c8c14c435 Move "max-connect-retries" option to get alpabetichal order 2006-05-03 15:53:59 +02:00
msvensson@neptunus.(none)
5563a2f32f Add support for specifyihng the number of reconnec retries oin the command line 2006-05-03 14:04:54 +02:00
jimw@mysql.com
052b126853 Merge mysql.com:/home/jimw/my/mysql-5.0-clean
into  mysql.com:/home/jimw/my/mysql-5.1-clean
2006-05-01 11:38:15 -07:00
jimw@mysql.com
3761b25696 Bug #18495: mysqltest does not use the correct error number
When looking up the error number for named errors in mysqltest .test
  files, we inadvertantly would match ER_WRONG_VALUE against
  ER_WRONG_VALUE_COUNT because we were using the length of the shorter
  string in strncmp(). Now we double-check the length of matches to
  make sure it was a complete match.
2006-04-21 19:29:22 -07:00
jimw@mysql.com
c28ea5b03b 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.
2006-04-21 10:48:53 -07:00
msvensson@neptunus.(none)
a51668c74c 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.
2006-04-18 17:58:27 +02:00
tomas@poseidon.ndb.mysql.com
07753c59a0 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-04-13 10:48:24 +02:00
tomas@poseidon.ndb.mysql.com
10692ba84f increase save_master_pos timeout to 30 seconds for higher test predictability
better replicaiton test cleanup to ensure better test predictability
+ some ndb test cleanup
2006-04-12 15:55:41 +02:00
msvensson@neptunus.(none)
53ff7dfbc9 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-04-11 09:54:00 +02:00
msvensson@neptunus.(none)
0d98d97170 Remove #if 0 2006-04-07 14:21:00 +02:00
msvensson@neptunus.(none)
1452892816 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.
2006-04-05 11:47:12 +02:00
knielsen@mysql.com
da000b2d2a Fix AIX compile failure. 2006-03-30 11:12:24 +02:00
monty@mysql.com
1994ed49ec Fixed compiler and valgrind warnings
Added missing DBUG_xxx_RETURN statements
Fixed some usage of not initialized variables (as found by valgrind)
Ensure that we don't remove locked tables used as name locks from open table cache until unlock_table_names() are called.
This was fixed by having drop_locked_name() returning any table used as a name lock so that we can free it in unlock_table_names()
This will allow Tomas to continue with his work to use namelocks to syncronize things.

Note: valgrind still produces a lot of warnings about using not initialized code and shows memory loss errors when running the ndb tests
2006-03-29 14:27:36 +03:00
msvensson@neptunus.(none)
ab1f95df3e Merge 192.168.0.100:mysql/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-03-24 12:33:11 +01:00
msvensson@shellback.(none)
8f1ed3c463 Dump result to .log file at test failure 2006-03-23 21:48:31 +01:00
msvensson@shellback.(none)
4602e426dc Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  shellback.(none):/home/msvensson/mysql/mysql-5.0
2006-03-23 18:58:53 +01:00
msvensson@shellback.(none)
b5bea5e312 Merge shellback.(none):/home/msvensson/mysql/mysql-5.0
into  shellback.(none):/home/msvensson/mysql/mysql-5.1
2006-03-23 18:14:02 +01:00
msvensson@shellback.(none)
5ebda1d2f6 Update after merge, function renamed 2006-03-23 16:21:20 +01:00
msvensson@shellback.(none)
e6bf664c62 Merge shellback.(none):/home/msvensson/mysql/mysqltestrun_pl/my50-mysqltestrun_pl
into  shellback.(none):/home/msvensson/mysql/mysql-5.0
2006-03-23 15:30:21 +01:00
msvensson@shellback.(none)
5ec7aa3aaf Dump reject file before mysqltest in 'die'
Makes it easier to see what happened before the failure
2006-03-23 15:04:46 +01:00
msvensson@neptunus.(none)
4064528279 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1
into  neptunus.(none):/home/msvensson/mysql/bug11835/my51-bug11835
2006-03-20 21:41:27 +01:00
msvensson@neptunus.(none)
0811648e31 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/bug11835/my50-bug11835
2006-03-20 21:35:05 +01:00
msvensson@neptunus.(none)
f12b979fb1 Merge neptunus.(none):/home/msvensson/mysql/bug11835/my50-bug11835
into  neptunus.(none):/home/msvensson/mysql/bug11835/my51-bug11835
2006-03-20 20:16:53 +01:00
msvensson@neptunus.(none)
31804060aa 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
2006-03-10 12:08:53 +01:00
reggie@linux.site
980434bf4b Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  linux.site:/home/reggie/work/mysql-5.1
2006-03-07 14:52:51 -06:00
kent@mysql.com
05f3d1710a Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-tmp
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
2006-03-07 21:52:50 +01:00