Commit graph

1145 commits

Author SHA1 Message Date
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
hf@deer.(none)
7aa25240f7 Fix for bug #4809 (Backticks not handled in mysql) 2004-09-13 12:13:24 +05:00
ram@gw.mysql.r18.ru
9f66608a31 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0
into gw.mysql.r18.ru:/usr/home/ram/work/4.0.b3120
2004-09-09 11:58:11 +05:00
monty@mysql.com
f2829d0386 After merge fixes of merge with 4.1 that included the new arena code.
Fixed (together with Guilhem) bugs in mysqlbinlog regarding --offset
Prefix addresses with 0x for easier comparisons of debug logs
Fixed problem where MySQL choosed index-read even if there would be a much better range on the same index
This fix changed some 'index' queries to 'range' queries in the test suite
Don't create 'dummy' WHERE clause for trivial WHERE clauses where we can remove the WHERE clause.
This fix removed of a lot of 'Using where' notes in the test suite.
Give NOTE instead of WARNING if table/function doesn't exists when using DROP IF EXISTS
Give NOTE instead of WARNING for safe field-type conversions
2004-09-09 06:59:26 +03: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
rburnett@build.mysql.com
751071a677 [This patch has already been approved by Serge. I am recommitting and pushing from a new repository because there were other changesets that couldn't be pushed.]
BUG# 5229 --password=foobar does not override the empty 'password' option in the my.cnf
This is a backport of a change made by jani in the 4.1 tree.

mysql.cc:
  Add tty_password=0 in the p case handling in get_one_option
2004-09-08 16:31:01 +02:00
ram@gw.mysql.r18.ru
2b8b1a399a A fix (bug #3120: 'mysqladmin ping' - return error code). 2004-09-08 16:45:03 +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
serg@serg.mylan
413a8753e2 merged 2004-09-07 15:18:53 +02:00
ram@gw.mysql.r18.ru
173561b0cd Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0
into gw.mysql.r18.ru:/usr/home/ram/work/4.0.b2205
2004-09-07 17:26:15 +05: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
serg@serg.mylan
c0aba1ab98 Bug #5413 mysqlcheck segfaults when user has to few permissions 2004-09-06 22:48:42 +02:00
monty@mysql.com
31122efde7 Merge with 4.1
(Includes merge of arena code in 4.1 and 5.0)
2004-09-06 15:14:10 +03: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
vva@eagle.mysql.r18.ru
f6a3f2cfad fixed :
Bug #3937  	fails to compile with both gcc 3.3.3/icc8
Bug #4728  	mysql couldn't be compiled using system readline (readline-4.3)
2004-08-24 19:23:23 +05:00
vva@eagle.mysql.r18.ru
237615bc53 fixed a Bug #4998 "--protocol doesn't reject bad values" 2004-08-23 20:55:09 +05:00
ram@gw.mysql.r18.ru
c40f3a2c97 A fix (bug #5115: Erronious Syntax Error when comment placed inside of "create table") 2004-08-20 13:37:58 +05:00
serg@serg.mylan
e1237cbc53 manually merged 2004-08-18 19:57:55 +02:00
ram@gw.mysql.r18.ru
f1ab1b129f A fix (bug #5055: SQL_SELECT_LIMIT=0 crashes command line client):
mysql outwits itself.
2004-08-17 11:12:22 +05:00
rburnett@build.mysql.com
67003d1c98 mysql_priv.h:
Added declarations for print_msg_to_log and vprint_msg_to_log.  sql_print_error are simple functions that wrap calls to print_msg_to_log.  Define the different error types with MY_ERROR_TYPE, MY_WARNING_TYPE, and MY_INFORMATION_TYPE
gen_lex_hash.cc:
  Added NULL error reporting parameter to handle_options
log.cc:
  Add print_msg_to_log, print_buffer_to_log, and vprint_msg_to_log.  Print_msg_to_log will write the message to the windows event log if on NT.  We now have error, warning, and information versions of sql_print_xxxx.  T his is a variation of a similar changeset WAX did.
mysqld.cc:
  Added option_error_reporter callback function and pass that into handle_options
mysql.cc:
  Added NULL as error reporter arg to the end of handle_options
Many files:
  Added NULL error reporter parameter as the last paramter to handle_options
my_getopt.c:
  Added second function pointer to server as an error reporting callback.  Added local function report_option_error that will either write the error to stderr or to the error reporting callback.  changed all calls in handle_options from fprintf(stderr, ... ) to report_option_error
my_getopt.h:
  Changed declaration of handle_options to use typedefs for the two function pointers.  added second function pointer to server as an error reporting callback
mysqld.dsp:
  Added custom build step for compiling message file and added message resource file (output of mc)
2004-08-14 03:38:37 +02:00
serg@serg.mylan
e1e1c39bda cleanup 2004-08-07 23:18:13 +02:00
guilhem@mysql.com
2b6151c20f Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-1717
2004-07-29 23:28:28 +02:00
guilhem@mysql.com
0f3e279a05 WL#1580: --start-datetime, --stop-datetime, --start-position (alias for --position) and --stop-position
options for mysqlbinlog, with a test file.
This enables user to say "recover my database to how it was this morning at 10:30"
(mysqlbinlog "--stop-datetime=2003-07-29 10:30:00").
Using time functions into client/ made me move them out of sql/ into sql-common/.
+ (small) fix for BUG#4507 "mysqlbinlog --read-from-remote-server sometimes
cannot accept 2 binlogs" (that is, on command line).
2004-07-29 23:25:58 +02:00
guilhem@mysql.com
31f61883df Replication: various small fixes specific to the new binlog format of 5.0
(including one which may explain autobuild's failure of yesterday)
2004-07-26 19:42:59 +02:00
serg@serg.mylan
8d080cbcfa manual merge 2004-07-20 15:34:57 +02:00
guilhem@mysql.com
88e00cd919 Fixes for
BUG#4506 "mysqlbinlog --position --read-from-remote-server has wrong "# at" lines",
BUG#4553 "Multi-table DROP TABLE replicates improperly for nonexistent table" with a test file.
It was not possible to add a test for BUG#4506 as in the test suite we must use --short-form
which does not display the "# at" lines.
2004-07-17 16:58:16 +02:00
serg@serg.mylan
8542743833 s/help all/help contents/
bug#4527
2004-07-13 08:57:55 +02:00
monty@mysql.com
31fe2837f9 Merge with 4.1 2004-07-12 08:20:24 +03:00
monty@mysql.com
064b8b8f65 Merge with 4.0 to get bug fixes 2004-07-09 02:29:28 +03:00
monty@mysql.com
1e31199995 Merge with 4.1.3-beta 2004-07-07 11:29:39 +03:00
serg@serg.mylan
d8dabe43fb Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-07-06 16:30:04 +02:00
bar@mysql.com
1bc5370cff mysqltest.c:
Bug #4338  	mysql-test-run fails if compiled with non-latin1 character set.
2004-07-06 17:18:04 +05:00
guilhem@mysql.com
83dbc6b006 Fixing a bug in mysqltest.c:
if a command has a comment at the end of line, like:
error 2002 ; # this is error 2002
then the parsing of comment should not make mysqltest
forget about the value of expected error.
Reason it forgot it (so the next query caused the test to fail)
is that internally the above line is 2 queries.
2004-07-02 19:20:30 +02:00
serg@serg.mylan
24b84fbc87 unused (and unnecessary) mysqltest commands removed 2004-07-02 11:02:21 +02:00