bell@sanja.is.com.ua
7eae926e26
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-view-5.0
2004-11-06 12:46:46 +02:00
monty@mysql.com
afbe601302
merge with 4.1
2004-10-29 19:26:52 +03:00
bell@sanja.is.com.ua
3d389a038e
fixed detection of updating table on which we select (BUG#6032)
2004-10-25 17:32:28 +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
ram@gw.mysql.r18.ru
62a42f7f57
A fix (Bug #5415 : Table marked as crashed after DELETE queries).
2004-09-19 16:15:01 +05:00
bell@sanja.is.com.ua
763c57d41f
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-show-5.0
2004-09-10 02:26:09 +03:00
dlenev@mysql.com
c46e640009
Yet another manual merge with main tree for patch for WL#1218 "Triggers"
2004-09-09 19:52:10 +04:00
bell@sanja.is.com.ua
336cb5f8be
merge
2004-09-09 16:52:22 +03:00
monty@mysql.com
49cd04b510
Merge on pull
2004-09-09 07:26:28 +03:00
dlenev@mysql.com
9b1bc6a4d5
Merge of changes from the main tree to tree for WL#1218 "Triggers".
2004-09-08 13:29:21 +04:00
bell@sanja.is.com.ua
425857f5b2
test of updating and fetching from the same table check (BUG##5157)
2004-09-08 10:18:04 +03:00
dlenev@brandersnatch.localdomain
9ed038dd6f
WL#1218 "Triggers". Some very preliminary version of patch.
...
Mostly needed for Monty for him getting notion what needed for triggers
from new .FRM format.
Things to be done:
- Right placement of trigger's invocations
- Right handling of errors in triggers (including transaction rollback)
- Support for priviliges
- Right handling of DROP/RENAME table (hope that it will be handled automatically
with merging of .TRG into .FRM file)
- Saving/restoring some information critical for trigger creation and replication
with their definitions (e.g. sql_mode, creator, ...)
- Replication
Already has some known bugs so probably not for general review.
2004-09-07 16:29:46 +04:00
monty@mysql.com
31122efde7
Merge with 4.1
...
(Includes merge of arena code in 4.1 and 5.0)
2004-09-06 15:14:10 +03:00
bell@sanja.is.com.ua
161662ba4c
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-5.0
2004-09-04 15:32:13 +03:00
monty@mysql.com
cbd67f49e1
Cleanup of new code pushed into 5.0 since last pull
...
Merged the different find_xxxx_table_in_list functions to one + some inline functions
2004-09-03 21:43:04 +03:00
tomas@poseidon.(none)
caf79dacfe
renamed ha_recovery_logging to ha_enable_transaction
...
added tests to alter table for "large" alter tables and truncates in ndbcluster
added debug printout in restart() in ndbcluster
added flag THD::transaction.on to enable/disable transaction
2004-09-03 15:11:09 +00:00
bell@sanja.is.com.ua
392c306969
fixed open_and_lock_tables result processing (all open_and_lock_tables revision)
...
fixed printing of COLLATE operation
(BUG#5155)
2004-08-31 10:06:38 +03:00
serg@serg.mylan
8f2d92c56a
manually merged
2004-08-24 17:24:23 +02:00
guilhem@mysql.com
252ebd2b30
Fix for BUG#5033 "When using temporary tables truncate does NOT reset the auto_increment counter"
...
(ok'd by CTO to fix it in 4.0).
Fix to make mysql-test-run work with all Valgrind versions.
2004-08-23 16:15:57 +02:00
bell@sanja.is.com.ua
9336d36cf8
VIEW
...
two TABLE_LIST copy eliminated
2004-07-16 01:15:55 +03:00
monty@mysql.com
1e31199995
Merge with 4.1.3-beta
2004-07-07 11:29:39 +03:00
serg@serg.mylan
c03addab79
merged
2004-06-23 12:36:07 +02:00
serg@serg.mylan
3f1c4ba745
handler interface cleanups:
...
more logical table/index_flags
return HA_ERR_WRONG_COMMAND instead of abstract methods where appropriate
max_keys and other limits renamed to max_supported_keys/etc
max_keys/etc are now wrappers to max_supported_keys/etc
ha_index_init/ha_rnd_init/ha_index_end/ha_rnd_end are now wrappers to real {index,rnd}_{init,end} to enforce strict pairing
2004-06-23 12:29:05 +02:00
guilhem@mysql.com
2b20e84ff8
Making DROP TABLE IF EXISTS, DROP DATABASE IF EXISTS, DELETE FROM, UPDATE be logged to
...
binlog even if they changed nothing, and a test for this.
This is useful when users use these commands to clean up their master and slave by issuing
one command on master (assume master and slave have slightly different data for some
reason and you want to clean up both).
Note that I have not changed multi-table DELETE and multi-table UPDATE because their
error-reporting mechanism is more complicated.
2004-06-09 16:07:01 +02:00
sergefp@mysql.com
5843eec521
Manual merge
2004-05-29 20:55:46 +04:00
bell@sanja.is.com.ua
c7396f8d20
PS and SP made compatible in mechanism used for preparing query for rexecutions (Bug #2266 )
2004-05-20 02:02:49 +03:00
sergefp@mysql.com
3b29cad05c
Manual merge
2004-05-13 01:49:47 +04:00
sergefp@mysql.com
a46d7542c9
This is first cset for WL#1394 "Optimize index merge when all involved index ranges include only values with equal keys"
...
The main idea is to exploit the fact that key scans for "key=const" return ordered sequences of rowids.
2004-05-13 01:38:40 +04:00
pem@mysql.com
bf45960eef
Merge 4.1 -> 5.0
2004-05-07 18:52:06 +02:00
pem@mysql.comhem.se
296ba0ea57
WL#1567: Add ROW_COUNT() Function to retrieve count of rows updated/inserted/deleted
2004-05-04 13:45:20 +02:00
monty@mysql.com
7d9a9fd93a
Added missing return statement
2004-04-12 03:26:32 +03:00
bell@sanja.is.com.ua
a535342d57
after review PS fixes
2004-04-10 01:14:32 +03:00
pem@mysql.com
dfd59e296e
Merge 4.1 -> 5.0.
2004-04-07 19:07:44 +02:00
monty@mysql.com
350b433569
merge with 4.0
2004-03-16 22:41:30 +02:00
sergefp@mysql.com
3d2794ae9a
Fix for Bug#3183
2004-03-15 23:11:58 +03:00
monty@mysql.com
b9c4ee353d
Rollback UPDATE/DELETE statements on kill
...
nsure that rows in a multi-row INSERT DELAYED are inserted atomicly
2004-03-04 18:16:10 +02:00
monty@mashka.mysql.fi
3b83cce5eb
merge with 4.0
2004-02-22 09:50:59 +02:00
monty@mashka.mysql.fi
e74182fe52
Cleanups
2004-02-22 08:54:06 +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
b99d13582b
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-derived2-4.1
2004-02-09 12:10:12 +02:00
ram@gw.mysql.r18.ru
f231d9826b
just tried to find all 'skipp' and replace it with 'skip'.
2004-02-02 20:25:39 +04:00
bell@sanja.is.com.ua
2a9cd37cd6
now all tables of query are locked in one place (including derived tables)
...
fixed BUG#2120 and other problem with EXPLAINing derived tables
2004-02-01 15:30:32 +02:00
monty@mysql.com
9f78dc52b0
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/my/mysql-5.0
2003-12-21 02:08:44 +02:00
monty@mysql.com
c6ed2a625b
Update for VC++
...
(Fixed project files, compiler warnings etc..)
2003-12-21 02:07:45 +02:00
pem@mysql.com
d672412102
Merge 4.1 to 5.0 (the prep stmt fixes in particular).
2003-12-20 13:10:29 +01:00
monty@mysql.com
0448a3f4c0
Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe
...
A after merge fix for last merge
2003-12-20 03:41:04 +02:00
monty@mysql.com
fcbee7eb1a
merge with lex pointer change patch
2003-12-19 20:18:18 +02:00
monty@mysql.com
1b7f67d65b
Fixed memory overrun bug in DELETE ... ORDER BY
2003-12-19 19:16:26 +01:00
konstantin@oak.local
d37da004f6
THD::lex now points to THD::main_lex like in 5.0
...
All tests pass (client_test included)
2003-12-19 20:52:13 +03:00