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
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
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
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
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
pekka@clam.ndb.mysql.com
7f9bfc2058
ndb - add test_event_merge to daily-devel-tests.txt
2006-06-21 17:17:12 +02:00
mikael@dator5.(none)
de9eb496af
BUG#19309: Problem with calling proecdures twice
...
Need to flag when a copy is needed to not overwrite a create_info
object connected to the lex structure
2006-06-21 10:57:30 -04:00
tomas@poseidon.ndb.mysql.com
ebb8ac0221
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-main
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
2006-06-21 16:44:40 +02: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
pekka@clam.ndb.mysql.com
6ba2b1845c
ndb - bug#18102: fixes on NDB API level
2006-06-21 16:15:04 +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
jonas@perch.ndb.mysql.com
8e198f577f
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-21 16:03:10 +02:00
jonas@perch.ndb.mysql.com
a32d815a25
ndb - bug#19275
...
make sure tablename is release in case of alter table
2006-06-21 16:01:23 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
143648c35e
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 16:55:47 +03: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
jonas@perch.ndb.mysql.com
a75c1eadde
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-21 14:39:28 +02:00
jonas@perch.ndb.mysql.com
e166a5e6be
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-06-21 14:36:50 +02: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
jonas@perch.ndb.mysql.com
9db4c3dfac
Merge perch.ndb.mysql.com:/home/jonas/src/50-work
...
into perch.ndb.mysql.com:/home/jonas/src/51-work
2006-06-21 14:08:39 +02:00