gshchepa/uchum@gleb.loc
aac756e4ff
Merge gleb.loc:/home/uchum/work/bk/5.1
...
into gleb.loc:/home/uchum/work/bk/5.1-opt
2007-09-14 12:18:48 +05:00
gshchepa/uchum@gleb.loc
7284a865df
Merge gleb.loc:/home/uchum/work/bk/5.0
...
into gleb.loc:/home/uchum/work/bk/5.0-opt
2007-09-14 12:16:19 +05:00
joerg@trift2.
b0fb8aa374
Merge trift2.:/MySQL/M50/tmp-5.0
...
into trift2.:/MySQL/M51/tmp-5.1
2007-09-13 23:56:48 +02:00
joerg@trift2.
6a67761bcc
Merge trift2.:/MySQL/M51/push-5.1
...
into trift2.:/MySQL/M51/tmp-5.1
2007-09-13 23:54:22 +02:00
joerg@trift2.
1dc3246fe3
Merge trift2.:/MySQL/M50/push-5.0
...
into trift2.:/MySQL/M50/tmp-5.0
2007-09-13 23:42:17 +02:00
gshchepa/uchum@gleb.loc
e4eadcfbdd
Fixed bug #27695 .
...
Declaring an all space column name in the SELECT FROM DUAL or in a view
leads to misleading warning message:
"Leading spaces are removed from name ' '".
The Item::set_name method has been modified to raise warnings like
"Name ' ' has become ''" in case of the truncation of an all
space identifier to an empty string identifier instead of the
"Leading spaces are removed from name ' '" warning message.
2007-09-13 18:41:50 +05:00
gshchepa/uchum@gleb.loc
a9dd53abd6
Merge gleb.loc:/home/uchum/work/bk/5.0-opt
...
into gleb.loc:/home/uchum/work/bk/5.1-opt
2007-09-13 15:05:54 +05:00
mskold/marty@linux.site
f2159e2d21
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
2007-09-13 10:35:11 +02:00
mskold/marty@linux.site
d4e84e13b0
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
2007-09-13 10:06:42 +02:00
mskold/marty@linux.site
2ea6d3d680
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
2007-09-13 10:00:14 +02:00
mskold/marty@mysql.com/linux.site
44b6c2edad
bug#27494 An invalid subselect crashes mysql server: Added check for missing arguments
2007-09-13 09:47:21 +02:00
gshchepa/uchum@gleb.loc
2e7306d503
Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into gleb.loc:/home/uchum/work/bk/5.0-opt
2007-09-13 11:48:58 +05:00
gshchepa/uchum@gleb.loc
2a3facc3de
Merge gleb.loc:/home/uchum/work/bk/5.0-opt
...
into gleb.loc:/home/uchum/work/bk/5.1-opt
2007-09-13 11:31:45 +05:00
gshchepa/uchum@gleb.loc
321c172e95
sql_view.cc:
...
Post-merge fix.
2007-09-13 02:09:29 +05:00
gshchepa/uchum@gleb.loc
bd4fd0473c
Merge gleb.loc:/home/uchum/work/bk/5.1
...
into gleb.loc:/home/uchum/work/bk/5.1-opt
2007-09-13 00:44:50 +05:00
gshchepa/uchum@gleb.loc
ff042427cf
Merge gleb.loc:/home/uchum/work/bk/5.0
...
into gleb.loc:/home/uchum/work/bk/5.0-opt
2007-09-12 23:41:35 +05:00
sergefp@mysql.com
1ff0caf49d
Better wording in comments
2007-09-12 18:13:19 +04:00
tomas@whalegate.ndb.mysql.com
5b0e532db3
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
2007-09-12 14:03:21 +02:00
tomas@whalegate.ndb.mysql.com
59e502dc2b
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
2007-09-12 14:02:27 +02:00
tomas@whalegate.ndb.mysql.com
df552c310d
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge
2007-09-12 14:01:51 +02:00
tomas@whalegate.ndb.mysql.com
f0f025f91b
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-bj
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-bj
2007-09-12 13:58:03 +02:00
tomas@whalegate.ndb.mysql.com
63648db422
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-bj
2007-09-12 13:55:45 +02:00
tomas@whalegate.ndb.mysql.com
83eed4d876
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-bj
2007-09-12 13:55:22 +02:00
tomas@whalegate.ndb.mysql.com
461a3dccac
BUG#23354 revert
2007-09-12 13:53:32 +02:00
gshchepa@bk-internal.mysql.com
ae46c7e54a
Merge bk-internal.mysql.com:/data0/bk/mysql-5.0-opt
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-opt
2007-09-12 11:52:42 +02:00
tomas@whalegate.ndb.mysql.com
c484d9c5ef
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
2007-09-12 07:37:27 +02:00
tomas@whalegate.ndb.mysql.com
f1674d1b66
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge
2007-09-12 07:34:42 +02:00
sergefp@mysql.com
06f12f66e8
Post-merge fixes
2007-09-12 01:52:27 +04:00
tomas@whalegate.ndb.mysql.com
0c0f6dfa03
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
2007-09-11 19:56:26 +02:00
tomas@whalegate.ndb.mysql.com
9620892508
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-09-11 19:52:05 +02:00
holyfoot/hf@mysql.com/hfmain.(none)
474bcd3b00
merging
2007-09-11 20:47:17 +05:00
jonas@perch.ndb.mysql.com
cf17cd229b
Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
...
into perch.ndb.mysql.com:/home/jonas/src/51-ndb
2007-09-11 16:55:37 +02:00
jonas@perch.ndb.mysql.com
0b2c8fa3c4
ndb - bug#30914
...
Dont add insert+delete tuple(s) to lcp-keep-list
2007-09-11 16:45:22 +02:00
tomas@whalegate.ndb.mysql.com
9e37aaf433
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
2007-09-11 16:17:28 +02:00
sergefp@mysql.com
6f702a4b42
Post-merge fixes
2007-09-11 02:41:42 +04:00
sergefp@pylon.mylan
d276ce3402
Merge mysql.com:/home/psergey/mysql-4.1-bug30385
...
into mysql.com:/home/psergey/mysql-5.0-bug30385
2007-09-11 02:24:08 +04:00
sergefp@mysql.com
da04109de2
BUG#30385: Server crash when deleting with ORDER BY and LIMIT
...
in get_index_for_order(), don't walk over the end of the index key parts
when matching index description and needed ordering.
2007-09-10 16:26:51 +04:00
lars/lthalmann@dl145j.mysql.com
1e265379a7
Merge mysql.com:/nfsdisk1/lars/MERGE/mysql-4.1-merge
...
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
2007-09-10 14:17:12 +02:00
lars/lthalmann@dl145h.mysql.com
7d6f639d28
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl
...
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
2007-09-10 13:59:38 +02:00
lars/lthalmann@dl145h.mysql.com
4f29c65ae1
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl
...
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
2007-09-10 13:15:04 +02:00
lars/lthalmann@mysql.com/dl145h.mysql.com
cc5fa8d649
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-4.1-rpl
...
into mysql.com:/nfsdisk1/lars/MERGE/mysql-4.1-merge
2007-09-10 13:14:35 +02:00
holyfoot/hf@hfmain.(none)
f57f1d0942
Merge bk@192.168.21.1:mysql-5.1-opt
...
into mysql.com:/home/hf/work/28430/my51-28430
2007-09-10 10:21:55 +05:00
jperkin@production.mysql.com
6ed2034824
Merge production.mysql.com:/usersnfs/jperkin/bk/trees/50/push-5.0
...
into production.mysql.com:/usersnfs/jperkin/bk/trees/51/push-5.1
2007-09-07 21:56:00 +02:00
jperkin@production.mysql.com
302e1811f7
Merge production.mysql.com:/usersnfs/jperkin/bk/trees/build-gca/mysql-5.1
...
into production.mysql.com:/usersnfs/jperkin/bk/trees/51/mysql-5.1
2007-09-07 17:46:31 +02:00
jperkin@production.mysql.com
fa73a68c8b
Merge production.mysql.com:/usersnfs/jperkin/bk/trees/50/mysql-5.0
...
into production.mysql.com:/usersnfs/jperkin/bk/trees/51/mysql-5.1
2007-09-07 17:30:47 +02:00
jperkin@production.mysql.com
29b0900ddd
Merge production.mysql.com:/usersnfs/jperkin/bk/tmp/bug-27693
...
into production.mysql.com:/usersnfs/jperkin/bk/trees/50/mysql-5.0
2007-09-07 17:24:17 +02:00
holyfoot/hf@mysql.com/hfmain.(none)
a60f7988b9
Bug #28430 Failure in replication of innodb partitioned tables on row/mixed format.
...
In the ha_partition::position() we don't calculate the number
of the partition of the record, but use m_last_part value instead,
relying on that it's previously set by some other call like ::write_row().
Delete_rows_log_event::do_exec_row() calls find_and_fetch_row(),
where we used position() + rnd_pos() call for the InnoDB-based PARTITION-ed
table as there HA_PRIMARY_KEY_REQUIRED_FOR_POSITION enabled.
fixed by introducing new handler::rnd_pos_by_record() method to be
used for random record-based positioning
2007-09-07 18:41:49 +05:00
jperkin@production.mysql.com
ebb1d05402
Merge production.mysql.com:/usersnfs/jperkin/bk/tmp/bug-27520
...
into production.mysql.com:/usersnfs/jperkin/bk/trees/51/mysql-5.1
2007-09-07 15:37:04 +02:00
jperkin@production.mysql.com
5133eeff45
Merge production.mysql.com:/usersnfs/jperkin/bk/tmp/bug-27520
...
into production.mysql.com:/usersnfs/jperkin/bk/trees/50/mysql-5.0
2007-09-07 15:32:47 +02:00
tomas@whalegate.ndb.mysql.com
35bddfecf7
Bug #11313 confusing/erroneous 4006 message
2007-09-07 11:15:07 +02:00