anozdrin@mysql.com
f23f49ed57
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/alik/MySQL/devel/5.0-wl2818
2005-11-10 22:48:00 +03:00
anozdrin@mysql.com
491e4f89f5
WL#2818 (Add creator to the trigger definition for privilege
...
checks on trigger activation)
2005-11-10 22:25:03 +03:00
guilhem@mysql.com
ff46e54932
WL#2971 "change log-bin-trust-routine-creators=0 to apply only to functions".
...
Indeed now that stored procedures CALL is not binlogged, but instead the invoked substatements are,
the restrictions applied by log-bin-trust-routine-creators=0 are superfluous for procedures.
They still need to apply to functions where function calls are written to the binlog (for example as "DO myfunc(3)").
We rename the variable to log-bin-trust-function-creators but allow the old name until some future version (and issue a warning if old name is used).
2005-11-10 17:50:51 +01:00
sasha@asksasha.com
aaaee3f23b
Merge spachev@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into asksasha.com:/reiser-data/mysql-dev/mysql-4.1-bug7947
2005-11-07 15:10:48 -07:00
sasha@asksasha.com
41752fa9a0
fix for BUG#7947 - failure to log DO RELEASE_LOCK() if we disconnect in the middle of
...
transaction while holding the lock. Also test to make sure other binlogging issues
reported in the bug have been addressed.
2005-11-07 15:09:35 -07:00
ramil@mysql.com
2467674b73
Fix for bug #13044 : BIT_COUNT with NULL values.
2005-11-06 12:35:49 +04:00
igor@rurik.mysql.com
8e8a2d79cc
Merge rurik.mysql.com:/home/igor/mysql-5.0
...
into rurik.mysql.com:/home/igor/dev/mysql-5.0-2
2005-11-04 17:54:47 -08:00
holyfoot@mysql.com
c2640d292a
Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0
...
into mysql.com:/home/hf/work/mysql-5.0.13573
2005-11-03 11:05:34 +04:00
holyfoot@mysql.com
dc78f2ea4d
Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0
...
into mysql.com:/home/hf/work/mysql-5.0.13573
2005-11-02 18:58:25 +04:00
monty@mysql.com
65034c9fb2
Merge monty@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/my/mysql-5.0
2005-11-02 16:29:00 +02:00
monty@mysql.com
164b469660
Fixed wrong merge
...
Optimize new pushed code
2005-11-02 14:43:25 +02:00
bell@sanja.is.com.ua
35cc6325a7
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-owner-5.0
2005-11-02 12:56:19 +02:00
holyfoot@mysql.com
6b5c422fe1
Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0
...
into mysql.com:/home/hf/work/mysql-5.0.13573
2005-11-02 13:01:21 +04:00
evgen@moonbone.local
bbe58c7e26
Manually merged
2005-11-01 19:47:53 +03:00
hf@deer.(none)
0ec768c407
Conflicts resolving
2005-11-01 20:37:27 +04:00
monty@mysql.com
e5f48e13bf
Reverting patch for BUG #14009 (use of abs() on null value causes problems with filesort
...
Fix for bug #14536 : SELECT @a,@a:=... fails with prepared statements
2005-11-01 15:54:30 +02:00
monty@mysql.com
19502e8eb5
Review of new pushed code
...
Removed wrong fix for bug #14009 (use of abs() on null value causes problems with filesort)
Mark that add_time(), time_diff() and str_to_date() can return null values
2005-11-01 13:00:02 +02:00
bell@sanja.is.com.ua
c54d129224
postreview fixes
2005-10-31 22:14:27 +02:00
igor@rurik.mysql.com
6a1c8d48f6
Merge rurik.mysql.com:/home/igor/mysql-5.0
...
into rurik.mysql.com:/home/igor/dev/mysql-5.0-2
2005-10-29 09:41:18 -07:00
jimw@mysql.com
f6995841b3
Merge bk-internal:/home/bk/mysql-5.0
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-10-28 10:17:37 -07:00
igor@rurik.mysql.com
30a7c28603
Merge rurik.mysql.com:/home/igor/mysql-5.0
...
into rurik.mysql.com:/home/igor/dev/mysql-5.0-2
2005-10-27 21:37:52 -07:00
jimw@mysql.com
009bcc7442
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-10-27 18:46:00 -07:00
bell@sanja.is.com.ua
c399932a72
fixe of typos, comments & layout
2005-10-28 00:56:44 +03:00
bell@sanja.is.com.ua
6143c6543e
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-owner7-5.0
2005-10-28 00:24:13 +03:00
bell@sanja.is.com.ua
1b164c7b83
support of view underlying tables and SP functions security check added (BUG#9505) (WL#2787)
2005-10-28 00:18:23 +03:00
monty@mysql.com
a9b1ff4095
Add DROP TABLE before trying to create view (in mysqldump)
...
Cleaned up xxxx_gis.test's and made gis_generic.inc independent of ndb
(Note that archive_gis.test fails, but this is independent of this patch)
2005-10-27 22:45:18 +03:00
jimw@mysql.com
7a8bd252d2
Merge mysql.com:/home/jimw/my/mysql-4.1-14009
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-10-27 10:20:38 -07:00
hf@deer.(none)
fa56a9d576
Additional fix for bug #13573
2005-10-26 11:54:15 +05:00
hf@deer.(none)
50a8dbc8c2
Merge deer.(none):/home/hf/work/mysql-5.0.13820
...
into deer.(none):/home/hf/work/mysql-5.0.12267
2005-10-25 21:10:58 +05:00
igor@rurik.mysql.com
a236acce10
Merge rurik.mysql.com:/home/igor/mysql-5.0
...
into rurik.mysql.com:/home/igor/dev/mysql-5.0-2
2005-10-22 19:35:37 -07:00
jimw@mysql.com
2c90e2f7a6
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-10-19 13:47:05 -07:00
jani@ua141d10.elisa.omakaista.fi
8e1dac44b4
Some fixes to avoid compiler warnings.
2005-10-18 18:03:26 +03:00
jimw@mysql.com
31a79ee3d0
Fix Item_func_abs::fix_length_and_dec() to set maybe_null properly. (Bug #14009 )
2005-10-17 17:00:42 -07:00
hf@deer.(none)
15fbd07a22
Fix for bug #13820 (No warning on log(NEGATIVE))
2005-10-17 12:32:22 +05:00
igor@rurik.mysql.com
c136e9c43b
Fixed bug #12762 :
...
allowed set functions aggregated in outer subqueries, allowed nested set functions.
2005-10-15 14:32:37 -07:00
hf@deer.(none)
3f76925d06
Fix for bug #13573 (wrong data inserted for too big decimals)
2005-10-15 21:57:32 +05:00
hf@deer.(none)
ba82a6a759
Fix for bug #9855 (Inconsistend column type in create select)
2005-10-15 19:47:23 +05:00
bar@mysql.com
0bf436a058
Merge mysql.com:/usr/home/bar/mysql-4.1.b13751
...
into mysql.com:/usr/home/bar/mysql-5.0.char1
2005-10-14 12:07:13 +05:00
monty@mysql.com
f5fdf3e87a
Reviewing new pushed code
...
- CHAR() now returns binary string as default
- CHAR(X*65536+Y*256+Z) is now equal to CHAR(X,Y,Z) independent of the character set for CHAR()
- Test for both ETIMEDOUT and ETIME from pthread_cond_timedwait()
(Some old systems returns ETIME and it's safer to test for both values
than to try to write a wrapper for each old system)
- Fixed new introduced bug in NOT BETWEEN X and X
- Ensure we call commit_by_xid or rollback_by_xid for all engines, even if one engine has failed
- Use octet2hex() for all conversion of string to hex
- Simplify and optimize code
2005-10-12 00:58:22 +03:00
monty@mysql.com
17d7ba931d
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2005-10-08 03:37:23 +03:00
bar@mysql.com
62ad8922b8
ctype_utf8.result, ctype_utf8.test:
...
Adding test case.
item_func.cc:
Bug#13751 find_in_set: Illegal mix of collations.
Character set conversion was forgotten in find_in_set.
2005-10-07 09:52:15 +05:00
monty@mysql.com
78e828d32f
Review of code pushed since last 5.0 pull:
...
Ensure that ccache is also used for C programs
mysql: Ensure that 'delimiter' works the same way in batch mode as in normal mode
mysqldump: Change to use ;; (instead of //) as a stored procedure/trigger delimiter
Fixed test cases by adding missing DROP's and rename views to be of type 'v#'
Removed MY_UNIX_PATH from fn_format()
Removed current_db_used from TABLE_LIST
Removed usage of 'current_thd' in Item_splocal
Removed some compiler warnings
A bit faster longlong2str code
2005-10-06 17:54:43 +03:00
jonas@perch.ndb.mysql.com
05d875f8c1
sql/item_func.cc
...
remove extra ";" after function
2005-09-21 14:36:55 +02:00
bell@sanja.is.com.ua
506c6eb922
postmerge fixes
2005-09-21 08:29:47 +03:00
bell@sanja.is.com.ua
3f66053a50
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-owner5-5.0
2005-09-20 21:27:28 +03:00
bell@sanja.is.com.ua
c1b185f5ff
WL#2787 (Add view definer/owner to the view definition (.frm) to check privileges on used tables and stored routines when using a VIEW.)
...
Part 2 postreview fixes.
2005-09-20 21:20:38 +03:00
evgen@moonbone.local
b7c42a65d1
item_func.cc:
...
Fixed mistake in fix for bug#12812
2005-09-20 21:35:57 +04:00
evgen@moonbone.local
e9c3396cd4
Manual merge
2005-09-20 03:31:00 +04:00
evgen@moonbone.local
de4e941e3f
Fix bug #12812 create view calling a function works without execute right on function
...
Execution rigths on function was checked just before function execution,
thus it was unknown on prepare stage whether user have right to execute
particular function.
Added access rights checking function which is called right after fixing
Item_func_sp.
This have additional effect that if user don't have rights for execution
query will fail on earlier stage and will not waste resources on optimizing
with failing on execution stage.
2005-09-20 03:05:35 +04:00
bell@sanja.is.com.ua
aec371f910
WL#2787 (part 2, ver 3 (merged)) changed securety context switching
2005-09-15 22:29:07 +03:00