Commit graph

575 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
bell@sanja.is.com.ua
0b8d7d8371 test suite for bug Bug#3969 (commited separetely because it took too long time to parse it on 3.23) 2004-06-11 16:25:18 +03:00
greg@mysql.com
3b313f14f2 Fix applied to allow building of 4.0.20 for NetWare 2004-06-01 19:35:09 -01:00
monty@mysql.com
833ec1653e netware files should always be in 'make dist'
use opt_net_buffer_length instead of net_buffer_length
2004-05-27 02:47:04 +03:00
hf@deer.(none)
78f58ff384 Fix to make Windows compilation smoother 2004-05-26 21:40:27 +05:00
monty@mysql.com
ca8dbc24ee Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/tmp/skr99/mysql-4.0
2004-05-25 22:01:50 +03:00
monty@mysql.com
f2e1e3ce4c Added patches from Novell 2004-05-25 22:00:14 +03:00
guilhem@mysql.com
a039062ef3 Replication testsuite: making the master-slave synchronization less likely to fail,
by adding sleep-and-retries (max 4 times) if MASTER_POS_WAIT() returns NULL
in sync_with_master and sync_slave_with_master.
The problem showed up only today, in MySQL 5.0 in rpl_server_id2.test,
but may affect 4.x as well, so fixing it here. Note that I am also fixing
5.0 too, with the same exact patch, because I don't want to leave 5.0 broken
until the next 4.0->4.1->5.0 merge.
2004-05-14 23:08:03 +02:00
ingo@mysql.com
19156a3ac7 Merge mysql.com:/home/mydev/mysql-4.0
into mysql.com:/home/mydev/mysql-4.0-bug2831
2004-05-07 10:42:08 +02:00
jani@a80-186-24-72.elisa-laajakaista.fi
6bc03b14d9 Fixed a problem with option --where, which earlier was not dynamic. One was not able
to use long query strings with it.
Bug#3633
2004-05-07 01:02:57 +03:00
ingo@mysql.com
ba0697c658 Fix a forgotten skip of space at line begin for the 'system' command. 2004-05-06 16:15:46 +02:00
vva@eagle.mysql.r18.ru
7b68b26623 fixed Bug #3361 "mysqldump quotes DECIMAL values" 2004-04-05 23:18:16 +05:00
gluh@gluh.mysql.r18.ru
9832571c1e Fix bug #3181: insert_test client test missing mysql_init 2004-03-29 18:10:59 +05:00
paul@teton.kitebird.com
389ab9fc5d "automagically" is not a word. 2004-03-22 09:38:57 -06:00
monty@mysql.com
b7fc7188d0 Portability fixes
Removed \r from new tests
Fixes to get new sustem_mysql_db... tests to work
2004-03-19 14:52:48 +02:00
guilhem@mysql.com
cf94cd506f Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
2004-03-12 22:03:27 +01:00
guilhem@mysql.com
c421527dee Force mysqlbinlog to require an argument if --local-load is used
(--local-load alone means "I want files to be prepared for LOAD 
DATA INFILE, in the default temp directory", and mysqlbinlog already
does this without --local-load).
2004-03-12 22:01:29 +01:00
Sinisa@sinisa.nasamreza.org
37817f60cc Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2004-03-11 22:27:17 +02:00
jani@ua72d24.elisa.omakaista.fi
2bf78563f7 Fixed error in version. 2004-03-11 20:12:16 +02:00
Sinisa@sinisa.nasamreza.org
67a5ccc5a6 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2004-03-11 15:41:09 +02:00
jani@ua72d24.elisa.omakaista.fi
3b5a46939f Small fixes. 2004-03-11 15:41:07 +02:00
Sinisa@sinisa.nasamreza.org
7e5a43af85 mysqldump.c:
reverting fix
2004-03-11 15:35:08 +02:00
vva@eagle.mysql.r18.ru
a135907547 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0
into eagle.mysql.r18.ru:/home/vva/work/BUG_2874/mysql-4.0
2004-03-10 23:35:40 +04:00
vva@eagle.mysql.r18.ru
faa9c92765 fixed BUG #2874 "Grant table bug" and
added tests for testing structure of mysql db
2004-03-10 22:54:07 +04:00
Sinisa@sinisa.nasamreza.org
0bbbdb0530 mysqldump.c:
This is to fix mysqldump problem when local-infile option is present under [client] options header.  It will not start. This must be fixed as other programs use that option under [client] options header.
2004-03-09 17:00:00 +02:00
paul@ice.snake.net
ae18d8d64c Patch for #3068: [Prompt without seconds when set from INI file].
(Fix hours/seconds always to display with two digits.)
2004-03-08 15:52:06 -06:00
jani@ua72d24.elisa.omakaista.fi
58a978b900 Fixed Bug#2491, INSERT DELAYED causes binary log unusable by mysqlbinlog (replication is ok)
Setting insert delayed threads = 0 at mysql_init_command.
2004-03-04 17:58:36 +00:00
monty@mashka.mysql.fi
6fbf1efdc2 Indented comment properly 2004-03-04 10:57:30 +02:00
ulli@morbus.(none)
709a5d6a8b fix for bug #2905 -
"mysqladmin.c & co fail to use MYSQL_PORT as the default value of the TCP/IP port"
2004-02-26 19:09:49 +01:00
serg@serg.mylan
3d750efcb1 do not look for string characters "'` inside comments - bug#539 2004-02-26 01:05:04 +01:00
arjen@bitbike.com
fafc130b61 Inserted comment about lost root pwd procedure in Docs relying on command order in mysqladmin. 2004-02-25 09:46:43 +10:00
Sinisa@sinisa.nasamreza.org
74dc9f16bb A fix for double free of memory in mysqlbinlog. 2004-02-23 14:02:32 +02:00
monty@mysql.com
fb8f27f017 Always use libtool with "--preserve-dup-deps"
Always use all LOAD DATA options in replication.
Fixed problem in mysqlbinlog where LOAD DATA options could be overwritten.
2004-02-13 16:05:09 +02:00
monty@mysql.com
079edf3313 Code cleanups 2004-02-10 12:03:08 +01:00
vva@eagle.mysql.r18.ru
0333f7b10f fixed bug #1378 "mysqlbinlog for remote host is broken" 2004-02-06 20:57:11 +04:00
serg@serg.mylan
5d4077cc0b clarify -F help text a bit 2004-02-04 16:50:33 +01:00
monty@mysql.com
268521a61d Give error if locked table is used twice in query. This fixes strange error message when doing LOCK TABLES t1 WRITE; INSERT TABLE t1 SELECT * from t1 (Bug #2296) 2004-02-03 09:46:48 +01:00
Sinisa@sinisa.nasamreza.org
704284d4a1 mysqldump.c:
Fix for UNLOCK TABLES bug #2242
2004-01-06 19:23:30 +02:00
monty@mysql.com
c1dd070ba7 Some small portability fixes.
Added support for lower_case_table_names=2, which is to be used on case insensitive file systems.
This tells MySQL to preserve the used case of filenames and database names to make it esier to move files between cases sensitive can case insensitive file systems (like Windows and Linux)
2003-12-30 13:14:21 +02:00
monty@mysql.com
6e58a7c49e Code cleanup 2003-12-18 01:13:52 +02:00