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
tsmith@quadxeon.mysql.com
8e74a1d736
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
2007-04-20 00:21:57 +02:00
tsmith@quadxeon.mysql.com
2272cad3f4
innodb_mysql.test, innodb_mysql.result:
...
Fix test case: add drop table
2007-04-20 00:20:57 +02:00
mtaylor@blade09.mysql.com
4cc0c69e47
rules:
...
Protect the control file from running ./configure again
2007-04-19 23:43:57 +02:00
cmiller@zippy.cornsilk.net
dfdc475a57
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint--pthreadkeycreate
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-new-maint
2007-04-19 17:23:41 -04:00
cmiller@zippy.cornsilk.net
28b3218e45
Bug #27964 : pthread_key_create doesn't set errno, so don't report \
...
errno
Vasil Dimov (at Oracle) noted that pthread_key_create() does not
set errno, so if it fails then we return the wrong error code.
Instead, capture the return value, which is the real error value,
and instead report that.
2007-04-19 17:07:11 -04:00
mtaylor@blade09.mysql.com
e3b33f856a
control.in:
...
Fixed branding problem.
Many files:
Fixed branding problem
changelog:
Upgraded to 5.0.42
defs.mk.in:
Fixed branding and variable persiting problem.
2007-04-19 23:07:09 +02:00
tsmith@quadxeon.mysql.com
4702afda85
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
2007-04-19 22:53:19 +02:00
tsmith@quadxeon.mysql.com
be9c660729
innodb_mysql.test, innodb_mysql.result:
...
Add test case for Bug #27210 : INNODB ON DUPLICATE KEY UPDATE
2007-04-19 22:38:12 +02:00
msvensson@pilot.blaudden
b9d7122376
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-04-19 21:35:26 +02:00
msvensson@pilot.blaudden
498c152b11
Add replace for varying errno
2007-04-19 21:35:10 +02:00
msvensson@pilot.blaudden
9c775302de
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-04-19 21:31:17 +02:00
msvensson@pilot.blaudden
da93a36a0e
mysql_upgrade portability fixes
2007-04-19 21:30:46 +02:00
tsmith@quadxeon.mysql.com
c1e156b1cd
Post-merge fix of innodb.result
2007-04-19 21:18:49 +02:00
msvensson@pilot.blaudden
f8e3fbc27b
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-04-19 18:34:47 +02:00
msvensson@pilot.blaudden
1f6021dd30
mysql_upgrade must depend on GenFixPrivs
2007-04-19 18:34:00 +02:00
msvensson@pilot.blaudden
2c95135c8d
mysql_upgrade depends on GenFixPrivs
2007-04-19 18:32:55 +02:00
msvensson@pilot.blaudden
179ffb2407
Merge bk-internal:/home/bk/mysql-5.1-new-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-04-19 17:05:18 +02:00
msvensson@pilot.blaudden
ce518d20ef
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-04-19 17:01:59 +02:00
msvensson@pilot.blaudden
46793b6134
Build zlib before extra since extra/comp_err uses zlib
2007-04-19 17:01:19 +02:00
msvensson@pilot.blaudden
41c41448b9
mysql_upgrade win fixes
2007-04-19 17:00:29 +02:00
mskold/marty@linux.site
44c80020b4
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
2007-04-19 15:52:31 +02:00
mskold/marty@mysql.com/linux.site
098adcb465
Commented out buggy debugging code
2007-04-19 15:48:17 +02:00
gkodinov/kgeorge@magare.gmz
83fff26261
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into magare.gmz:/home/kgeorge/mysql/autopush/B27530-5.0-opt
2007-04-19 15:07:03 +03:00
gluh@mysql.com/eagle.(none)
16223f0d75
Bug#27499 DROP TABLE race with SHOW TABLE STATUS
...
They can drop table after table names list creation and before table opening.
We open non existing table and get ER_NO_SUCH_TABLE error.
In this case we do not store the record into I_S table and clear error.
2007-04-19 16:49:21 +05:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
f2b227dc52
Merge mysql.com:/home/ram/work/mysql-5.0-maint
...
into mysql.com:/home/ram/work/b26851/b26851.5.0
2007-04-19 15:02:36 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
c4ee4e65df
Merge mysql.com:/home/ram/work/mysql-5.1-maint
...
into mysql.com:/home/ram/work/b26851/b26851.5.1
2007-04-19 14:56:04 +05:00
marty@linux.site
607838a126
Bug#24667 After ALTER TABLE operation ndb_dd table becomes regular ndb, Bug #25296 Truncate table converts NDB disk based tables to in-memory tables: Added more checks in tests
2007-04-19 10:48:24 +02:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
bc1805891c
Merge mysql.com:/home/ram/work/mysql-5.0-maint
...
into mysql.com:/home/ram/work/b22824/my50-b22824
2007-04-19 12:32:38 +05:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
df75e6e50e
Merge mysql.com:/home/ram/work/mysql-5.0-maint
...
into mysql.com:/home/ram/work/b26851/b26851.5.0
2007-04-19 11:45:26 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
3a0042c757
Merge mysql.com:/home/ram/work/b26851/b26851.5.0
...
into mysql.com:/home/ram/work/b26851/b26851.5.1
2007-04-19 11:07:19 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
570aacac45
Merge mysql.com:/home/ram/work/b22824/my50-b22824
...
into mysql.com:/home/ram/work/b22824/my51-b22824
2007-04-19 10:42:47 +05:00
tomas@whalegate.ndb.mysql.com
1ed4baf376
corrrection of test case
2007-04-19 06:24:36 +02:00
tsmith@siva.hindu.god
88a477abe9
Post-push fix of client/mysqltest.c oops.
2007-04-18 21:29:38 -06:00
tsmith@siva.hindu.god
041c8a825f
Move WEXITSTATUS #define from mysqltest.c to client_priv.h, and
...
include client_priv.h in mysqltest.c. Portability fix.
2007-04-18 20:47:55 -06:00
tsmith@siva.hindu.god
68f2cc2906
Merge siva.hindu.god:/home/tsmith/m/inno/apr18/50
...
into siva.hindu.god:/home/tsmith/m/inno/apr18/51
2007-04-18 20:38:18 -06:00
tsmith@siva.hindu.god
5b06f8bbad
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into siva.hindu.god:/home/tsmith/m/inno/apr18/51
2007-04-18 20:06:42 -06:00
tsmith@siva.hindu.god
e2873193c7
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into siva.hindu.god:/home/tsmith/m/inno/apr18/50
2007-04-18 20:03:47 -06:00
tsmith@siva.hindu.god
50fe976aeb
Merge siva.hindu.god:/home/tsmith/m/inno/apr18/50
...
into siva.hindu.god:/home/tsmith/m/inno/apr18/51
2007-04-18 20:00:56 -06:00