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
bell@sanja.is.com.ua
da5a55e3cd
sql_updatable_view_key replaced with updatable_views_with_limit
...
now default behaviour do not prevent any updates of view.
Also updating VIEWs of queries without LIMIT clause will not be checked at all (there will not be even warning)
(changes according to discussion on last dev-conf)
2004-10-07 12:13:42 +03: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
ae87bd11fb
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb2
2004-10-06 13:34:17 +00:00
tomas@poseidon.ndb.mysql.com
884892a650
bug#5736, subqueries and not in
...
and testcases
2004-10-06 13:18:55 +00:00
joreland@mysql.com
f715d82a74
testcase for bug#5736
...
fix of changed clo to mysql-test-run
2004-10-06 11:00:09 +02: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
joreland@mysql.com
761bc1ce4d
Merge mysql.com:/home/jonas/src/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-10-05 15:02:10 +02: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
bell@sanja.is.com.ua
05acd51fba
postmerge fix
2004-10-05 15:07:31 +03:00
joreland@mysql.com
9d6cb54bce
Merge mysql.com:/home/jonas/src/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-10-05 14:04:33 +02:00
bell@sanja.is.com.ua
a78f817d20
merge
2004-10-05 13:41:51 +03:00
joreland@mysql.com
0a8bbe4d85
wl2135 - index restart
2004-10-05 12:17:42 +02: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
igor@rurik.mysql.com
a9b759af3e
join_outer.result, join_outer.test:
...
Added a test case for bug #5896 .
sql_select.cc:
Fixed the problem of ignoring on expressions depending
only on outer table when outer table either contains
1 row or is guaranteed to return only 1 row (bug #5896 ).
2004-10-04 22:26:36 -07:00
monty@mishka.local
76a315410b
After merge fixes
2004-10-05 03:05:20 +03:00
monty@mishka.local
5eca078b19
merge
2004-10-05 01:10:23 +03:00
monty@mishka.local
0fa62b691b
Fixed bug in strict mode (A state was not properly cleared on successful insert/update's)
2004-10-05 01:05:15 +03: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
bell@sanja.is.com.ua
9062e99ee6
merge
2004-10-04 13:56:48 +03:00
bell@sanja.is.com.ua
9d9c950445
postmerge fix
2004-10-04 13:45:35 +03: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
monty@mishka.local
be4ca46fbe
More fixes for strict mode:
...
More tests.
Better error messages.
Fixed bug when checking if we updated all needed columns for INSERT.
Give an error if we encounter a wrong float value during parsing.
Don't print DEFAULT for columns without a default value in SHOW CREATE/SHOW FIELDS.
Fixed UPDATE IGNORE when using STRICT mode.
2004-10-02 22:20:08 +03: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
brian@avenger.(none)
da71f76910
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into avenger.(none):/export/brian/mysql/schema-5.0
2004-10-01 12:44:52 -07:00
brian@avenger.(none)
335a81ebb0
Update to add keyword "SCHEMA" and "SCHEMAS". Small test case was added too.
2004-10-01 12:39:11 -07: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