sanja@hasky.mysql.fi
1006063ef1
Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into hasky.mysql.fi:/home/sanja/work-merge-5.0
2005-08-13 11:16:26 +03:00
sanja@hasky.mysql.fi
16d279bb12
Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into hasky.mysql.fi:/home/sanja/work-merge-5.0
2005-08-13 08:19:34 +03:00
tsmith@.mysql.com
9097bd2f08
sql_parse.cc:
...
Don't skip SET command even if --replicate-wild* says to.
E.g., SET ONE_SHOT TIME_ZONE = 'XYZ' should be executed (BUG #12542 )
2005-08-13 05:08:29 +02:00
serg@sergbook.mysql.com
d42f973b80
merged
2005-08-12 22:58:13 +02:00
serg@sergbook.mysql.com
f5ff607c14
BUG#12162 - one can start two transactions with the same XID.
...
Now we keep all active XID's in a hash
2005-08-12 21:15:01 +02:00
timour@mysql.com
354ce1d024
Merge mysql.com:/home/timka/mysql/src/5.0-virgin
...
into mysql.com:/home/timka/mysql/src/5.0-2486-merge
2005-08-12 19:27:54 +03:00
timour@mysql.com
a247282aa6
Implementation of WL#2486 -
...
"Process NATURAL and USING joins according to SQL:2003".
* Some of the main problems fixed by the patch:
- in "select *" queries the * expanded correctly according to
ANSI for arbitrary natural/using joins
- natural/using joins are correctly transformed into JOIN ... ON
for any number/nesting of the joins.
- column references are correctly resolved against natural joins
of any nesting and combined with arbitrary other joins.
* This patch also contains a fix for name resolution of items
inside the ON condition of JOIN ... ON - in this case items must
be resolved only against the JOIN operands. To support such
'local' name resolution, the patch introduces a stack of
name resolution contexts used at parse time.
NOTICE:
- This patch is not complete in the sense that
- there are 2 test cases that still do not pass -
one in join.test, one in select.test. Both are marked
with a comment "TODO: WL#2486".
- it does not include a new test specific for the task
2005-08-12 17:57:19 +03:00
monty@mysql.com
4963388cc1
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2005-08-12 13:57:20 +03:00
monty@mysql.com
4c0d23e156
Fixes during review of new pushed code
...
Removed duplicate usage of TMP_TABLE_FORCE_MYISAM by making 'options' longlong
2005-08-12 13:54:42 +03:00
jimw@mysql.com
3a815f45bd
Avoid spurious error when restoring INFORMATION_SCHEMA as the current
...
database after failing to execute a stored procedure in an inaccessible
database. (Bug #12318 )
2005-08-11 17:04:16 -07:00
monty@mysql.com
e80252e53c
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2005-08-11 16:43:22 +03:00
monty@mysql.com
7b80e62528
Cleanups during review of new code
2005-08-11 15:58:15 +03:00
acurtis@xiphis.org
b9476f7d50
Merge xiphis.org:/usr/home/antony/work2/mysql-4.1
...
into xiphis.org:/usr/home/antony/work2/merge-5.0
2005-08-11 12:18:53 +01:00
dlenev@mysql.com
0f75d64734
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/dlenev/src/mysql-5.0-bg11973-2
2005-08-11 10:39:33 +04:00
sergefp@mysql.com
9125477df5
Merge mysql.com:/home/psergey/mysql-5.0-bug12228-r4
...
into mysql.com:/home/psergey/mysql-5.0-bug12228-r5
2005-08-10 21:17:52 +00:00
sergefp@mysql.com
fbab5fc568
BUG#12228: Post review fixes: Added test case, code cleanup.
2005-08-10 21:17:02 +00:00
hf@deer.(none)
88b01808d9
error message fixed
2005-08-10 16:02:36 +05:00
dlenev@mysql.com
ec5ceecab7
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/dlenev/src/mysql-5.0-bg12280
2005-08-10 10:32:43 +04:00
dlenev@mysql.com
51537c057d
Fix for bug #12280 "Triggers: crash if flush tables".
...
We should not allow FLUSH statement to be executed inside both triggers
and stored functions.
2005-08-10 10:31:32 +04:00
dlenev@mysql.com
60511c3df2
Clumsy but working fix for bug #11973 "SELECT .. INTO var_name; in trigger
...
cause crash on update".
Let us update "thd" pointer in LEX, all its units and in LEX::result before
executing statement in trigger body, since triggers are associated with TABLE
object and because of this can be used in different threads.
2005-08-10 00:23:56 +04:00
acurtis@xiphis.org
aa99bd61c0
Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into xiphis.org:/usr/home/antony/work2/p2-bug10109.3
2005-08-09 16:35:51 +01:00
jani@ua141d10.elisa.omakaista.fi
083da3ecee
Merged code.
2005-08-09 15:29:33 +03:00
sergefp@mysql.com
c6db76b076
Fix for BUG#12228: SP cache code:
...
* Cleanup SP Cache code, now SP Cache only deletes sp_head objects in
sp_cache_flush_obsolete() invalidates all pointers to routines in the cache.
* Use new SP Cache use contract in the code.
There is no test case because it doesn't seem to be possible to cause thread races to end
the same way they end in heavy-load test. This patch removes the crash in heavy test.
2005-08-08 23:23:34 +00:00
monty@mysql.com
99cb083549
Review of new pushed code
...
- Fixed some error condtion when handling dates with 'T'
- Added extra test for bug #11867 (Wrong result with "... WHERE ROW( a, b ) IN ( SELECT DISTINCT a, b WHERE ...)" to show it's not yet fixed
- Safety fixes and cleanups
2005-08-09 00:13:49 +03:00
jimw@mysql.com
4cdca3486d
Merge mysql.com:/home/jimw/my/mysql-5.0-6080
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-08-08 10:12:24 -07:00
ingo@mysql.com
806b5468b8
Merge mysql.com:/home/mydev/mysql-4.1-4100
...
into mysql.com:/home/mydev/mysql-5.0-5000
2005-08-08 00:10:07 +02:00
acurtis@xiphis.org
015447b211
Bug#10109
...
"INSERT .. SELECT ... ON DUPLICATE KEY UPDATE fails"
Ensure that check_insert_fields() is only called once when
doing an INSERT..SELECT
2005-08-07 03:16:15 +01:00
jimw@mysql.com
268a68ad08
Fix error message when creating a non-string field with a display
...
width beyond the maximum. (Bug #6080 )
2005-08-05 17:22:53 -07:00
pappa@c-8b0ae253.1238-1-64736c10.cust.bredbandsbolaget.se
69acde961f
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into c-8b0ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.1
2005-08-05 18:01:34 -04:00
ingo@mysql.com
c9e04f4642
Bug#9459 - deadlock with flush with lock, and lock table write
...
Added a check before taking a global read lock if
the own thread has a write locked table.
2005-08-05 15:37:24 +02:00
sergefp@mysql.com
31a73da815
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-sp-no-lock-r7
2005-08-03 10:14:01 +00:00
sergefp@mysql.com
f595847ec0
Manual merge
2005-08-03 03:47:07 +00:00
jimw@mysql.com
de46ae18c2
Merge mysql.com:/home/jimw/my/mysql-5.0-11602
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-08-02 16:50:12 -07:00
bell@sanja.is.com.ua
4c69fbe632
issue correct error message in case of view presence for duplicated table on update (BUG#10773)
...
frequently used command sequence replaced with inline function
2005-08-02 22:54:49 +03:00
jimw@mysql.com
48d111c8c2
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-08-01 17:54:57 -07:00
jimw@mysql.com
ca56883011
Merge mysql.com:/home/jimw/my/mysql-4.1-9947
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-08-01 17:12:30 -07:00
jimw@mysql.com
9a5560683f
Merge mysql.com:/home/jimw/my/mysql-4.1-10724
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-08-01 17:10:35 -07:00
sergefp@mysql.com
de02193bdd
Added Non-prelocked SP execution: Now a PROCEDURE doesn't enter/leave prelocked mode for
...
its body, but lets each statement to get/release its own locks. This allows a broader set
of statements to be executed inside PROCEDUREs (but breaks replication)
This patch should fix BUG#8072, BUG#8766, BUG#9563, BUG#11126
2005-07-30 08:19:57 +00:00
hf@deer.(none)
29cfa64f68
Merging
2005-07-27 14:37:16 +05:00
hf@deer.(none)
b17a35e06f
Merge
2005-07-27 12:39:49 +05:00
jimw@mysql.com
0536bd6679
Increase allowed size of stored procedure bodies to 4GB, and
...
produce a sensible error when that limit is exceeded. (Bug #11602 )
2005-07-26 18:08:49 -07:00
jimw@mysql.com
3409537f2a
Don't force column header to @@session.var_name if @@local.var_name
...
was used. (Bug #10724 )
2005-07-25 11:25:28 -07:00
hf@deer.(none)
ded44df2b5
Fix for bug #6710 (CREATE FUNCTION fails with 'Unknown error')
2005-07-23 17:21:27 +05:00
jimw@mysql.com
421f267b7f
Merge mysql.com:/home/jimw/my/mysql-5.0-11213
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-07-22 12:38:14 -07:00
tulin@dl145b.mysql.com
bf6e3f9aa8
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-07-20 07:53:10 +02:00
jimw@mysql.com
39efcdcf7c
Merge mysql.com:/home/jimw/my/mysql-5.0-11822
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-07-19 19:59:33 -07:00
tulin@dl145b.mysql.com
a6c21a0791
merge
2005-07-19 21:56:10 +02:00
dlenev@mysql.com
b141437ad3
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/dlenev/src/mysql-5.0-tn
2005-07-19 20:55:09 +04:00
dlenev@mysql.com
8a3e723b74
Fix for bugs #5892/6182/8751/8758/10994 (based on Antony's patch)
...
"Triggers have the wrong namespace"
"Triggers: duplicate names allowed"
"Triggers: CREATE TRIGGER does not accept fully qualified names"
"SHOW TRIGGERS"
2005-07-19 20:06:49 +04:00
gluh@eagle.intranet.mysql.r18.ru
d59ff2764c
Bug#11577 'show procedure/function status' doesn't work for user with limited access
...
changed 'SHOW PROCEDURE' behavoiur to be like INFORMATION_SCHEMA.routines
2005-07-19 13:49:43 +05:00