Commit graph

8210 commits

Author SHA1 Message Date
bell@sanja.is.com.ua
3abe558fa8 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.0
2004-10-24 11:32:08 +03:00
bell@sanja.is.com.ua
e0c3e769e2 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-10-24 10:31:59 +03:00
pem@mysql.comhem.se
4970bdab13 Fixed BUG#6029: Stored procedure specific handlers should have priority. 2004-10-23 14:23:32 +02:00
pem@mysql.comhem.se
7944acbbfa Fixed BUG#6022: Stored procedure shutdown problem with self-calling function.
Fixed the pre-caching of functions. It now gives the expected stack overrun
  error for functions recursing too deep.
2004-10-23 13:30:05 +02:00
bell@sanja.is.com.ua
0ddef9ecf8 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-sub-4.1
2004-10-23 10:27:34 +03:00
monty@mysql.com
8b6839e644 Fixed wrong range test code for HEAP tables. This caused a crash when doing a range test with a key that didn't have lower or upper bound (Bug #6082)
More test cases
2004-10-23 03:30:27 +03:00
serg@serg.mylan
66124a5ec1 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-10-22 22:44:08 +02:00
bell@sanja.is.com.ua
ce93a3c202 postreview fixes 2004-10-22 22:51:04 +03:00
dellis@goetia.(none)
d4c5e404ac sql_acl.cc:
Correcting problem with merge
2004-10-22 14:32:23 -05:00
dellis@goetia.(none)
f5bc0d774e Merge dellis@bk-internal.mysql.com:/home/bk/mysql-4.1
into goetia.(none):/home/dellis/mysqlab/bk/mysql-4.1
2004-10-22 14:21:35 -05:00
dellis@goetia.(none)
8ac3b79008 After-merge fixes. 2004-10-22 14:19:42 -05:00
bell@sanja.is.com.ua
bc68cd7d32 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0
into sanja.is.com.ua:/home/bell/mysql/bk/work-qc-4.0
2004-10-22 22:10:52 +03:00
bell@sanja.is.com.ua
23ba4c325c Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.0
2004-10-22 22:08:46 +03:00
konstantin@mysql.com
9eb769afdf Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/media/sda1/mysql/mysql-4.1-6088
2004-10-22 23:06:24 +04:00
konstantin@mysql.com
659de73248 Manual merge 2004-10-22 22:55:49 +04:00
dlenev@mysql.com
796ccbf478 Manual merge of fix for bug #6081 "Call to deprecated mysql_create_db()
function crashes server" with main tree.
2004-10-22 22:51:55 +04:00
konstantin@mysql.com
e3abcb6b53 A fix and test case for Bug#6088 "FOUND_ROWS returns wrong values for
prepared statements when LIMIT is used" and post-review comments.
The fix changes the approach we calculate the need for ORDER BY 
in UNION: the previous was not PS friendly, as it damaged SELECT_LEX 
options in case of single select.
2004-10-22 22:51:16 +04:00
dellis@goetia.(none)
e1d5815341 sql_acl.cc:
BUG #5831  Post-review changes, merging improvements from Monty.
2004-10-22 13:41:40 -05:00
serg@serg.mylan
1e60c59102 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-10-22 20:34:25 +02:00
serg@serg.mylan
123ce649b4 added missing command names to command_name[] array 2004-10-22 20:33:10 +02:00
pem@mysql.comhem.se
2c428ca09d Fixed BUG#6030: Stored procedure has no appropriate DROP privilege.
...and no ALTER privilege either.
  For now, only the definer and root can drop or alter an SP.
