mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-22 23:04:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
15435 commits 2774 branches 343 tags 1.6 GiB
Commit graph

7474 commits

Author SHA1 Message Date
konstantin@mysql.com
659de73248 Manual merge 2004-10-22 22:55:49 +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
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
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
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
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
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
konstantin@mysql.com
e546d901ac Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/kostja/work/mysql-4.1-6049
 2004-10-20 16:45:09 +04:00
dlenev@brandersnatch.localdomain
75d816627c Fix for bug #6173 "One can circumvent missing UPDATE privilege if 
he has SELECT and INSERT privileges for table with primary key"

Now we set lex->duplicates= DUP_UPDATE right in parser if INSERT has
ON DUPLICATE KEY UPDATE clause, this simplifies insert_precheck()
function (this also fixes a bug) and some other code.
 2004-10-20 16:04:43 +04:00
ingo@mysql.com
f32fb586c6 Fixed a typo, which prevented non-valgrind build. 2004-10-20 13:52:56 +02:00
monty@mysql.com
1f8b3d0f22 Code cleanups (done during review of new code) 
Rename innodb_table_locks_old_behavior -> innodb_table_locks
Set innodb_table_locks to off by default to get same behaviour as in MySQL 4.0.20
(This means that Innodb ignore table locks by default, which makes it easier to combine MyISAM and InnoDB to simulate a transaction)
 2004-10-20 11:24:08 +03:00
monty@mishka.local
7af65592c7 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mishka.local:/home/my/mysql-4.1
 2004-10-20 02:55:03 +03:00
tomas@poseidon.ndb.mysql.com
1ef4979e48 fix for platforms that have lower_case_table_names == 2 2004-10-19 23:55:02 +00:00
monty@mishka.local
04c23808a8 Review of all code pushed since last review 
Simple optimzations and cleanups
Removed compiler warnings and fixed portability issues
Added client functions 'mysql_embedded()' to allow client to check if we are using embedded server
Fixes for purify
 2004-10-20 01:28:42 +03:00
tomas@poseidon.ndb.mysql.com
8476fe9757 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb-merge
 2004-10-19 15:00:02 +00:00
marko@hundin.mysql.fi
665e22eeae Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1 
into hundin.mysql.fi:/home/marko/j/mysql-4.1
 2004-10-19 11:00:02 +03:00
jan@hundin.mysql.fi
98ecd7422a Fixed bug #5835 load data infile...replace error with InnoDB table. 2004-10-19 09:58:41 +03:00
bar@mysql.com
cdd9d656b4 sql_union.cc: 
Check DERIVATION_NONE only for UNIONS.
 2004-10-19 11:45:33 +05:00
marko@hundin.mysql.fi
fe83d97800 ha_innodb.cc: 
Replace a tolower() loop with innobase_casedn_str()
 2004-10-18 16:59:15 +03:00
marko@hundin.mysql.fi
57f1f4ea41 InnoDB: Treat UTF-8 strings properly in case insensitive operations 2004-10-18 16:00:57 +03:00
bar@mysql.com
47f638054e Bug #6139 UNION doesn't understand collate in the column of second select 2004-10-18 17:56:25 +05:00
tomas@poseidon.ndb.mysql.com
60cf2213fd Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
 2004-10-18 12:12:02 +00:00
dlenev@brandersnatch.localdomain
391a086d52 Fix for broken --with-csv-storage-engine build. 
Now we use TABLE::timestamp_field_type instead of
TABLE::timestamp_default_now/on_update_now for determining
if we should auto-set value of TIMESTAMP field during this operation.
We are also use Field_timestamp::set_time() instead of
handler::update_timestamp().
 2004-10-18 10:32:52 +04:00
dellis@goetia.(none)
34e5df0d36 Merge dellis@bk-internal.mysql.com:/home/bk/mysql-4.0 
into goetia.(none):/home/dellis/mysqlab/bk/mysql-4.0
 2004-10-17 18:47:08 -05:00