Commit graph

9472 commits

Author SHA1 Message Date
hf@deer.(none)
2f7f2dfe5d Fix for NCHAR bug appeared during the merging 2005-02-09 16:32:43 +04:00
hf@deer.(none)
96558f6ad3 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0
into deer.(none):/home/hf/work/mysql-5.0.clean
2005-02-09 02:54:08 +04:00
hf@deer.(none)
b94a482ee9 Precision Math implementation 2005-02-09 02:50:45 +04:00
pem@mysql.comhem.se
2c26ebe359 WL#2130: Table locking for stored FUNCTIONs
Collect all tables and SPs refered by a statement, and open all tables
with an implicit LOCK TABLES. Do find things refered by triggers and views,
we open them first (and then repeat this until nothing new is found), before
doing the actual lock tables.
2005-02-08 20:52:50 +01:00
jan@hundin.mysql.fi
6e6daf8189 Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-5.0
into hundin.mysql.fi:/home/jan/mysql-5.0
2005-02-08 14:48:25 +02:00
monty@mysql.com
e795134875 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
2005-02-08 10:55:06 +02:00
jimw@mysql.com
bd72e16540 Merge mysql.com:/home/jimw/my/mysql-5.0-6368
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-02-07 12:20:08 -08:00
jimw@mysql.com
5f28ad75c3 Merge mysql.com:/home/jimw/my/mysql-5.0-7856
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-02-07 12:19:32 -08:00
monty@mysql.com
dcb7865548 Merge with 4.1 to get bug fix 2005-02-07 19:42:03 +02:00
monty@mysql.com
c926d8a0be Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
2005-02-07 18:26:14 +02:00
monty@mysql.com
80acd88168 Added comment 2005-02-07 18:24:21 +02:00
monty@mysql.com
3fe60486e4 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2005-02-07 18:14:31 +02:00
monty@mysql.com
32f91f48e8 Fixed bug in HAVING when refering to RAND() through alias
(BUG 8216)
2005-02-07 18:13:57 +02:00
acurtis@pcgem.rdg.cyberkinetica.com
95aaf76682 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/wl1967.extra1
2005-02-07 15:27:17 +00:00
acurtis@pcgem.rdg.cyberkinetica.com
0b1f98e83e Ensure that slaves have normal COMMIT behaviour after WL#1967 2005-02-07 13:15:48 +00:00
msvensson@neptunus.homeip.net
558af8e2ea Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into neptunus.homeip.net:/home/msvensson/mysql/mysql-5.0
2005-02-07 13:48:02 +01:00
msvensson@neptunus.homeip.net
28b21534bb Small changes after Tomas review 2005-02-07 13:46:13 +01:00
gluh@gluh.mysql.r18.ru
dc6e3cf5d4 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0
2005-02-07 13:41:21 +03:00
jan@hundin.mysql.fi
ac9a456a5e Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-5.0
into hundin.mysql.fi:/home/jan/mysql-5.0
2005-02-07 11:23:19 +02:00
tomas@poseidon.ndb.mysql.com
a5ba7db771 Merge 2005-02-07 10:13:07 +01:00
tomas@poseidon.ndb.mysql.com
6bbaeed5b9 ha_ndbcluster.cc:
corrected typo in previous changeset
2005-02-07 09:58:37 +01:00
gluh@gluh.mysql.r18.ru
15273035ce Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0
2005-02-07 11:57:14 +03:00
jan@hundin.mysql.fi
a5b193511c Relaxed locking in INSERT...SELECT, single table UPDATE...SELECT and
single table DELETE...SELECT clauses when innobase_locks_unsafe_for_binlog
is used and isolation level of the transaction is not serializable. 
InnoDB uses consistent read in these cases for a selected table.
2005-02-07 10:12:40 +02:00
tomas@poseidon.ndb.mysql.com
0da4ee9131 Merge 2005-02-07 08:54:35 +01:00
tomas@poseidon.ndb.mysql.com
4873adace0 Corrected fragmentation calculation to take into account that LQH creates "2 fragments per fragment" in 4.1 and 5.0
+added some comments to ndb fragmentation calulation
2005-02-07 08:51:27 +01:00
guilhem@mysql.com
a70adb5d2a Merge 2005-02-05 18:07:50 +01:00
jimw@mysql.com
3c10ccd3f7 Merge bk-internal:/home/bk/mysql-5.0
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-02-05 07:52:55 -08:00
sergefp@mysql.com
b9704ce78a Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/psergey/mysql-5.0-outer-joins-cleanup
2005-02-05 18:18:06 +03:00
sergefp@mysql.com
bc1fdfa402 Outer joins cleanup: Remove TABLE::outer_join and use TABLE::maybe_null only (2nd patch after Monty's comments). 2005-02-05 18:16:29 +03:00
guilhem@mysql.com
b97a519d72 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-clean
2005-02-05 15:29:38 +01:00
monty@mysql.com
23bf186c70 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
2005-02-05 16:06:29 +02:00
monty@mysql.com
80b3e02462 Fixed bug detected by sp-tests
Cleanup during reviews of new pushed code
2005-02-05 16:05:46 +02:00
sergefp@mysql.com
fb113b94e4 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/psergey/mysql-4.1-bug7816
2005-02-05 01:53:12 +03:00
sergefp@mysql.com
72c473ec58 Merge mysql.com:/home/psergey/mysql-4.1-bug7816
into mysql.com:/home/psergey/mysql-5.0-bug7716
2005-02-05 01:52:17 +03:00
guilhem@mysql.com
44c2dcff36 Fix for BUG#8055 "Trouble with replication from temporary tables and ignores":
when we close the session's temp tables at session end, we automatically write to binlog *one* DROP TEMPORARY TABLE *per tmp table*.
2005-02-04 22:43:54 +01:00
jimw@mysql.com
f98a2c27a1 Merge 2005-02-04 12:01:30 -08:00
jimw@mysql.com
8c8553af81 Merge changes 2005-02-04 11:59:02 -08:00
jimw@mysql.com
b509f2b373 Merge mysql.com:/home/jimw/my/mysql-4.1-6067
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-02-04 10:39:13 -08:00
mysqldev@mysql.com
79b88ead4a Merge bk-internal:/home/bk/mysql-4.1
into mysql.com:/home/mysqldev/tulin/mysql-4.1
2005-02-04 18:45:02 +01:00
tulin@mysql.com
d017a604fe Merge bk-internal:/home/bk/mysql-5.0
into mysql.com:/home/mysqldev/tulin/mysql-5.0
2005-02-04 17:32:18 +01:00
serg@serg.mylan
47f354bca7 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-02-04 15:31:39 +01:00
serg@serg.mylan
cc1ee6475f indexless boolean fulltext search was depending on default_charset_info - Bug#8159
ftbw->off wasn't cleared on reinit - Bug#8234
2005-02-04 15:24:06 +01:00
msvensson@neptunus.homeip.net
c9d7cd043b Merge neptunus.homeip.net:/home/msvensson/mysql/mysql-5.0
into neptunus.homeip.net:/home/msvensson/mysql/mysql-5.0-cluster-extra
2005-02-04 15:13:45 +01:00
msvensson@neptunus.homeip.net
94978c214a Updated after review. 2005-02-04 15:08:08 +01:00
tulin@mysql.com
2339b328fc ha_ndbcluster.cc:
fixed change in struct in 4.1->5.0 merge
2005-02-04 14:33:08 +01:00
mysqldev@mysql.com
753ea29f86 Merge bk-internal:/home/bk/mysql-4.1
into mysql.com:/home/mysqldev/tulin/mysql-4.1
2005-02-04 14:29:52 +01:00
mysqldev@mysql.com
abf7837fbb resolved merge conflict 2005-02-04 14:27:09 +01:00
tomas@poseidon.ndb.mysql.com
27a69e573a Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2005-02-04 14:27:08 +01:00
tomas@poseidon.ndb.mysql.com
7fd685ffe8 added test to trigger drifferent fragmentations in ndb
corrected documentation on fragmentation
    set "fragmentation medium" to mean 2 fragments per node instead of 1
    set default fragmentation to small instead of medium
    bug#8284 adjust fragmentation to max_rows
2005-02-04 14:25:08 +01:00
gluh@gluh.mysql.r18.ru
e9ce96c5cd Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-4.1
2005-02-04 15:47:12 +03:00