Commit graph

905 commits

Author SHA1 Message Date
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
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
serg@serg.mylan
c4004aec8a restored --all as an alias to --create-options for backward compatibility 2004-06-26 23:00:23 +02:00
vva@eagle.mysql.r18.ru
dfd200c835 Merge 2004-06-25 02:29:27 +05:00
vva@eagle.mysql.r18.ru
8e651814e9 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/BUG_1851/mysql-4.1
2004-06-25 02:24:00 +05:00
vva@eagle.mysql.r18.ru
665d1451f2 fixed bug #1851 "mysqldump does not return
an error code if the output device is filled"
2004-06-25 01:14:12 +05:00
guilhem@mysql.com
a86b133a44 removing forgotten line (had not noticed as I build with LINT_INIT undefined :( ). 2004-06-24 00:09:29 +02:00
guilhem@mysql.com
bccf57fbb2 Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-1717
2004-06-23 23:52:49 +02:00
serg@serg.mylan
2c48e052d9 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-06-23 21:47:07 +02:00
serg@serg.mylan
fc234f2e4c Bug#4261 - mysqldump omits NULLs with --skip-extended-insert 2004-06-23 21:46:17 +02:00
paul@kite-hub.kitebird.com
7cb8b935b4 mysqldump.c:
Fix typo.
2004-06-23 12:37:34 -05:00
paul@kite-hub.kitebird.com
ea4265ab87 mysqldump.c:
Correct the help text for mysqldump --set-charset option.
2004-06-23 12:21:49 -05:00
monty@mysql.com
d69a36d118 merge 2004-06-21 10:24:40 +03:00
monty@mysql.com
1388c164bc After merge fixes
Return NULL if a time argument is given to date_add(). (Warning will be shown after Dimitri's timezone patch is pushed)
2004-06-21 10:21:20 +03:00
guilhem@mysql.com
f5d6424487 Robustness feature.
Won't be pushed as is - separate email sent for internal review.
WL#1717 "binlog-innodb consistency".
Now when mysqld starts, if InnoDB does a crash recovery, we use the binlog name
and position retrieved from InnoDB (corresponding to the last transaction
successfully committed by InnoDB) to cut any rolled back transaction from
the binary log. This is triggered by the --innodb-safe-binlog option.
Provided you configure mysqld to fsync() InnoDB at every commit (using
flush_log_at_trx_commit) and to fsync() the binlog at every write
(using --sync-binlog=1), this behaviour guarantees that a master always has
consistency between binlog and InnoDB, whenever the crash happens.
6 tests to verify that it works.
2004-06-20 19:11:02 +02:00
monty@mysql.com
b11d258835 Merge with 4.0.21 2004-06-18 04:38:58 +03:00
monty@mysql.com
fd0153304d Fixed some byte order bugs with prepared statements on machines with high-byte-first. (Bug #4173)
Fixed problem with NULL and derived tables (Bug #4097)
Cleanup of new pushed code
2004-06-18 03:02:29 +03:00
guilhem@mysql.com
f1fda6387e API change: mysql_shutdown() now needs a 2nd parameter, the shutdown level.
Server will however still accept shutdown without specified level; so that old
mysqladmin can still shut server down.
I would like your comments on the names of shutdown level which I chose. You
are welcome to propose better names. Please however check WL#709 before.
Reason for the names I propose is to be accurate, thus leaving possibility
for other levels which we may imagine in the future; that's why I have rejected
names like "fast", "smart", "graceful" so far. My position is that WAIT_ALL_BUFFERS
or WAIT_CRITICAL_BUFFERS say what the shutdown does, whereas for "smart", "fast" you
need to remember what it does.
This should be pushed in 4.1.3 but only after your comments.
2004-06-15 11:35:23 +02:00
serg@serg.mylan
035e03c1f6 merged 2004-06-11 20:55:08 +02:00
serg@serg.mylan
683a8893a8 mysqltest.c: don't hardcode variables to be taken from environment.
use MYSQL_TCP_PORT instead of 3306 in tests
2004-06-11 18:26:13 +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
konstantin@mysql.com
f08bbd1f12 assert.h needed for my_dbug.h now is included in my_dbug.h, where it for
some reason wasn't included before.
A lot of files cleaned up from #include <assert.h>
2004-06-10 23:58:39 +04:00
bar@bar.intranet.mysql.r18.ru
0860e3bfe4 mysqldump.c:
Dump could fail to load because of --default-character-set command line option.
  More safe dump is now produces, --default-character-set doesn't matter.
2004-06-07 18:12:23 +05:00
pem@mysql.comhem.se
3dcd7e53af Post-merge fixes.
Not finished, will not be pushed until additional fixes have been made.
2004-06-03 19:36:36 +02:00
monty@mysql.com
70c2256d2f Merge with 4.0 to get fixes for netware 2004-06-02 00:09:14 +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
dlenev@brandersnatch.localdomain
03b705ff44 Made my_snprintf() behavior snprintf() compatible when printing %x arguments (it should
produce hex digits in lower case). (fixed version)

Replaced _dig_vec array with two _dig_vec_upper/_dig_vec_lower arrays.
Added extra argument to int2str function which controls case of digits you get.
Replaced lot of invocations of int2str for decimal radix with more optimized int10_to_str()
function.
Removed unused my_itoa/my_ltoa functions.
2004-05-27 17:54:40 +04:00
monty@mysql.com
f693787063 Merge mysql.com:/home/my/mysql-4.0 into mysql.com:/home/my/mysql-4.1 2004-05-27 02:51:28 +03: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
monty@mysql.com
61a6557307 merge with 4.0 to get windows fixes 2004-05-27 00:30:28 +03:00
hf@deer.(none)
78f58ff384 Fix to make Windows compilation smoother 2004-05-26 21:40:27 +05:00
pem@mysql.com
71eddc362e Merging 4.1 to 5.0. 2004-05-26 17:04:45 +02:00
monty@mysql.com
390d9898f9 merge with 4.0 to get Netware patches and fixes for libmysqld.dll 2004-05-25 22:54:00 +03: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
dlenev@brandersnatch.localdomain
b5b4c88455 Fix of small syntax error - added missing backslash that prevented building of mysqlbinlog. 2004-05-24 14:38:55 +04:00
guilhem@mysql.com
ce1e1f4cb6 mysqlbinlog: new option --to-last-log. This option has effect only if --read-from-remote-server.
It causes mysqlbinlog to not stop after the end of the requested binlog, and instead read
until the end of the last binlog of mysqld (beware of endless loops if you pipe this
into the same mysqld).
I.e. it enables back (at customer's request) what we considered (and I still do)
as BUG#3204, but now with an option instead of being the default behaviour.
The default behaviour is still to stop after the end of the requested binlog,
whether --read-from-remote-server or not.
2004-05-23 17:42:12 +02:00
hf@deer.(none)
418dffe205 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.3744
2004-05-21 22:00:12 +05:00
hf@deer.(none)
0379682ea6 Addition to the fix for bug #3791 (libmysqld mysql segfaults if can's find
errormsg.sys)
Cleanups added
2004-05-21 17:23:27 +05:00
monty@mysql.com
332f124bc6 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2004-05-19 05:09:41 +03:00
monty@mysql.com
21f1bca789 Portability fixes
Fixed wrong number of warnings/duplicates for machines with high-byte-first
2004-05-19 05:09:10 +03:00
serg@serg.mylan
d9ec0f2b90 after merge fix 2004-05-18 09:56:45 +02:00