evgen@moonbone.local
41f968e1b4
Manually merged
2006-05-29 19:07:35 +04:00
evgen@moonbone.local
1f30bf5a33
Fixed bug#19225: unchecked error results in server crash
...
In multi-table delete a table for delete can't be used for selecting in
subselects. Appropriate error was raised but wasn't checked which leads to a
crash at the execution phase.
The mysql_execute_command() now checks for errors before executing select
for multi-delete.
2006-05-29 00:32:59 +04:00
monty@mysql.com
15d48525af
Merge mysql.com:/home/my/mysql-4.1
...
into mysql.com:/home/my/mysql-5.0
2005-07-28 17:09:54 +03:00
monty@mysql.com
3c12d0ae54
Added end marker for tests to make future merges easier
2005-07-28 03:22:47 +03:00
jimw@mysql.com
c18307e8a2
Cleanup tests and results after merge from 4.1 of embedded
...
server testing cleanups.
2005-04-04 12:43:58 -07:00
monty@mysql.com
3c6d5e43f9
Merge
2005-01-04 13:23:04 +02:00
serg@sergbook.mysql.com
b23a226151
mysql-test/r/multi_update.result, mysql-test/t/multi_update.test
...
don't fail w/o bdb (or innodb)
sql/sql_base.cc
typo fixed.
"mysql-test-run --ps-protocol select" fixed (item->cached_item was set to the last table if many matches)
2005-01-04 00:22:22 +02:00
monty@mysql.com
309b1a2b6c
Merge with 4.1 tree to get fix for INSERT IGNORE ... ON DUPLICATE KEY
2005-01-03 23:04:52 +02:00
monty@mysql.com
d35d4eab91
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2005-01-03 21:14:20 +02:00
serg@sergbook.mysql.com
a04fc26c54
manually merged
2004-12-31 15:26:24 +01:00
serg@sergbook.mysql.com
45ce994e5d
post-merge
2004-12-31 11:52:14 +01:00
monty@mysql.com
1bd22faa05
Remove DUP_IGNORE from enum_duplicates and instead use a separate ignore flag
...
This allows use to use INSERT IGNORE ... ON DUPLICATE ...
2004-12-31 12:04:35 +02:00
monty@mysql.com
d71c030587
After merge fixes
2004-12-31 00:44:00 +02:00
monty@mishka.local
4f4bbfc279
Merge with 4.1
2004-12-22 13:54:39 +02:00
sergefp@mysql.com
5b0e3b132c
Post-merge fixes
2004-12-11 16:36:12 +03:00
sergefp@mysql.com
aee9340493
Fix for BUG#5837 merged from 4.0
2004-12-11 15:55:50 +03:00
sergefp@mysql.com
6b55909673
Fix for BUG#5837 - attempt 3.
...
Call mark_as_null_row in join_read_const and join_read_system.
2004-12-11 15:51:52 +03:00
bell@sanja.is.com.ua
9d0bb7426a
postreview fixes
2004-11-08 01:54:23 +02:00
bell@sanja.is.com.ua
064b02203f
new lock for multiupdate:
...
- open and create derived tables
- detect which tables should be locked for write
- lock and fill derived tables
some unitialized variables fixed
2004-11-05 17:29:47 +02:00
monty@mysql.com
47bbf768d4
Fixes after merge with 4.1
...
FOUND is not a reserved keyword anymore
Added Item_field::set_no_const_sub() to be able to mark fields that can't be substituted
Added 'simple_select' method to be able to quickly determinate if a select_result is a normal SELECT
Note that the 5.0 tree is not yet up to date: Sanja will have to fix multi-update-locks for this merge to be complete
2004-11-03 12:39:38 +02:00
monty@mysql.com
afbe601302
merge with 4.1
2004-10-29 19:26:52 +03: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
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
bell@sanja.is.com.ua
0badc913bb
check that table used in multi-update is unique added (BUG#5455)
2004-09-08 13:39:15 +03:00
monty@mysql.com
5b3c418b48
After merge fixes
...
Note: The following tests fails
- fulltext (Sergei has promised to fix)
- rpl_charset (Guilhem should fix)
- rpl_timezone (Dimitray has promised to fix)
Sanja needs to check out the calling of close_thread_tables() in sp_head.cc
2004-07-15 04:19:07 +03:00
monty@mysql.com
31fe2837f9
Merge with 4.1
2004-07-12 08:20:24 +03:00
bar@mysql.com
6c996daa91
Bug#4338: mysql-test-run fails if compiled with non-latin1 character set
2004-07-08 18:54:07 +05:00
monty@mysql.com
1e31199995
Merge with 4.1.3-beta
2004-07-07 11:29:39 +03:00
bell@sanja.is.com.ua
266dd53da2
if exists should not be used inside test
...
removed influence of some tests on other tests
2004-05-28 21:31:51 +03:00
pem@mysql.com
bf45960eef
Merge 4.1 -> 5.0
2004-05-07 18:52:06 +02:00
Sinisa@sinisa.nasamreza.org
68cb444c62
Fix for a multi table updates when one of the tables is not updated
...
but used in a nested query.
2004-05-04 23:04:05 +03:00
bell@sanja.is.com.ua
5e37c41fae
new error for unsupported command in PS
...
fixed IN subselect with basic constant left expression
SQLCOM_CREATE_TABLE, SQLCOM_UPDATE_MULTI, SQLCOM_REPLACE_SELECT, SQLCOM_INSERT_SELECT, QLCOM_DELETE_MULTI fixed to be compatible with PS (BUG#3398, BUG#3406)
fixed multiupdate privelege check (BUG#3408)
fixed multiupdate tables check (BUG#3411)
unchecked commands now is rejected by PS protocol to avoid serever crash
fixed cleunup procedure to be compatible sith DO/SET (BUG#3393)
2004-04-08 00:16:17 +03:00
pem@mysql.com
dfd59e296e
Merge 4.1 -> 5.0.
2004-04-07 19:07:44 +02:00
monty@mysql.com
f34a642d6e
after merge fixes
2004-03-18 00:09:13 +02:00
monty@mysql.com
350b433569
merge with 4.0
2004-03-16 22:41:30 +02:00
monty@mysql.com
325f661525
Remove not needed patch
2004-03-16 02:59:39 +02:00
Sinisa@sinisa.nasamreza.org
639f411a82
multi_update.result:
...
Fix for a bug in the result
multi_update.test:
Fix for a bug in the test
2004-03-13 21:06:36 +02:00
Sinisa@sinisa.nasamreza.org
a86753b00e
multi_update.result:
...
Test case for a #2996 bug fix
multi_update.test:
test case for a #2996 bug fix
sql_select.cc:
Fix for a bug #2996 involving multi-table updates over the const tables
2004-03-11 22:26:03 +02:00
monty@mysql.com
4ee44751d9
Fixed memory leak in DROP DATABASE when using RAID tables (Bug #2882 )
2004-03-10 13:46:11 +02:00
monty@mashka.mysql.fi
43451f3e5b
Merge with 4.0 to get fixed tests
2004-02-22 10:04:08 +02:00
monty@mashka.mysql.fi
fa882fd73c
Move tests that uses innodb to innodb.test
2004-02-22 09:58:51 +02:00
monty@mashka.mysql.fi
3b83cce5eb
merge with 4.0
2004-02-22 09:50:59 +02:00
Sinisa@sinisa.nasamreza.org
cd0562158a
Fix for a bug #2799 .
...
Multi-table delete's with tables having foreign key constraints
did not return the error.
Also added tests for multi-table updates.
2004-02-19 19:43:46 +02:00
pem@mysql.com
c8585f3283
Merge 4.1 into 5.0.
2004-02-10 18:44:02 +01:00
bell@sanja.is.com.ua
2a55a7684f
for multy-delete command used same algorithm of table reference (alias)
2004-01-20 19:16:18 +02:00
pem@mysql.com
99e0ae85c7
Merge 4.1 to 5.0.
2003-12-19 18:03:27 +01:00
monty@mysql.com
031390a9a4
Fixes after merge with 4.0
...
Cleaned up embedded library access and query cache handling
Changed min stack size to 128K (to allow longer MyISAM keys)
Fixed wrong priority for XOR (should be less than NEG to get -1^1 to work)
2003-12-19 16:25:50 +02:00
pem@mysql.comhem.se
89b2ddcf3f
Post-merge fix.
2003-12-18 18:50:07 +01:00
monty@mysql.com
e0cc6799ec
Merge with 4.0.17
2003-12-17 17:35:34 +02:00
