gshchepa/uchum@gleb.loc
8f09a374ea
Fixed bug #28625 :
...
DECIMAL column was used instead of BIGINT for the minimal possible
BIGINT (-9223372036854775808).
The Item_func_neg::fix_length_and_dec has been adjusted to
to inherit the type of the argument in the case when it's an
Item_int object whose value is equal to LONGLONG_MIN.
2007-06-16 13:05:07 +05:00
baker@bk-internal.mysql.com
77b96c765c
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
2007-06-16 08:10:02 +02:00
brian@zim.(none)
ab73475950
Added a test for pre-statement call, and fixed connection/deconnect code so that the rest of bbench can be ran by others.
2007-06-15 17:22:57 -07:00
tsmith@quadxeon.mysql.com
891116551e
binlog.result, binlog.test:
...
Post-merge fix: replace xid=* with XID to isolate from number of transactions
2007-06-15 23:57:53 +02:00
istruewing@chilla.local
875cac1ffb
Merge chilla.local:/home/mydev/mysql-5.1-amain
...
into chilla.local:/home/mydev/mysql-5.1-axmrg
2007-06-15 20:23:20 +02:00
malff/marcsql@weblab.(none)
7e36d37eb0
Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-base
...
into weblab.(none):/home/marcsql/TREE/mysql-5.1-rt-merge
2007-06-15 11:36:31 -06:00
malff/marcsql@weblab.(none)
4b427bde82
Fixed warnings raised from mysqltest (unknown -- commands)
2007-06-15 11:15:22 -06:00
tsmith@maint1.mysql.com
a9ae34b56c
Merge quadxeon:m/srv/quadxeon/local/bk/maint/jun14/50
...
into maint1.mysql.com:/data/localhome/tsmith/bk/maint/51
2007-06-15 18:56:11 +02:00
tsmith@maint1.mysql.com
9f4134267a
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into maint1.mysql.com:/data/localhome/tsmith/bk/maint/51
2007-06-15 18:03:59 +02:00
tsmith@quadxeon.mysql.com
73035c274f
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun14/50
2007-06-15 17:59:04 +02:00
istruewing@chilla.local
676ea58252
Merge chilla.local:/home/mydev/mysql-5.0-amain
...
into chilla.local:/home/mydev/mysql-5.0-axmrg
2007-06-15 17:47:02 +02:00
istruewing@chilla.local
dceae35549
Merge chilla.local:/home/mydev/mysql-5.0-ateam
...
into chilla.local:/home/mydev/mysql-5.0-axmrg
2007-06-15 17:45:50 +02:00
msvensson@pilot.(none)
69cfa9b06e
Bug#18415 known problem when mysql-test-run.pl run ActiveState perl for windows
...
- Select STDOUT as default handle after having cloned the child
- Disable check for "$error eq $output" to ptoperly redirect $error
2007-06-15 17:42:03 +02:00
mats@kindahl-laptop.dnsalias.net
43d419e9a9
Disabling test case awaiting reply
2007-06-15 17:21:56 +02:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
9c9464d566
Fix for bug #28144 : "Slave_IO_Running" differs in replication tests
...
Problem: show slave status may return different Slave_IO_Running values running some tests.
Fix: wait for a certain slave state if needed to get tests more predictable.
2007-06-15 16:09:28 +05:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
44c3524026
Backport of
...
mysql-test/include/wait_for_slave_io_to_stop.inc
mysql-test/include/wait_for_slave_sql_to_stop.inc
mysql-test/include/wait_for_slave_to_start.inc
mysql-test/include/wait_for_slave_to_stop.inc
from 5.1
2007-06-15 13:53:36 +05:00
mats@kindahl-laptop.dnsalias.net
9f5b594b8a
Fixing typo in test case.
2007-06-15 09:32:54 +02:00
bar@mysql.com/bar.myoffice.izhnet.ru
f28a584287
Additional fix for bug N26402:
...
An attempt to open file with name '????????.frm'
can produce different errors:
- ER_NO_SUCH_TABLE on Unix
- ER_FILE_NOT_FOUND on Windows
because QUESTION MARK has special meaning on Windows.
Make sure that any of these two errors happens.
2007-06-15 11:53:46 +05:00
bar@bar.myoffice.izhnet.ru
615297df8b
Merge mysql.com:/home/bar/mysql-work/mysql-5.0.b28862
...
into mysql.com:/home/bar/mysql-work/mysql-5.1.b28862
2007-06-15 11:27:10 +05:00
bar@mysql.com/bar.myoffice.izhnet.ru
caf85332ba
Bug#28862 Extended Latin1 characters get lost in CVS engine
...
Problem: Temporary buffer which is used for quoting and escaping
was initialized to character set utf8, and thus didn't allow
to store data in other character sets.
Fix: changing character set of the buffer to be able to
store any arbitrary sequence of bytes.
2007-06-15 11:19:35 +05:00
igor@olga.mysql.com
0f0d4720b8
Fixed bug #27932 : the function LOCATE returned NULL if any
...
of its arguments was evaluated to NULL, while the predicate
LOCATE(str,NULL) IS NULL erroneously was evaluated to FALSE.
This happened because the Item_func_locate::fix_length_and_dec
method by mistake set the value of the maybe_null flag for
the function item to 0. In consequence of this the function
was considered as the one that could not ever return NULL.
2007-06-14 18:55:07 -07:00
dkatz@damien-katzs-computer.local
3a1a561322
Merge damien-katzs-computer.local:/Users/dkatz/mysql51
...
into damien-katzs-computer.local:/Users/dkatz/51_win
2007-06-14 20:48:11 -04:00
tsmith@maint1.mysql.com
664fa012c0
Merge quadxeon:m/srv/quadxeon/local/bk/maint/jun14/51
...
into maint1.mysql.com:/data/localhome/tsmith/bk/maint/51
2007-06-15 02:36:37 +02:00
tsmith@quadxeon.mysql.com
918090030b
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-build
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun14/51
2007-06-15 01:57:33 +02:00
antony@ppcg5.local
21c233440d
Merge ppcg5.local:/Users/antony/Work/p2-bug25800.6
...
into ppcg5.local:/Users/antony/Work/p2-bug25800.6.merge
2007-06-14 16:04:52 -07:00
svoj@mysql.com/april.(none)
8f5b6ec237
BUG#28971 - ALTER TABLE followed by UPDATE for a CSV table
...
make server crash
UPDATE against CSV table may cause server crash or update a table with wrong
values.
CSV can write only a whole row at once. That means it must read all columns,
that it is not going to update, and write them along with updated columns.
But only limited set of columns was read, those that were needed for the
UPDATE query.
With this fix all columns are read in case we're performing an UPDATE.
2007-06-15 03:22:40 +05:00
tsmith@quadxeon.mysql.com
87fdad4ce8
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-build
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun14/50
2007-06-14 23:23:30 +02:00
mskold/marty@linux.site
dea70c74dd
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
2007-06-14 21:58:45 +02:00
malff/marcsql@weblab.(none)
ef2bca44b0
Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into weblab.(none):/home/marcsql/TREE/mysql-5.1-27857
2007-06-14 12:00:14 -06:00
mskold/marty@linux.site
7b99f8a0fc
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-06-14 19:08:46 +02:00
tomas@whalegate.ndb.mysql.com
0da2eb5ce3
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-06-14 18:43:29 +02:00
tomas@whalegate.ndb.mysql.com
ad81e83c70
Bug #27640 backup id not displayed in the output of "ndb_mgm start backup wait completed"
...
- correction, missing node id
2007-06-14 18:40:32 +02:00
holyfoot/hf@mysql.com/hfmain.(none)
160add01a5
fix the binlog-stm_ps.test for the embedded-server
2007-06-14 20:33:57 +05:00
mskold/marty@linux.site
8945183fc3
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
2007-06-14 16:21:52 +02:00
mskold/marty@linux.site
c487c38111
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-06-14 16:10:11 +02:00
mats@kindahl-laptop.dnsalias.net
a6e2763853
Merge kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-rpl
...
into kindahl-laptop.dnsalias.net:/home/bk/b23051-mysql-5.1-rpl
2007-06-14 15:48:32 +02:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
ad88a849c8
Merge jhe@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
...
into dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.0/bug27640-5.0-ndb
2007-06-14 20:45:12 +08:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
27430cd10b
Merge jhe@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
...
into dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/bug27640-5.1-new-ndb
2007-06-14 20:30:48 +08:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
04931cfcd6
Merge dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.0/bug27640-5.0-ndb
...
into dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/bug27640-5.1-new-ndb
2007-06-14 19:57:50 +08:00
holyfoot/hf@hfmain.(none)
1e9373fd60
Merge bk@192.168.21.1:mysql-5.1
...
into mysql.com:/d2/hf/mrg/mysql-5.1-opt
2007-06-14 16:42:43 +05:00
holyfoot/hf@hfmain.(none)
8ccc50b303
Merge bk@192.168.21.1:mysql-5.0
...
into mysql.com:/d2/hf/mrg/mysql-5.0-opt
2007-06-14 16:41:10 +05:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
51fe11b494
Bug#27640, backup id not displayed in the output of "ndb_mgm start backup wait completed"
2007-06-14 19:40:44 +08:00
holyfoot/hf@mysql.com/hfmain.(none)
79062df3fb
Merge bk@192.168.21.1:mysql-4.1
...
into mysql.com:/d2/hf/mrg/mysql-4.1-opt
2007-06-14 16:35:46 +05:00
holyfoot/hf@hfmain.(none)
76e0a0768a
Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt
...
into mysql.com:/d2/hf/mrg/mysql-5.1-opt
2007-06-14 16:35:20 +05:00
mats@kindahl-laptop.dnsalias.net
0341be4eb3
BUG#23051 (READ COMMITTED breaks mixed and statement-based replication):
...
Temporarily using thd_tx_isolation() until decision is made on how to
get the isolation level.
2007-06-14 13:33:31 +02:00
svoj@june.mysql.com
d122a8caf7
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG26976/mysql-5.1-engines
2007-06-14 16:28:34 +05:00
bar@mysql.com/bar.myoffice.izhnet.ru
6d2ffe7b8e
Bug#26402 Server crashes with old-style named table
...
Problem: crash on attempt to open a table
having "#mysql50#" prefix in db or table name.
Fix: This prefix is reserved for "mysql_upgrade"
to access 5.0 tables whose file names are not encoded
according to "5.1 tablename to filename encoded".
Don't try open tables whose db name or table name
has this prefix.
2007-06-14 16:28:33 +05:00
svoj@june.mysql.com
09cd5b5ef8
Merge mysql.com:/home/svoj/devel/mysql/BUG26976/mysql-5.0-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG26976/mysql-5.1-engines
2007-06-14 16:19:47 +05:00
svoj@mysql.com/june.mysql.com
01c9419cec
BUG#26976 - Missing table in merge not noted in related error msg +
...
SHOW CREATE TABLE fails
Addition to the fix: report db name + table name instead of table path.
This solves embedded merge test failure.
2007-06-14 16:18:01 +05:00
tomas@whalegate.ndb.mysql.com
b2aa8dd4d3
Bug #29103 ndb_restore segfaults on NULL var[char|binary]
2007-06-14 12:51:13 +02:00