vva@eagle.mysql.r18.ru
c74da8bbd7
added checking for empty index name (fixed bug #1419 )
2003-10-16 11:33:44 -04:00
monty@mashka.mysql.fi
6ad94a6d57
Fix test after merge
2003-10-16 08:34:17 +03:00
monty@mashka.mysql.fi
e87c9f5ff8
merge with 4.0
2003-10-16 03:08:40 +03:00
monty@mashka.mysql.fi
0d34e50f39
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mashka.mysql.fi:/home/my/mysql-4.1
2003-10-15 22:52:31 +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
gluh@gluh.mysql.r18.ru
9c2867c2d4
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into gluh.mysql.r18.ru:/home/gluh/mysql-4.1.max
2003-10-15 14:51:56 +05:00
gluh@gluh.mysql.r18.ru
9e401712a0
WL#1106: Switch = --maxdb rather than --sapdb
2003-10-15 14:50:36 +05:00
monty@mashka.mysql.fi
e71b53a8fe
merge with 4.0 to get fix for SET enum_system_variable=NULL
2003-10-14 16:34:09 +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
461d1627b3
merge with 4.0 for more memory allocation variables.
2003-10-13 15:50:30 +03:00
bell@sanja.is.com.ua
628d2e4a7c
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-group_concat-4.1
2003-10-13 09:49:47 +03:00
serg@serg.mylan
32fed1e877
wrong ER_TOO_BIG_FOR_UNCOMPRESS error in UNCOMPRESS() fixed.
...
typo in error message text corrected.
new tests added
2003-10-12 15:16:45 +02:00
bell@laptop.sanja.is.com.ua
8f5c3f3981
fixed fix_fields() parameters for GROUP_CONCAT() ORDER BY clause
...
(BUG#1537)
2003-10-12 16:10:40 +03:00
monty@mashka.mysql.fi
c60a75e9ba
Add warnings for single line inserts. To do this I had to convert count_cuted_fields to an enum (to be able to detect setting a NOT NULL field to NULL)
2003-10-11 23:26:39 +03: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@gbichot2
d6d6c5e1bb
Don't show Slave_IO_State in the testsuite (replace it with #) because it can't be predicted.
...
I manually edited rpl_openssl.result because the test is skipped on my
machine. Hope it's correct.
2003-10-09 18:16:15 +02:00
guilhem@gbichot2
c0075fa64b
Final push for WL#1098:
...
"Add a column "Timestamp_of_last_master_event_executed" in SHOW SLAVE STATUS".
Finally this is adding
- Slave_IO_State (a copy of the State column of SHOW PROCESSLIST for the I/O thread,
so that the users, most of the time, has enough info with only SHOW SLAVE STATUS).
- Seconds_behind_master. When the slave connects to the master it does SELECT UNIX_TIMESTAMP()
on the master, computes the absolute difference between the master's and the slave's clock.
It records the timestamp of the last event executed by the SQL thread, and does a
small computation to find the number of seconds by which the slave is late.
2003-10-09 00:06:21 +02:00
vva@eagle.mysql.r18.ru
6f96749cca
fixed temp directory for mysqlbinlog (was wrong on solaris)
2003-10-08 17:15:59 -04:00
guilhem@mysql.com
324ff6dedf
Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
...
into mysql.com:/home/mysql_src/mysql-4.1
2003-10-08 20:53:07 +02:00
monty@narttu.mysql.fi
d37a5c4dd7
Indentation cleanups
...
Remove wait_if_global_read_lock on commit as this can cause deadlocks
2003-10-08 21:50:05 +03:00
monty@narttu.mysql.fi
dc6f07256c
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into narttu.mysql.fi:/my/mysql-4.1
2003-10-08 18:55:34 +03:00
monty@narttu.mysql.fi
9e57c12b5a
Fixed bug in error handling of CREATE ... SELECT
...
More tests cases
After merge fixes
2003-10-08 18:53:31 +03:00
monty@narttu.mysql.fi
246febee42
merge with 4.0 to get fix for mysqlbinlog
2003-10-08 12:05:27 +03:00
monty@narttu.mysql.fi
d9ff665102
Fixes after merge
2003-10-08 12:01:58 +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
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
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
6056cfadfc
Merge with 4.0.16
2003-10-07 15:42:26 +03: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
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
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@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
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