54f9d44b7f
merged
2003-10-30 19:26:57 +01:00
b99fd4beca
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/mysql_src/mysql-4.0
2003-10-30 16:13:38 +01:00
80793657b4
Fix to be able to run
...
mysql-test-run --manager --valgrind
(without this fix, the manager fails to start mysqld and the tests hang).
2003-10-30 16:12:21 +01:00
33346e26af
added code covarage for functions convert(), nullif(), crc32(), is_used_lock(), char_lengtrh(), bit_xor()
...
added string length for more speed
made code covarage for print() method of Item
fixed printability of some items (SCRUM) (WL#1274)
2003-10-30 12:57:26 +02:00
59d0872aa0
Fix for BUG#1686
...
"If 2 master threads with same-name temp table, slave makes bad binlog"
and (two birds with one stone) for
BUG#1240 "slave of slave breaks when STOP SLAVE was issud on parent slave
and temp tables".
Here is the design change:
in a slave running with --log-slave-updates, events are now logged with the
thread id they had on the master. So no more id conflicts between master threads,
but introduces id conflicts between one master thread and one normal
client thread connected to the slave. This is solved by storing the server id
in the temp table's name.
New test which requires mysql-test-run to be run with --manager,
otherwise it will be skipped.
Undoing a Monty's change (hum, a chill runs down my spine ;) which was
"Cleanup temporary tables when slave ends" in ChangeSet 1.1572.1.1.
2003-10-29 14:23:35 +01:00
ae380c5855
merge
2003-10-28 12:45:37 +02:00
2efab5b67d
fixed ALL/ANY optimisation with union (BUG#1668)
...
code cleanup
2003-10-27 01:01:27 +02:00
c43ac24bf7
after-merge fix
2003-10-26 22:01:00 +02:00
393838ad61
merge
2003-10-26 19:38:41 +02:00
8cdc27da15
Merge serg.mylan:/usr/home/serg/Abk/mysql-4.1-bug
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2003-10-25 00:03:44 +02:00
6e17f4f20d
fixes to Bitmap class
2003-10-24 22:44:48 +02:00
caa9645c24
Merge
2003-10-24 19:42:39 +03:00
f349adf8de
support 'parallel' updates and rallback of whole statement in case of error in evalueting value which should be assigned
...
(BUG#1484)
2003-10-24 17:28:32 +03:00
944570970d
Merge bk-internal:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2003-10-23 23:11:33 +02:00
6457b89948
added check of cardinality to IN/ALL/ANY subquery transformer
...
(BUG#1638)
2003-10-23 23:54:21 +03:00
4e1920762a
Merge
2003-10-23 23:06:43 +03:00
faea7e0144
Merge
2003-10-23 21:26:06 +03:00
5fb30467ee
Merge
2003-10-23 21:09:40 +03:00
b820d2a347
query expansion for fulltext search
2003-10-23 15:21:06 +02:00
eaf9f35db8
Fix results after merge
2003-10-23 14:04:06 +03:00
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
934fa2a104
Merge
2003-10-22 20:52:47 +03:00
df69309593
MATCH ... AGAINST ("..." WITH QUERY EXPANSION) syntax
2003-10-22 17:57:09 +02:00
f602be8d3f
Fix for bug #1271 : Undefined variable in PASSWORD() function is not
...
handled correctly
2003-10-21 15:14:06 +05:00
f944fd4a65
merged
2003-10-21 11:58:43 +02:00
282b402813
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-count-4.1
2003-10-20 18:18:18 +03:00
e0444dc3be
Test for bug #1022
...
Description: When a table contains a 'float' field, and one of the functions
MAX, MIN, or AVG is used on that field, the system crashes.
2003-10-20 19:13:45 +05:00
c60ef8160f
FULLTEXT: correct charset support (UTF included, UCS2 - not)
...
code cleanup
2003-10-20 15:53:48 +02:00
4bed4abb62
Merge commit
2003-10-20 13:45:28 +05:00
62b0b8b800
Scrum task 835 - text-to-datetime conversion function
2003-10-20 13:24:18 +05:00
9d294b869e
correct table name assigned to temporary table field:
...
- correct table name shown in EXPLAIN Iindex reference)
- pointer on freed memmory (reallocation of table name in reusing table entry) can't be used in EXPLAIN
(BUG#1584)
2003-10-19 14:25:33 +03:00
1db5484577
index name shown (SCRUM) (WL#1274)
2003-10-19 14:22:17 +03:00
2586a56be5
fixed deleting derived table tree after using (BUG#1536)
2003-10-17 15:18:57 +03:00
095db2746e
- Updated rpl_trunc_binlog test result after last change
2003-10-17 02:32:09 +02:00
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
b9dccb34dd
fixed support of used_tables() and const_item() in subqueries
...
(BUG#1444)
2003-10-17 00:36:01 +03:00
1692d2de15
fixed sqlstate for ER_WRONG_INDEX_NAME
...
removed unnesessary code from create.test
2003-10-16 16:15:45 -04:00
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
c74da8bbd7
added checking for empty index name (fixed bug #1419 )
2003-10-16 11:33:44 -04:00
a7bdd19707
subqueries made printable
...
new EXPLAIN parameter to show real query as it was interpreted
(SCRUM) (WL#1274)
2003-10-16 15:54:47 +03:00
6ad94a6d57
Fix test after merge
2003-10-16 08:34:17 +03:00
a3707408e8
Update results after merge
2003-10-16 08:16:39 +03:00
e87c9f5ff8
merge with 4.0
2003-10-16 03:08:40 +03:00
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
9ef2a83fbe
Portability fixes for windows
...
After merge fixes
2003-10-15 22:40:36 +03:00
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
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
50c8b7c13b
stricter checks on FULLTEXT index creating
2003-10-15 13:40:20 +02:00
50d9b95b77
merged
2003-10-15 12:25:44 +02:00
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
