mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 19:41:47 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
16375 commits 2793 branches 343 tags 1.7 GiB
Commit graph

16375 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
ingo@mysql.com
7916e63c5a Merge mysql.com:/home/mydev/mysql-4.1 
into mysql.com:/home/mydev/mysql-4.1-bug6151
 2004-10-22 21:07:09 +02: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
50c5af7bc4 Post merge fix (test results) 2004-10-22 23:05:48 +04:00
pem@mysql.comhem.se
bf60309ea2 Updated view test result (after a warning's been removed). 2004-10-22 20:55:52 +02: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
monty@mysql.com
91c80cf44e merge 2004-10-22 19:21:55 +03: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
jani@a193-229-222-105.elisa-laajakaista.fi
af7ecf4c78 Fixed a bug in vis.c 2004-10-22 19:21:54 +03:00
mysqldev@mysql.com
50ff14b9a1 Merge mysql.com:/home/bk/mysql-4.1 
into mysql.com:/build/mysqldev/my/mysql-4.1-tomastest
 2004-10-22 18:21:53 +02:00
kent@mysql.com
e58f924020 Merge mysql.com:/home/bk/mysql-4.1 
into mysql.com:/users/kboortz/daily/work/mysql-4.1-sjis
 2004-10-22 18:21:52 +02:00
tomas@poseidon.ndb.mysql.com
5037886d14 removing compiler warnings 2004-10-22 16:21:51 +00: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
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
tomas@poseidon.ndb.mysql.com
31501a9939 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
 2004-10-22 15:22:47 +00:00
tomas@poseidon.ndb.mysql.com
8c9dd887f7 Add extra include on OSF1 (to let c++ program use stdint.h) 2004-10-22 15:20:15 +00:00
tomas@poseidon.ndb.mysql.com
48f1ee6acf AIX compile fixes 2004-10-22 15:13:06 +00:00
ingo@mysql.com
20cea41f76 Merge mysql.com:/home/mydev/mysql-4.1 
into mysql.com:/home/mydev/mysql-4.1-bug6151
 2004-10-22 17:03:26 +02:00
mysqldev@mysql.com
36e59a681e remove compiler warnings 2004-10-22 16:57:19 +02:00
paul@ice.snake.net
cbaa07d78d handler.cc: 
Typos in comments.
 2004-10-22 09:19:08 -05:00
kent@mysql.com
90a8caee45 Merge 2004-10-22 15:41:56 +02:00
monty@mysql.com
97b4a3415d Merge mysql.com:/home/my/mysql-4.0 into mysql.com:/home/my/mysql-4.1 2004-10-22 14:59:59 +03:00
konstantin@mysql.com
f99d6ccfd0 A test case for Bug#6046: no fix is needed (the bug is already 
fixed in the main tree).
 2004-10-22 15:59:59 +04: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
tomas@poseidon.ndb.mysql.com
c21b47540f fix c++ style comments in .h and .c files 
compilation problems on some platforms'
 2004-10-22 11:59:57 +00: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
tomas@poseidon.ndb.mysql.com
6d0e947051 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
 2004-10-22 09:01:10 +00:00
tomas@poseidon.ndb.mysql.com
009bf31915 use the right make in make_binary_distribution 2004-10-22 08:57:52 +00: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