kent@mysql.com
05c01360e3
Makefile.am, client_test.test, mysql-test-run.sh:
...
To make client_test work as mysql-test-run test case, needs to install it
2004-10-08 01:39:20 +02:00
konstantin@mysql.com
d7bda287de
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/media/sda1/mysql/mysql-4.1-5748-anew
2004-10-08 02:22:40 +04:00
konstantin@mysql.com
2aa7ec0d9d
A fix for Bug#5748 "Prepared statement with BETWEEN and bigint values
...
crashes mysqld": implementation for a generic item tree modifications
registry. Every item tree modification which should be rolled back for
subsequent execution of a prepared statement or stored procedure should
be saved in the registry. All such modifications are rolled back at once
during cleanup stage of PS.
Actual fix for the bug just adds a call to register modifications to
convert_constant_item.
Post review fixes implemented.
2004-10-08 02:21:19 +04:00
tomas@poseidon.ndb.mysql.com
69f40808e2
ndb_alter_table.result, ndb_alter_table.test:
...
...
2004-10-07 16:30:21 +00:00
tomas@poseidon.ndb.mysql.com
a257686692
more order by fixes
2004-10-07 12:36:37 +00:00
dlenev@mysql.com
e5483ab3bd
Manual merge of tree containing fix for bug #5915 "ALTER TABLE behaves
...
differently when converting column to auto_increment in 4.1" with
current tree.
2004-10-07 13:51:32 +04:00
monty@mysql.com
01232b2c52
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2004-10-07 12:51:31 +03:00
tomas@poseidon.ndb.mysql.com
4afccd761b
more order by for ndb
2004-10-07 09:51:30 +00:00
monty@mysql.com
546c2bd6ab
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2004-10-07 12:37:21 +03:00
tomas@poseidon.ndb.mysql.com
690cdfc697
added order by to give same order results on different endian and different sized clusters
2004-10-07 09:27:39 +00:00
dlenev@brandersnatch.localdomain
1f54900630
Fix for bug #5915 "ALTER TABLE behaves differently when converting column
...
to auto_increment in 4.1".
Now we are enforcing NO_AUTO_VALUE_ON_ZERO mode during ALTER TABLE only
if we are converting one auto_increment column to another auto_increment
column (this also includes most common case when we don't do anything
with such column).
Also now when we convert some column to TIMESTAMP NOT NULL column with
ALTER TABLE we convert NULL values to current timestamp, (as we do this
in INSERT). One can still get old behavior by setting system TIMESTAMP
variable to 0.
2004-10-07 13:02:39 +04:00
tomas@poseidon.ndb.mysql.com
a8d2692c65
adder order by
2004-10-07 08:42:11 +00:00
monty@mysql.com
6239edc1d1
After merge fixes
...
Some bigger code changes was necessary becasue of the multi-table-update and the new HANDLER code
2004-10-07 10:50:13 +03:00
monty@mysql.com
62f3cd6a31
Merge with 4.0 for 4.1 release
...
Noteworthy:
- New HANDLER code
- New multi-update-grant-check code
- Table lock code in ha_innodb.cc was not applied
2004-10-06 19:14:33 +03:00
tomas@poseidon.ndb.mysql.com
884892a650
bug#5736, subqueries and not in
...
and testcases
2004-10-06 13:18:55 +00:00
ram@gw.mysql.r18.ru
0944bed7fc
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into gw.mysql.r18.ru:/usr/home/ram/work/4.0.b5733
2004-10-06 12:49:56 +05:00
bar@mysql.com
3fc7640a19
Bug #5832 SELECT doesn't return records in some cases
2004-10-05 21:22:14 +05:00
gluh@gluh.mysql.r18.ru
2a621e275b
Fix for bug #5555 : "GROUP BY enum_field" returns incorrect results
2004-10-05 17:02:09 +04:00
ingo@mysql.com
c546074e21
Merge mysql.com:/home/mydev/mysql-4.0
...
into mysql.com:/home/mydev/mysql-4.0-bug4286
2004-10-05 11:33:13 +02:00
dlenev@mysql.com
0d83bdf20d
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/dlenev/src/mysql-4.1-ryan
2004-10-04 20:13:16 +04:00
tomas@poseidon.ndb.mysql.com
16ab4447bf
corrected merge error rgarding NDB_CONNECTSTRING
2004-10-04 13:53:36 +00:00
dlenev@mysql.com
a4d5804e31
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/dlenev/src/mysql-4.1-ryan
2004-10-04 17:16:49 +04:00
dlenev@brandersnatch.localdomain
cfd34f779f
Made TIMESTAMP NULL columns without explicit DEFAULT value to be always
...
treated as DEFAULT NULL columns (independently from their position in
table).
(still to be discussed with Monty, Brian, Trudy et al. before push)
2004-10-04 17:13:31 +04:00
tomas@poseidon.ndb.mysql.com
bc5ca3a1ce
Merge
2004-10-04 12:36:25 +00:00
tomas@poseidon.ndb.mysql.com
e13b136c9a
bug #5872 , transactions should only be restarted with transaction.on flag off if execute_commit has been performed
...
added testcase for this
use force send for all executes
2004-10-04 12:26:26 +00:00
tomas@poseidon.ndb.mysql.com
4cab81d8c3
Merge
2004-10-04 00:34:34 +00:00
tomas@poseidon.ndb.mysql.com
e554888be6
use new function stop_ndbcluster
2004-10-04 00:25:04 +00:00
tomas@poseidon.ndb.mysql.com
fd0e3d0899
Merge
2004-10-04 00:15:32 +00:00
tomas@poseidon.ndb.mysql.com
794755cd9d
better cleanup of cluster processes with test failure
2004-10-04 00:10:33 +00:00
tomas@poseidon.ndb.mysql.com
08ce5f4a35
make sure old mysqld's are shutdown
2004-10-03 23:41:15 +00:00
tomas@poseidon.ndb.mysql.com
f6ad058388
Merge
2004-10-03 21:39:04 +00:00
antony@ltantony.rdg.cyberkinetica.homeunix.net
b36a565931
Merge ltantony.rdg.cyberkinetica.homeunix.net:/usr/home/staff/repositories/mysql-4.0
...
into ltantony.rdg.cyberkinetica.homeunix.net:/usr/home/antony/work/bug4118
2004-10-03 00:25:09 +01:00
antony@ltantony.rdg.cyberkinetica.homeunix.net
2973a047ea
Bug#4118: multi-table UPDATE takes WRITE lock on read table
...
Ensures that WRITE lock is not obtained on all tables referenced.
2004-10-03 00:20:47 +01:00
tomas@poseidon.ndb.mysql.com
fbf2a6ac0c
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2004-10-01 22:15:05 +00:00
tomas@poseidon.ndb.mysql.com
5745223a90
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2004-10-01 21:35:50 +00:00
dellis@goetia.(none)
141a5eeaca
Merge dellis@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into goetia.(none):/home/dellis/mysqlab/bk/mysql-4.1
2004-10-01 14:53:52 -05:00
dellis@goetia.(none)
ce6f076315
grant.test, grant.result, sql_acl.cc:
...
BUG #5831 Changed mysql_revoke_all() to successfully delete all privileges for a user in one pass.
2004-10-01 14:48:48 -05:00
kent@mysql.com
391cc2963a
Merge mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/users/kboortz/daily/work/mysql-4.1-vax
2004-10-01 18:28:44 +02:00
kent@mysql.com
3f717d7c00
client_test.test:
...
Temporarely disabled client_test test
Use MASTER_MYSOCK to get socket path
2004-10-01 18:27:24 +02:00
tomas@poseidon.ndb.mysql.com
929e98b45b
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2004-10-01 16:17:04 +00:00
dlenev@mysql.com
53209cc4fc
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/dlenev/src/mysql-4.1-ryan
2004-10-01 18:55:17 +04:00
dlenev@brandersnatch.localdomain
2511990c97
Support for TIMESTAMP columns holding NULL values. Unlike all other
...
column types TIMESTAMP is NOT NULL by default, so in order to have
TIMESTAMP column holding NULL valaues you have to specify NULL as
one of its attributes (this needed for backward compatibility).
Main changes:
Replaced TABLE::timestamp_default_now/on_update_now members with
TABLE::timestamp_auto_set_type flag which is used everywhere
for determining if we should auto-set value of TIMESTAMP field
during this operation or not. We are also use Field_timestamp::set_time()
instead of handler::update_timestamp() in handlers.
2004-10-01 18:54:06 +04:00
dellis@goetia.(none)
f5b7774e99
Merge dellis@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into goetia.(none):/home/dellis/mysqlab/bk/mysql-4.1
2004-10-01 08:22:12 -05:00
mskold@mysql.com
dd8c74beac
Added index cardinality check
2004-10-01 14:57:17 +02:00
dellis@goetia.(none)
8a12b5add0
logging_ok:
...
Logging to logging@openlogging.org accepted
sql_acl.cc, grant.test, grant.result:
BUG 5831 Changed mysql_revoke_all() to successfully delete all privileges for a user in one pass.
2004-10-01 07:50:26 -05:00
mskold@mysql.com
ca47a4a25c
Changed test to be independent on scan order
2004-10-01 14:23:31 +02:00
ram@gw.mysql.r18.ru
4ec50dc4d7
delete.result, delete.test:
...
A fix (bug #5733 : Table handler error with self-join multi-table DELETE).
records.cc:
A fix (bug #5733 : Table handler error with self-join multi-table DELETE).
2004-10-01 16:23:54 +05:00
tomas@poseidon.ndb.mysql.com
5e8ce3841a
bug#5349 ALTER TABLE corrupts TEXT (and blob?)
2004-10-01 11:16:49 +00:00
jan@hundin.mysql.fi
aaf661fcaa
Merge jlindstrom@build.mysql.com:/home/bk/mysql-4.1
...
into hundin.mysql.fi:/home/jan/mysql-4.1
2004-10-01 08:39:34 +03:00
kent@mysql.com
48006039c1
client_test.test:
...
Use TESTS_BINDIR to point out bin dir for "client_test"
mysql-test-run.sh:
Export TESTS_BINDIR to be used from --exec
2004-10-01 00:32:42 +02:00