bell@sanja.is.com.ua
05c9defefa
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-multi-5.0
2005-04-01 13:02:29 +03:00
pekka@mysql.com
57451feb1c
Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/space/pekka/ndb/version/my50
2005-04-01 11:18:52 +02:00
msvensson@neptunus.(none)
6f9b118626
Merge
2005-04-01 11:15:11 +02:00
pekka@mysql.com
5b9bd8c0c8
Merge
2005-04-01 10:13:37 +02:00
sergefp@mysql.com
7ace3f1362
Better comment
2005-04-01 11:05:17 +04:00
bell@sanja.is.com.ua
45a79c9056
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-union_merge-5.0
2005-04-01 02:15:40 +03:00
bell@sanja.is.com.ua
1029e533df
postmerge 4.1->5.0 fixes
2005-04-01 02:14:30 +03:00
magnus@msdesk.mysql.com
9c9149571d
Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into msdesk.mysql.com:/home/magnus/mysql-5.0
2005-03-31 14:37:22 +02:00
magnus@msdesk.mysql.com
e8434aadca
BUG#8585 ndb_cache2
...
- When deleting from a cursor the m_rows_changed variable was not properly incremented to indicate that m_share->commit_count should be cleared at end of trans.
2005-03-31 14:33:50 +02:00
msvensson@neptunus.(none)
830b088fde
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-03-31 12:57:16 +02:00
pem@mysql.com
bb27307778
Merge pmartin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/local/bk/mysql-5.0
2005-03-31 10:54:15 +02:00
msvensson@neptunus.(none)
c732cae6e0
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-03-31 10:51:00 +02:00
msvensson@neptunus.(none)
f4e3bcc015
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-03-31 10:47:32 +02:00
bell@sanja.is.com.ua
05d4ed14e4
merge 4.1->5.0
2005-03-31 10:39:48 +03:00
konstantin@mysql.com
3e2452024b
A fix for Bug#9443 "mysql_client_test fails on linux and some solaris
...
platforms": yet another issue with floating pointer comparisons.
The fix uses the workaround with volatiles.
2005-03-31 03:44:51 +04:00
monty@mysql.com
e9205dc0f0
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2005-03-30 23:42:53 +03:00
monty@mysql.com
b43b7dc128
Enabled more tests of STR_TO_DATE()
...
Fixed that datetime gives warning for zero dates in traditional mode
2005-03-30 23:41:42 +03:00
bell@sanja.is.com.ua
dc87075f86
postmerge fixes
2005-03-30 23:08:03 +03:00
bell@sanja.is.com.ua
c64efa6062
merge
2005-03-30 22:11:08 +03:00
msvensson@neptunus.(none)
2e2ff0459f
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-03-30 17:54:10 +02:00
pem@mysql.comhem.se
8df8afc270
Fixed BUG#6600: Stored procedure crash after repeated calls with check table.
...
Sedond attempt: Simply disallow CHECK in SPs, since it can't work.
2005-03-30 17:43:52 +02:00
ramil@mysql.com
8098ef79f0
after merge fix/
2005-03-30 18:57:56 +05:00
monty@mysql.com
fac67f091c
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2005-03-30 16:01:30 +03:00
monty@mysql.com
332b7ed4a1
Give warnings if wrong date/time/datetime argument for STR_TO_DATE
...
Small fixes while doing review of new pushed code
More test cases for decimal
2005-03-30 16:00:31 +03:00
msvensson@neptunus.(none)
b7ab584096
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1-synced
2005-03-30 14:33:55 +02:00
msvensson@neptunus.(none)
c93ae4f8a1
Merge
2005-03-30 14:32:53 +02:00
msvensson@neptunus.(none)
9471e922f1
Merge neptunus.(none):/home/msvensson/mysql/bug8807
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1-synced
2005-03-30 14:30:32 +02:00
ramil@mysql.com
e9dbf09dfc
Merge
2005-03-30 17:07:40 +05:00
sergefp@mysql.com
86e3a378ea
Fix for BUG#9213: GROUP BY returns wrong query results:
...
Make test_if_skip_sort_order() rebuild tab->ref if it decides to use an index
different from the index join optimizer has choosen.
2005-03-30 15:57:42 +04:00
msvensson@neptunus.(none)
382a8c0048
BUG#8807 Select crash server
...
- Add function Item_param::fix_fields which will update any subselect they are part of and indicate that the subsleect is not const during prepare phase, and thus should not be executed during prepare.
2005-03-30 12:14:37 +02:00
serg@serg.mylan
de8015f040
merged
2005-03-30 12:03:02 +02:00
ramil@mysql.com
fb87f5b5c4
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/ram/work/mysql-4.1
2005-03-30 14:51:23 +05:00
ramil@mysql.com
1a25c55e49
A fix (bug #9401 : type_timestamp segfaults mysqld)
2005-03-30 14:43:56 +05:00
serg@serg.mylan
9db4daf111
merged
2005-03-30 10:52:28 +02:00
serg@serg.mylan
2a297353c6
don't strcmp db if it's a pattern
2005-03-30 10:43:24 +02:00
bell@sanja.is.com.ua
dcdda90a11
Merge
2005-03-30 10:27:36 +03:00
bell@sanja.is.com.ua
4fdb0f48e7
postreview changes
...
fixed bug in IN/ALL/ANY subqeries with HAVING clause (BUG#9350)
2005-03-30 10:07:08 +03:00
serg@serg.mylan
884abd39fc
Merge bk-internal:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-03-30 00:27:35 +02:00
gbichot@production.mysql.com
3cd2a3b21b
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into production.mysql.com:/nfstmp1/guilhem/mysql-5.0-prod
2005-03-29 17:47:48 +02:00
gbichot@production.mysql.com
260d4dd493
making Q_CATALOG_CODE be understood by 5.0.4 slave, so that 5.0.3->5.0.4 repl can work (but 5.0.4->5.0.3 won't).
2005-03-29 17:26:38 +02:00
serg@serg.mylan
eb5dfbe3ac
Merge bk-internal:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-03-29 14:58:03 +02:00
bar@mysql.com
7131f313be
after merge fix
2005-03-29 17:37:10 +05:00
bar@mysql.com
6d3f944d80
merge
2005-03-29 17:24:26 +05:00
bar@mysql.com
ba115894c5
Better error message.
...
Bugs#9057: Incorrect errormsg for too-large char field in table definition
2005-03-29 15:43:00 +05:00
konstantin@mysql.com
2115900460
Remove redundant my_security_attr_free() from
...
handle_connections_shared_memory (double free spotted by Monty).
2005-03-29 14:30:34 +04:00
monty@mysql.com
c4467b817d
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2005-03-29 12:58:31 +03:00
monty@mysql.com
dd4b0710dd
Cleanups during review
2005-03-29 12:37:36 +03:00
pekka@mysql.com
727015dbb3
Merge
2005-03-28 23:06:19 +02:00
bell@sanja.is.com.ua
1659dacab1
fixed mechanism of detection selection from table wich we update
...
(BUG##9398, BUG#8703)
fixed wrong join view detection in multi-delete which lead to server crash
2005-03-28 15:13:31 +03:00
serg@serg.mylan
55d3d94c3b
Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-03-28 13:56:27 +02:00
