Commit graph

312 commits

Author SHA1 Message Date
monty@mysql.com
3839e443a4 merge with 4.1 2005-02-28 12:18:39 +02:00
ramil@mysql.com
dee22632f7 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/home/ram/work/4.1.b4802
2005-02-25 15:47:36 +04:00
monty@mysql.com
e2ea35ec67 Merge with 4.1 2005-02-22 15:47:00 +02:00
monty@mysql.com
e2dc9b4099 Backport my_strntod() from 5.0
Change string->float conversion to delay division as long as possible.
This gives us more exact integer->float conversion for numbers of type '123.45E+02' (Bug #7740)
2005-02-22 12:51:23 +02:00
bar@mysql.com
e2bd15eca2 mysql.cc:
bug#7571:
  Server & Client characterset are shown under different decriptions
  Switch them into the correct order.
2005-02-21 15:43:25 +04:00
ramil@mysql.com
8cf2b82f94 After review fixes 2005-02-02 15:52:19 +04:00
ramil@mysql.com
7f68f132fd Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/home/ram/work/4.1.b4802
2005-02-02 15:06:36 +04:00
jimw@mysql.com
85a5c61c5d Merge mysql.com:/home/jimw/my/mysql-4.1-7811
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-01-31 17:51:45 -08:00
jimw@mysql.com
ec98b8f235 Change 'mysql' client to output XML like the 'mysqldump'
tool does, with the column names as attributes on <field>
elements, instead of trying to use the column name as the
element name. Also fix some encoding issues. (Bug #7811)
2005-01-25 14:25:40 -08:00
jani@ua141d10.elisa.omakaista.fi
d5f76d50f6 Some bug fixes and a feature add to mysql-test-run 2005-01-25 18:32:09 +02:00
serg@serg.mylan
c76405a7ee merged 2005-01-24 19:41:42 +01:00
serg@serg.mylan
67ba2e367a fixes/cleanups according to Coverity report 2005-01-24 15:48:25 +01:00
monty@mysql.com
502ba93b38 Merge with global tree 2005-01-18 04:03:26 +02:00
reggie@bob.(none)
da9f7c7ec4 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1
into bob.(none):/home/reggie/bk/mysql-4.1
2005-01-17 14:08:36 -06:00
guilhem@mysql.com
05793bb9b9 Merge 2005-01-16 21:39:21 +01:00
reggie@bob.(none)
68c540f090 Bug #7922 prompt \p fails on Windows for shared-memory connections
Fixed bug by adding code that displays the contents of mysql.host when \p is added as part of the prompt.

mysql.cc:
  Added code to display mysql.host as prompt when using shared memory
2005-01-15 23:19:34 -06:00
serg@serg.mylan
275a9293e4 protect against malicious server trying to crash command-line client :) 2005-01-14 22:46:04 +01:00
hf@deer.(none)
196c95e938 Merging conflicts resolved 2005-01-11 21:00:53 +04:00
hf@deer.(none)
8b3b364893 Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.5920
2005-01-11 19:58:52 +04:00
pekka@mysql.com
195f7bda02 Merge 2005-01-08 22:34:16 +01:00
serg@sergbook.mylan
247052fecc few harmless warnings from automated code-checking tools fixed 2005-01-08 21:25:31 +01:00
hf@deer.(none)
5eb5fd12be fix for bug #5920 (embedded-server mysql doesn't handle --defaults-file) 2005-01-03 19:21:54 +04:00
monty@mishka.local
4f4bbfc279 Merge with 4.1 2004-12-22 13:54:39 +02:00
paul@frost.snake.net
66f0ff16a3 mysql.cc:
Fix up mysql help messages.
2004-12-18 14:30:00 -06:00
guilhem@mysql.com
1cbc904c59 Changing the default of libmysqlclient : it's now NO reconnection.
All our programs which use mysql_real_connect() and mysql_connect() are updated accordingly, though I have deliberately
made mysqlimport not reconnect anymore (already true for mysqldump >= 4.1.8).
All Connector devs have been warned about the change I'm doing here - which was agreed with Monty,
and fixes BUG#2555.
2004-12-09 14:44:10 +01:00
paul@kite-hub.kitebird.com
59c0102e23 mysql.cc:
Tweak some help text.
2004-11-19 14:53:40 -06:00
monty@mysql.com
3afecef4df Fix compiler warnings (detected by Intel's C++ compiler)
Fixed checking of privilege handling in CREATE ... SELECT (Bug #6094)
2004-10-22 18:44:51 +03:00
ram@gw.mysql.r18.ru
61c7767786 A fix (bug #4802 prompt in mysql client shows wrong database after dropping default db). 2004-10-21 17:02:24 +05:00
jani@a80-186-41-201.elisa-laajakaista.fi
a37355fb98 Added option --sigint-ignore to mysql.cc 2004-10-07 22:47:11 +03:00
bar@mysql.com
dcfb23f37f mysql.cc:
SQL_SELECT_LIMIT=0 protection
2004-09-15 13:26:47 +05:00
bar@mysql.com
1992322af5 Restoring old code to be used with 4.0 server if 4.1-compient query fails.
Restoring displaying database and user which was removed in a mistake
in the previous change.
2004-09-15 10:06:30 +05:00
bar@mysql.com
49728cce7e mysql.cc:
Bug #5536: wrong server character set in "status" command
  More character set variables.
2004-09-13 12:51:08 +05:00
paul@kite-hub.kitebird.com
a022b3c549 mysql.cc:
Print sqlstate value in batch mode, not just in interactive mode.
2004-09-08 13:28:11 -05:00
serg@serg.mylan
0afcaac5a8 after merge 2004-09-07 22:10:15 +02:00
serg@serg.mylan
323e683cbf merged 2004-09-07 21:30:28 +02:00
ram@gw.mysql.r18.ru
00830a11fc A fix (Bug #5432: Is this a leak in mysql console client?) 2004-09-07 14:24:47 +05:00
ram@gw.mysql.r18.ru
92be15da12 A fix (bug #2205 USE database doesn't work after DROP database + CREATE database)
(Jani's CS 1.1675 04/01/05 21:45:14 was adapted an aplied).
2004-09-06 16:48:11 +05:00
gluh@gluh.mysql.r18.ru
9700398e8b Fix for bug #4373: \u behaves differently 2004-09-03 19:56:24 +04:00
monty@mysql.com
054cea4ca8 Merge with 4.0 2004-09-01 04:12:09 +03:00
ram@gw.mysql.r18.ru
b93a973b12 Added global my_getopt_error_reporter function pointer which is
used in the handle_options() function (instead of using additional 
handle_option() parameter). The default value of the 
my_getopt_error_reporter is default_reporter(). One can set it to
other functions if case of need.
2004-08-31 21:27:58 +05:00
paul@kite-hub.kitebird.com
30e7217d52 Names listed as options should look like options,
not variables.
2004-08-30 11:11:10 -05:00
paul@kite-hub.kitebird.com
f1c0b1be9e mysql.cc:
Minor edits to help command messages.
2004-08-27 12:27:57 -05:00
serg@serg.mylan
acbf96a161 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-08-26 17:49:16 +02:00
serg@serg.mylan
b4bb38e896 merged 2004-08-26 15:19:46 +02:00
jani@rhols221.adsl.netsonic.fi
5e4df770e3 Fixed a bug in mysql.cc. Overriding password prompting
by giving password as an argument later did not work.
2004-08-26 16:15:36 +03:00
bar@mysql.com
65b7032857 mysql.cc:
Bug#3453: MySQL output formatting in multibyte character sets
2004-08-25 13:03:34 +05:00
rburnett@build.mysql.com
52a973c5ff Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into build.mysql.com:/users/rburnett/mysql-4.0
2004-08-25 06:39:19 +02:00
serg@serg.mylan
0c950c5bfe compatibility fixes 2004-08-24 22:37:05 +02:00
vva@eagle.mysql.r18.ru
b20161b841 Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/BUG_libedit/mysql-4.1.clear_v2
2004-08-24 23:38:31 +05:00
vva@eagle.mysql.r18.ru
ffacc77f22 more accurate processing of find_type result
(Bug #4998 --protocol doesn't reject bad values)
2004-08-24 20:13:31 +05:00