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
monty@mysql.com
aa2327f95e
Portability fix (Got different results for double -> longlong when compiling with full optimization)
2004-10-08 00:48:42 +03:00
bell@sanja.is.com.ua
ca7a4e495f
changes in SHOW CREATE VIEW output
2004-10-07 23:26:26 +03:00
bell@sanja.is.com.ua
78acfbb740
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-error-5.0
2004-10-07 23:00:33 +03:00
bell@sanja.is.com.ua
78997a2acd
allow merging views with subqueries in WHERE clause (BUG#5504)
2004-10-07 22:54:31 +03:00
tomas@poseidon.ndb.mysql.com
0d5c9fb910
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb-merge
2004-10-07 16:57:53 +00:00
tomas@poseidon.ndb.mysql.com
69f40808e2
ndb_alter_table.result, ndb_alter_table.test:
...
...
2004-10-07 16:30:21 +00:00
magnus@neptunus.(none)
d167c09834
Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
...
into neptunus.(none):/home/magnus/mysql/mysql-4.1-ndb
2004-10-07 15:42:56 +02:00
tomas@poseidon.ndb.mysql.com
6f0dc0f48e
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
2004-10-07 13:42:55 +00:00
pem@mysql.comhem.se
8b1a6d377f
Revised BUG#5000: SPs can be created with no default database.
...
Now simply give an error if no database. (The "global SP feature" will be
done using PATH instead.)
2004-10-07 15:32:36 +02:00
monty@mysql.com
3a24c279be
Fix results (becasue of strict mode)
2004-10-07 16:18:27 +03:00
bell@sanja.is.com.ua
d73ba9660d
test of DELETE privilege and cyclic reference added in case of altering view (BUG#5148)
...
fixed ALTER VIEW syntax
fixed WITH CHECK OPTION clause printing in SHOW CREATE VIEW
2004-10-07 15:43:04 +03:00
tomas@poseidon.ndb.mysql.com
a257686692
more order by fixes
2004-10-07 12:36:37 +00:00
monty@mysql.com
66406dc47c
Updates tests after 'no automatic default' patch
2004-10-07 15:28:05 +03:00
magnus@neptunus.(none)
ac9016df91
Initialise "sorted" variable in constructor of QUICK_SELECT. The variable is set to 1 in test_if_skip_sort_order if we decide to optimize "order by" by uinsg index_read.
2004-10-07 11:57:48 +02:00
tomas@poseidon.ndb.mysql.com
0ac2c35fe9
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
2004-10-07 09:57:46 +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
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