cmiller@zippy.(none)
00243ac847
Merge zippy.(none):/home/cmiller/work/mysql/merge/tmp_merge
...
into zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new
2006-06-13 16:06:35 -04: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
kent@mysql.com
d48e55eefd
Merge
2006-05-17 23:41:56 +02:00
tomas@poseidon.ndb.mysql.com
6cb699d208
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2006-05-16 10:37:40 +02:00
cmiller@zippy.(none)
d8330e2858
Merge zippy.(none):/home/cmiller/work/mysql/merge/tmp_merge
...
into zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new
2006-05-15 19:26:49 -04:00
cmiller@zippy.(none)
eca1b560ae
Porting fix of Bug#19564 from 5.0/5.1 trees.
2006-05-15 14:58:48 -04: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
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)
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
jimw@mysql.com
da9a11669d
Merge mysql.com:/home/jimw/my/mysql-4.1-wl2852
...
into mysql.com:/home/jimw/my/mysql-5.1-clean
2006-05-03 15:58:16 -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
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
cmiller@zippy.(none)
9ae7dd9e35
Merge zippy.(none):/home/cmiller/work/mysql/merge/jimw_merge
...
into zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new
2006-04-24 16:17:50 -04: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
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
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
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)
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
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
cmiller@zippy.(none)
599c710a5b
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.
2006-03-03 16:26:38 -05:00
aelkin@mysql.com
dd2a44c497
BUG#16217 forced to introduce a separate mysql client command to adopt its
...
internal charset to one associated with currently being handled query.
To note such a query can come from interactive client either.
There was a discussion within replication team and Monty who's suggestion won.
It avoids straightforward parsing of all `set' queries that could affect client side
character set.
According to the idea, mysql client does not parse `set' queries but rather cares of
`charset new_cs_name' command.
This command is generated by mysqlbinlog in form of exclaiming comment (Lars' suggestion)
so that enlightened clients like `mysql' knows what to do with it.
Interactive human can switch between many multi-byte charsets during the session
providing the command explicitly.
To note that setting new internal mysql's charset does not
trigger sending any `SET' sql statement to the server.
2006-02-09 16:23:09 +02:00
stewart@mysql.com
efbdf7b225
Merge mysql.com:/home/stewart/Documents/MySQL/4.1/main
...
into mysql.com:/home/stewart/Documents/MySQL/5.0/main
2005-12-28 00:57:18 +11:00
paul@snake-hub.snake.net
f5cc3fd619
mysql.cc:
...
Typo in help message.
2005-12-20 12:47:44 -06:00
knielsen@mysql.com
17cab43fcf
Bug#15097: Missing \n in header printed by mysql --help when HAVE_READLINE
...
is not defined.
2005-12-05 12:12:08 +01:00
jani@a193-229-222-105.elisa-laajakaista.fi
d88d8081da
Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0
...
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
2005-12-04 15:34:47 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
669a12fdb0
A set of Netware related patches.
2005-12-04 15:02:06 +02:00
joerg@mysql.com
b3b124f9e4
Merge the last 5.0.16 (Unix, Windows) and 5.0.16a (Netware) changes to the general tree.
2005-11-21 15:49:34 +01:00
jamppa@suse9-x86.mysql.com
a50cc250ff
Netware specific changes for 5.0.16a
2005-11-18 18:25:46 +01:00
jimw@mysql.com
f8ce7bc01e
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-11-17 13:37:30 -08:00
jimw@mysql.com
2ffc7ff2a2
Update out-of-date URLs in 'help' text of mysql client. (Bug #14801 )
2005-11-11 15:23:04 -08:00
tim@siva.hindu.god
c704130389
BUG#14358: in mysql.cc, don't neglect to strip delimiter off lines < 9 characters long.
2005-10-28 12:13:34 +13:00
kent@mysql.com
70c816c801
Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-10-20 23:23:33 +02:00
reggie@ugeek.(none)
600c7df8f1
readd the my_cgets call that SergeyV originally put in
2005-10-18 17:53:09 -05:00
bar@mysql.com
e7fa41ebf7
mysql.cc:
...
After merge fix.
2005-10-14 14:19:15 +05:00
bar@mysql.com
aec79cc463
Merge mysql.com:/usr/home/bar/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-5.0
2005-10-14 14:17:15 +05:00
bar@mysql.com
48238e1b90
Merge mysql.com:/usr/home/bar/mysql-4.1.b13487
...
into mysql.com:/usr/home/bar/mysql-4.1
2005-10-14 14:07:22 +05:00
monty@mysql.com
17d7ba931d
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2005-10-08 03:37:23 +03:00
gluh@mysql.com
041eab4663
4.1 -> 5.0 merge
2005-10-07 14:26:32 +05:00
monty@mysql.com
78e828d32f
Review of code pushed since last 5.0 pull:
...
Ensure that ccache is also used for C programs
mysql: Ensure that 'delimiter' works the same way in batch mode as in normal mode
mysqldump: Change to use ;; (instead of //) as a stored procedure/trigger delimiter
Fixed test cases by adding missing DROP's and rename views to be of type 'v#'
Removed MY_UNIX_PATH from fn_format()
Removed current_db_used from TABLE_LIST
Removed usage of 'current_thd' in Item_splocal
Removed some compiler warnings
A bit faster longlong2str code
2005-10-06 17:54:43 +03:00
jimw@mysql.com
f1006fa620
In the command-line client, try to abort the current query by issuing a
...
KILL command on a second connection when handling Ctrl-C. (WL#2852)
Based on patch by Harrison Fisk.
2005-10-05 12:54:04 -07:00
georg@lmy002.wdf.sap.corp
f846bc32c1
Windows compilation fix: Added typecast (const char* to char *)
2005-10-04 10:54:58 +02:00
kent@mysql.com
7b2e04d5a2
Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
2005-09-30 16:37:02 +02:00