anozdrin@alik.
4653035e67
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into mysql.com:/mnt/raid/alik/MySQL/devel/5.1-rt-bug20294
2006-06-22 18:58:15 +04:00
anozdrin@mysql.com
d5dca744cd
Additional fix for BUG#20294: Instance manager test
...
im_instance_conf fails randomly.
2006-06-22 18:56:22 +04:00
mikael@dator5.(none)
446af39337
BUG#20583: index_last causes crash when performed on single partition
2006-06-22 10:46:02 -04:00
bar@mysql.com
75351dc0a5
Additional test for Bugs#20392: INSERT_ID session variable has weird value
...
sys_var_insert_id returned LAST_INSERT_ID instead of INSERT_ID,
as Guilhem suggested.
2006-06-22 19:40:59 +05: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
bar@mysql.com
4bd163b698
Bugs#20392: INSERT_ID session variable has weird value
...
sys_var_insert_id returned LAST_INSERT_ID instead of INSERT_ID.
2006-06-22 19:10:11 +05: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
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
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
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
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
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
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
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
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
monty@mysql.com
bb02e07777
Change table_id's to # to make tests portable
2006-06-21 18:27:45 +03:00
cmiller@zippy.(none)
1dd674ef8a
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into zippy.(none):/home/cmiller/work/mysql/mysql-5.0-maint
2006-06-21 11:07:34 -04:00
svoj@may.pils.ru
ffd8ea244d
Merge may.pils.ru:/home/svoj/devel/mysql/BUG20357/mysql-4.1
...
into may.pils.ru:/home/svoj/devel/mysql/BUG20357/mysql-5.0
2006-06-21 19:41:09 +05:00
svoj@may.pils.ru
fedbbf4865
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into may.pils.ru:/home/svoj/devel/mysql/BUG20357/mysql-4.1
2006-06-21 19:41:08 +05:00
tomas@poseidon.ndb.mysql.com
5f46cb7e1a
added missing MYSQLTEST_VARDIR declaration
2006-06-21 16:41:07 +02:00
ramil@myoffice.izhnet.ru
3228ce7f9e
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/usr/home/ram/work/mysql-5.1
2006-06-21 19:14:59 +05:00
rburnett@bk-internal.mysql.com
5a558eaf89
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
2006-06-21 15:33:22 +02:00
lars@mysql.com
207c0baf45
After merge fix
2006-06-21 15:30:26 +02:00
ramil@mysql.com
db2acfc926
Fix for bug #20601 : rpl_ndb_log.test failure
2006-06-21 18:16:07 +05:00
svoj@may.pils.ru
e560564cfa
Merge april:devel/BitKeeper/mysql-4.1
...
into may.pils.ru:/home/svoj/devel/mysql/BUG20357/mysql-4.1
2006-06-21 17:51:16 +05:00
svoj@may.pils.ru
8b98be2844
BUG#20357 - Got error 124 from storage engine using MIN and MAX
...
functions in queries
Using MAX()/MIN() on table with disabled indexes (by ALTER TABLE)
results in error 124 (wrong index) from storage engine.
The problem was that optimizer use disabled index to optimize
MAX()/MIN(). Normally it must skip disabled index and perform
table scan.
This patch skips disabled indexes for min/max optimization.
2006-06-21 17:30:59 +05:00
anozdrin@mysql.com
6ed2ec688d
Merge mysql.com:/mnt/raid/alik/MySQL/devel/5.1-tree
...
into mysql.com:/mnt/raid/alik/MySQL/devel/5.1-rt-bug20294
2006-06-21 16:17:51 +04:00
lars@mysql.com
6b8c196584
Merge mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
...
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
2006-06-21 14:14:37 +02:00
anozdrin@mysql.com
ce8734699b
Fix for BUG#20294: Instance manager test im_instance_conf
...
fails randomly.
The problem is that the test was affected by other running
test-suites on the same box. The fix affects the test only,
no code touched.
2006-06-21 16:02:51 +04:00
lars@dl145j.mysql.com
ed0e98529c
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl
...
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
2006-06-21 13:51:28 +02:00