Commit graph

7364 commits

Author SHA1 Message Date
mskold@mysql.com
089e0565d1 Added support for auto_increment of partial key 2004-09-15 17:31:15 +02:00
magnus@neptunus.(none)
013486701c BUG#4775 "Duplicate key requires rollback of transaction" - Improved error message telling that transaction is aborted
BUG#4312 "wrong behaviour on insert .. on duplicate key" functionality disabled
2004-09-15 14:44:21 +02:00
ram@gw.mysql.r18.ru
b3dc9f65b0 A fix (bug #5540: CONCAT function and 'double' type). 2004-09-15 15:13:17 +05:00
ram@gw.mysql.r18.ru
b5da3c1997 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b5546
2004-09-15 13:45:44 +05:00
mskold@mysql.com
be9742d43e Merge mskold@build.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
2004-09-14 18:17:04 +02:00
ingo@mysql.com
89b29aa1b3 Merge mysql.com:/home/mydev/mysql-4.1
into mysql.com:/home/mydev/mysql-4.1-bug5318
2004-09-14 18:17:03 +02:00
mskold@mysql.com
9311c81a55 Merge mskold@build.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
2004-09-14 18:17:03 +02:00
paul@kite-hub.kitebird.com
d10383d6df Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1
2004-09-14 11:17:02 -05:00
tomas@poseidon.(none)
db1604a7c7 fix to make transaction failure also affect select count() on other tables in thread 2004-09-14 16:17:01 +00:00
tomas@poseidon.(none)
457dfbe779 Added testcase for select count() during transaction with failures
added fix for keeping "records" up to date when execute() fails
2004-09-14 15:51:57 +00:00
ram@gw.mysql.r18.ru
4a2cc99d3f code clean-up 2004-09-14 18:57:22 +05:00
tomas@poseidon.(none)
f896a690f8 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.(none):/home/tomas/mysql-4.1-ndb-merge
2004-09-14 12:48:42 +00:00
tomas@poseidon.(none)
fc174af248 new method to set size of local table data
clearer configure description texts
changed Ndb_local_table_info to use create, destroy metods and hidden constructor/destructor
move definition if Thd_ndb to .h file and changes seize/release to operate on Thd_ndb instead of Ndb objects
moved allocation/deletion of Ndb objects to Thd_ndb
2004-09-14 12:47:34 +00:00
ram@gw.mysql.r18.ru
998504d715 A fix (bug #5546: mysqld crash on PURGE MASTER LOGS BEFORE '...' with log-bin off). 2004-09-14 17:30:57 +05:00
ingo@mysql.com
38767cadba Merge mysql.com:/home/mydev/mysql-4.1
into mysql.com:/home/mydev/mysql-4.1-bug5318
2004-09-14 13:50:30 +02:00
ingo@mysql.com
ce8db2bfb7 BUG#5318 - failure: 'IGNORE_SPACE' affects numeric values after DEFAULT.
Added a check to recover from IGNORE_SPACE in this situation: 
<ident-character(s)><space><dot><ident-character(s)>
The ignored space led to the false identification of the dot
as an ident separator (like "db.table").
2004-09-14 13:49:08 +02:00
tomas@poseidon.(none)
24ceb26d4d Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.(none):/home/tomas/mysql-4.1-ndb-merge
2004-09-14 09:15:43 +00:00
tomas@poseidon.(none)
aecd1e5d7f Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into poseidon.(none):/home/tomas/mysql-4.1-ndb-merge
2004-09-14 08:55:09 +00:00
tomas@poseidon.(none)
21a4b1b4e6 moved all ndb thread specific data into new placeholder
new methods to keep "records" up to date
unset flag HA_NOT_EXACT_COUNT to make handler read "records" field, for count() optim and join optimization
new methods to keep "records" up to datecorrect record field in ndbcluster handler
new method for ndbcluster handler to store/retrieve table and thread specific data
changed local hash to store new table_info object, with placeholders for local data, instead of TableImpl
hanged deleteKey to return ponter to deleted object
moved heavy global cache fetch from inline to separate method
2004-09-14 08:52:21 +00:00
ram@gw.mysql.r18.ru
beb5d60a6b Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b5497
2004-09-14 13:09:51 +05:00
ram@gw.mysql.r18.ru
e5a0524fe6 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0
into gw.mysql.r18.ru:/usr/home/ram/work/4.0.b5498
2004-09-14 13:08:54 +05:00
magnus@neptunus.(none)
619b8a0beb Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into neptunus.(none):/home/magnus/mysql/wl/wl1424_discover_2
2004-09-14 10:03:56 +02:00
hf@deer.(none)
118669b418 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.4815
2004-09-14 10:07:17 +05:00
hf@deer.(none)
7ec92d572c Merging 2004-09-14 10:04:35 +05:00
joerg@mysql.com
481f8d5b1c Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/M41/mysql-4.1
2004-09-13 23:31:15 +02:00
mskold@mysql.com
6370af0bb2 Merge mskold@build.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
2004-09-13 22:31:16 +02:00
paul@kite-hub.kitebird.com
437e680e8a Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1
2004-09-13 14:57:50 -05:00
mskold@mysql.com
245fcb3fa4 Merge mskold@build.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
2004-09-13 20:09:55 +02:00
paul@kite-hub.kitebird.com
1f32b3d2f4 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1
2004-09-13 11:50:03 -05:00
hf@deer.(none)
610913c8b9 Additional fix about paths 2004-09-13 21:49:41 +05:00
joreland@mysql.com
29c5bfb21e Fix ; when compiling release 2004-09-13 18:46:56 +02:00
joreland@mysql.com
bcfbf6038a Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2004-09-13 18:07:51 +02:00
heikki@hundin.mysql.fi
d6b4c4f90e row0mysql.h:
Improve the comment on stored_select_lock_type
ha_innodb.cc:
  Let InnoDB remember select_lock_type inside LOCK TABLES, also over plain consistent read SELECTs; fix Bug #5538 : assertion failure when using mysqldump with the -l option; in MERGING this patch to 4.1, there may be PROBLEMS; that is because previous patch was never merged to 4.1; Heikki Tuuri has to polish the code in 4.1 after this patch has been merged.
2004-09-13 19:05:39 +03:00
mskold@mysql.com
1081072486 Merge mskold@build.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
2004-09-13 17:14:57 +02:00
paul@kite-hub.kitebird.com
ed5e7166bd Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1
2004-09-13 10:14:00 -05:00
joerg@mysql.com
563c556694 Replace 'sete_id(__)' calls by 'setre_id(-1,__)' to solve the
missing prototyped problem (bug#5521).
2004-09-13 16:32:47 +02:00
serg@serg.mylan
a8b38dd71d Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-09-13 16:20:42 +02:00
ram@gw.mysql.r18.ru
a3a6b7fa25 A fix (bug #5497: COMPRESS() returns NULL for large strings). 2004-09-13 18:43:59 +05:00
magnus@neptunus.(none)
d41f7af07e Merged 2004-09-13 14:49:50 +02:00
magnus@neptunus.(none)
8abbb28f8b WL1424 Multiple MySQL Servers: SHOW TABLES etc. should detect new and delete old tables. 2004-09-13 14:46:38 +02:00
sergefp@mysql.com
ca0fc0b4f4 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/dbdata/psergey/mysql-4.1-bug-tina
2004-09-13 16:26:01 +04:00
ram@gw.mysql.r18.ru
2488b827de A fix (bug #5498 TRIM fails with LEADING or TRAILING if remstr = str). 2004-09-13 14:25:43 +05:00
serg@serg.mylan
962c228a68 select send_error cleanup (not everything is fixed) 2004-09-13 11:22:01 +02:00
serg@serg.mylan
4a9defa31e un-reserving "RETURNS" 2004-09-13 11:19:38 +02:00
serg@serg.mylan
68bcfc95b7 indentation cleanup 2004-09-13 11:16:34 +02:00
joreland@mysql.com
77445739ad Merge mysql.com:/home/jonas/src/mysql-4.1-ndb
into mysql.com:/home/jonas/src/mysql-4.1
2004-09-13 06:49:16 +02:00
joreland@mysql.com
f003b3244e Fix dict error code on list tables
Check g_ndb before deleting it
Wait until ready(10) if get mgm connection
2004-09-13 06:40:25 +02:00
sergefp@mysql.com
13fdbc99cf Fix for BUG#5117:
* Renamed handler::estimate_number_of_rows to handler::estimate_rows_upper_bound function, which can also return "unknown"
 * made filesort to use full sort buffer if number of rows to sort is not known.
2004-09-13 06:14:25 +04:00
mskold@mysql.com
e50c7e19fc Merge mskold@build.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
2004-09-12 21:59:17 +02:00
gluh@gluh.mysql.r18.ru
3b7378f992 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
into gluh.mysql.r18.ru:/home/gluh/MySQL-BUGS/mysql-4.1
2004-09-12 10:41:06 +04:00