monty@narttu.mysql.fi
6056cfadfc
Merge with 4.0.16
2003-10-07 15:42:26 +03:00
bell@laptop.sanja.is.com.ua
18bb43671d
Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-all_any_group-4.1
2003-10-07 01:31:16 +03:00
monty@narttu.mysql.fi
446d40e880
After merge fixes
2003-10-07 00:23:29 +03:00
bell@laptop.sanja.is.com.ua
e527f268d5
fixed error names
2003-10-06 22:35:05 +03:00
bell@laptop.sanja.is.com.ua
e1b53fdd42
Merge
2003-10-06 20:55:06 +03:00
bell@laptop.sanja.is.com.ua
ba26a1aa64
fix error messages
...
fix derived inside subqueries
2003-10-06 13:16:56 +03:00
bell@laptop.sanja.is.com.ua
179acaa37e
Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-derived-4.1
2003-10-06 12:04:08 +03:00
bell@laptop.sanja.is.com.ua
16733e423e
prohibited using derived tables in UPDATE command (BUG#1477)
...
fixed incorrect table name in test
2003-10-05 21:09:50 +03: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
guilhem@gbichot2
6bbf52d2ac
Fix for a rpl_relayrotate failure.
...
Changed Rotate_log_event::exec_event() to not increment positions when the
event is seen in the middle of a transaction.
2003-10-03 20:07:08 +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
guilhem@mysql.com
b95e3911a2
Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
...
into mysql.com:/home/mysql_src/mysql-4.1
2003-10-02 16:26:39 +02:00
guilhem@gbichot2
d099c0ed40
Had mangled the order of if()s in a previous changeset (1.1596) (not pushed),
...
correcting it now. Thanks Dmitri for spotting this.
2003-10-02 16:19:33 +02:00
guilhem@gbichot2
2f11e5d1d3
fix for BUG#1331: "Unexistent user variable is not replicated".
...
When an update query is to be written to the binlog, and it reads unset
user variables (example: INSERT INTO t VALUEs(@a) where @a does not exist),
we create the variable like if it had been set with SET before, and we loop
(i.e. we redo the steps of logging, now that the variable exists).
2003-10-02 10:31:37 +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
paul@teton.kitebird.com
95dffdb956
Subselect -> subquery
2003-09-30 11:40:15 -05: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
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
4fedb81eda
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/dlenev/src/mysql-4.1-rplunt
2003-09-26 17:55:10 +04:00
dlenev@dlenev.mshome
3f586da948
Fixed spurios failures of rpl_until test.
2003-09-26 17:42:05 +04: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
bar@bar.mysql.r18.ru
d5d4923107
LPAD and RPAD test with UCS2 was added.
2003-09-25 18:06:39 +05:00
bar@bar.mysql.r18.ru
ebbc1dc13e
LPAD() and RPAD() are now multibyte-compatible
2003-09-25 17:31:20 +05: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
5e07599ebe
#1169 : Add --exec command to mysqltest
2003-09-24 16:13:47 +05:00
bar@bar.mysql.r18.ru
52bb4efcdd
regexp worked only with the default character set.
...
Now it can work with any character set.
2003-09-24 13:57:26 +05:00
dlenev@mysql.com
b8c07da057
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/dlenev/src/mysql-4.1-868
2003-09-23 13:28:48 +04:00
bar@bar.mysql.r18.ru
147046367e
Merge abarkov@build.mysql.com:/home/bk/mysql-4.1
...
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
2003-09-22 17:28:19 +05:00
bar@bar.mysql.r18.ru
1faafac4fd
Bug 1181 fix. LIKE didn't work with UCS2 character set.
2003-09-22 17:18:47 +05:00
dlenev@mysql.com
5bba265e0e
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/dlenev/src/mysql-4.1-868
2003-09-22 11:00:51 +04:00
ram@gw.mysql.r18.ru
6312ad254c
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into gw.mysql.r18.ru:/usr/home/ram/work/4.1
2003-09-22 11:39:29 +05:00
dlenev@mysql.com
467f66532a
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/dlenev/src/mysql-4.1-868
2003-09-20 23:57:11 +04: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
bar@bar.mysql.r18.ru
acf5ba7d59
New test for UTF8 functionality
2003-09-19 16:59:14 +05:00
bar@bar.mysql.r18.ru
e0a0790ebb
Fixed that multibyte charsets didn't honor multibyte
...
sequence boundaries in functions LIKE and LOCATE in
the case of "binary" collation. Comparison was done
like if the strings were just a binary strings without
character set assumption.
2003-09-19 15:18:19 +05:00
ram@gw.mysql.r18.ru
28c92200fb
Test for mysqldump
2003-09-19 14:02:49 +05:00
ram@gw.mysql.r18.ru
50254237de
Fix for the bug #1333 : COMPRESS(NULL) segfaults.
2003-09-19 12:25:03 +05:00
kostja@oak.local
6fba16eabf
Applied Monty corrections to the FULL SCAN
...
optimiser bug patch.
2003-09-17 21:52:05 +04:00
bell@sanja.is.com.ua
fb48eaaa81
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-union-4.1
2003-09-17 14:55:27 +03: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
bar@bar.mysql.r18.ru
fb4f5e7d42
Bug fix:
...
SET character_set_connection=newcharset;
SELECT hex('text');
The above sequence failed in some cases.
2003-09-16 17:14:23 +05:00
bar@bar.mysql.r18.ru
1932b40c13
UCS tests
2003-09-16 16:26:33 +05:00
bar@bar.mysql.r18.ru
83c6946232
Bug fix:
...
http://bugs.mysql.com/bug.php?id=1264
2003-09-16 15:43:17 +05:00