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
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
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
ramil@mysql.com
e9dbf09dfc
Merge
2005-03-30 17:07:40 +05: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
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
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
bar@eagle.intranet.mysql.r18.ru
8e028d2f88
item_func.cc:
...
Post merge additional fix for DECIMAL type:
Bugs: #9425 : A user variable doesn't always have implicit coercibility
2005-03-28 14:15:43 +05:00
bar@eagle.intranet.mysql.r18.ru
ef81035ff4
Merge eagle.intranet.mysql.r18.ru:/home/bar/mysql-4.1
...
into eagle.intranet.mysql.r18.ru:/home/bar/mysql-5.0
2005-03-28 14:08:25 +05:00
bar@mysql.com
e60daecc87
Bug#9425 A user variable doesn't always have implicit coercibility
...
Coercibility fixes for numeric types and not defined values were done.
2005-03-28 14:01:57 +05:00
serg@serg.mylan
8207241882
merged
2005-03-26 20:15:18 +01:00
serg@serg.mylan
2dd1847bc2
Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-03-26 19:49:24 +01:00
serg@serg.mylan
b100adf750
Merge bk-internal:/home/bk/mysql-4.0/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2005-03-26 19:49:17 +01:00
serg@serg.mylan
72c9ac844b
fixes for "backport wild_compare fix from 4.1 - bug#3924"
2005-03-26 19:46:42 +01:00
gbichot@quadita2.mysql.com
e207736b84
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into quadita2.mysql.com:/nfstmp1/guilhem/mysql-5.0-4ita
2005-03-26 19:20:13 +01:00
konstantin@mysql.com
eeeedd31b9
Manual merge
2005-03-26 01:44:54 +03:00
konstantin@mysql.com
ff8017f0d3
A fix for Bug#8226 "Cannot connect via shared memory":
...
provide created shared memory objects with proper
access rights to make them usable when client and server
are running under different accounts.
Post review fixes.
2005-03-26 01:21:52 +03:00
brian@zim.(none)
89838b1ebc
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into zim.(none):/home/brian/mysql/mysql-5.0
2005-03-25 12:37:24 -08:00
brian@zim.(none)
0c21adf370
Fix upgrade/downgrade issue.
2005-03-25 12:36:04 -08:00
brian@zim.(none)
7b81a9fd4c
Merging support for blackhole up to 5.0.
2005-03-25 10:36:58 -08:00
jimw@mysql.com
a13ef90ed1
Merge bk-internal:/home/bk/mysql-5.0
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-03-25 09:42:18 -08:00
gbichot@quadita2.mysql.com
9a139ddcd3
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into quadita2.mysql.com:/nfstmp1/guilhem/mysql-5.0-4ita
2005-03-25 14:55:41 +01:00
gbichot@quadita2.mysql.com
ead47f4701
WWe now store the catalog in Query_log_event in binlog WITHOUT its end zero.
...
This saves one byte per Query_log_event on disk compared to 5.0.[0..3]. Compatibility problems with 5.0.x where x<4
are explained in the comments in log_event.cc. Putting back s/my_open(O_TRUNC)/(my_delete+my_create) change which had
been wiped away by somebody doing a wrong 4.1->5.0 merge (which happened just
before 5.0.3 :( ). Applying it to new events for LOAD DATA INFILE.
If slave fails in Execute_load_query_log_event::exec_event(),
don't delete the file (so that it's re-usable at next START SLAVE).
And (youpi!) fix for BUG#3247 "a partially completed LOAD DATA INFILE is not
executed at all on the slave" (storing an Execute_load_query_log_event
to binlog, with its error code, instead of Delete_file_log_event).
2005-03-25 14:51:17 +01:00
gluh@gluh.mysql.r18.ru
fe0b425e0a
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into gluh.mysql.r18.ru:/home/gluh/MySQL-BUGS/mysql-5.0.8941
2005-03-25 15:09:22 +03:00
gluh@gluh.mysql.r18.ru
a1e6b80b46
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into gluh.mysql.r18.ru:/home/gluh/MySQL-MERGE/mysql-5.0
2005-03-25 13:33:28 +03:00
gluh@gluh.mysql.r18.ru
bbd27199b6
Bug#9317: Wrong count for tables in INFORMATION_SCHEMA(fix after review)
2005-03-25 13:31:29 +03:00
gluh@gluh.mysql.r18.ru
d5e448870d
Fix for bug #8941 : garbage MAX_ROWS=# from SHOW CREATE TABLE INFORMATION_SCHEMA.*
...
-skip the print of 'MAX_ROWS=#' for 'SHOW CRETAE TABLE' with information schema tables
2005-03-25 12:19:11 +03:00
bar@eagle.intranet.mysql.r18.ru
2a1ad57732
Merge
2005-03-25 10:43:35 +04:00
brian@zim.(none)
6e2caeb0ce
Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into zim.(none):/home/brian/mysql/mysql-4.1
2005-03-24 16:08:48 -08:00
brian@zim.(none)
e65b96693c
Collection of changes per Bar and Serg.
2005-03-24 16:07:56 -08:00
msvensson@neptunus.(none)
eaa057e97a
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-03-24 20:17:08 +01:00
jimw@mysql.com
3b090265ee
Merge bk-internal:/home/bk/mysql-5.0
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-03-24 10:53:51 -08:00
msvensson@neptunus.(none)
f953016a6f
Removed faulty merge
2005-03-24 18:15:58 +01:00
