Commit graph

2935 commits

Author SHA1 Message Date
kostja@oak.local
4aedeb3a60 Merge oak.local:/home/kostja/mysql/mysql-4.0-root
into oak.local:/home/kostja/mysql/mysql-4.0-1274
2003-10-17 18:44:13 +04:00
guilhem@mysql.com
ce6d736714 A fix for a random test failure rpl_trunc_binlog: don't RESET MASTER
while the slave is connected.
2003-10-17 00:00:25 +02:00
bell@sanja.is.com.ua
857b7a80a3 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0
into sanja.is.com.ua:/home/bell/mysql/bk/work-qc_crash-4.0
2003-10-16 21:17:45 +03:00
monty@mashka.mysql.fi
b1dba93cdb Safety fix to detect multiple calls to my_thread_end()
Portability fix (For Mac OS X)
2003-10-16 20:55:15 +03:00
kostja@oak.local
c7d8977f43 fix for one of the bugs spotted by #1274 2003-10-16 17:00:09 +04:00
monty@mashka.mysql.fi
f2884bac40 Changing max_insert_delayed_threads now also changes the size of thread alarm buffer. 2003-10-16 07:44:18 +03:00
monty@mashka.mysql.fi
84d9d98078 Better fix for CREATE TABLE IF NOT EXISTS ... SELECT
Fixed chsize() problem on windows
Extend default timeout on windows clients to 1 year (to avoid timeout problems)
2003-10-15 21:41:13 +03:00
monty@mashka.mysql.fi
35c09b8082 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mashka.mysql.fi:/home/my/mysql-4.0
2003-10-15 16:23:01 +03:00
monty@mashka.mysql.fi
b5849f451d Add more information about memory usage to debug log 2003-10-15 15:21:50 +03:00
monty@mashka.mysql.fi
2d3840f550 Fixed bug in SET enum_system_variable=NULL 2003-10-14 16:30:42 +03:00
serg@serg.mylan
f078e50a6b make LOCK TABLES to work when Lock_tables_priv is granted on the DB level and Select_priv is granted on the table level. 2003-10-14 13:10:41 +02:00
serg@serg.mylan
f3e7012d6e Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2003-10-14 00:27:04 +02:00
monty@mashka.mysql.fi
c95d142f8f Add new user variables for tuning memory usage:
query_alloc_block_size, query_prealloc_size, range_alloc_block_size,transaction_alloc_block_size and transaction_prealloc_size
Add more checks for "out of memory" detection in range optimization
2003-10-11 22:00:24 +03:00
guilhem@mysql.com
b2500829a3 Make the slave die if master is 5.0. Indeed, 5.0 masters send
a Format_description_log_event (or maybe it will be named
Description_log_event) which is not recognized by 4.0, so
a 4.0 can't be a slave of 5.0. We detect it early to produce
a helpful message instead of "corrupted relay log" later.
2003-10-09 17:40:38 +02:00
serg@serg.mylan
9d198d35bf merged 2003-10-07 20:41:07 +02:00
vva@eagle.mysql.r18.ru
16b8fd8ece Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0
into eagle.mysql.r18.ru:/home/vva/work/BUG_1323/mysql-4.0
2003-10-07 14:41:04 -04:00
monty@narttu.mysql.fi
446d40e880 After merge fixes 2003-10-07 00:23:29 +03:00
serg@serg.mylan
b58098c3b9 bug #1434 (and related issues) 2003-10-06 20:02:27 +02:00
serg@serg.mylan
2667d7f8cc fix_max_connections to resize alarm_queue (Bug #1435) 2003-10-06 14:11:16 +02:00
serg@serg.mylan
0ce865b6b4 Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2003-10-06 09:24:12 +02:00
vva@eagle.mysql.r18.ru
af3184909c Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0
into eagle.mysql.r18.ru:/home/vva/work/BUG_1323/mysql-4.0
2003-10-03 17:55:57 -04:00
vva@eagle.mysql.r18.ru
795e14871d Fixed bug #1323 (varchar fields becoming char fields adter create ... select) 2003-10-03 17:54:32 -04:00
guilhem@mysql.com
ae054504e3 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
2003-10-03 22:18:34 +02:00
guilhem@mysql.com
52ae1609eb When the I/O thread was stopped while copying a long transaction, and restarted,
Rotate_log_event::exec_event() believed that the relay log was corrupted. Fixed it
by moving the test for corruption to Start_log_event::exec_event(). 
Changed Rotate_log_event::exec_event() to not increment positions when the
event is seen in the middle of a transaction.
I did a separate commit in 4.1 (so this should not be merged to 4.0) because
code is a bit different in 4.1.
A test to see if the slave detects when the master died while writing a 
transaction to the binlog (uses a forged truncated binlog I made).
2003-10-03 22:13:01 +02:00
monty@mishka.mysql.fi
3216d0559c Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mishka.mysql.fi:/home/my/mysql-4.0
2003-10-03 00:42:47 +03:00
monty@mishka.mysql.fi
989ca397b2 Optimized code for setting user variables with := and fixed some bugs in old code (Bug #1194)
Use forced close of socket to make mysqld shutdown faster when used under valgrind
2003-10-03 00:40:27 +03:00
guilhem@mysql.com
9f4d29c3f3 Reverting changeset 1.1590 2003-10-02 16:25:47 +02:00
bell@laptop.sanja.is.com.ua
267444b95a Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-qc_crash-4.0
2003-10-02 16:33:50 +03:00
guilhem@mysql.com
8c13c30142 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
2003-10-01 18:46:24 +02:00
guilhem@mysql.com
301a30cbdd Follow-up of an IRC discussion today. Declaring ignore_log_space_limit volatile,
and a comment to explain why.
2003-10-01 18:40:27 +02:00
vva@eagle.mysql.r18.ru
14a2466532 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0
into eagle.mysql.r18.ru:/home/vva/work/BUG_1194/mysql-4.0
2003-10-01 12:22:30 -04:00
vva@eagle.mysql.r18.ru
761c790636 turn Item_func_set_user_var
::native_val, ::native_val_int and native_val_str into inline
2003-10-01 12:00:08 -04:00
vva@eagle.mysql.r18.ru
fd835da6ec rewrite Item_func_set_user_var ::val, ::val_str, ::val_int, ::update
with less code duplication
2003-09-30 12:32:48 -04:00
lenz@mysql.com
9b8b92faff - enable changing the number of table bits for JOINs to be increased
from ulong to ulonglong by defining -DBIG_JOINS
2003-09-29 12:01:10 +02:00
monty@narttu.mysql.fi
89f30200bc Removed random chars after filename for LOAD DATA INFILE (in mysqlbinlog)
Add quoting for use `database` for mysqlbinlog
Removed test ins0000001
Add support for --replace for exec in mysqltest
Don't refer to install dir in mysqlbinlog.result
2003-09-29 12:31:35 +03:00
serg@serg.mylan
8c7c4de0b4 enum options renamed to avoid possible name conflicts 2003-09-29 11:21:17 +02:00
guilhem@mysql.com
9d7014c07b Fix for BUG#1345 "SQL Syntax Error in binarylog with DROP TABLES":
it's just backquoting the db's and table's names
when writing DROP TEMPORARY TABLE to the binlog when a connection ends.
A testcase for this.
2003-09-28 18:31:49 +02:00
guilhem@mysql.com
7dbbd82f13 Fix for 64-bit machines.
I am almost sure this is the cause for
BUG#1381 [Opn]: Bug in replication on HP-UX 64 bit binaries?
BUG#1256 [CRp]: Replication slave fails to connect to master in 64-bit version (Solaris)
The reason why I think it's wrong is that the normal client code has 
uint32 ip_addr.
(of course on 32-bit machines it does not matter, but on 64-bit it does).
2003-09-26 23:43:22 +02:00
vva@eagle.mysql.r18.ru
fd2925b7c7 fixed bug #1194
(changes in Item_func_set_user_var::update, ::val, ::val_str, ::val_int)
2003-09-24 19:30:20 -04:00
guilhem@mysql.com
e4c7496c14 a small comment about why we call end_io_cache in mysql_load 2003-09-25 00:24:06 +02:00
guilhem@mysql.com
c5242d2f46 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
2003-09-25 00:15:47 +02:00
guilhem@mysql.com
9854acae25 Fix for BUG#1391:
"If LOAD DATA INFILE 'small_file' fails on master, slave leaves temp files"
(the bug is in the master)
2003-09-25 00:14:46 +02:00
dlenev@mysql.com
7795de8906 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/dlenev/src/mysql-4.0-bgrn
2003-09-25 01:25:54 +04:00
dlenev@mysql.com
7826fce264 Fixed BUG#1357 MySQL too eagerly cleanups temporary files for LOAD DATA (SQL_LOAD-...) 2003-09-25 01:25:19 +04:00
guilhem@mysql.com
b4171fe620 Fix for
Bug #1392 "On Win, slave leaves one temp file after successf. replicating LOAD DATA INFILE"
Windows-specific bug (we forgot to close a file before deleting it).
Patch written by me, tested by Miguel (thanks!) and it works.
2003-09-24 22:55:04 +02:00
dlenev@mysql.com
ef8cd36168 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/dlenev/src/mysql-4.0-opssl
2003-09-20 23:13:31 +04:00
serg@serg.mylan
02753ead71 Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2003-09-18 14:35:25 +02:00
kostja@oak.local
6fba16eabf Applied Monty corrections to the FULL SCAN
optimiser bug patch.
2003-09-17 21:52:05 +04:00
kostja@oak.local
de3019c61a comment made more explanatory 2003-09-16 21:20:16 +04:00
kostja@oak.local
29eec6c738 join buffer cache usage/not usage is taken
into account to increase the cost of FULL SCAN
2003-09-16 04:04:54 +04:00