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
jani@ua141d10.elisa.omakaista.fi
083da3ecee
Merged code.
2005-08-09 15:29:33 +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
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
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
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
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
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
jimw@mysql.com
aff38d8659
Handle systems where 127.0.0.1 doesn't always map to 'localhost'
...
first. (Bug #11822 )
2005-07-18 17:00:37 -07:00
konstantin@mysql.com
52b8928b09
Merge mysql.com:/home/kostja/mysql/mysql-4.1-root
...
into mysql.com:/home/kostja/mysql/mysql-5.0-merge
2005-07-19 00:55:37 +04:00
monty@mishka.local
2278e0319c
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mishka.local:/home/my/mysql-5.0
2005-07-18 19:03:01 +03:00
monty@mishka.local
78c65b5adc
Cleanups during review
...
Changed defaults option --instance to --defaults-group-suffix
Changed option handling to allow --defaults-file, --defaults-extra-file and --defaults-group-suffix to be given in any order
Changed MYSQL_INSTANCE to MYSQL_GROUP_SUFFIX
mysql_print_defaults now understands --defaults-group-suffix
Remove usage of my_tempnam() (not safe function)
if( -> if ( and while( to while (
2005-07-18 15:33:18 +03:00
jimw@mysql.com
b4b874568b
Merge mysql.com:/home/jimw/my/mysql-4.1-9979
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-07-15 10:52:22 -07:00
gluh@eagle.intranet.mysql.r18.ru
f302759522
valgrind error fix(uninitialiased variable)
...
removed unnecessary operation
2005-07-14 15:42:36 +05:00
konstantin@mysql.com
618f7d9449
Merge mysql.com:/opt/local/work/mysql-4.1-11458
...
into mysql.com:/opt/local/work/mysql-5.0-root
2005-07-13 18:05:57 +04:00
konstantin@mysql.com
bef558b7ee
- a fix for Bug#11458 "Prepared statement with subselects return random
...
data": remove the fix for another bug (8807) that
added OUTER_REF_TABLE_BIT to all subqueries that used a placeholder
to prevent their evaluation at prepare. As this bit hanged in
Item_subselect::used_tables_cache for ever, a constant subquery with
a placeholder was never evaluated as such, which caused wrong
choice of the execution plan for the statement.
- to fix Bug#8807 backport a better fix from 5.0
- post-review fixes.
2005-07-13 17:38:55 +04:00
gluh@eagle.intranet.mysql.r18.ru
9c3349f5c6
Fix for bug#11685 SHOW TABLES; doesn't update Com_show_tables
2005-07-13 13:30:39 +05:00
dlenev@mysql.com
75b8d4fa08
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/dlenev/src/mysql-5.0-bg8406
2005-07-09 22:04:18 +04:00
dlenev@mysql.com
923fe817e0
Enable support of access to tables from triggers. Thus fix bug #8406 "Triggers
...
crash if referencing a table" and several other related bugs.
Fix for bug #11834 "Re-execution of prepared statement with dropped function
crashes server." which was spotted during work on previous bugs.
Also couple of nice cleanups:
- Replaced two separate hashes for stored routines used by statement with one.
- Now instead of doing one pass through all routines used in statement for
caching them and then doing another pass for adding their tables to table
list, we do only one pass during which do both things.
2005-07-09 21:51:59 +04:00
hf@deer.(none)
c7940aeb86
Fix for bug #8449(Silent column changes)
2005-07-07 21:47:18 +05:00
monty@mysql.com
fe30ec9032
manual merge
2005-07-04 03:50:04 +03:00
monty@mysql.com
ec420bfb43
Fixes during review of new code
...
- Mostly indentation fixes
- Added missing test
- Ensure that Item_func_case() checks for stack overruns
- Use real_item() instead of (Item_ref*) item
- Fixed wrong error handling
2005-07-04 03:42:33 +03:00
monty@mysql.com
86d7b02199
Merge with 4.1
2005-07-03 14:17:52 +03:00
bell@sanja.is.com.ua
d3905f3d0e
Name resolution context added (BUG#6443)
2005-07-01 07:05:42 +03:00
monty@mysql.com
10c4678def
Move reset of insert_values to ensure it's done also during error conditions
...
This fixed a failure of insert_update.test on some platforms
2005-06-28 15:06:16 +03:00
jimw@mysql.com
d4dea98f44
Fix max_connections_per_hour handling when the global
...
max_user_connections is also set. (Bug #9947 )
2005-06-27 18:03:14 -07:00
monty@mishka.local
7398252d02
Portability fixes
...
Fixes while reviewing new pushed code
NULL as argument to encrypt/decrypt should return NULL without a warning
2005-06-27 20:31:00 +03:00
monty@mishka.local
6db013ef86
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mishka.local:/home/my/mysql-4.1
2005-06-27 16:47:44 +03:00
monty@mishka.local
83f90e060e
Better bug fix for:
...
#9728 'Decreased functionality in "on duplicate key update
#8147 'a column proclaimed ambigous in INSERT ... SELECT .. ON DUPLICATE'
This ensures fields are uniquely qualified and also that one can't update other tables in the ON DUPLICATE KEY UPDATE part
2005-06-27 16:46:41 +03:00
msvensson@neptunus.(none)
dee0be6eed
Simpler impl.
2005-06-27 14:26:07 +02:00
msvensson@neptunus.(none)
88c96026af
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/bug10466
2005-06-27 13:12:10 +02:00
igor@rurik.mysql.com
268110b34b
Manual merge
2005-06-23 11:22:30 -07:00
evgen@moonbone.local
be76efab84
sql_parse.cc:
...
Fix for fix for bug #9728
Error caused server hang on prepared insert ... select
2005-06-23 21:06:33 +04:00
jimw@mysql.com
fa353b8f48
Change error message when the amount of stack needed is not available
...
to include how much stack space we need. (Bug #11213 )
2005-06-22 11:02:44 -07:00