Commit graph

2844 commits

Author SHA1 Message Date
guilhem@mysql.com
cc918272ed The slave threads MUST not care about max_join_size, we start them with
OPTION_BIG_SELECTS.
2003-08-23 17:41:43 +02:00
guilhem@mysql.com
c3a18a3da4 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
2003-08-23 16:54:22 +02:00
guilhem@mysql.com
10811aba88 * Fix for a potential bug:
when the SQL thread stops, set rli->inside_transaction to 0. This is needed if the user
later restarts replication from a completely different place where there are only autocommit
statements.
* Detect the case where the master died while flushing the binlog cache to the binlog
and stop with error. Cannot add a testcase for this in 4.0 (I tested it manually)
as the slave always runs with --skip-innodb.
2003-08-23 16:53:04 +02:00
Sinisa@sinisa.nasamreza.org
ced195f8a9 After merge fixes 2003-08-22 18:43:46 +03:00
Sinisa@sinisa.nasamreza.org
4d2902a27d grant.result, grant.test, sql_acl.cc:
Fix for a bug #878
2003-08-22 18:32:11 +03:00
guilhem@mysql.com
9676fdcbcd Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
2003-08-22 15:42:22 +02:00
guilhem@mysql.com
759a3c1e3c 2 minor edits, plus
fix for BUG#1113 "INSERT into non-trans table SELECT ; ROLLBACK" does not send warning"
and
fix for BUG#873 "In transaction, INSERT to non-trans table is written too early to binlog".
Now we don't always write the non-trans update immediately to the binlog;
if there is something in the binlog cache we write it to the binlog cache
(because the non-trans update could depend on a trans table which was modified
earlier in the transaction); then in case of ROLLBACK, we write the binlog
cache to the binlog, wrapped with BEGIN/ROLLBACK.
This guarantees that the slave does the same updates.
For ROLLBACK TO SAVEPOINT: when we execute a SAVEPOINT command we write it
to the binlog cache. At ROLLBACK TO SAVEPOINT, if some non-trans table was updated,
we write ROLLBACK TO SAVEPOINT to the binlog cache; when the transaction
terminates (COMMIT/ROLLBACK), the binlog cache will be flushed to the binlog
(because of the non-trans update) so we'll have SAVEPOINT and ROLLBACK TO
SAVEPOINT in the binlog.

Apart from this rare case of updates of mixed table types in transaction, the
usual way is still clear the binlog cache at ROLLBACK, or chop it at
ROLLBACK TO SAVEPOINT (meaning the SAVEPOINT command is also chopped, which
is fine).
Note that BUG#873 encompasses subbugs 1) and 2) of BUG#333 "3 binlogging bugs when doing INSERT with mixed InnoDB/MyISAM".
2003-08-22 15:39:24 +02:00
monty@narttu.mysql.fi
5192a58140 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0
2003-08-22 04:08:16 +03:00
monty@narttu.mysql.fi
efa85aad49 Move test that uses many tables (in query_cache.test) to separate test so that we can get it 'skipped' instead of 'failed' on system where we can't open many files. 2003-08-22 04:07:40 +03:00
serg@serg.mylan
e3a3d00c77 merged 2003-08-21 21:39:22 +02:00
serg@serg.mylan
7f1ffcc453 Bug #1064: SHOW CREATE TABLE: avoid allocations for simple tables, old client compatibility 2003-08-21 21:14:02 +02:00
serg@serg.mylan
5bc4965d70 fix for SHOW CREATE TABLE to report corerct second field's length 2003-08-21 20:21:07 +02:00
serg@serg.mylan
071ec76892 Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2003-08-21 10:45:43 +02:00
serg@serg.mylan
a72587ffb0 sorted 2003-08-21 10:44:17 +02:00
guilhem@mysql.com
165dc895b3 Yesterday I removed process_io_create_file; I shouldn't have.
Let's say the lack of comments did not help me ;)
Copying it back again and adding comments; now 3.23->4.0
replication of LOAD DATA INFILE works again.
2003-08-21 10:24:37 +02:00
guilhem@mysql.com
f405287beb Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
2003-08-20 23:25:58 +02:00
guilhem@mysql.com
1dd53ed073 First commit for fixing BUG#1100
"LOAD DATA INFILE is badly filtered by binlog-*-db rules".
There will probably be a second final one to merge Dmitri's changes
to rpl_log.result and mine.
2 new tests:
rpl_loaddata_rule_m : test of logging of LOAD DATA INFILE when the master has binlog-*-db rules,
rpl_loaddata_rule_s : test of logging of LOAD DATA INFILE when the slave has binlog-*-db rules and --log-slave-updates.
2003-08-20 23:24:45 +02:00
Sinisa@sinisa.nasamreza.org
e5b841e392 sql_union.cc:
Merge fix
2003-08-20 20:16:37 +03:00
dlenev@mysql.com
319017ae9f Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/dlenev/src/mysql-4.0-bg-1086
2003-08-20 17:25:45 +04:00
monty@narttu.mysql.fi
359846f052 Fixed some varnings from valgrind
Set min value of max_allowed_packet to 1024
Fixed problem with UNION's without braces and SQL_CALC_FOUND_ROWS, LIMIT #,#
and ORDER BY...LIMIT
2003-08-20 16:25:44 +03:00
Sinisa@sinisa.nasamreza.org
84c2e91f1e sql_union.cc:
Fix for SQL_CALC_FOUND_ROWS in UNION's
2003-08-20 16:14:01 +03:00
Sinisa@sinisa.nasamreza.org
fb774125e8 item_func.h:
Fix for a bug with LEAST() in WHERE clause
ha_innodb.cc:
  Fix for a configure bug
