joreland@mysql.com
af7c3008db
Merge mysql.com:/home/jonas/src/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-08-27 14:11:50 +02:00
tomas@poseidon.(none)
698511bfe4
small fixes
2004-08-27 12:11:49 +00:00
joreland@mysql.com
6df66180bd
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-4.1
2004-08-27 01:01:47 +02:00
joreland@mysql.com
95e5b457b8
Fix ordered index scan with partially specified key
2004-08-27 00:59:16 +02:00
serg@serg.mylan
acbf96a161
Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-08-26 17:49:16 +02:00
monty@mysql.com
ceba1429b7
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2004-08-26 18:27:33 +03:00
monty@mysql.com
ea687ba5da
Portability fixes
...
Fixed bug in end space handle for WHERE text_column="constant"
2004-08-26 18:26:38 +03:00
tomas@poseidon.(none)
50cee6abc8
ndb cluster config fixes, se respective files
2004-08-26 14:35:33 +00:00
serg@serg.mylan
b4bb38e896
merged
2004-08-26 15:19:46 +02:00
ram@gw.mysql.r18.ru
2a29cb0204
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b5219
2004-08-26 16:54:33 +05:00
ram@gw.mysql.r18.ru
2133721ac6
A fix (Bug#5219: Cannot use '||' with MBRContains(..)).
2004-08-26 16:51:26 +05:00
bar@mysql.com
87537752e2
"SELECT BINARY x" now means "SELECT CAST(x AS BINARY)".
2004-08-26 16:31:37 +05:00
rburnett@build.mysql.com
1e0e96a0d2
Test case for Bug #4792 lower_case_table_names does not resolve db.tbl.column in SELECT list
...
lowercase_table.result:
New results for modified lowercase_table test
lowercase_table.test:
Added test case for all uppercase database when running under lower_case_table_names. This really only failed under Windows. Bug# 4792
2004-08-25 17:25:38 +02:00
tomas@poseidon.(none)
646153819c
minor fixes
2004-08-24 23:31:47 +00:00
tomas@poseidon.(none)
c16f134be3
Merge
2004-08-24 22:35:14 +00:00
tomas@poseidon.(none)
0f8dc70610
ndb config ability/naming changes, see respective file
2004-08-24 22:27:33 +00:00
mskold@mysql.com
a2bcb2a558
Cleaned up rnd_init
2004-08-24 23:13:32 +02:00
serg@serg.mylan
1538c318c9
Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-08-24 22:37:04 +02:00
serg@serg.mylan
19f7592206
Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-08-24 22:37:03 +02:00
tomas@poseidon.(none)
c81df5a0ae
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.(none):/home/tomas/mysql-4.1-clean
2004-08-24 20:37:03 +00:00
joreland@mysql.com
7a3d0c83fa
Merge mysql.com:/home/jonas/src/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-08-24 21:07:08 +02:00
konstantin@mysql.com
522a27069f
Merge: manual resolve
2004-08-24 23:07:08 +04:00
tomas@poseidon.(none)
0483eb8139
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.(none):/home/tomas/mysql-4.1-clean
2004-08-24 19:07:08 +00:00
serg@serg.mylan
8f254c1b7b
followup
2004-08-24 18:20:27 +02:00
konstantin@mysql.com
ae18dc3ec8
Fix for Bug#5034 "prepared "select 1 into @arg15", second
...
execute crashes server": we were deleting lex->result
after each execute, but prepared statements assumed that
it's left intact.
The fix adds cleanup() method to select_result hierarchy,
so that result objects can be reused.
Plus we now need to delete result objects more wisely.
2004-08-24 20:17:11 +04:00
serg@serg.mylan
8f2d92c56a
manually merged
2004-08-24 17:24:23 +02:00
serg@serg.mylan
a302f88eb9
Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-08-24 17:24:05 +02:00
vva@eagle.mysql.r18.ru
b076665030
Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1
...
into eagle.mysql.r18.ru:/home/vva/work/BUG_4998/mysql-4.1
2004-08-24 20:18:39 +05:00
tomas@poseidon.(none)
aae0b7ed65
added alias MYSQLD for API
...
added choice of : or = in config file
set case insensitive section names
2004-08-24 14:41:48 +00:00
serg@serg.mylan
50ee43be43
BDB: Bug#4531: unique key prefix interacts poorly with utf8,
...
Bug#4594 column index make = failed for gbk
2004-08-24 15:32:57 +02:00
gluh@gluh.mysql.r18.ru
1786a388e4
Fix for bug #4340 : find_in_set is case insensitive even on binary operators(2nd version)
2004-08-24 17:29:08 +04:00
joreland@mysql.com
6163efe1ac
merge
2004-08-24 13:29:11 +02:00
hf@deer.(none)
b22a499d42
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into deer.(none):/home/hf/work/mysql-4.1.emb
2004-08-24 16:29:05 +05:00
tomas@poseidon.(none)
c5bf129e9c
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.(none):/home/tomas/mysql-4.1-clean
2004-08-24 11:29:04 +00:00
tomas@poseidon.(none)
5a24844551
some more printouts to SHOW command
2004-08-24 11:28:19 +00:00
hf@deer.(none)
cce03195dc
Merging fix
2004-08-24 15:03:44 +05:00
hf@deer.(none)
43a853dd4d
Merging
2004-08-24 12:58:21 +05:00
bell@sanja.is.com.ua
9d71f85121
subselect test split on two tests because gis extention can be absent
2004-08-24 10:15:39 +03:00
bell@sanja.is.com.ua
3b65ce7489
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-bugs-4.1
2004-08-23 22:32:38 +03:00
bell@sanja.is.com.ua
6fcd27e9cd
after review fixes:
...
allowed parsing of table fields inside aggregate functions
added new tests of fields resolving in grouping
2004-08-23 22:31:01 +03:00
lenz@mysql.com
871625c5d5
Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/space/my/mysql-4.1
2004-08-23 21:03:16 +02:00
lenz@mysql.com
0479919884
- removed mysql-test/t/flush_block_commit-master.opt as it collided
...
with the sleep value we use for the test suite run during the
release builds
2004-08-23 20:58:56 +02:00
tomas@poseidon.(none)
c8d9149ff0
Merge poseidon.(none):/home/tomas/mysql-4.1
...
into poseidon.(none):/home/tomas/mysql-4.1-ndb-merge
2004-08-23 18:54:29 +00:00
tomas@poseidon.(none)
a1e0046cbf
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.(none):/home/tomas/mysql-4.1
2004-08-23 18:47:37 +00:00
mskold@mysql.com
9ad2448606
Merge mskold@build.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
2004-08-23 20:33:38 +02:00
tomas@poseidon.(none)
c3f2f7426c
further simplifications of ndb config and aligned usage of mysql datadir in ndb
2004-08-23 16:29:04 +00:00
gluh@gluh.mysql.r18.ru
b1847f471c
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into gluh.mysql.r18.ru:/home/gluh/MySQL-BUGS/mysql-4.1
2004-08-23 20:18:24 +04:00
gluh@gluh.mysql.r18.ru
7b17daf21e
Fix for bug #5134 : WHERE x = 'bar' AND x LIKE BINARY 'bar' returns wrong results(for 4.1 tree)
2004-08-23 20:17:14 +04:00
vva@eagle.mysql.r18.ru
237615bc53
fixed a Bug #4998 "--protocol doesn't reject bad values"
2004-08-23 20:55:09 +05:00
mskold@mysql.com
c644595dac
Fix for bug#5171
2004-08-23 17:24:03 +02:00