database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-15 09:02:33 +03:00
Code Activity
36,936 Commits 3,275 Branches 1,097 Tags
a13d114d0274e7203c74e7edce6650006be4b35e
Commit Graph

13345 Commits

Author SHA1 Message Date
lars@mysql.com
0e45d26993 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0 
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
 2006-06-29 14:14:08 +02:00
ingo@mysql.com
02c8e6b000 Fixed yet another forgotten port number replacement. 2006-06-29 14:03:53 +02:00
lars@mysql.com
0707d4753f Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl 
into  mysql.com:/users/lthalmann/bkroot/mysql-5.0-release
 2006-06-29 14:03:41 +02:00
ingo@mysql.com
35a92af077 Merge mysql.com:/home/mydev/mysql-5.0--main 
into  mysql.com:/home/mydev/mysql-5.0-bug11824
 2006-06-29 13:43:56 +02:00
konstantin@mysql.com
06c2f1a2aa Merge mysql.com:/opt/local/work/mysql-5.0-release 
into  mysql.com:/opt/local/work/mysql-5.0-runtime
 2006-06-29 15:25:03 +04:00
gluh@eagle.intranet.mysql.r18.ru
9901efea1f Bug#15298 SHOW GRANTS FOR CURRENT_USER: Incorrect output in DEFINER context 
user name is calculated on function execution stage instead of parse stage
 2006-06-29 15:50:44 +05:00
kroki@mysql.com
621a86ce82 Replace all numeric error code with symbolic names in trigger.test. 2006-06-29 13:45:43 +04:00
tomas@poseidon.ndb.mysql.com
0d22cc662b Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2006-06-29 10:48:31 +02:00
knielsen@mysql.com
86268a54df Fix test files to work with non-standard ports (MTR_BUILD_THREAD). 2006-06-29 10:35:16 +02:00
ingo@mysql.com
968ba3c226 Merge mysql.com:/home/mydev/mysql-4.1-bug17877 
into  mysql.com:/home/mydev/mysql-5.0-bug11824
 2006-06-29 10:26:24 +02:00
ingo@mysql.com
366cf25f4c Merge mysql.com:/home/mydev/mysql-5.0-amerge 
into  mysql.com:/home/mydev/mysql-5.0-bug11824
 2006-06-29 10:18:29 +02:00
monty@mysql.com
3f22bc07c6 Fixed failing test rpl_ndb_auto_inc.test 
Mark events_stress.test as 'big' as it's very slow on some machines
 2006-06-29 03:24:33 +03:00
monty@narttu.mysql.fi
7b0f8635ae Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/my/mysql-5.1
 2006-06-29 00:09:53 +03:00
kroki@mysql.com
9c3805c9bb Merge mysql.com:/home/tomash/src/mysql_ab/mysql-5.0 
into  mysql.com:/home/tomash/src/mysql_ab/mysql-5.0-bug10946
 2006-06-28 23:54:18 +04:00
kroki@mysql.com
3e2e20ecfb Bug#10946: Confusing error messeges in the case of duplicate trigger definition 
It was hard to distinguish case, when one was unable to create trigger
on the table because trigger with same action time and event already
existed for this table, from the case, when one tried to create trigger
with name which was already occupied by some other trigger, since in
both these cases we emitted ER_TRG_ALREADY_EXISTS error and message.
Now we emit ER_NOT_SUPPORTED_YET error with appropriate additional
message in the first case. There is no sense in introducing separate
error for this situation since we plan to get rid of this limitation
eventually.
 2006-06-28 23:50:50 +04:00
jimw@mysql.com
afef612bd6 Merge bk-internal:/home/bk/mysql-5.0-engines 
into  mysql.com:/home/jimw/my/mysql-5.0-16494
 2006-06-28 12:26:21 -07:00
patg@govinda.patg.net
18d264a1ea BUG #19773 
Pushbuild fixes to result file, test, and header file for federated.
 2006-06-28 12:18:21 -07:00
jimw@mysql.com
9bcb24b65e Merge bk-internal:/home/bk/mysql-5.0-runtime 
into  mysql.com:/home/jimw/my/mysql-5.0-18005
 2006-06-28 10:55:27 -07:00
acurtis@xiphis.org
48e17abe0f Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.0-engines 
into  xiphis.org:/home/antony/work2/mysql-5.0-engines.sync
 2006-06-28 10:31:03 -07:00
patg@govinda.patg.net
87e88fe76b Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  govinda.patg.net:/home/patg/mysql-build/mysql-5.0-engines-bug19773
 2006-06-28 10:11:43 -07:00
monty@narttu.mysql.fi
91c3e28d77 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/my/mysql-5.1
 2006-06-28 20:03:46 +03:00
igreenhoe@mysql.com
d2e8235372 Merge igreenhoe@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  mysql.com:/home/greenman/workspace-mysql/mysql/pending/bug-5.0-18979
 2006-06-28 08:36:01 -07:00
evgen@moonbone.local
82369c4e65 Manual merge 2006-06-28 19:34:04 +04:00
tomas@poseidon.ndb.mysql.com
63c72dc02b Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2006-06-28 17:12:18 +02:00
lars@dl145k.mysql.com
d4f7943594 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl 
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
 2006-06-28 16:44:54 +02:00
lars@mysql.com
6036c30b57 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl 
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
 2006-06-28 16:18:57 +02:00
