mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 03:21:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
15632 commits 2791 branches 343 tags 1.7 GiB
Commit graph

7553 commits

Author SHA1 Message Date
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
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
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
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
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
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
dlenev@brandersnatch.localdomain
e6a44b719a Fix for bug #6116 "SET time_zone := ... requires access to 
mysql.time_zone* tables".

We are excluding implicitly used time zone tables from privilege
checking.
 2004-10-21 22:18:00 +04:00
konstantin@mysql.com
9d73472840 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/media/sda1/mysql/mysql-4.1-6059
 2004-10-21 19:57:23 +04:00
ram@gw.mysql.r18.ru
136652522e A fix (bug #6138: MOD operator should not round non-integral argument). 2004-10-21 19:52:55 +05:00
konstantin@mysql.com
a55e6dda22 Manual merge. 2004-10-21 18:44:40 +04:00
konstantin@mysql.com
49a58fc64e A fix and test case for bug#6059 "mysql_stmt_field_count returns 
positive numbers when no resultset is available": when sending
result set metadata we need to use virtual select_result::send_fields, 
and not address protocol directly, because select_result descendents may 
intercept result set (it's the case for example for SELECT INTO OUTFILE).
 2004-10-21 18:33:53 +04:00
jan@hundin.mysql.fi
65a9dd2dca SHOW TABLE STATUS now prints create_time, update_time and check_time 
for InnoDB tables. Note that these times may always be correct ones,
because for example ALTER TABLE creates a table again.
 2004-10-21 14:57:43 +03:00
joreland@mysql.com
75ac46c0d4 compile fixes for butch 2004-10-21 12:39:08 +02:00
bell@sanja.is.com.ua
7bee6db380 force assigning error handler for all mem_roots 2004-10-21 10:58:03 +03:00
jan@hundin.mysql.fi
de0488ee4b Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-4.1 
into hundin.mysql.fi:/home/jan/talle/mysql-4.1
 2004-10-21 08:49:57 +03:00
tomas@poseidon.ndb.mysql.com
eda3eb378d Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
 2004-10-20 17:31:59 +00:00
tomas@poseidon.ndb.mysql.com
8ae6219c26 fix so that ndb handler can cope with char(0), mapped to char(1) for now 2004-10-20 17:22:58 +00:00
monty@mysql.com
b686f98f50 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2004-10-20 18:58:01 +03:00
dlenev@mysql.com
b9bf4e8ccd Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/dlenev/src/mysql-4.1-secfix
 2004-10-20 17:37:46 +04:00
konstantin@mysql.com
df58c0bce7 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/media/sda1/mysql/mysql-4.1-6049
 2004-10-20 17:33:14 +04:00
monty@mysql.com
e1218474b8 Merge with 4.0 2004-10-20 16:24:28 +03:00
monty@mysql.com
b32ffec8fd Fix test case for innodb-lock 2004-10-20 16:04:28 +03:00
dlenev@mysql.com
a10ce662b4 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/dlenev/src/mysql-4.1-secfix
 2004-10-20 17:02:15 +04:00