rburnett@bk-internal.mysql.com
b072ecd049
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
2006-06-22 16:30:46 +02:00
mikael@dator5.(none)
10ecad1f6f
Merge dator5.(none):/home/pappa/clean-mysql-5.1
...
into dator5.(none):/home/pappa/bug17138
2006-06-22 10:27:41 -04:00
gluh@eagle.intranet.mysql.r18.ru
2415b3210e
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1-kt
...
into mysql.com:/home/gluh/MySQL/Merge/5.1-kt
2006-06-22 19:21:59 +05:00
gluh@eagle.intranet.mysql.r18.ru
4c746fdb8e
test fix(to satisfy Win)
2006-06-22 19:20:29 +05:00
andrey@lmy004.
50c7663dbc
fix for bug#20624: events_logs_tests.test fails randomly
...
(this is a change to a faulty test file)
2006-06-22 16:13:18 +02:00
mikael@dator5.(none)
59e0502e52
BUG#17138: Stored procedure error
...
Review fixes
2006-06-22 10:01:30 -04:00
bar@bar.intranet.mysql.r18.ru
025180044e
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-kt
...
into mysql.com:/usr/home/bar/mysql-5.1.b20086
2006-06-22 18:55:44 +05:00
bar@bar.intranet.mysql.r18.ru
5694d5a63c
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-kt
...
into mysql.com:/usr/home/bar/mysql-5.1.b20086
2006-06-22 18:51:50 +05:00
bar@bar.intranet.mysql.r18.ru
ac487f52aa
Merge mysql.com:/usr/home/bar/mysql-5.1-new.19392
...
into mysql.com:/usr/home/bar/mysql-5.1-kt
2006-06-22 18:38:26 +05:00
mats@romeo.(none)
1b6a017155
Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/bk/fix-mysql-5.1
2006-06-22 15:26:08 +02:00
jonas@perch.ndb.mysql.com
ecedd8c608
ndb - bug#18782
...
crash correct node in case of START_FRAGREF
2006-06-22 15:16:33 +02:00
cmiller@zippy.(none)
0f4e09a81a
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into zippy.(none):/home/cmiller/work/mysql/mysql-5.0__bug19904
2006-06-22 08:58:37 -04:00
jonas@perch.ndb.mysql.com
bbbb156efb
ndb - bug#20008
...
no DD when diskless
2006-06-22 14:57:43 +02:00
jonas@perch.ndb.mysql.com
92addc582b
Merge perch.ndb.mysql.com:/home/jonas/src/51-work
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-06-22 13:53:59 +02:00
jonas@perch.ndb.mysql.com
ef892289cf
fix result file for ndb_dd_ddl
2006-06-22 13:53:02 +02:00
mats@mysql.com
3b830e4b9f
Patch to handle some bad situations resulting from the fix for BUG#19995.
2006-06-22 13:28:04 +02:00
andrey@lmy004.
c59a58c4ba
fix for bug#16992 (Events: Information_schema troubles)
...
Introduced EVENTS.EVENT_DEFINITION, like ROUTINES.ROUTINE_DEFINITION
Hence, the contents of the current EVENTS.EVENT_BODY become the contents
of EVENT_DEFINITION. EVENT_BODY will contain always, for now, "SQL" (wo
quotes).
2006-06-22 13:01:08 +02:00
joerg@trift2.
5eea972046
Merge mysql.com:/M50/bug19353-5.0 into mysql.com:/M51/bug19353-5.1
2006-06-22 12:22:52 +02:00
jonas@perch.ndb.mysql.com
18686cd08d
ndb - bug#19164
...
set max value on ports
2006-06-22 12:03:28 +02:00
monty@hasky.mysql.fi
729ee03648
Merge monty@192.168.0.9:/my/mysql-5.1
...
into mysql.com:/home/my/mysql-5.1
2006-06-22 12:37:49 +03:00
monty@mysql.com
b8ab496057
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/my/mysql-5.1
2006-06-22 12:21:41 +03:00
jonas@perch.ndb.mysql.com
f618c9ed8f
Merge perch.ndb.mysql.com:/home/jonas/src/51-work
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-06-22 10:52:45 +02:00
jonas@perch.ndb.mysql.com
dc75269965
ndb - bug#16341
...
create tablespace/logfile group should "back out changes"
2006-06-22 10:24:44 +02:00
igor@rurik.mysql.com
f1eb33096f
Post-merge fix.
2006-06-22 00:08:32 -07:00
igor@rurik.mysql.com
85f0e50ab3
Merge rurik.mysql.com:/home/igor/mysql-4.1-opt
...
into rurik.mysql.com:/home/igor/mysql-5.0-opt
2006-06-21 22:41:51 -07:00
igor@rurik.mysql.com
e307b5b297
Modified the test case for bug 16674 to have the same
...
execution plans in 4.1 and 5.0.
2006-06-21 22:39:48 -07:00
acurtis@xiphis.org
9d74f0c601
traditional grep does not have -q option
2006-06-21 20:27:52 -07:00
igor@rurik.mysql.com
9631db0620
Merge rurik.mysql.com:/home/igor/mysql-4.1-opt
...
into rurik.mysql.com:/home/igor/mysql-5.0-opt
2006-06-21 20:06:33 -07:00
mikael@dator5.(none)
c91d6eb7b8
Merge dator5.(none):/home/pappa/clean-mysql-5.1
...
into dator5.(none):/home/pappa/bug17138
2006-06-21 21:24:04 -04:00
mikael@dator5.(none)
a8e6967c02
BUG#17138: Error in stored procedure
...
Review comments
2006-06-21 20:55:33 -04:00
igor@rurik.mysql.com
cfd2c2a569
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1-opt
...
into rurik.mysql.com:/home/igor/mysql-4.1-opt
2006-06-21 16:29:58 -07:00
rburnett@bk-internal.mysql.com
d9fb74e40e
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
2006-06-22 01:25:57 +02:00
mikael@dator5.(none)
9543cae6cf
Merge dator5.(none):/home/pappa/clean-mysql-5.1
...
into dator5.(none):/home/pappa/bug19281
2006-06-21 19:25:56 -04:00
mikael@dator5.(none)
cb5043199b
mmanual merge
2006-06-21 19:08:30 -04:00
evgen@moonbone.local
c948256692
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into moonbone.local:/work/tmp_merge-5.0-opt-mysql
2006-06-22 01:16:57 +04:00
acurtis@xiphis.org
751887b4c1
Merge xiphis.org:/home/antony/work2/mysql-5.0-engines
...
into xiphis.org:/home/antony/work2/p4-bug12096.2
2006-06-21 14:16:15 -07:00
jani@a193-229-222-105.elisa-laajakaista.fi
fa98891ee7
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into a193-229-222-105.elisa-laajakaista.fi:/home/jani/mysql-5.0
2006-06-21 23:54:06 +03:00
evgen@moonbone.local
e39e665390
Manual merge
2006-06-22 00:49:17 +04:00
evgen@moonbone.local
36a436adae
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into moonbone.local:/work/tmp_merge-5.0-opt-mysql
2006-06-22 00:45:42 +04:00
evgen@moonbone.local
6439337bb1
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into moonbone.local:/work/tmp_merge-4.1-opt-mysql
2006-06-22 00:29:47 +04:00
evgen@moonbone.local
8d4a910a1f
Fixed bug #14896 .
...
This bug in Field_string::cmp resulted in a wrong comparison
with keys in partial indexes over multi-byte character fields.
Given field a is declared as a varchar(16) collate utf8_unicode_ci
INDEX(a(4)) gives us an example of such an index.
Wrong key comparisons could lead to wrong result sets if
the selected query execution plan used a range scan by
a partial index over a utf8 character field.
This also caused wrong results in many other cases.
2006-06-22 00:29:04 +04:00
mats@mysql.com
9025bcfb4e
Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/bk/fix-mysql-5.0
2006-06-21 20:08:34 +02:00
rburnett@bk-internal.mysql.com
8472ce9ff8
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
2006-06-21 17:51:54 +02:00
mikael@dator5.(none)
eab0cfbc25
Merge dator5.(none):/home/pappa/clean-mysql-5.1
...
into dator5.(none):/home/pappa/bug19281
2006-06-21 11:41:06 -04:00
jani@a193-229-222-105.elisa-laajakaista.fi
5b7827b238
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into a193-229-222-105.elisa-laajakaista.fi:/home/jani/mysql-5.0
2006-06-21 18:40:50 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
b40ee2a7aa
Merge bk://localhost:5559
...
into a193-229-222-105.elisa-laajakaista.fi:/home/jani/mysql-5.0
2006-06-21 18:39:46 +03:00
jani@ua141d10.elisa.omakaista.fi
f57cf654f4
Cleanup to patch for Bug#18246, "compilation error with tcp_wrapper"
2006-06-21 18:35:19 +03:00
monty@hasky.mysql.fi
202ddd20be
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/my/mysql-5.1
2006-06-21 18:29:17 +03:00
monty@mysql.com
bb02e07777
Change table_id's to # to make tests portable
2006-06-21 18:27:45 +03:00
pekka@orca.ndb.mysql.com
43409d98fe
Merge clam.ndb.mysql.com:/space/pekka/ndb/version/my51
...
into clam.ndb.mysql.com:/space/pekka/ndb/version/my51-bug18102
2006-06-21 17:19:59 +02:00