multi_update.result, multi_update.test:
  Fix for the update with NULL's in the result set
sql_update.cc:
  Fix for the update with NULL's in the result set
   Fix for the update with NULL's in the result set
   Fix for the update with NULL's in the result set
2003-08-20 15:33:21 +03:00
dlenev@mysql.com
bb96092202 Fix for BUG#1086. Now we don't preserve event's log_pos through
log-slave-updates since this causes unexpected values in 
Exec_master_log_pos in A->B->C replication setup, synchronization
 problems in master_pos_wait()... 
Still this brokes some functionality in sql/repl_failsafe.cc 
(but this file is not used now)
2003-08-20 03:38:31 +04:00
guilhem@mysql.com
6e32e19047 Use my_b_append instead of my_b_write on a SEQ_READ_APPEND cache, when we write
the first 4 bytes of the relay log. Indeed comments in mysys/mf_iocache.c 
say we must always use my_b_append for such a cache.
This *could* avoid a very rare assertion failure which is: 
030524 19:32:38  Slave SQL thread initialized, starting replication in log 'FIRST' at position 0, relay log '/
users/gbichot/4.1.1/mysql-test/var/log/slave-relay-bin.000001' position: 4
030524 19:32:38  next log '/users/gbichot/4.1.1/mysql-test/var/log/slave-relay-bin.000002' is currently active
mysqld: mf_iocache.c:701: _my_b_seq_read: Assertion `pos_in_file == info->end_of_file' failed.
and which seemed to happen always when the SQL thread and/or the I/O thread
were at position 4 in a relay log.
2003-08-19 17:00:36 +02:00
guilhem@mysql.com
1a5c8be408 Fix for BUG#1096 which is:
"mysqlbinlog does not comment the original LOAD DATA INFILE if it has a "use xx""
2003-08-19 15:46:47 +02:00
bell@laptop.sanja.is.com.ua
39a65cd777 Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.0
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0
2003-08-18 01:56:31 +03:00
monty@narttu.mysql.fi
bb837f3506 fixed typo in last push 2003-08-17 14:37:26 +03:00
monty@narttu.mysql.fi
7b13560ce7 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0
2003-08-17 14:10:45 +03:00
monty@narttu.mysql.fi
d79cbc3b99 Fix mutex handling in SHOW_VARIABLES (key_buffer_size was not properly protected)
Changed some non fatal myisamchk error messages to warnings
2003-08-17 14:10:15 +03:00
monty@mashka.mysql.fi
a9146ace70 Cleanups to recent patches
Fix packet error when using wrong GRANT command
2003-08-15 09:54:19 +03:00
bell@laptop.sanja.is.com.ua
e9e5faacfe Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.0
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0
2003-08-15 00:17:43 +03:00
monty@mashka.mysql.fi
fb47e64256 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mashka.mysql.fi:/home/my/mysql-4.0
2003-08-13 13:26:52 +03:00
serg@serg.mylan
bc9f6cde50 Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2003-08-12 15:30:47 +02:00
serg@serg.mylan
147b34e2f4 snprintf compatibility fix 2003-08-12 15:28:36 +02:00
monty@mashka.mysql.fi
2fb441fdf7 Remove wrong bug fix when calling create_sort_index.
Fix possible replication bug with LOAD DATA ... IGNORE LINES #
2003-08-10 05:14:16 +03:00
bell@sanja.is.com.ua
b41599de1c Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0
into sanja.is.com.ua:/home/bell/mysql/bk/work-merged_qc-4.0
2003-08-09 14:16:13 +03:00
serg@serg.mylan
083acc29bb BETWEEN bug fix: non-const expressions on both ends 2003-08-09 01:20:02 +02:00
bell@sanja.is.com.ua
ddd3ee8b27 rewritten test using loop (BUG#930)
removed unused field (now it is in variables)
2003-08-08 23:27:22 +03:00
serg@serg.mylan
df8b7799cb between range optimization bug (between with const on one end only) 2003-08-08 19:13:27 +02:00
monty@mashka.mysql.fi
6e7a509d06 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mashka.mysql.fi:/home/my/mysql-4.0
2003-08-07 20:18:51 +03:00
monty@mashka.mysql.fi
8f08c511ee Review of changesets since last pull.
(Mostly code cleanups)
2003-08-07 20:16:37 +03:00
serg@serg.mylan
86e79ec380 merged 2003-08-07 14:39:34 +02:00
serg@serg.mylan
2fd6684928 Merge bk-internal:/home/bk/mysql-3.23/
into serg.mylan:/usr/home/serg/Abk/mysql
2003-08-07 14:33:56 +02:00
serg@serg.mylan
7da378f1d1 PRIMARY KEY can erroneously have HA_NULL_PART_KEY flag that breaks correct key sorting 2003-08-07 13:39:53 +02:00
serg@serg.mylan
4235268bef fixed password buffer overflow 2003-08-07 11:16:34 +02:00
serg@serg.mylan
73bb79dbea Bug #792 combination of date-interval and between with mixed constant and non-constant 2003-08-06 15:37:22 +02:00
miguel@hegel.local
27fde36d15 Fix an erronous cast for GCC introduced for to fix VC++ compiler error 2003-08-05 22:57:44 -03:00
serg@serg.mylan
3396c1a89d Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2003-08-05 16:30:22 +02:00
serg@serg.mylan
c0317ce66c make it clear for optimizer that XOR's are not optimizable at the moment (BUG#992) 2003-08-05 16:29:09 +02:00
miguel@hegel.local
be123fe5a7 Fix VC++ compiler error 2003-08-04 09:44:26 -03:00