mtaylor@qualinost.(none)
d63c70c910
Merge qualinost.(none):/home/mtaylor/src/mysql/mysql-5.1-new-maint
...
into qualinost.(none):/home/mtaylor/src/mysql/mysql-5.1-debian
2007-04-20 14:16:33 -07:00
mtaylor@qualinost.(none)
0690dac3aa
Merge qualinost.(none):/home/mtaylor/src/mysql/mysql-5.0-maint
...
into qualinost.(none):/home/mtaylor/src/mysql/mysql-5.0-debian
2007-04-20 14:09:43 -07:00
mtaylor@qualinost.(none)
3b5d1076bb
Merge qualinost.(none):/home/mtaylor/src/mysql/mysql-5.0-debian
...
into qualinost.(none):/home/mtaylor/src/mysql/mysql-5.1-debian
2007-04-20 13:54:32 -07:00
evgen@moonbone.local
4434ff13a9
Merge moonbone.local:/mnt/gentoo64/work/bk-trees/mysql-5.0-opt
...
into moonbone.local:/mnt/gentoo64/work/bk-trees/mysql-5.1-opt
2007-04-21 00:33:56 +04:00
sergefp@mysql.com
1f6935d2af
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into mysql.com:/home/psergey/mysql-5.0-bug27939
2007-04-21 00:24:43 +04:00
msvensson@pilot.blaudden
b0d923d73b
Don't copy subidrs of scripts/
2007-04-20 20:46:55 +02:00
cmiller@zippy.cornsilk.net
219f3fb7c6
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
2007-04-20 13:57:24 -04:00
cmiller@zippy.cornsilk.net
bd31322626
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-new-maint
2007-04-20 13:52:57 -04:00
cmiller@zippy.cornsilk.net
0b69216315
Avoid compiler warnings.
2007-04-20 13:49:06 -04:00
tomas@whalegate.ndb.mysql.com
fc61036567
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1
2007-04-20 19:34:49 +02:00
joerg@trift2.
bcaa5cc7e8
mysql-test/t/sp_trans_log.test : Disable it in embedded (test fails).
2007-04-20 16:54:21 +02:00
kent@mysql.com/kent-amd64.(none)
75c31f6bb9
Makefile.am:
...
Typo
2007-04-20 15:52:49 +02:00
kent@mysql.com/kent-amd64.(none)
9050451afe
Makefile.am:
...
Added the 'suite' directory to the source TAR and install
2007-04-20 15:49:35 +02:00
msvensson@maint1.mysql.com
a581ad07ea
Merge maint1.mysql.com:/data/localhome/msvensson/mysql-5.0-maint
...
into maint1.mysql.com:/data/localhome/msvensson/mysql-5.1-maint
2007-04-20 15:36:56 +02:00
msvensson@maint1.mysql.com
4d0fdd70d1
Protect against copying a ny subdirectories in scripts/
2007-04-20 15:36:04 +02:00
sergefp@mysql.com
479c8cdaad
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into mysql.com:/home/psergey/mysql-5.0-bug27939
2007-04-20 17:30:15 +04:00
mats@romeo.(none)
f4c4de6a56
Added missing result file for rpl_critical_errors.
2007-04-20 14:08:12 +02:00
mats@romeo.(none)
ae9744f266
Adding missing result file for rpl_critical_errors.
2007-04-20 14:03:15 +02:00
gshchepa/uchum@gshchepa.loc
6c5d17ef56
Merge gshchepa.loc:/home/uchum/work/bk-trees/mysql-5.0-opt
...
into gshchepa.loc:/home/uchum/work/bk-trees/mysql-5.0-opt-27704
2007-04-20 16:44:50 +05:00
tomas@whalegate.ndb.mysql.com
53cee9f2bf
Construction does not work on hpux aCC, so some refactoring
2007-04-20 12:37:32 +02:00
joerg@debian.(none)
ade0e424c0
Merge debian.(none):/M41/push-4.1
...
into debian.(none):/M50/push-5.0
2007-04-20 12:35:35 +02:00
gshchepa/uchum@gshchepa.loc
4fcf1316bb
Merge gshchepa.loc:/home/uchum/work/bk-trees/mysql-4.1-opt-27704
...
into gshchepa.loc:/home/uchum/work/bk-trees/mysql-5.0-opt-27704
2007-04-20 15:31:33 +05:00
joerg@debian.(none)
6ef12bb111
Merge debian.(none):/M50/mysql-5.0
...
into debian.(none):/M50/push-5.0
2007-04-20 12:31:03 +02:00
joerg@debian.(none)
88d88e7f7a
Merge debian.(none):/M50/bug27739-5.0
...
into debian.(none):/M50/push-5.0
2007-04-20 12:25:50 +02:00
joerg@debian.(none)
a9e05f8ce5
Merge debian.(none):/M50/push-5.0
...
into debian.(none):/M51/push-5.1
2007-04-20 12:15:57 +02:00
gshchepa/uchum@gshchepa.loc
f5a229b3d1
Bug#27704: incorrect comparison of rows with NULL components
...
Support for NULL components was incomplete for row comparison,
fixed. Added support for abort_on_null at compare_row() like
in 5.x
2007-04-20 15:14:09 +05:00
joerg@debian.(none)
4c00b6fd26
Merge debian.(none):/M51/mysql-5.1
...
into debian.(none):/M51/push-5.1
2007-04-20 11:58:56 +02:00
kent/mysqldev@mysql.com/production.mysql.com
8378813628
testScanFilter.cpp:
...
Corrected copyright header
2007-04-20 11:53:53 +02:00
gkodinov/kgeorge@magare.gmz
0d70f964aa
Merge magare.gmz:/home/kgeorge/mysql/work/B27786-5.0-opt
...
into magare.gmz:/home/kgeorge/mysql/work/B27786-addon-5.1-opt
2007-04-20 12:06:52 +03:00
joerg@debian.(none)
cd8359720e
Merge debian.(none):/M50/bug27739-5.0
...
into debian.(none):/M51/bug27739-5.1
2007-04-20 11:03:13 +02:00
gkodinov/kgeorge@magare.gmz
bcde01f6ff
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into magare.gmz:/home/kgeorge/mysql/autopush/B27786-5.0-opt
2007-04-20 12:01:54 +03:00
mhansson@dl145s.mysql.com
f0fc4b88e0
Bug #24778 : Innodb: No result when using ORDER BY
...
This bug was intruduced by the fix for bug#17212 (in 4.1). It is not
ok to call test_if_skip_sort_order since this function will
alter the execution plan. By contract it is not ok to call
test_if_skip_sort_order in this context.
This bug appears only in the case when the optimizer has chosen
an index for accessing a particular table but finds a covering
index that enables it to skip ORDER BY. This happens in
test_if_skip_sort_order.
2007-04-20 11:01:53 +02:00
mats@romeo.(none)
6d0fb7cbfb
Merge romeo.(none):/home/bk/merge-mysql-5.0
...
into romeo.(none):/home/bk/merge-mysql-5.1
2007-04-20 10:55:50 +02:00
joerg@debian.(none)
5de73f45f9
configure.in : Ensure that "icheck" is really the ABI checker,
...
not some other tool (file system checker on Tru64).
Patch originally supplied by Peter O'Gorman, slightly modified by me.
Bug#27739 "build fails on Tru64 due to icheck test in configure"
2007-04-20 10:51:53 +02:00
mats@romeo.(none)
875de0e571
Merge romeo.(none):/home/bkroot/mysql-5.1-rpl
...
into romeo.(none):/home/bk/merge-mysql-5.1
2007-04-20 10:46:58 +02:00
tomas@whalegate.ndb.mysql.com
742a4d50e9
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-maint
2007-04-20 10:46:34 +02:00
mats@romeo.(none)
f1caa9559c
Merge romeo.(none):/home/bkroot/mysql-5.0-rpl
...
into romeo.(none):/home/bk/merge-mysql-5.0
2007-04-20 10:35:27 +02:00
mats@romeo.(none)
bb73858835
Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl
...
into romeo.(none):/home/bkroot/mysql-5.0-rpl
2007-04-20 10:28:44 +02:00
mats@romeo.(none)
06a3b047fd
Merge romeo.(none):/home/bkroot/mysql-5.1-rpl
...
into romeo.(none):/home/bk/b27779-mysql-5.1-rpl
2007-04-20 10:20:52 +02:00
mats@romeo.(none)
6d9631cc6e
Disabling test case rpl_ndb_circular_simplex
2007-04-20 10:10:21 +02:00
tomas@whalegate.ndb.mysql.com
fcb7246406
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-maint
2007-04-20 10:03:18 +02:00
gkodinov/kgeorge@magare.gmz
4c89a5960f
Bug #27786 :
...
When merging views into the enclosing statement
the ORDER BY clause of the view is merged to the
parent's ORDER BY clause.
However when the VIEW is merged into an UNION
branch the ORDER BY should be ignored.
Use of ORDER BY for individual SELECT statements
implies nothing about the order in which the rows
appear in the final result because UNION by default
produces unordered set of rows.
Fixed by ignoring the ORDER BY clause from the merge
view when expanded in an UNION branch.
2007-04-20 10:49:45 +03:00
msvensson@pilot.blaudden
344758cc1e
Merge bk-internal:/home/bk/mysql-5.1-new-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-04-20 07:21:54 +02:00
msvensson@pilot.blaudden
ba97785fe7
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-04-20 07:20:48 +02:00
msvensson@pilot.blaudden
71e58855bf
Remove comment
2007-04-20 07:20:26 +02:00
mtaylor@qualinost.(none)
7e47a7c76b
Change mode to -rw-rw-r--
2007-04-19 21:59:25 -07:00
mtaylor@qualinost.(none)
4b820c5067
Made default changelog a little more generic.
2007-04-19 21:58:36 -07:00
mtaylor@blade09.mysql.com
5b3a22ecb6
control.in:
...
Left a stray space in.
2007-04-20 03:50:11 +02:00
mtaylor@blade09.mysql.com
007d2edc1c
Makefile.am:
...
Renamed libmysqlclient package entires
2007-04-20 02:17:15 +02:00
mtaylor@blade09.mysql.com
d847f76f49
libmysqlclientSLIBoff.README.Debian.in:
...
Rename: debian/libmysqlclientSLIB.README.Debian.in -> debian/libmysqlclientSLIBoff.README.Debian.in
libmysqlclientSLIBoff.docs.in:
Rename: debian/libmysqlclientSLIB.docs.in -> debian/libmysqlclientSLIBoff.docs.in
control.in:
Renamed packages back to libmysqlclientSLIBoff to match current packages.
We can rename this in a sensible way later on.
libmysqlclientSLIBoff.files.in:
Rename: debian/libmysqlclientSLIB.files.in -> debian/libmysqlclientSLIBoff.files.in
libmysqlclientSLIBoff.dirs.in:
Rename: debian/libmysqlclientSLIB.dirs.in -> debian/libmysqlclientSLIBoff.dirs.in
libmysqlclientSLIBoff.postinst.in:
Rename: debian/libmysqlclientSLIB.postinst.in -> debian/libmysqlclientSLIBoff.postinst.in
2007-04-20 02:06:16 +02:00