pem@mysql.com
c289a3b60e
Merge mysql.com:/extern/mysql/bk/mysql-5.0
...
into mysql.com:/extern/mysql/work/bug16303/mysql-5.0
2006-02-06 17:58:15 +01:00
pem@mysql.com
62d2511df5
Merge mysql.com:/extern/mysql/bk/mysql-5.0
...
into mysql.com:/extern/mysql/work/bug16303/mysql-5.0
2006-02-06 16:07:13 +01:00
pem@mysql.com
5debbc9e8a
Updated sp-code.result after merge (BUG#16568)
2006-02-06 16:05:46 +01:00
pem@mysql.com
2d340a875c
Merge mysql.com:/extern/mysql/bk/mysql-5.0
...
into mysql.com:/extern/mysql/work/bug16568/mysql-5.0
2006-02-06 14:09:14 +01:00
jonas@perch.ndb.mysql.com
669a2bfa82
Merge perch.ndb.mysql.com:/home/jonas/src/41-work
...
into perch.ndb.mysql.com:/home/jonas/src/50-work
2006-02-06 11:46:40 +01:00
jonas@perch.ndb.mysql.com
78bd6d93af
bug#13966 - ndb
...
better error message on invalid config change
2006-02-06 11:42:44 +01:00
jonas@perch.ndb.mysql.com
155081e425
bug#13965
...
ndb - error while restarting in dict
improve error message when changed config leads to failed restart
2006-02-06 11:30:56 +01:00
aelkin@mysql.com
3b0dcb08a4
Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/mysql-5.0
2006-02-06 09:55:20 +02:00
ramil@mysql.com
1b09ce5ef8
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/ram/work/5.0.b16511
2006-02-06 09:42:15 +04:00
pekka@mysql.com
810cbaf157
ndb - testBlobs needs more tx in 5.0 ?
2006-02-05 23:06:08 +01:00
pekka@mysql.com
9ccda327a3
Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/space/pekka/ndb/version/my50
2006-02-05 22:51:13 +01:00
pekka@mysql.com
8ed86030b4
ndb - bug#16693 (4.1) test + workaround, analyze later
2006-02-05 22:12:06 +01:00
aelkin@mysql.com
217499df86
Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/mysql-5.0
2006-02-04 10:25:46 +02:00
pekka@mysql.com
4df873e547
Merge mysql.com:/space/pekka/ndb/version/my41
...
into mysql.com:/space/pekka/ndb/version/my50
2006-02-03 15:27:26 +01:00
pekka@mysql.com
c696582df4
ndb - replace+tinyblob back-patch from 5.0 [ discard on 4.1->5.0 merge ]
2006-02-03 15:23:58 +01:00
pekka@mysql.com
7b892368c3
ndb - bugfix: tinyblob + replace => mysqld crash (no bug#)
2006-02-03 14:35:29 +01:00
svoj@april.(none)
7c76ae4c13
BUG#16893: Crash in test 'fulltext_order_by'
...
Fixed that fulltext query + union results in unexpected behaviour.
2006-02-03 14:09:33 +04:00
ramil@mysql.com
b2d608cf41
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/ram/work/5.0.b16511
2006-02-03 12:34:25 +04:00
igor@rurik.mysql.com
66b6c988f5
Merge rurik.mysql.com:/home/igor/mysql-5.0
...
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2006-02-03 00:07:57 -08:00
igor@rurik.mysql.com
7b58b91fe4
Fixes after manual merge
2006-02-02 23:56:08 -08:00
igor@rurik.mysql.com
f61517d60b
Merge rurik.mysql.com:/home/igor/dev/mysql-4.1-0
...
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2006-02-02 21:23:36 -08:00
igor@rurik.mysql.com
4abab51c24
Post-review fix for bug #14927 .
2006-02-02 20:37:58 -08:00
igor@rurik.mysql.com
cc2fae5244
Merge rurik.mysql.com:/home/igor/mysql-4.1
...
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2006-02-02 17:56:05 -08:00
igor@rurik.mysql.com
3f9bb37461
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into rurik.mysql.com:/home/igor/mysql-5.0
2006-02-02 17:39:38 -08:00
konstantin@mysql.com
cb7118edcd
One more post-merge fix.
2006-02-03 02:01:01 +03:00
igor@rurik.mysql.com
b32ce5ac79
Merge rurik.mysql.com:/home/igor/mysql-5.0
...
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2006-02-02 13:47:21 -08:00
konstantin@mysql.com
303ad65fb2
Post-merge fixes.
2006-02-03 00:07:36 +03:00
konstantin@mysql.com
5678bc526e
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/opt/local/work/mysql-5.0-root
2006-02-02 23:35:23 +03:00
gunnar@mysql.com.
17fe251201
item_timefunc.cc:
...
manual adding the fix for bug#15828 which did not automerge
2006-02-02 21:27:23 +01:00
gunnar@mysql.com.
b413d72850
Merge mysql.com.:/data/BK/mysql-4.1_15828
...
into mysql.com.:/data/BK/mysql-5.0_15828
2006-02-02 19:10:27 +01:00
konstantin@mysql.com
98091b152a
Merge mysql.com:/opt/local/work/mysql-4.1-root
...
into mysql.com:/opt/local/work/mysql-5.0-root
2006-02-02 18:17:18 +03:00
pem@mysql.com
c5abd52a47
Minor fix for BUG#16303 in sp.cc: Simplified code in sp_routine_exists_in_table().
...
(No change of functionality)
2006-02-02 15:37:29 +01:00
msvensson@neptunus.(none)
c9b7317ff9
Merge neptunus.(none):/home/msvensson/mysql/mysqltest_float_result/my50-mysqltest_float_result
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-02-02 11:47:01 +01:00
msvensson@neptunus.(none)
01ddf96930
Convert exponent results for MYSQL_TYPE_FLOAT on Windows
2006-02-02 11:45:37 +01:00
ramil@mysql.com
eeabac7a52
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/ram/work/5.0.b16511
2006-02-02 13:21:45 +04:00
aelkin@mysql.com
d19f3f07e4
Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/mysql-5.0
2006-02-02 10:55:54 +02:00
msvensson@neptunus.(none)
264640c532
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-02-02 08:23:24 +01:00
igor@rurik.mysql.com
86606615ab
Fixed bug #16382 .
...
When an ambiguous field name is used in a group by clause a warning is issued
in the find_order_in_list function by a call to push_warning_printf.
An expression that was not always valid was passed to this call as the field
name parameter.
2006-02-01 20:43:43 -08:00
jimw@mysql.com
970aa54bd6
Fix mysqldump crash when encountering a VIEW (when used against a
...
5.0 or later server, obviously). (Bug #16389 )
2006-02-01 12:28:39 -08:00
andrey@lmy004.
736faf4730
fix for bug #12744 (MYSQL_STMT operations cause seg fault after connection reset)
2006-02-01 20:35:16 +01:00
svoj@april.(none)
332be5bdd9
BUG#14496: Crash or strange results with prepared statement,
...
MATCH and FULLTEXT
Fixed that fulltext query using PS results in unexpected behaviour
when executed 2 or more times.
2006-02-01 20:40:12 +04:00
ingo@mysql.com
c5a7bffcee
Bug#8841 - CHECKSUM TABLE is broken in MyISAM
...
There are (at least) two implementations of the checksum
computation. One is in MyISAM for the quick checksum. It
is executed on every row change. The other is in the
SQL layer for the extended checksum. It retrieves all rows
of a table via the respective storage engine.
In former MySQL versions varchars were stored with their
maximum length, but now with their real length similar to
blobs.
This change had been forgotten to take care of in the
extended checksum calculation. Hence too much data was
checksumed. In MyISAM this change had been taken care of
already. Only the real data is included in the checksum.
I changed mysql_checksum_table() so that it uses the
length information of true varchar fields instead
of the field length like in former varchar
implementations.
2006-02-01 16:46:44 +01:00
pem@mysql.com
526a974460
Merge mysql.com:/extern/mysql/bk/mysql-5.0
...
into mysql.com:/extern/mysql/work/bug15011/mysql-5.0
2006-02-01 16:01:22 +01:00
pem@mysql.com
30d1426675
Post-review fix for BUG#15011.
...
Added comments.
2006-02-01 16:00:11 +01:00
msvensson@neptunus.(none)
df5a947ba7
Merge neptunus.(none):/home/msvensson/mysql/mysqltest_float_result/my50-mysqltest_float_result
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-02-01 15:02:36 +01:00
pem@mysql.com
a84c7e1c29
Added new test case for BUG#14533: 'desc tbl' in stored procedure causes error 1142
...
which is no longer repeatable. (Unclear when this was fixed.)
2006-02-01 14:46:30 +01:00
pem@mysql.com
d37570daf4
Merge mysql.com:/extern/mysql/bk/mysql-5.0
...
into mysql.com:/extern/mysql/work/cantrepeat/mysql-5.0
2006-02-01 12:31:48 +01:00
msvensson@neptunus.(none)
102aa5a79f
Use common function 'append_field' to output the value of one field to the result.
...
Fix for extra zero in exponent of double values on windows.
2006-02-01 11:36:32 +01:00
ramil@mysql.com
a7979389c3
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/ram/work/5.0.b16511
2006-02-01 12:11:07 +04:00
igor@rurik.mysql.com
d6370b48a7
FIxed bug #14927 .
...
A query with a group by and having clauses could return a wrong
result set if the having condition contained a constant conjunct
evaluated to FALSE.
It happened because the pushdown condition for table with
grouping columns lost its constant conjuncts.
Pushdown conditions are always built by the function make_cond_for_table
that ignores constant conjuncts. This is apparently not correct when
constant false conjuncts are present.
2006-01-31 21:48:32 -08:00