b4105df897
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-bg4302
2004-08-20 19:30:45 +04:00
02e93b5758
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/mysql_src/mysql-4.0
2004-08-20 17:16:03 +02:00
5db56a106b
Making FLUSH TABLES WITH READ LOCK block COMMITs of existing transactions,
...
in a deadlock-free manner. This splits locking the global read lock in two steps.
This fixes a consequence of this bug, known as:
BUG#4953 'mysqldump --master-data may report incorrect binlog position if using InnoDB'
And a test.
2004-08-20 16:35:23 +02:00
c8882165f3
Fix for bug#4302 "ambiguos order by when renamed column is identical to another in result"
...
When in find_item_in_list() we are looking for item we should take into account unaliased
names of the fields but only if item with such aliased name is not found.
Also we should ignore aliases when looking for fully specified field.
2004-08-20 17:53:46 +04:00
ce65325320
Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1
...
into deer.(none):/home/hf/work/mysql-4.1.clean
2004-08-20 15:39:26 +05:00
833d285c67
Fix to make range.test work smoothly --without-innidb
2004-08-20 14:29:28 +05:00
6f8ebb4798
Merge mskold@build.mysql.com:/home/bk/mysql-4.1-ndb
...
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
2004-08-20 06:51:02 +02:00
62722e7b05
merged
2004-08-20 00:52:43 +02:00
22546845f2
Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-08-19 23:45:44 +02:00
0db5b4d202
(manual port from 4.0 - was needed)
...
Fix for BUG#4971 "CREATE TABLE ... TYPE=HEAP SELECT ... stops slave (wrong DELETE in binlog)":
replacing the no_log argument of mysql_create_table() by some safer method
(temporarily setting OPTION_BIN_LOG to 0) which guarantees that even the automatic
DELETE FROM heap_table does not get into the binlog when a not-yet-existing HEAP table
is opened by mysql_create_table().
2004-08-19 23:24:35 +02:00
b81af1c750
less strict assert to take into account weird cases
2004-08-19 23:10:33 +02:00
ba924c0a40
Merge mskold@build.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1-ndb
2004-08-19 21:37:58 +02:00
68bc1c28a4
Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-08-19 18:42:01 +02:00
a29c9d3707
Bug #4769 - ft in subqueries
2004-08-19 18:40:15 +02:00
d81136e3e1
Bug 4531: unique key prefix interacts poorly with utf8
...
Check HEAP+HASH, binary collation
2004-08-19 16:07:18 +05:00
a7510c70fc
Fix trailing spaces behaviour for binary collation.
2004-08-19 15:21:35 +05:00
2496e85b84
Bug#4521: unique key prefix interacts poorly with utf8.
...
Fix for binary collations for MyISAM and HEAP BTREE.
This patch also changes trailing spaces behaviour for
binary collations. Binary collations now have PAD
characteristic too.
2004-08-19 15:15:10 +05:00
6b90806a4a
ctype_utf8.test, ctype_utf8.result:
...
Typo fix
2004-08-19 15:00:55 +05:00
59c9bcb366
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1-ndb
2004-08-19 11:13:49 +02:00
7f92905954
Bug#5081: UCS2 fields are filled with '0x2020' after extending field length
2004-08-19 11:59:33 +05:00
3f2210c064
after merge fixes
2004-08-19 03:02:09 +02:00
6f8f231c35
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/mysql_src/mysql-4.0
2004-08-19 00:43:48 +02:00
42d30b758b
Fix for BUG#4971 "CREATE TABLE ... TYPE=HEAP SELECT ... stops slave (wrong DELETE in binlog)":
...
replacing the no_log argument of mysql_create_table() by some safer method
(temporarily setting OPTION_BIN_LOG to 0) which guarantees that even the automatic
DELETE FROM heap_table does not get into the binlog when a not-yet-existing HEAP table
is opened by mysql_create_table().
2004-08-19 00:29:11 +02:00
e1237cbc53
manually merged
2004-08-18 19:57:55 +02:00
3e1493b84b
Fix for WL#1731 Handler: multiple databases
2004-08-18 19:13:39 +02:00
8ce92878a2
Bug 4937: different date -> string conversion when using
...
SELECT ... UNION and INSERT ... SELECT ... UNION
2004-08-18 14:46:31 +02:00
e0731bad9e
func_like.result:
...
LIKE crashed mysqld for binary collations in some cases
2004-08-18 12:11:26 +05:00
f60b356f5f
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/dbdata/psergey/mysql-4.1-root
2004-08-18 02:16:43 +04:00
fdb51f67a2
Fix for bug#4488: sign-aware equality check
2004-08-17 02:59:24 +04:00
79a3576f7d
ctype_utf8.test:
...
Bug#4521: unique prefix keys, fix for HEAP HASH and HEAP BTREE case insensitive collations.
2004-08-16 19:58:50 +05:00
e51de97ebe
Merge mysql.com:/home/jonas/src/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-08-15 18:58:02 +02:00
2fb2ee6f8f
Adding test cases for the example storage engine (so that you can test to see if it was built correctly).
2004-08-13 17:14:36 -07:00
b7b48d6764
Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into avenger.(none):/export/brian/tina-4.1
2004-08-13 16:27:17 -07:00
68f193f97d
Merge
2004-08-13 18:31:30 +02:00
cd7276689e
apply UNIQUE constrain correctly for multi-byte charsets
...
only MyISAM is fixed
2004-08-13 18:29:25 +02:00
1c8b328e16
CSC issue # 3299 fix:
...
ENUM and SET type didn't compute their length correctly.
That showed up for example while converting into a CHAR column.
2004-08-13 19:06:24 +05:00
40577d587d
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1-ndb
2004-08-13 14:34:51 +02:00
7c6b884ef5
Added support for NULL in unique index
2004-08-13 13:51:18 +02:00
8186470b6b
ctype_utf8.result, ctype_utf8.test, item_strfunc.cc:
...
LEFT() didn't work well in some cases.
2004-08-13 15:04:10 +05:00
eb5f9437f1
ctype_utf8.result, ctype_utf8.test, mi_key.c:
...
bug 4521: unique key prefix interacts poorly with utf8: fixed length key fix.
2004-08-13 12:32:27 +05:00
0ce931947e
skip resolving field in table list if table list is not accessable due to groupping (BUG#4814)
2004-08-13 10:01:30 +03:00
186e6cb2d6
ctype_ucs.result, ctype_ucs.test, item.cc:
...
#5024 [Ver]: Server crashes with queries on fields with certain charset/collation settings
2004-08-13 11:13:56 +05:00
1fe8b35bba
This is the addition of the CSV engine "aka tina". Its an example engine that works as a plain text file.
2004-08-12 20:57:18 -07:00
698a88b15d
Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into eagle.mysql.r18.ru:/home/vva/work/BUG_4358/mysql-4.0
2004-08-13 02:27:21 +05:00
3681594d08
Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0
...
into eagle.mysql.r18.ru:/home/vva/work/BUG_4358/mysql-4.0
2004-08-13 02:25:50 +05:00
3fdc2999b7
Merge mysql.com:/home/jonas/src/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-08-12 20:31:00 +02:00
eb1a82b25d
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-4.1
2004-08-12 20:43:14 +05:00
fad7a5643a
#4521 : unique key prefix interacts poorly with utf8
...
Fix for MyISAM with prefix compressed keys.
2004-08-12 20:39:24 +05:00
d372284d09
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
2004-08-12 18:38:29 +03:00
5406709672
fixed Bug #4358 Problem with HAVING clause that uses alias
...
from the select list and TEXT field
make setup_copy_fields to insert Item_copy_string for blobs in
the beginning of the copy_funcs (push_back instead of push_front)
the thing is that Item_copy_string::copy for function can call
Item_copy_string::val_int for blob via Item_ref.
But if Item_copy_string::copy for blob isn't called before,
it's value will be wrong.
So all the Item_copy_string::copy for blobs should be called before
Item_copy_string::copy for functions.
2004-08-12 20:37:31 +05:00
