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
bell@laptop.sanja.is.com.ua
9b4018066e
Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-allany_aggregate-4.1
2003-10-08 08:50:57 +03:00
bar@bar.mysql.r18.ru
c5c4e31545
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
2003-10-08 10:19:25 +05:00
bar@bar.mysql.r18.ru
9023009ae3
query_cache.result, query_cache.test:
...
Character set variables test
2003-10-08 10:18:38 +05:00
greg@mysql.com
7a6239640f
Fixed test case to work on NetWare.
2003-10-08 00:19:44 -04:00
guilhem@gbichot2
528b082705
mysql_real_connect picks the Unix login when the user "" is used.
...
This makes the test non-repeatable when running as root.
So I change to not use the "" user, but a random string which will
always result in the @localhost user being selected by the server.
2003-10-07 23:15:13 +02: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
1f8e38d03a
Merge with 4.0 to get fix for mysqlbinlog
2003-10-07 21:41:06 +03: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
bell@laptop.sanja.is.com.ua
1324a97f63
Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-allany_aggregate-4.1
2003-10-07 21:01:57 +03:00
monty@narttu.mysql.fi
b82b76f480
Simple cleanups
2003-10-07 15:44:31 +03:00
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
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
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
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@gbichot2
5e55c4b809
editing comments.
2003-10-03 22:14:23 +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
pem@mysql.telia.com
e8634f80bd
Check that a FUNCTION contains RETURN and that we actually get a return value.
2003-10-03 17:38:12 +02:00
pem@mysql.telia.com
dbf45cbc3c
Fixed BUG#822: Copying and clearing some things in thd/lex when
...
executing sub-statements (selects) prevents crashes intermittent
crashes.
Also fixed bug in sql_yacc.yy (generated a hpop instruction when
not needed).
2003-10-03 12:39:12 +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
serg@serg.mylan
9a057fd0bd
ft1->ft2 auto-conversion on INSERT (WL#725)
2003-10-02 20:22:29 +02: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
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@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
igor@rurik.mysql.com
f17ff0bc39
Many files:
...
Fix after manual merge
2003-10-01 23:37:05 -07:00
igor@rurik.mysql.com
f12cbd4bb8
Manual merge after improving concurrency for key cache reassignment
2003-10-01 20:20:17 -07:00
igor@rurik.mysql.com
17aecac32c
Manual merge after improving concurrency for key cache reassignment
2003-10-01 20:16:36 -07: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
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
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