guilhem@mysql.com
60fb005e5e
Fix for bug 254 :
...
we now make a distinction between if the master is < 3.23.57, 3.23 && >=57, and 4.x
(before the 2 3.23 were one). This is because in 3.23.57 we have a way to distinguish between
a Start_log_event written at server startup and one written at FLUSH LOGS, so we
have a way to know if the slave must drop old temp tables or not.
Change: mi->old_format was bool, now it's enum (to handle 3 cases). However, functions
which had 'bool old_format' as an argument have their prototypes unchanged, because
the old old_format == 0 now corresponds to the enum value BINLOG_FORMAT_CURRENT which
is equal to 0, so boolean tests are left untouched. The only case were we use mi->old_format
as an enum instead of casting it implicitly to a bool, is in Start_log_event::exec_event,
where we want to distinguish between the 3 possible enum values.
2003-06-06 16:41:28 +02:00
guilhem@mysql.com
1dccfd055d
In Start_log_event::print, don't print "created 1970 etc" if created == 0.
...
Otherwise, we'll get questions from users about this curious 1970.
2003-06-06 14:13:26 +02:00
monty@narttu.mysql.fi
7a54334443
Merge with 4.0.13
2003-06-05 17:33:38 +03:00
guilhem@mysql.com
3b974039f7
-- Waiting for Monty's approval before push --
...
Bug 571: play LOAD DATA INFILE the same way on the slave as it was on the master:
if it was with IGNORE, do it with IGNORE,
if it was with REPLACE, do it with REPLACE,
and (the change) if it was with nothing, do it with nothing (not with IGNORE !!).
Bug 573: print a proper error message in case of duplicate entry in LOAD DATA INFILE
on the slave, i.e. a message where the keyname and key value appear :
'Duplicate entry '1' for key 1' and not 'Duplicate entry '%-.64s' for key %d'
2003-06-03 15:47:29 +02:00
monty@narttu.mysql.fi
17dfc88105
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into narttu.mysql.fi:/my/mysql-4.0
2003-05-26 13:36:43 +03:00
monty@narttu.mysql.fi
102c477760
Added testing of LOAD DATA ... STARTING BY
...
Added read_only variable
2003-05-26 11:47:03 +03:00
monty@mashka.mysql.fi
cb7061ebe4
merge
2003-05-22 02:57:27 +03:00
vva@eagle.mysql.r18.ru
6b5c9851a4
Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-3.23
...
into eagle.mysql.r18.ru:/home/vva/work/LOADDATA/mysql-3.23
2003-05-21 15:18:30 -04:00
vva@eagle.mysql.r18.ru
4ae8af4ae2
fixed "LINES STARTING" in load data replication
2003-05-21 15:16:56 -04:00
vva@eagle.mysql.r18.ru
d124cd5bd7
Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0
...
into eagle.mysql.r18.ru:/home/vva/work/LOADDATA/mysql-4.0
2003-05-21 14:58:11 -04:00
vva@eagle.mysql.r18.ru
09348e271a
fixed 'STARTING BY' in replication
2003-05-21 14:54:02 -04:00
monty@mashka.mysql.fi
6aa8929cf3
After merge fixes
...
Added initialization of all important global variables
2003-05-21 21:39:58 +03:00
vva@eagle.mysql.r18.ru
ec247fd6af
changed processing of LOAD DATA in mysqlbinlog
2003-05-20 17:03:18 -04:00
monty@narttu.mysql.fi
dd2b7918cd
Merge with 4.0.13
2003-05-19 16:35:49 +03:00
pem@mysql.com
35c82164f6
Merged 4.1 to 5.0.
2003-04-29 12:06:04 +02:00
monty@mashka.mysql.fi
8b20a878cc
Merge with 3.23:
...
Set innobase_flush_log_at_trx_commit to 1 by default
Fix problem with timestamp on 64 bit systems
Reserve alarms for up to 10 slave threads
2003-04-26 21:10:13 +03:00
guilhem@mysql.com
b03ec0d7db
Replication: new code to not modify in-memory log positions until the COMMIT
...
is executed, even if the transaction spans on >=2 relay logs (bug #53 ).
New variable relay_log_purge =0|1
New test to verify bug #53
2003-04-24 15:29:25 +02:00
gluh@gluh.mysql.r18.ru
e6fe7d1bed
Task 761:'mysqlbinlog should not die when reading
...
unknown event'
2003-04-23 18:00:07 +05:00
vva@eagle.mysql.r18.ru
56667e1eba
Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0
...
into eagle.mysql.r18.ru:/home/vva/work/LOADDATA_BUG/mysql-4.0
2003-04-22 19:50:21 -04:00
vva@eagle.mysql.r18.ru
9588dc01e5
fix error message for for load data infile
2003-04-22 19:38:57 -04:00
monty@narttu.mysql.fi
1621dd9818
Fixed problem with timestamps in binary log on 64 bit machines
...
Backported fix from 4.1 for bug 212: SELECT query containing a NATURAL JOIN and parentheses in the WHERE clause
2003-04-23 00:13:37 +03:00
guilhem@mysql.com
c7891fe9bc
fix for #254
...
(3.23 master, 4.0 slave.
Slave loss temp tables everytime FLUSH LOGS on master).
This fix is less bad than the bug, it will cause a problem only maybe
if the master dies the hard way (I say maybe because I could not
cause a problem, and I don't see how it could happen).
2003-04-09 15:16:12 +02:00
hf@deer.mysql.r18.ru
5d4e9f95f2
Merging
2003-04-08 19:43:24 +05:00
hf@deer.mysql.r18.ru
0428d08606
SCRUM
...
two KILL versions
code trimming with headquarter's suggestions
2003-04-08 19:18:33 +05:00
monty@narttu.mysql.fi
a7708c7904
Merge with 4.0
2003-04-03 21:19:12 +03:00
monty@narttu.mysql.fi
aa4bf1cd8d
After merge fix
2003-04-03 21:19:11 +03:00
monty@narttu.mysql.fi
d56dc85205
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into narttu.mysql.fi:/my/mysql-4.0
2003-04-03 19:55:37 +03:00
vva@eagle.mysql.r18.ru
f45be5e6cd
added test for replication load data into temporary table with additional options
2003-04-03 12:54:08 -04:00
monty@narttu.mysql.fi
618857b6eb
Merge with 3.23 to get fixes for:
...
mysqldump --delete-master-logs
Portability fix for hammer
Memory overrun for MyISAM
LOAD DATA LOCAL replication bug fix.
2003-04-03 12:33:13 +03:00
guilhem@mysql.com
1211b9a513
Small-and-safe fix for bug #218 : "LOAD DATA INFILE IGNORE is well
...
logged, but read as LOAD DATA INFILE REPLACE"
This was just bad && instead of &, but nasty consequences.
This should be merged to 4.0 BUT it will not be automatic (some code
has moved from log_event.h to log_event.cc, and log_event.cc has changed);
please Merging Man, do 'bk grep REPLACE_FLAG' in 4.0/sql
to find all the new places.
2003-04-01 18:19:15 +02:00
hf@genie.(none)
0ee0589e93
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into genie.(none):/home/hf/work/mysql-5.0.kil
2003-03-31 13:42:37 +05:00
hf@genie.(none)
f8f0b70380
SCRUM
...
two KILL commands implementation (version 2)
2003-03-31 13:39:46 +05:00
vva@eagle.mysql.r18.ru
af61a4c7fa
Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0
...
into eagle.mysql.r18.ru:/home/vva/work/LOADDATA_BUG/mysql-4.0
2003-03-25 19:58:40 -04:00
vva@eagle.mysql.r18.ru
e1173e70a5
fix bug with parameters of LOAD DATA INFILE in exec_event
2003-03-25 19:57:38 -04:00
guilhem@mysql.com
b90c91a710
Fix for bug #174 (charset 0 caused segfault)
2003-03-21 21:08:56 +01:00
monty@narttu.mysql.fi
9f200ede0d
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into narttu.mysql.fi:/my/mysql-4.1
2003-03-20 02:06:08 +02:00
monty@narttu.mysql.fi
48a9c1239c
Added support for ULONG division with DIV
...
Fixed non fatal memory leak in slave code.
2003-03-19 21:23:13 +02:00
bar@bar.mysql.r18.ru
8103c4c537
CONVERT class was removed
2003-03-18 17:01:32 +04:00
bar@bar.mysql.r18.ru
7549a76c7c
Replication were broken because of automatic charset conversion.
...
As a fix, my_charset_bin is now used in master-slave packets instead
of system_charset_info.
2003-03-18 11:34:19 +04:00
monty@narttu.mysql.fi
5dd970c335
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into narttu.mysql.fi:/my/mysql-4.1
2003-03-17 15:06:06 +02:00
bar@bar.mysql.r18.ru
caf31a0790
Preparing to client<->server autoconvert
2003-03-17 13:14:04 +04:00
monty@narttu.mysql.fi
a434bca704
Merge with 4.0
2003-03-16 19:17:54 +02:00
monty@mashka.mysql.fi
9257a27c82
Fixed character set bug when replicating user variables
2003-03-05 16:10:40 +02:00
monty@narttu.mysql.fi
143c85057e
Fix for reading variables from binary log.
2003-03-04 15:17:29 +02:00
bar@bar.mysql.r18.ru
4ffd74e5de
Coercibility is now stored in user vars
2003-03-03 13:16:39 +04:00
guilhem@mysql.com
10735252ee
When the SQL thread cannot read an event from the relay log
...
("Event too big" etc), stop this thread instead of going on
with the next event, which would certainly lead to slave's data
corruption.
2003-03-02 00:34:44 +01:00
monty@narttu.mysql.fi
e8aa21c8d3
LOAD DATA INFILE is not replicated if replicate_*_table is set
...
LOAD DATA LOCAL INFILE was not replicated correctly
2003-02-28 22:24:00 +02:00
monty@narttu.mysql.fi
050543bdfc
Merge with 3.23 -> 4.0
2003-02-28 13:29:48 +02:00
monty@narttu.mysql.fi
a0d2a621ed
Added detection if pthread_attr_getstacksize() exists
...
Fixed bug in RAND() usage in mysqlbinlog
2003-02-27 17:35:51 +02:00
gluh@gluh.mysql.r18.ru
ae911ef858
Bug fix: for SHOW STATUS (when ssl is used)
...
Added ROW_RESULT to switchs(for documentation purposes)
2003-02-17 18:06:51 +04:00
