Commit graph

1821 commits

Author SHA1 Message Date
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
kent@mysql.com
64295d82d1 Merge 2006-04-18 17:16:27 +02:00
kent@mysql.com
58c153c629 Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-release
2006-04-18 10:34:56 +02:00
serg@mysql.com
98ea03931e mysql.cc:
revert bug#16855 "fix" per Monty's request
2006-04-18 10:16:06 +02:00
cmiller@zippy.(none)
7d282984f3 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.
2006-04-16 17:17:36 -04:00
brian@zim.(none)
5d1d27c016 Final patch to remove the last of the OS2 support. 2006-04-15 18:17:32 -07:00
cmiller@zippy.(none)
c7513d482f Merge zippy.(none):/home/cmiller/work/mysql/merge/tmp_merge
into  zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new
2006-04-14 13:33:02 -04: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
bpontz@shasta.mysql.com
19688a131a Child segfault when tring to call "mysql_error(NULL)", fixed by not
assigning "mysql" variable from return value of mysql_real_connect.
2006-04-12 23:16:15 -04:00
jimw@mysql.com
c490aff57e Merge mysql.com:/home/jimw/my/mysql-5.1-refactor
into  mysql.com:/home/jimw/my/mysql-5.1-clean
2006-04-12 08:24:20 -07: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
jimw@mysql.com
276109b155 Remove old cruft from the tree: mysqltestmanager, mysql_test_run_new,
and various stuff in Docs/. Also move the certificates used for testing
into mysql-test/std_data from the top-level SSL directory (now gone).
2006-04-11 18:54:24 -07:00
msvensson@neptunus.(none)
ee76a12c09 Protect from empty --query argument 2006-04-11 23:24:06 +02:00
cmiller@zippy.(none)
a1e78b3d36 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
msvensson@neptunus.(none)
52c9feff13 Bug#18012 mysqlslap fails if querystring starts with delimiter
- Terminate loop not only when the limit is met, but alse when there is no more stmts
2006-04-11 22:23:16 +02:00
msvensson@neptunus.(none)
0bdb9ff547 Fix syntax error 2006-04-11 22:10:11 +02:00
msvensson@neptunus.(none)
5848a4276d Bug#17478 mysqlslap not issuing any queries
- Add more printouts it depending on verbose level
 - New common function 'run_query' to be used when executing a query
2006-04-11 22:04:08 +02:00
msvensson@neptunus.(none)
c8c8041804 Don't use the MYSQL* returned from mysql_real_connect to overwrite the already initalised mysql variable 2006-04-11 20:49:31 +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)
8fe764fbb2 Merge bk-internal:/home/bk/mysql-5.1-new
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-04-11 09:11:36 +02:00
kent@mysql.com
691822a929 mysql_upgrade.c:
No declarations after first expression in block
2006-04-11 02:48:19 +02:00
holyfoot@deer.(none)
b5afca05a4 WL#2645 (mysql_upgrade tool) 2006-04-10 20:54:43 +05:00
holyfoot@mysql.com
a5d18bc8ab Merging 2006-04-10 20:54:42 +05:00
msvensson@neptunus.(none)
24a6dd64b5 Update implementation of new function 'mysql_get_ssl_cipher' after review 2006-04-10 12:23:20 +02:00
msvensson@neptunus.(none)
0d98d97170 Remove #if 0 2006-04-07 14:21:00 +02:00
msvensson@neptunus.(none)
98904a8caa Add new function mysql_get_ssl_cipher to libmysl and use it from client to avoid dependency on SSL libs from mysql client. 2006-04-07 11:26:21 +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
cmiller@zippy.(none)
0db6176bfc 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.)
2006-04-04 17:35:07 -04:00
knielsen@mysql.com
da000b2d2a Fix AIX compile failure. 2006-03-30 11:12:24 +02:00
monty@mysql.com
c3e7c7aa4b Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/my/mysql-5.1
2006-03-29 17:28:40 +03: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
brian@zim.(none)
097804fbdb Behavior change to preserve schema unless you specify autogenerated SQL or create values. 2006-03-28 17:59:11 -08:00
knielsen@mysql.com
cc57e4e01b Manual merge. 2006-03-28 10:07:03 +02:00
ian@zim.(none)
9caff206c2 Merge zim.(none):/home/ian/workspace/mysql-5.0
into  zim.(none):/home/ian/workspace/mysql-5.1-new

Updated bug message in disabled file -Brian
2006-03-27 19:48:44 -08:00
ian@zim.(none)
a66aace3e9 Fix for bug #16855 2006-03-27 17:45:06 -08:00
bpontz@shasta.mysql.com
2d14a5e560 netware doesnt use fork 2006-03-27 12:25:01 -05:00
knielsen@mysql.com
bc6628d27f Some changes to make it possible to build for Windows with CMake from
a normal 'make dist' source .tar.gz.
2006-03-24 22:50:56 +01: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
holyfoot@deer.(none)
9bc866d9b2 bug #18115 (mysql_upgrade missing in Windows binary) 2006-03-18 17:56:24 +04:00
knielsen@mysql.com
8567553bcb Fix Windows CMake compilation after merge of Magnuses ssl patch. 2006-03-16 16:57:24 +01:00
knielsen@mysql.com
ca4ec28146 CMake Windows comp_error dependency fix after last push. 2006-03-16 15:42:48 +01:00