tnurnberg@mysql.com
d5ff4f6882
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into mysql.com:/home/tnurnberg/mysql-5.0-maint-18462
2006-06-26 16:15:41 +02:00
cmiller@zippy.(none)
deca07bdcc
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into zippy.(none):/home/cmiller/work/mysql/mysql-5.0-maint
2006-06-20 17:17:04 -04:00
cmiller@bk-internal.mysql.com
b0ebd2fce0
Merge bk-internal.mysql.com:/data0/bk/mysql-5.0
...
into bk-internal.mysql.com:/data0/bk/mysql-5.0-maint
2006-06-19 14:38:57 +02:00
lars@mysql.com
5937422a53
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl
...
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
2006-06-19 12:09:24 +02:00
tnurnberg@mysql.com
2b613e4ce7
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into mysql.com:/home/mysql-5.0-maint-17371
2006-06-12 02:46:26 +02:00
anjuta@arthur.local
bd8eef5647
BUG#19363: mysql --no_pager makes core dump.
...
The problem was missing break; operator.
2006-06-02 22:03:39 +03:00
tnurnberg@mysql.com
a717c68739
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into mysql.com:/home/mysql-5.0-maint-18462
2006-06-01 07:11:00 +02:00
msvensson@shellback.(none)
c542aa8701
Merge shellback.(none):/home/msvensson/mysql/bug19575/my50-bug19575
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0
2006-05-31 16:32:08 +02: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)
20217ba36f
Bug#19575 MySQL-shared-5.0.21-0.glibc23 causes segfault in SSL_library_init
...
- 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.
2006-05-31 16:19:06 +02:00
tnurnberg@mysql.com
8c24373668
Bug#18462: mysqldump does not dump view structures correctly
...
(The above problem only occurs with -T -- create a separate file for
each table / view.) This ChangeSet results in correct output of view-
information while omitting the information for the view's stand-in
table. The rationale is that with -T, the user is likely interested
in transferring part of a database, not the db in its entirety (that
would be difficult as replay order is obscure, the files being named
for the table/view they contain rather than getting a sequence number).
2006-05-31 13:36:28 +02:00
tnurnberg@mysql.com
c7ae355d89
Bug#17371: Unable to dump a schema with invalid views
...
'show create' works even on views that are short of a base-table (this
throw a warning though, like you would expect). Unfortunately, this is
not what mysqldump uses; it creates stand-in tables and hence requests
'show fields' on the view which fails with missing base-tables. The
--force option prevents the dump from stopping at this point; furthermore
this patch dumps a comment showing create for the offending view for
better diagnostics. This solution was confirmed by submitter as solving
their/clients' problem. Problem might become non-issue once mysqldump no
longer creates stand-in tables.
2006-05-30 14:49:05 +02:00
ramil@mysql.com
4df24774c1
Merge mysql.com:/usr/home/ram/work/mysql-4.1
...
into mysql.com:/usr/home/ram/work/mysql-5.0
2006-05-30 13:16:11 +05:00
ramil@mysql.com
8436973fda
after merge fix.
2006-05-29 12:32:08 +05:00
ramil@mysql.com
6b2ab800c9
manual merge
2006-05-29 11:17:38 +05:00
grog@mysql.com
1f86b3f100
BUG#17201: Improve handling of views.
2006-05-25 17:30:28 +09:30
knielsen@mysql.com
b6ee2d2340
Merge mysql.com:/usr/local/mysql/mysql-5.0-vgfix
...
into mysql.com:/usr/local/mysql/tmp-5.0
2006-05-15 19:57:12 +02:00
knielsen@mysql.com
fc16aff742
Fix two Valgrind memory leak warnings.
2006-05-15 18:07:18 +02:00
cmiller@zippy.(none)
d24b4d6e99
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into zippy.(none):/home/cmiller/work/mysql/mysql-5.0-maint
2006-05-11 09:14:09 -04:00
cmiller@zippy.(none)
18754b0a97
Bug#19564: mysql displays NULL instead of space
...
Correct a bug (that I introduced, after using Oracle's database software for
too many years) where the length of the database-sent data is incorrectly
used to infer NULLness.
2006-05-09 22:35:51 -04:00
msvensson@neptunus.(none)
a15415cc04
BUG#16803 "ln -s /dev/null .mysql_history" doesn't work!
...
- Add a check to see if the .mysql_history file a symlink to /dev/null
and in such case, skip reading and writing to it.
2006-05-09 11:01:50 +02: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
ramil@mysql.com
b698a07b1f
Fix for bug #18351 : mysqlbinlog does not set default charset?
2006-05-04 15:34:20 +05: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
holyfoot@mysql.com
aaf2c26e01
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/hf/work/mysql-5.0.clean
2006-05-02 09:01:13 +05:00
holyfoot@deer.(none)
aab0e9c24e
Win build fix
2006-05-02 08:59:49 +05:00
jimw@mysql.com
c571f6ff57
Merge bk-internal:/home/bk/mysql-5.0
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2006-05-01 10:59:14 -07:00
holyfoot@deer.(none)
9b832153f9
Fix for Win build
2006-05-01 22:16:08 +05:00
jimw@mysql.com
9ab852bb35
Merge mysql.com:/home/jimw/my/mysql-5.0-18312
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2006-05-01 09:11:57 -07:00
msvensson@neptunus.(none)
cccc2c4b6a
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-04-28 08:33:42 +02:00
holyfoot@mysql.com
059e2f7005
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/hf/work/mysql-5.0.upgd
2006-04-28 09:19:53 +05:00
holyfoot@deer.(none)
5a75f865c2
bug #18115 (mysql_upgrade on Windows)
...
pushed in 5.0
2006-04-28 09:07:25 +05:00
msvensson@shellback.(none)
e5004d1312
Merge shellback.(none):/home/msvensson/mysql/mysql-5.0
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-04-27 17:35:29 +02:00
msvensson@neptunus.(none)
31db4898c3
Merge neptunus.(none):/home/msvensson/mysql/bug17208/my50-bug17208
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-04-26 22:24:25 +02:00
msvensson@neptunus.(none)
29ace143a1
Backport fix for mysql client not using SSl library directly
...
- Add function mysql_get_ssl_cipher
- Use function mysql_get_ssl_cipher from mysql
2006-04-22 00:48:13 +02:00
kent@mysql.com
1472ed2061
Merge
2006-04-21 20:04:13 +02: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
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
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)
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
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
ian@zim.(none)
a66aace3e9
Fix for bug #16855
2006-03-27 17:45:06 -08: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)
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