lars@mysql.com
c75584d8d9 Merge mysql.com:/users/lthalmann/bk/mysql-5.0-rpl 
into  mysql.com:/users/lthalmann/bk/mysql-5.1-new-rpl
 2006-06-28 15:27:25 +02:00
lars@mysql.com
38501d8804 Disabled test case for Windows (BUG#20753) 2006-06-28 15:07:41 +02:00
gkodinov@mysql.com
2cda7f5d80 4.1->5.0 merge for bug #16458 2006-06-28 15:53:54 +03:00
ingo@mysql.com
d8499f2d8f Bug#17877 - Corrupted spatial index 
CHECK TABLE could complain about a fully intact spatial index.
A wrong comparison operator was used for table checking. 
The result was that it checked for non-matching spatial keys. 
This succeeded if at least two different keys were present, 
but failed if only the matching key was present.

I fixed the key comparison.
 2006-06-28 14:27:37 +02:00
tnurnberg@mysql.com
69820afce0 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/tnurnberg/mysql-5.0
 2006-06-28 13:37:13 +02:00
monty@mysql.com
31fdcd3be0 Added purecov comment for new, not executed code for my recent changeset 
(Found by dgcov)
 2006-06-28 14:03:08 +03:00
tnurnberg@mysql.com
a956e9d638 Merge mysql.com:/home/tnurnberg/work/mysql-5.0-maint-19857 
into  mysql.com:/home/tnurnberg/mysql-5.0
 2006-06-28 12:43:04 +02:00
tnurnberg@mysql.com
763752ef2e Bug#19857: When a user with CREATE ROUTINE priv creates a routine it results in NULL p/w 
sp_grant_privileges(), the function that GRANTs EXECUTE + ALTER privs on a SP,
did so creating a user-entry with not password; mysql_routine_grant() would then
write that "change" to the user-table.
 2006-06-28 12:40:17 +02:00
knielsen@mysql.com
529a2d1291 BUG#20739: __NT__ not probably defined for mysys project. 
Make sure for the mysys project that __NT__ is defined in *nt solution
configurations (but not in other configurations).
 2006-06-28 12:30:14 +02:00
gluh@mysql.com
e5dbc49bb0 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/gluh/MySQL/Merge/5.0-kt
 2006-06-28 14:23:33 +05:00
gluh@eagle.intranet.mysql.r18.ru
3e22ea44e5 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1 
into mysql.com:/home/gluh/MySQL/Merge/5.1-kt
 2006-06-28 11:55:15 +05:00
patg@govinda.patg.net
d2df283b78 BUG #19773 
Final-review fixes per Monty, pre-push. OK'd for 
push. Please see each file's comments.
 2006-06-27 23:49:48 -07:00
jonas@perch.ndb.mysql.com
b26e651f98 Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
 2006-06-28 08:47:43 +02:00
jimw@mysql.com
5d2c0de578 Bug #18005: Creating a trigger on mysql.event leads to server crash on scheduler startup 
Bug #18361: Triggers on mysql.user table cause server crash

 Because they do not work, we do not allow creating triggers on tables
 within the 'mysql' schema.

 (They may be made to work and re-enabled at some later date, but not
 in 5.0 or 5.1.)
 2006-06-27 17:16:02 -07:00
iggy@mysql.com
2781050afc Bug#16180 Setting SQL_LOG_OFF without SUPER privilege is silently ignored 2006-06-27 20:10:49 -04:00
ngrishakin@ndb15.mysql.com
af763ef55e Merge ngrishakin@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/ndbdev/ngrishakin/mysql-5.1
 2006-06-28 01:03:11 +02:00
tomas@poseidon.ndb.mysql.com
40267422eb corrected partition test case results that were put back 2006-06-28 01:03:10 +02:00
tomas@poseidon.ndb.mysql.com
ec4738fcf0 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2006-06-27 22:27:25 +02:00
kroki@mysql.com
08f192f81b Bug#17203: "sql_no_cache sql_cache" in views created from prepared statement 
The problem was that we restored SQL_CACHE, SQL_NO_CACHE flags in SELECT
statement from internal structures based on value set later at runtime, not
the original value set by the user.

The solution is to remember that original value.
 2006-06-27 21:28:32 +04:00
svoj@may.pils.ru
ffd8ed1716 BUG#1662 - ALTER TABLE LIKE ignores DATA/INDEX DIRECTPORY 
Produce a warning if DATA/INDEX DIRECTORY is specified in
ALTER TABLE statement.

Ignoring of these options is documented in the symbolic links
section of the manual.
 2006-06-27 22:22:43 +05:00
gluh@eagle.intranet.mysql.r18.ru
0ccd44cdf2 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1 
into mysql.com:/home/gluh/MySQL/Merge/5.1-kt
 2006-06-27 22:02:06 +05:00
jmiller@mysql.com
909e81fbf0 rpl_ndb_dd_partitions.test, rpl_ndb_dd_partitions.result: 
Adding back ndb partition tests from mysql-test-extra per tomas and clavin
  new file
 2006-06-27 18:44:25 +02:00
jmiller@ndb08.mysql.com
4dcee064c4 Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/data0/mysql-5.1
 2006-06-27 18:36:52 +02:00
jmiller@mysql.com
40e27a25f5 Many files: 
Adding back ndb partition tests from mysql-test-extra per tomas and clavin
  new file
 2006-06-27 18:35:10 +02:00