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
lars@mysql.com
6839e64298
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl
...
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
2006-06-21 13:42:02 +02:00
knielsen@mysql.com
66bdb6de02
Merge knielsen@10.100.52.19:/usr/local/mysql/mysql-5.0
...
into mysql.com:/data0/knielsen/mysql-5.0
2006-06-21 12:59:19 +02:00
knielsen@mysql.com
8167b2c8ef
BUG#20578
...
Backport Valgrind suppression from mysql-5.1:
D 1.4 05/11/23 22:44:54+02:00 monty@mysql.com 5 4 12/0/154
P mysql-test/valgrind.supp
C Remove warning that may happens becasue threads dies in different order
2006-06-21 12:52:59 +02:00
monty@narttu.mysql.fi
20c00662eb
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/my/mysql-5.1
2006-06-21 13:24:56 +03:00
gkodinov@mysql.com
bca6492927
Merge mysql.com:/home/kgeorge/mysql/5.0/teamclean
...
into mysql.com:/home/kgeorge/mysql/5.0/B18080
2006-06-21 13:06:32 +03:00
mskold@mysql.com
22334907fc
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/marty/MySQL/mysql-5.0
2006-06-21 12:03:08 +02:00
gkodinov@mysql.com
f327a8c536
merge of the changes for bug #18080
2006-06-21 13:03:06 +03:00
gkodinov@mysql.com
4f8f4cd51a
manual merge
2006-06-21 13:01:00 +03:00
gkodinov@mysql.com
bee985af35
Merge mysql.com:/home/kgeorge/mysql/5.0/teamclean
...
into mysql.com:/home/kgeorge/mysql/5.0/B20482
2006-06-21 12:59:34 +03:00
gluh@eagle.intranet.mysql.r18.ru
8097ba2046
after merge fixes
2006-06-21 14:53:40 +05:00
gkodinov@mysql.com
75ca055493
Bug #20482 : failure on Create join view with sources views/tables in different
...
schemas
The function check_one_table_access() called to check access to tables in
SELECT/INSERT/UPDATE was doing additional checks/modifications that don't hold
in the context of setup_tables_and_check_access().
That's why the check_one_table() was split into two : the functionality needed by
setup_tables_and_check_access() into check_single_table_access() and the rest of
the functionality stays in check_one_table_access() that is made to call the new
check_single_table_access() function.
2006-06-21 12:12:46 +03:00
mskold@linux.site
7704d973d4
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/marty/MySQL/mysql-5.1
2006-06-21 10:10:01 +02:00
bar@mysql.com
bfae7303d7
Bug#20086: Can't get data from key partitioned tables with VARCHAR key
...
The problem appeared because the same values produced different hash
during INSERT and SELECT for VARCHAR data type.
Fix:
VARCHAR required special treatment to avoid hashing of length bytes
(leftmost one or two bytes) as well as trailing bytes beyond real length,
which could contain garbage. Fix is done by introducing hash() - new method
in the Field class.
2006-06-21 13:00:19 +05:00
mskold@mysql.com
f0bd8a7cd9
Merge mysql.com:/home/marty/MySQL/mysql-5.0-backed
...
into mysql.com:/home/marty/MySQL/mysql-5.0
2006-06-21 09:50:41 +02:00
anozdrin@mysql.com
5ce56c1cdc
Disable IM tests.
2006-06-21 11:44:54 +04:00