Commit graph

47546 commits

Author SHA1 Message Date
df@pippilotta.erinye.com
6db1887a5c fix make_win_bin_dist typo 2007-06-13 19:19:11 +02:00
igor@olga.mysql.com
20ad515003 Fixed bug #28980: the result of ROUND(<decimal expr>,<int column>)
was erroneously converted to double, while the result of
ROUND(<decimal expr>, <int literal>) was preserved as decimal.
As a result of such a conversion the value of ROUND(D,A) could
differ from the value of ROUND(D,val(A)) if D was a decimal expression.

Now the result of the ROUND function is never converted to 
double if the first argument is decimal.
2007-06-13 09:32:36 -07:00
jmiller/ndbdev@ndb08.mysql.com
8b44b6f593 Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
into  mysql.com:/data2/mysql-5.1-maint
2007-06-13 17:44:21 +02:00
jmiller/ndbdev@mysql.com/ndb08.mysql.com
61873b6765 rpl_known_bugs_detection.test:
Updated to use new tool(s)
2007-06-13 17:43:31 +02:00
mhansson@dl145s.mysql.com
b87dbfe949 Merge mhansson@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
into  dl145s.mysql.com:/users/mhansson/mysql/autopush/5.1o-bug27634
2007-06-13 16:01:16 +02:00
stewart@flamingspork.com[stewart]
13c4d317bb [PATCH] add knielsen as MAINTAINER of NDBAPI NdbRecord examples
Index: ndb-merge/storage/ndb/MAINTAINERS
===================================================================
2007-06-13 23:53:01 +10:00
stewart@flamingspork.com[stewart]
1518abe7f9 [PATCH] Add MAINTAINERS file for NDB
Index: ndb-merge/storage/ndb/MAINTAINERS
===================================================================
2007-06-13 23:52:47 +10:00
df@pippilotta.erinye.com
990ac2cc3f Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
2007-06-13 15:39:04 +02:00
df@pippilotta.erinye.com
40f8aa1fd6 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-build
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
2007-06-13 15:36:47 +02:00
stewart@flamingspork.com[stewart]
155390c3a7 [PATCH] BUG#29074 preserve file timestamps in ndb_error_reporter
Index: ndb-work/storage/ndb/tools/ndb_error_reporter
===================================================================
2007-06-13 23:34:36 +10:00
df@pippilotta.erinye.com
23ce2ec53c Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
2007-06-13 15:34:30 +02:00
stewart@flamingspork.com[stewart]
85eba85b40 [PATCH] Enable test for (Closed) bug 16445
Bug was updated on May 30th by Tomas to say that hasn't been seen in PB
since global dict cache rewrite. This test should probably be enabled then.

Index: ndb-work/mysql-test/t/ndb_basic.test
===================================================================
2007-06-13 23:34:22 +10:00
stewart@flamingspork.com[stewart]
7a8961fca3 [PATCH] BUG#29073 Store history for ndb_mgm
Index: ndb-work/storage/ndb/src/mgmclient/main.cpp
===================================================================
2007-06-13 23:34:09 +10:00
stewart@flamingspork.com[stewart]
367076371e [PATCH] Add tests for ndb variables (related to BUG#26675)
This is somewhat related to BUG#26675 (ndb_connectstring not reported
in show global variables)

