monty@narttu.mysql.fi
eaf9f35db8
Fix results after merge
2003-10-23 14:04:06 +03:00
monty@narttu.mysql.fi
12009f5d04
Merge with 3.23 to get 4.0 tree in sync (no relevant changes to 4.0 tree)
2003-10-23 13:25:16 +03:00
gluh@gluh.mysql.r18.ru
f602be8d3f
Fix for bug #1271 : Undefined variable in PASSWORD() function is not
...
handled correctly
2003-10-21 15:14:06 +05:00
lenz@mysql.com
095db2746e
- Updated rpl_trunc_binlog test result after last change
2003-10-17 02:32:09 +02: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
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
2d3840f550
Fixed bug in SET enum_system_variable=NULL
2003-10-14 16:30:42 +03: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
vva@eagle.mysql.r18.ru
6f96749cca
fixed temp directory for mysqlbinlog (was wrong on solaris)
2003-10-08 17:15:59 -04:00
monty@mishka.mysql.fi
498e1c6d95
Fixed memory leak in send_file
2003-10-08 21:02:53 +03:00
monty@narttu.mysql.fi
d00d9110ba
Fixed test case that my last patch to mysqlbinlog broke.
...
Changed --remote to --read-from-remote-server (mysqlbinlog)
2003-10-08 10:23:54 +03:00
serg@serg.mylan
9d198d35bf
merged
2003-10-07 20:41:07 +02:00
guilhem@mysql.com
ed5d059202
Fix for a test failure with the standard (no-BDB) binary:
...
as the test is meaningful only if the slave supports transactions,
we require this. As in 4.0 the slave runs with --skip-innodb, we
test for BDB.
2003-10-07 20:41:06 +02:00
monty@narttu.mysql.fi
1b06af3a97
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into narttu.mysql.fi:/my/mysql-4.0
2003-10-07 21:41:05 +03: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
b82b76f480
Simple cleanups
2003-10-07 15:44:31 +03:00
monty@narttu.mysql.fi
446d40e880
After merge fixes
2003-10-07 00:23:29 +03:00
serg@serg.mylan
511589a4f8
results updated
2003-10-06 20:11:39 +02:00
serg@serg.mylan
b58098c3b9
bug #1434 (and related issues)
2003-10-06 20:02:27 +02:00
paul@ice.snake.net
2de4f6b12d
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into ice.snake.net:/Users/paul/mysql-4.0
2003-10-04 17:42:43 -05:00
paul@ice.snake.net
62de13dca3
Ride hobby horse.
2003-10-04 17:41:17 -05: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
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
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
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
guilhem@mysql.com
7234ed2681
fix for a random test failure on hpux/ia64
...
(a missing synchronization in the test)
2003-09-29 22:56:31 +02:00
dlenev@mysql.com
573e5bffbf
Added resetting of replace_result patterns after --exec command in mysqltest (in order to be consistent with ordinary query execution).
2003-09-29 23:10:30 +04: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
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
dlenev@mysql.com
94e9e04250
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/dlenev/src/mysql-4.0-binlog
2003-09-25 20:05:39 +04: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
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
977c7b2d65
Test for mysqlbinlog
...
Particularly for BUG#1340 mysqlbinlog coredumps when reading Exec
event without seeing Create_file event before
2003-09-24 23:25:58 +04:00
ram@gw.mysql.r18.ru
75e89e0af8
Added MYSQL_BINLOG variable.
2003-09-24 16:46:19 +05:00
ram@gw.mysql.r18.ru
5e07599ebe
#1169 : Add --exec command to mysqltest
2003-09-24 16:13:47 +05:00
guilhem@mysql.com
f162eca688
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/mysql_src/mysql-4.0
2003-09-19 19:08:43 +02:00
guilhem@mysql.com
118670017f
removing my chmods so that the test can be run on non-Unix platforms
...
(kind request from the Novell team).
Note that old chmods in rpl_rotate_logs remain.
2003-09-19 19:07:41 +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
048245ae9d
fixed test result to be in sync with the optimiser
2003-09-17 14:00:43 +04:00
kostja@oak.local
a68800954c
Merge oak.local:/home/kostja/mysql/mysql-4.0-root
...
into oak.local:/home/kostja/mysql/mysql-4.0-rightnow
2003-09-16 21:26:26 +04:00
kostja@oak.local
668e7dcec8
select.test cleanup
2003-09-16 20:28:29 +04:00
kostja@oak.local
ab576328f0
Fixed bug in the optimiser for FULL TABLE SCAN case:
...
to estimate correctly cost of full table scan we should take into
account rows read and skipped on each iteration.
2003-09-15 22:21:39 +04:00
bell@sanja.is.com.ua
702b5ad4d6
fixed server crash on moving query block with pointers to same table in it (BUG#988)
...
removed server options
2003-09-15 15:16:13 +03:00
guilhem@mysql.com
59663fc661
* Fix for BUG#1248: "LOAD DATA FROM MASTER drops the slave's db unexpectedly".
...
Now LOAD DATA FROM MASTER does not drop the database, instead it only tries to
create it, and drops/creates table-by-table.
* replicate_wild_ignore_table='db1.%' is now considered as "ignore the 'db1'
database as a whole", as it already works for CREATE DATABASE and DROP DATABASE.
2003-09-11 23:17:28 +02:00