database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-18 07:48:43 +03:00
Code Activity
26,425 Commits 3,279 Branches 1,097 Tags
23f35495acac61b50a2c99f7a2bc5aef03885bb7
Commit Graph

8252 Commits

Author SHA1 Message Date
tomas@poseidon.ndb.mysql.com
b144b920a0 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-new
 2005-07-15 14:14:59 +02:00
tomas@poseidon.ndb.mysql.com
f54afc792f Merge 2005-07-15 14:13:23 +02:00
tomas@poseidon.ndb.mysql.com
cd590a6a02 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-release 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-new
 2005-07-15 13:32:08 +02:00
ramil@mysql.com
cd20ee4361 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/ram/work/mysql-5.0
 2005-07-15 16:27:59 +05:00
ramil@mysql.com
b11d04e50a a fix (bug #9881: ALTER TABLE gives wrong error message with sql-mode TRADITIONAL). 2005-07-15 15:50:57 +05:00
dlenev@mysql.com
2564656307 Added test case for bug #9565 "Wrong locking in stored procedure if a 
sub-sequent procedure is called" which was fixed by the same patch
as bug #9597 "read lock stays when querying view from stored procedure".
 2005-07-15 13:34:48 +04:00
bell@sanja.is.com.ua
0f6e1380dc Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug4-5.0
 2005-07-15 01:29:37 +03:00
bell@sanja.is.com.ua
a7834de02d take into account table lock mode when opening table: 
try to find most suitable table, to avouid pickup table with too low locking mode or occupy table with write mode for select when it will be need for update later
(BUG#9597)
 2005-07-15 01:22:14 +03:00
konstantin@mysql.com
fbf35e0e37 Merge mysql.com:/opt/local/work/mysql-4.1-root 
into  mysql.com:/opt/local/work/mysql-5.0-root
 2005-07-15 02:13:08 +04:00
konstantin@mysql.com
a4a5bc42a6 Fix ps.test in --ps-protocol 2005-07-15 02:11:07 +04:00
konstantin@mysql.com
60e7d6ff37 Post-merge fixes. 2005-07-15 00:41:58 +04:00
konstantin@mysql.com
3274b050bc Merge mysql.com:/opt/local/work/mysql-4.1-root 
into  mysql.com:/opt/local/work/mysql-5.0-root
 2005-07-15 00:31:09 +04:00
konstantin@mysql.com
a2b11ff266 A fix and a test case for Bug#11299 "prepared statement makes wrong SQL 
syntax in binlog which stops replication":
disallow the use of parameter markers which can lead to generation
of malformed binlog queries.
 2005-07-15 00:01:49 +04:00
konstantin@mysql.com
36810d25f3 Post-merge fixes. 2005-07-14 20:02:37 +04:00
konstantin@mysql.com
4099582be2 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/opt/local/work/mysql-5.0-root
 2005-07-14 20:02:35 +04:00
konstantin@mysql.com
3f28ad8eb7 Merge mysql.com:/opt/local/work/mysql-4.1-root 
into  mysql.com:/opt/local/work/mysql-5.0-root
 2005-07-14 20:02:32 +04:00
konstantin@mysql.com
3892f1d298 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/opt/local/work/mysql-4.1-root
 2005-07-14 20:02:31 +04:00
sergefp@mysql.com
86d3c07836 Merge mysql.com:/home/psergey/mysql-4.1-build-tree 
into mysql.com:/home/psergey/mysql-4.1-merge-from-build
 2005-07-14 16:02:30 +00:00
lenz@mysql.com
63ffc74532 - suppress warning when running this test with a "classic" build (which does not 
include InnoDB)
 2005-07-14 17:50:33 +02:00
sergefp@mysql.com
0b3db181bf Fix for BUG#11869: In Item_func_match::fix_index() handle the case when there is no 
source table present (this happens for ORDER BY after UNION)
 2005-07-14 15:19:26 +00:00
sergefp@mysql.com
e1273aec6d Fix for BUG#11700: in add_not_null_conds(), call full fix_fields() for the created NOT NULL. 
This is needed because in some cases range optimization is performed twice and added 
  NOT NULL item must have correct const_table_map() value.
 2005-07-14 15:13:36 +00:00
hf@deer.(none)
8f9a268a1c Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0 
into deer.(none):/home/hf/work/mysql-5.0.clean
 2005-07-14 19:12:03 +05:00
hf@deer.(none)
1969a1622e Fix for bug #10929 (type_newdecimal.test requires InnoDB) 2005-07-14 18:51:05 +05:00
konstantin@mysql.com
d4df2660c6 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/opt/local/work/mysql-4.1-root
 2005-07-14 15:14:40 +04:00
konstantin@mysql.com
62b8e6fdd1 A fix and a test case for Bug#9735. 
No separate typecode for MEDIUMTEXT/LONGTEXT is added, as we
have no sound decision yet what typecodes and for what types are
sent by the server (aka what constitutes a distinct type in MySQL).
 2005-07-14 15:13:23 +04:00
bar@mysql.com
7d405e3c65 Merge mysql.com:/usr/home/bar/mysql-4.1.num-conv 
into  mysql.com:/usr/home/bar/mysql-5.0
 2005-07-14 16:11:55 +05:00
bar@mysql.com
1b612b0006 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/bar/mysql-4.1.num-conv
 2005-07-14 10:46:15 +05:00
konstantin@mysql.com
3cf9a4c4fc Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/opt/local/work/mysql-5.0-root
 2005-07-14 01:39:40 +04:00
konstantin@mysql.com
7b507e8bb0 Merge mysql.com:/opt/local/work/mysql-4.1-9379 
into  mysql.com:/opt/local/work/mysql-5.0-root
 2005-07-14 00:52:57 +04:00
konstantin@mysql.com
ef1e748ef1 A test case for Bug#9442 "Set parameter make query fail if column 
character set is UCS2".
The bug is no longer repeatable.
 2005-07-14 00:15:23 +04:00
dlenev@mysql.com
200c751df8 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/dlenev/src/mysql-5.0-mysqlproc
 2005-07-14 00:11:15 +04:00
dlenev@mysql.com
14b93bf18a Now when we create or drop trigger we will open only subject table and not 
all tables suggested by prelocking algorithm.
Added test for bug #11889 "Server crashes when dropping trigger using stored
routine" (which was fixed by previous patch).
 2005-07-13 23:51:09 +04:00
konstantin@mysql.com
b6da7f6227 Merge mysql.com:/opt/local/work/mysql-4.1-9379 
into  mysql.com:/opt/local/work/mysql-5.0-root
 2005-07-13 23:49:45 +04:00
konstantin@mysql.com
1755df7649 A fix and a test case for Bug#9379 (collation of a parameter marker is 
binary).
 2005-07-13 23:43:46 +04:00
konstantin@mysql.com
a25c4ead10 Merge mysql.com:/opt/local/work/mysql-4.1-11458 
into  mysql.com:/opt/local/work/mysql-5.0-root
 2005-07-13 18:23:20 +04:00
konstantin@mysql.com
618f7d9449 Merge mysql.com:/opt/local/work/mysql-4.1-11458 
into  mysql.com:/opt/local/work/mysql-5.0-root
 2005-07-13 18:05:57 +04:00
konstantin@mysql.com
2dc2ec3ef7 Cleanup after test for Bug#11458 2005-07-13 18:01:04 +04:00
konstantin@mysql.com
374b9182af Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/opt/local/work/mysql-4.1-11458
 2005-07-13 17:39:48 +04:00
konstantin@mysql.com
bef558b7ee - a fix for Bug#11458 "Prepared statement with subselects return random 
data": remove the fix for another bug (8807) that
added OUTER_REF_TABLE_BIT to all subqueries that used a placeholder
to prevent their evaluation at prepare. As this bit hanged in 
Item_subselect::used_tables_cache for ever, a constant subquery with
a placeholder was never evaluated as such, which caused wrong 
choice of the execution plan for the statement.
- to fix Bug#8807 backport a better fix from 5.0
- post-review fixes.
 2005-07-13 17:38:55 +04:00
dlenev@mysql.com
4a5c65e146 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/dlenev/src/mysql-5.0-mysqlproc
 2005-07-13 16:43:13 +04:00
dlenev@mysql.com
a37eea1993 Fixed trigger.test after fixing bug #11554 "Server crashes on statement 
indirectly using non-cached function".
 2005-07-13 16:22:36 +04:00
mats@mysql.com
2588b7e51d Merge mysql.com:/home/bkroot/mysql-4.1 
into mysql.com:/home/bk/bXXX-mysql-5.0
 2005-07-13 14:15:23 +02:00
mats@mysql.com
1826c39897 Bug#11905: Tables used in rpl_deadlock are not dropped at the 
end of the test, causing subsequent tests to fail.
 2005-07-13 13:49:35 +02:00
dlenev@mysql.com
8a28d604f5 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/dlenev/src/mysql-5.0-mysqlproc
 2005-07-13 15:08:13 +04:00
gluh@mysql.com
b0ec1cd84e Merge mysql.com:/home/gluh/MySQL/Merge/4.1 
into mysql.com:/home/gluh/MySQL/Merge/5.0
 2005-07-13 16:08:13 +05:00
tomas@poseidon.ndb.mysql.com
738e0f15a4 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
 2005-07-13 13:08:12 +02:00
tomas@poseidon.ndb.mysql.com
a2ffbb5515 Bug #11903, make perl test script run ndbcluster tests by default 2005-07-13 13:07:09 +02:00
dlenev@mysql.com
f334ea1fc6 Implementation of Monty's idea: Now we can open mysql.proc table for lookup 
of stored routines definitions even if we already have some tables open and
locked. To avoid deadlocks in this case we have to put certain restrictions
on locking of mysql.proc table.

This allows to use stored routines safely under LOCK TABLES without explicitly
mentioning mysql.proc in the list of locked tables. It also fixes bug #11554
"Server crashes on statement indirectly using non-cached function".
 2005-07-13 13:48:13 +04:00
gluh@eagle.intranet.mysql.r18.ru
672e1f20cb Bug #9854 hex() and out of range handling 
added out of range handling
 2005-07-13 14:23:09 +05:00
gluh@eagle.intranet.mysql.r18.ru
9c3349f5c6 Fix for bug#11685 SHOW TABLES; doesn't update Com_show_tables 2005-07-13 13:30:39 +05:00