sergefp@mysql.com
6303ca7efa
Fixes in opt_range.cc: ROR plan choice code
...
* Removed unused parameters
* Fixed several cost calculation errors in ror_intersect_add
* Better code structure for ror_intersect_add and get_best_ror_intersect
2005-01-17 00:18:19 +03:00
tomas@poseidon.ndb.mysql.com
b16d58b167
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2005-01-16 21:50:31 +01:00
guilhem@mysql.com
05793bb9b9
Merge
2005-01-16 21:39:21 +01:00
guilhem@mysql.com
6412558d03
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/mysql_src/mysql-4.1-clean
2005-01-16 21:39:20 +01:00
tomas@poseidon.ndb.mysql.com
b34715555f
Makefile.am:
...
Bug#7721
2005-01-16 21:39:19 +01:00
tomas@poseidon.ndb.mysql.com
c0b21df9ec
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2005-01-16 20:13:47 +01:00
serg@serg.mylan
fa38a0d130
Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-01-16 16:41:38 +01:00
serg@serg.mylan
8bea4729fc
initialize mysql->charset in mysql_init
2005-01-16 16:38:38 +01:00
guilhem@mysql.com
1cb5d98d85
When we warn that --log-bin alone is dangerous, we give a suggestion.
2005-01-16 15:46:28 +01:00
guilhem@mysql.com
6cc7f39da0
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/mysql_src/mysql-4.1-clean
2005-01-16 15:14:06 +01:00
guilhem@mysql.com
c30e600081
Merge
2005-01-16 15:10:42 +01:00
reggie@bob.(none)
68c540f090
Bug #7922 prompt \p fails on Windows for shared-memory connections
...
Fixed bug by adding code that displays the contents of mysql.host when \p is added as part of the prompt.
mysql.cc:
Added code to display mysql.host as prompt when using shared memory
2005-01-15 23:19:34 -06:00
serg@serg.mylan
ef58da5435
don't ignore errors in readlink
2005-01-15 20:08:53 +01:00
jimw@mysql.com
65b800736f
Merge bk-internal:/home/bk/mysql-5.0
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-01-15 10:14:34 -08:00
jimw@mysql.com
96f0219de8
Update results after merge
2005-01-15 10:14:12 -08:00
dlenev@brandersnatch.localdomain
31d3aabb49
Porting fix for bug #7586 "TIMEDIFF for sec+microsec not working properly"
...
to 5.0 tree (since it was lost during last merge).
2005-01-15 20:02:46 +03:00
monty@mysql.com
8d616390e9
After merge fixes
...
Fix for BIT(X) field as string
2005-01-15 17:38:43 +02:00
monty@mysql.com
3b0f8cabaf
Merge with global tree
2005-01-15 14:39:16 +02:00
monty@mysql.com
0a1076a25f
Merge with 4.1
2005-01-15 14:09:45 +02:00
monty@mysql.com
97b28521e6
Added ndb_types.h to ignore
2005-01-15 12:36:20 +02:00
monty@mysql.com
a37e91e435
Changed interface for my_strntod() to make it more general and more portable
2005-01-15 12:28:38 +02:00
monty@mysql.com
f34bc883ab
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2005-01-15 12:00:56 +02:00
guilhem@mysql.com
de1ff0698b
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/mysql_src/mysql-5.0-clean
2005-01-15 10:22:05 +01:00
guilhem@mysql.com
09f36a69b9
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/mysql_src/mysql-4.1-clean
2005-01-15 10:21:50 +01:00
igor@rurik.mysql.com
cd577f2590
func_gconcat.result, func_gconcat.test:
...
Added a test case for bug #7769 .
item_sum.h:
Fixed bug #7769 : a crash for queries with group_concat and
having when the query table was empty.
The bug was due an unsafe dereferencing.
2005-01-15 01:05:00 -08:00
monty@mysql.com
7681e62422
Merge
2005-01-15 03:49:07 +02:00
monty@mysql.com
6d280ac161
Fixed possible access to unintialized memory in filesort when using many buffers
2005-01-15 03:47:06 +02:00
serg@serg.mylan
275a9293e4
protect against malicious server trying to crash command-line client :)
2005-01-14 22:46:04 +01:00
serg@serg.mylan
5ebcb21f12
Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-01-14 19:51:29 +01:00
serg@serg.mylan
367bcf8c40
limit HEAP table size with max_heap_table_size, better estimation for mem_per_row
2005-01-14 19:49:45 +01:00
jimw@mysql.com
a66f6b79be
Merge mysql.com:/home/jimw/my/mysql-5.0-6659
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-01-14 10:47:21 -08:00
jimw@mysql.com
bc7f4b2cfe
Merge mysql.com:/home/jimw/my/mysql-4.0-clean
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-01-14 10:45:17 -08:00
jimw@mysql.com
46e444293a
Merge mysql.com:/home/jimw/my/mysql-4.0-7347
...
into mysql.com:/home/jimw/my/mysql-4.0-clean
2005-01-14 10:44:29 -08:00
jimw@mysql.com
bdb36de9ff
Merge
2005-01-14 10:40:05 -08:00
jimw@mysql.com
b6d46b3c4c
Merge
2005-01-14 10:33:07 -08:00
lenz@mysql.com
ff347ae7a2
Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/space/my/mysql-4.1
2005-01-14 19:15:55 +01:00
joerg@mysql.com
790ea71b60
Re-enable running the 'client_test' test case during release builds on the platforms (bug#7909).
2005-01-14 18:57:50 +01:00
lenz@mysql.com
75935d2a8e
- replaced obsoleted "BuildPrereq" with "BuildRequires" in the RPM spec file
2005-01-14 18:20:03 +01:00
tomas@poseidon.ndb.mysql.com
8830ec9a1d
bumped up ndb version
...
compatible with 4.1.9
2005-01-14 16:14:50 +01:00
lenz@mysql.com
57b92c2042
- make sure to enable "--without-ndb-debug" when both --debug and
...
--with-cluster are provided. Yes, this sounds like a contradiction -
enabling debugging in NBD enables code parts that may still reveal
portability issues when compiled with non-gcc compilers. (request by TomasU)
2005-01-14 15:35:32 +01:00
ram@gw.mysql.r18.ru
4b3996d587
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into gw.mysql.r18.ru:/usr/home/ram/work/5.0
2005-01-14 18:32:43 +04:00
ram@gw.mysql.r18.ru
e6510c896b
A fix for bit type.
...
pack_length_in_rec() func has been introduced.
2005-01-14 18:24:32 +04:00
guilhem@mysql.com
2c6738cd7d
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/mysql_src/mysql-5.0-clean
2005-01-14 15:06:53 +01:00
guilhem@mysql.com
8ee8543aa9
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/mysql_src/mysql-4.1-clean
2005-01-14 15:02:05 +01:00
marko@hundin.mysql.fi
080869f995
Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into hundin.mysql.fi:/home/marko/k/mysql-4.1
2005-01-14 15:23:34 +02:00
guilhem@mysql.com
5cafbb6838
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/mysql_src/mysql-4.1-clean
2005-01-14 14:23:34 +01:00
dlenev@mysql.com
acd5a8ef5c
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/dlenev/src/mysql-4.1-dtbug
2005-01-14 16:23:33 +03:00
gluh@gluh.mysql.r18.ru
d28aa5cc15
Backport from 5.0
2005-01-14 16:23:32 +03:00
marko@hundin.mysql.fi
045aea9d92
InnoDB: Remove redundant page_no field from dict_index_t.
...
This completes the patch for fast TRUNCATE TABLE.
2005-01-14 13:54:23 +02:00
marko@hundin.mysql.fi
7ef8a20950
Merge marko@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into hundin.mysql.fi:/home/marko/j/mysql-5.0
2005-01-14 13:06:46 +02:00