Index: ndb-work/mysql-test/r/ndb_basic.result
===================================================================
2007-06-13 23:33:51 +10:00
stewart@flamingspork.com[stewart]
35006868d1 [PATCH] Disable mysql_upgrade test (Bug#28560)
Index: ndb-work/mysql-test/t/disabled.def
===================================================================
2007-06-13 23:33:37 +10:00
df@pippilotta.erinye.com
9dc622e540 Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-4.1-build
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-build
2007-06-13 15:13:54 +02:00
df@pippilotta.erinye.com
fb3a572ff8 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
2007-06-13 15:13:08 +02:00
df@pippilotta.erinye.com
1eae867a4f Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-build
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
2007-06-13 15:11:58 +02:00
df@pippilotta.erinye.com
e84571f742 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work
2007-06-13 15:10:45 +02:00
df@pippilotta.erinye.com
a98dca4c87 Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1-build
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
2007-06-13 15:09:49 +02:00
joerg@trift2.
b3917e94fa Merge trift2.:/MySQL/M50/push-5.0
into  trift2.:/MySQL/M51/push-5.1
2007-06-13 15:04:21 +02:00
joerg@trift2.
a4494a1b81 Merge trift2.:/MySQL/M41/push-4.1
into  trift2.:/MySQL/M50/push-5.0
2007-06-13 14:57:31 +02:00
stewart@flamingspork.com[stewart]
23eb8698dc [PATCH] BUG#29063 mgmapi: connect timeout set incorrectly
correctly divide timeout by 1000 to convert to seconds for SocketClient

Index: ndb-work/storage/ndb/src/mgmapi/mgmapi.cpp
===================================================================
2007-06-13 22:54:14 +10:00
stewart@flamingspork.com[stewart]
17fc7a8161 [PATCH] BUG#29063 TESTCASE mgmapi: connect timeout set incorrectly
Add test to testMgm for Connect timeout. add to autotest.

Index: ndb-work/storage/ndb/test/ndbapi/testMgm.cpp
===================================================================
2007-06-13 22:54:00 +10:00
joerg@trift2.
f004ab37ef Merge trift2.:/MySQL/M50/merge-5.0
into  trift2.:/MySQL/M50/push-5.0
2007-06-13 14:52:45 +02:00
joerg@trift2.
4d8632f2e0 Merge trift2.:/MySQL/M51/merge-5.1
into  trift2.:/MySQL/M51/push-5.1
2007-06-13 14:43:57 +02:00
joerg@trift2.
536ea333d8 Merge trift2.:/MySQL/M50/push-5.0
into  trift2.:/MySQL/M51/push-5.1
2007-06-13 14:36:18 +02:00
df@pippilotta.erinye.com
5ce49c284f Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
2007-06-13 14:24:31 +02:00
joerg@trift2.
4ed489d66b Merge trift2.:/MySQL/M50/merge-5.0
into  trift2.:/MySQL/M51/merge-5.1
2007-06-13 14:23:09 +02:00
joerg@trift2.
36adff6d0d Merge trift2.:/MySQL/M41/tmp-4.1
into  trift2.:/MySQL/M50/merge-5.0
2007-06-13 13:55:42 +02:00
joerg@trift2.
a4a2c7202c Merge trift2.:/MySQL/M41/tmp-4.1
into  trift2.:/MySQL/M41/push-4.1
2007-06-13 13:35:04 +02:00
joerg@trift2.
018a5d403b sql/item_func.cc
Improved check for thread identity in the "embedded" case,
    provided by Monty.
    
    This finishes the fixes for bug#27078.
2007-06-13 13:33:00 +02:00
df@pippilotta.erinye.com
6de0de60cf Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-post-commit
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
2007-06-13 13:19:43 +02:00
df@pippilotta.erinye.com
750b37a888 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
2007-06-13 13:17:29 +02:00
df@pippilotta.erinye.com
d32bdf767e Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
2007-06-13 13:16:18 +02:00
df@pippilotta.erinye.com
8b47143e27 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
2007-06-13 13:04:33 +02:00
df@pippilotta.erinye.com
7b7dda69de Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work
2007-06-13 13:02:17 +02:00
df@pippilotta.erinye.com
51672e9598 Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-4.1
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1
2007-06-13 12:58:56 +02:00
df@pippilotta.erinye.com
d735865d0c Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0
2007-06-13 12:56:43 +02:00
df@pippilotta.erinye.com
7ed3a78331 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0
2007-06-13 12:37:10 +02:00
df@pippilotta.erinye.com
f5d6c2906d Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-post-commit
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0
2007-06-13 12:35:13 +02:00
df@pippilotta.erinye.com
c379f6d99c Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-post-commit
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-post-commit
2007-06-13 12:04:05 +02:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
3587614be7 after-merge fix. 2007-06-13 14:59:31 +05:00
df@pippilotta.erinye.com
4f9c468eb9 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-post-commit
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-post-commit
2007-06-13 11:54:28 +02:00
df@pippilotta.erinye.com
36ea2e3091 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-post-commit
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1
2007-06-13 11:48:07 +02:00
df@pippilotta.erinye.com
320ec82616 BK changes for
https://inside.mysql.com/wiki/MySQL's_Code_Reviews_Published_Externally
2007-06-13 11:44:58 +02:00
ramil/ram@ramil.myoffice.izhnet.ru
87e7709fae Merge mysql.com:/home/ram/work/mysql-5.0-maint
into  mysql.com:/home/ram/work/b28748/b28748.5.0
2007-06-13 14:21:44 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
722f9305e0 Merge mysql.com:/home/ram/work/b28748/b28748.5.0
into  mysql.com:/home/ram/work/b28748/b28748.5.1
2007-06-13 14:16:39 +05:00
jmiller/ndbdev@ndb08.mysql.com
bbb9054c49 Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
into  mysql.com:/data2/mysql-5.1-maint
2007-06-13 05:53:37 +02:00
jmiller/ndbdev@mysql.com/ndb08.mysql.com
af62cf8072 Updated patch for Bug#28497 based off of Magnus's review 2007-06-13 05:52:43 +02:00