2004-10-22 20:29:06 +02:00
pem@mysql.comhem.se
ebf8dc0da6 Fixed BUG#6027: Stored procedures can be renamed.
Removed the support for renaming SPs. It's non-standard, conflicted with a standard
syntax, and was a bit broken anyway.
2004-10-22 19:05:17 +02:00
dlenev@mysql.com
2d5f423988 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/dlenev/src/mysql-4.1-bg6081
2004-10-22 20:59:00 +04:00
monty@mysql.com
a308981257 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2004-10-22 19:51:04 +03:00
monty@mysql.com
e5f30a8375 After merge fixes 2004-10-22 19:50:31 +03:00
dlenev@mysql.com
2dfc05b147 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/dlenev/src/mysql-4.1-tzfix
2004-10-22 20:21:57 +04:00
serg@serg.mylan
5d524d9e8e Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-10-22 18:21:56 +02:00
dlenev@mysql.com
fbdc20e0af Manual merge of fix for bug #6081 "Call to deprecated mysql_create_db() function crashes
server" with main tree.
2004-10-22 20:21:56 +04:00
konstantin@mysql.com
016d5adeeb Followup to fix for bug#6050: fix valgrind warnings. 2004-10-22 20:21:55 +04:00
dlenev@mysql.com
0ea8f29186 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/dlenev/src/mysql-4.1-tzfix
2004-10-22 20:21:55 +04:00
monty@mysql.com
bd04041264 Merge mysql.com:/home/my/mysql-4.0 into mysql.com:/home/my/mysql-4.1 2004-10-22 18:46:35 +03:00
monty@mysql.com
3afecef4df Fix compiler warnings (detected by Intel's C++ compiler)
Fixed checking of privilege handling in CREATE ... SELECT (Bug #6094)
2004-10-22 18:44:51 +03:00
hf@deer.(none)
497fe7f71e Fix for bug #6117 (Centroid() crashes server)
I learned that one shouldn't use String::set in val_str() methods...
2004-10-22 20:32:02 +05:00
dlenev@mysql.com
6b6692dc4d Part of fix for bug #6081 "Call to deprecated mysql_create_db() function
crashes server"

(in 4.0 we fix only connection stalling in case of error, crash itself is
fixed in 4.1, the test case for this code is also there).
2004-10-22 19:27:43 +04:00
paul@ice.snake.net
cbaa07d78d handler.cc:
Typos in comments.
2004-10-22 09:19:08 -05:00
bell@sanja.is.com.ua
3288007235 fixed db/user privileges getting (BUG#5976) 2004-10-22 15:43:22 +03:00
konstantin@mysql.com
33c97a499b Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/media/sda1/mysql/mysql-4.1-6050
2004-10-22 15:59:58 +04:00
konstantin@mysql.com
a7c52d755b A fix and test case for Bug#6050 "EXECUTE stmt reports ambiguous field
names with ident. tables fr. diff. schemata": revise all uses of
Item_field and make them prepared-statements friendly when necessary.
2004-10-22 14:47:35 +04:00
joreland@mysql.com
e95f46bbd2 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2004-10-22 11:01:11 +02:00
ram@gw.mysql.r18.ru
7590eed389 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into gw.mysql.r18.ru:/usr/home/ram/work/5.0
2004-10-22 12:48:37 +05:00
ram@gw.mysql.r18.ru
b7c57329a4 A fix (bug #5999 Typo in code, wrong config variable naming). 2004-10-22 12:47:32 +05:00
kent@mysql.com
21fd8948e6 Merge mysql.com:/home/bk/mysql-4.1
into mysql.com:/users/kboortz/daily/work/mysql-4.1-purify2
2004-10-22 08:57:20 +02:00
kent@mysql.com
bd3d0f6cea sql_parse.cc:
Bug#6167 One element missing in 'uc_update_queries[]'
2004-10-22 08:54:14 +02:00
bell@sanja.is.com.ua
7f896917b8 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-10-22 09:53:08 +03:00
jan@hundin.mysql.fi
baeecbd6e4 Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/jan/talle/mysql-4.1
2004-10-22 07:58:04 +03:00
jan@hundin.mysql.fi
64061eea5a Show table status now shows creation time of the table for InnoDB. Note that
this timestamp might not be the correct time because e.g. ALTER TABLE
changes this timestamp.
2004-10-22 07:52:52 +03:00
igor@rurik.mysql.com
4c605cece9 Merge rurik.mysql.com:/home/igor/mysql-5.0
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2004-10-21 14:47:40 -07:00
igor@rurik.mysql.com
dd44a4b4d4 ps.result:
Post-merge fixes.
sql_select.cc:
  Post-merge cleanup.
2004-10-21 14:46:40 -07:00
bell@sanja.is.com.ua
ded12c828d Check of temporary tables hiding for query fetched from QC (BUG#6084) 2004-10-21 23:56:12 +03:00
bell@sanja.is.com.ua
ed7b229a28 added support of view and CHECK OPTION of view to LOAD DATA (BUG#5996) 2004-10-21 21:53:27 +03:00