database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-13 21:42:58 +03:00
Code Activity
37,360 Commits 3,273 Branches 1,096 Tags
49eb41e09dba1b5136e8a94a86d66ad5b3c46d37
Commit Graph

13579 Commits

Author SHA1 Message Date
sergefp@mysql.com
61348cac0c Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/home/psergey/mysql-4.1-bug16168-push
 2006-07-01 01:55:43 +04:00
evgen@moonbone.local
1459784aba Reverted wrong bug fix (Bug#11228) 2006-07-01 01:37:20 +04:00
sergefp@mysql.com
784b3118a5 Merge mysql.com:/home/psergey/mysql-4.1-bug16168-push 
into  mysql.com:/home/psergey/mysql-5.0-bug16168-merge
 2006-07-01 01:25:59 +04:00
joerg@mysql.com
34d5c36c2b Manual transfer of the following changeset into the 5.0.23 release clone: 
1.2525 06/06/30 18:29:27 monty@mysql.com +3 -0
   Reverted wrong bug fix (Bug#11228)
 2006-06-30 19:37:11 +02:00
monty@mysql.com
f62829636b After merge fixes 2006-06-30 20:07:33 +03:00
monty@mysql.com
2f86009c9e Merge mysql.com:/home/my/mysql-4.1 
into  mysql.com:/home/my/mysql-5.0
 2006-06-30 19:15:18 +03:00
monty@mysql.com
445dfdc3a7 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/home/my/mysql-4.1
 2006-06-30 19:15:17 +03:00
monty@mysql.com
2bec1b86bb Reverted wrong bug fix (Bug#11228) 2006-06-30 18:29:27 +03:00
kroki@mysql.com
96bddcafe7 Bug#17226: Variable set in cursor on first iteration is assigned 
second iterations value

During assignment to the BLOB variable in routine body the value
wasn't copied.
 2006-06-30 18:14:22 +04:00
evgen@moonbone.local
a989f7261e Merge moonbone.local:/home/evgen/bk-trees/mysql-5.0-opt 
into moonbone.local:/work/merge-5.1
 2006-06-30 16:10:26 +04:00
sergefp@mysql.com
342283d00a BUG#20484: "Partitions: crash with EXPLAIN and UNION" 
- Don't forget to produce "partitions" column for "UNION RESULT" row of EXPLAIN output
 2006-06-30 09:34:06 +04:00
sergefp@mysql.com
611e20d8e1 BUG#16168: Wrong results from range optimizer, "Use_count: Wrong count for key ..." warnings: 
- Added comments.
 - Make SEL_ARG::clone() set SEL_ARG::elements in the created copy.
 2006-06-30 09:05:12 +04:00
monty@mysql.com
2356a54ca1 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/my/mysql-5.0
 2006-06-30 04:28:04 +03:00
monty@mysql.com
f25b4e0464 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/home/my/mysql-4.1
 2006-06-30 04:27:19 +03:00
monty@mysql.com
a267b8f33c Don't read ~/.my.cnf in mysqldump.test 2006-06-30 04:10:27 +03:00
monty@mysql.com
d76830faa5 Merge mysql.com:/home/my/mysql-4.1 
into  mysql.com:/home/my/mysql-5.0
 2006-06-30 02:35:52 +03:00
evgen@moonbone.local
3cc6d95d18 Merge 2006-06-30 02:03:09 +04:00
evgen@moonbone.local
9fd38baf13 Merge moonbone.local:/home/evgen/bk-trees/mysql-5.0-opt 
into moonbone.local:/work/merge-5.0
 2006-06-30 02:02:20 +04:00
evgen@moonbone.local
83bc48f38e Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into moonbone.local:/work/merge-4.1
 2006-06-30 01:12:16 +04:00
iggy@mysql.com
f6658356c6 Bug#20328 mysql client: dumb about trailing spaces on help command. 2006-06-29 17:06:28 -04:00
monty@hasky.mysql.fi
0b00ae6bc5 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/my/mysql-5.1
 2006-06-29 23:41:33 +03:00
kroki@mysql.com
21e1655f4d Merge mysql.com:/home/tomash/src/mysql_ab/mysql-5.0 
into  mysql.com:/home/tomash/src/mysql_ab/mysql-5.0-bug20230
 2006-06-30 00:24:47 +04:00
kroki@mysql.com
1bcf6b1d09 Bug#20230: routine_definition is not null 
SHOW CREATE PROCEDURE and SHOW CREATE FUNCTION are fixed as well as
INFORMATION_SCHEMA.ROUTINES.ROUTINE_NAME.
 2006-06-30 00:21:55 +04:00
cmiller@zippy.(none)
244bdc96c3 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  zippy.(none):/home/cmiller/work/mysql/mysql-5.0-maint
 2006-06-29 13:49:40 -04:00
joerg@mysql.com
6f6b966d16 Test "federated" failed because the log contains fixed port numbers. 
Re-apply a patch by Knielsen in the 5.0.23 build clone: Replace port number by "SLAVE_PORT".
 2006-06-29 17:00:48 +02:00
ingo@mysql.com
e29cc5d5b7 Merge mysql.com:/home/mydev/mysql-5.0--main 
into  mysql.com:/home/mydev/mysql-5.0-bug11824
 2006-06-29 16:53:05 +02:00
konstantin@mysql.com
7ca3749f59 Merge mysql.com:/opt/local/work/tmp_merge 
into  mysql.com:/opt/local/work/mysql-5.0-merge
 2006-06-29 18:34:49 +04:00
konstantin@mysql.com
3010430ddf Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/opt/local/work/mysql-5.0-runtime
 2006-06-29 18:17:37 +04:00
gluh@eagle.intranet.mysql.r18.ru
a230166f28 Fix for bug#13934 Silent truncation of table comments 
Table comment: issue a warning(error in traditional mode) if length of comment > 60 symbols
Column comment: issue a warning(error in traditional mode) if length of comment > 255 symbols
Table 'comment' is changed from char* to LEX_STRING
 2006-06-29 18:39:34 +05:00
lars@mysql.com
f24851ee71 Merge mysqldev@production.mysql.com:my/mysql-5.0-release 
into  mysql.com:/users/lthalmann/bkroot/mysql-5.0-release
 2006-06-29 15:15:21 +02:00
konstantin@mysql.com
2d9d740dbe Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/opt/local/work/mysql-5.0-runtime
 2006-06-29 16:44:21 +04:00
konstantin@mysql.com
1cb6eb00a5 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime 
into  mysql.com:/opt/local/work/mysql-5.0-runtime
 2006-06-29 16:43:23 +04:00
konstantin@mysql.com
5154bc6c47 A post-merge fix. 2006-06-29 16:31:08 +04:00
lars@dl145k.mysql.com
f3d8d60259 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1 
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
 2006-06-29 14:24:02 +02:00
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