lenz@mysql.com
09a71351e0
- Enabled the handling of architecture extensions e.g. "-64bit" when building
...
Mac OS X PKGs with Do-pkg
2005-01-17 17:22:17 +01:00
kaa@polly.local
c46f527454
Fixed memory leak in handle_local_infile()
2005-01-17 19:21:01 +03:00
timour@mysql.com
bb77b2e55f
Fix for BUG#7331 merged manually from 4.1.
2005-01-17 17:19:33 +02:00
timour@mysql.com
50e0474394
Merge mysql.com:/home/timka/mysql/src/4.1-virgin
...
into mysql.com:/home/timka/mysql/src/4.1-bug-7331
2005-01-17 15:46:44 +02:00
tomas@poseidon.ndb.mysql.com
9dbe52bdcf
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2005-01-17 12:53:50 +01:00
tomas@poseidon.ndb.mysql.com
beffd06278
Bug#7937
2005-01-17 12:29:43 +01:00
timour@mysql.com
06fce173c0
Merge mysql.com:/home/timka/mysql/src/4.1-virgin
...
into mysql.com:/home/timka/mysql/src/4.1-bug-7331
2005-01-17 12:41:59 +02:00
bar@deer.(none)
2933cd3d35
user_var.result:
...
after merge fix
2005-01-17 13:58:16 +04:00
bar@deer.(none)
3b7eb23e6b
func_str.result:
...
after merge fix
2005-01-17 13:23:56 +04:00
bar@mysql.com
3d4714424c
Merge
2005-01-17 12:30:12 +04:00
bar@mysql.com
e7e5e8b1e7
user_var.result, func_str.result, item_strfunc.cc:
...
bug#7839 ncorrect collation for char(ascii('a'))
2005-01-17 10:38:35 +04:00
paul@kite-hub.kitebird.com
3b9c5f3a17
mysqldump.c:
...
Move out-of-order option.
2005-01-17 00:09:47 -06:00
bar@mysql.com
d91cd61a4b
Merge mysql.com:/usr/home/bar/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-5.0
2005-01-17 09:30:30 +04:00
bar@mysql.com
308aec1526
libmysql.c:
...
bug#7891: mysql_character_set_name() returns collation
2005-01-17 09:27:24 +04:00
tomas@poseidon.ndb.mysql.com
c6e5521bbf
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2005-01-17 01:42:41 +01:00
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
