database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-16 20:23:18 +03:00
Code Activity
31,269 Commits 3,276 Branches 1,097 Tags
ec183566cc7bea0e42c2da9bc74c4429a66de924
Commit Graph

10632 Commits

Author SHA1 Message Date
paul@snake-hub.snake.net
32bdb2cc72 Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.0-r1.2173 
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1-r1.2478
 2006-03-01 17:55:41 -06:00
paul@snake-hub.snake.net
be887ea830 README.gcov: 
Revise README.gcov.
 2006-03-01 17:55:10 -06:00
paul@snake-hub.snake.net
7b4f0dc8b0 README: 
Revise mysql-test README.
 2006-03-01 17:37:07 -06:00
joerg@mysql.com
1b698f03e4 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/M41/comment-4.1
 2006-03-01 17:43:16 +01:00
tkatchaounov@lsmy3.wdf.sap.corp
95fe35437a Merge lsmy3.wdf.sap.corp:/data/users/tkatchaounov/mysql/src/5.0-virgin 
into  lsmy3.wdf.sap.corp:/data/users/tkatchaounov/mysql/src/5.0-bug-17523
 2006-03-01 17:27:39 +01:00
msvensson@shellback.(none)
c26674d7a0 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0
 2006-03-01 15:43:57 +01:00
tkatchaounov@lsmy3.wdf.sap.corp
6a44bb6403 Merge lsmy3.wdf.sap.corp:/data/users/tkatchaounov/mysql/src/5.0-virgin 
into  lsmy3.wdf.sap.corp:/data/users/tkatchaounov/mysql/src/5.0-dbg
 2006-03-01 15:43:57 +01:00
timour@mysql.com
0408f2bfc7 Merge mysql.com:/home/timka/mysql/src/5.0-virgin 
into  mysql.com:/home/timka/mysql/src/5.0-bug-17523
 2006-03-01 16:43:56 +02:00
msvensson@shellback.(none)
b802826fc9 Dont' run the mysql_protocols on Windows 2006-03-01 15:22:47 +01:00
bar@mysql.com
a6973ceed0 Bug#15949 union + illegal mix of collations (IMPLICIT + COERCIBLE) 
union.result, union.test:
  Adding test case.
item.cc:
  Allow safe character set conversion in UNION
  - string constant to column's charset
  - to unicode
  Thus, UNION now works the same with CONCAT (and other string functions)
  in respect of aggregating arguments with different character sets.
 2006-03-01 17:58:01 +04:00
joerg@mysql.com
24cb1ceb81 Merge mysql.com:/M50/comment-5.0 into mysql.com:/M50/mysql-5.0 2006-03-01 13:35:32 +01:00
joerg@mysql.com
30e00b0f7f Manual merge of the added "--comment=<string>" option 
to both the Shell and the Perl vaerion of "mysql-test-run"-
 2006-03-01 13:29:37 +01:00
joerg@mysql.com
38a7f5551a mysql-test/mysql-test-run.pl : Add a "--comment=<string>" option (backport from 5.1). 2006-03-01 13:15:37 +01:00
joerg@mysql.com
21a57a8f85 Merge mysql.com:/M40/comment-4.0 into mysql.com:/M41/comment-4.1 2006-03-01 13:10:59 +01:00
holyfoot@deer.(none)
dc052a3a00 bug #9088 (bigint WHERE fails) 2006-03-01 15:50:15 +04:00
joerg@mysql.com
0afe7f1987 mysql-test/mysql-test-run.sh : Add a "--comment=<string>" option, to get it logged when the test is run. 2006-03-01 12:21:44 +01:00
anozdrin@mysql.com
e03e522201 Fix for BUG#16266: Definer is not fully qualified error during replication. 
The idea of the fix is to extend support of non-SUID triggers for backward
compatibility. Formerly non-SUID triggers were appeared when "new" server
is being started against "old" database. Now, they are also created when
"new" slave receives updates from "old" master.
 2006-03-01 14:13:07 +03:00
paul@snake-hub.snake.net
21f0adc7c6 Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
 2006-02-28 18:48:58 -06:00
paul@snake-hub.snake.net
5ac33e8eb8 Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1 
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
 2006-02-28 17:54:50 -06:00
paul@snake-hub.snake.net
7f7f5969c0 mysqltest.test: 
Add real_sleep tests.
 2006-02-28 17:54:11 -06:00
paul@snake-hub.snake.net
d8a6e41c6b Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1 
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
 2006-02-28 15:09:45 -06:00
paul@snake-hub.snake.net
d6654fe9cb mysql-test-run.sh: 
Fix URLs.
README:
  Fix URL.
mysqltest.result:
  Update test result for real_sleep error message.
mysqltest.c:
  Fix do_sleep() to print correct command name for real_sleep.
 2006-02-28 15:08:16 -06:00
msvensson@shellback.(none)
916f763b9e Merge neptunus:/home/msvensson/mysql/bug16795/my50-bug16795 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0
 2006-02-28 13:03:00 +01:00
msvensson@devsrv-b.mysql.com
f2444c50fc Bug#17377 Federated Engine returns wrong Data, always the rows with the highest ID 
- Always make rnd_pos reposition the cursor in the fetched result set.
 2006-02-28 11:17:40 +01:00
msvensson@shellback.(none)
318bee862a Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0
 2006-02-28 11:00:35 +01:00
msvensson@neptunus.(none)
7551c8d7f8 Merge msvensson@devsrv-b.mysql.com:/space/magnus/bug17279/my50-bug17279/ 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-02-28 10:52:36 +01:00
SergeyV@selena.
2c8a6fadf9 Postfix for #17595. few lines in a test were accidentally commented. 
Comments removed.
 2006-02-27 22:14:48 +03:00
dlenev@mysql.com
db1ecaa1a2 Fix for trigger.test failures on pushbuild hosts introduced by fix for 
bug #13525 "Rename table does not keep info of triggers".

Now we use MYSQLTEST_VARDIR in order to be able to run this test in different
vardir. Also improved cleanup after the test.
 2006-02-27 20:32:32 +03:00
dlenev@mysql.com
3d6839d133 Fixed test results after bad auto-merge. 2006-02-27 20:00:06 +03:00
dlenev@mysql.com
6137476427 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/dlenev/src/mysql-5.0-bg13525
 2006-02-27 20:00:05 +03:00
dlenev@mysql.com
6cb5c38c14 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/dlenev/src/mysql-5.0-bg13525
 2006-02-27 20:00:03 +03:00
SergeyV@selena.
763475754a Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  selena.:H:/MYSQL/src/#15943-mysql-5.0
 2006-02-27 20:00:03 +03:00
sergefp@mysql.com
db54dc36f5 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/psergey/mysql-5.0-bug17314-push
 2006-02-27 20:00:02 +03:00
msvensson@devsrv-b.mysql.com
706070fbf8 Bug#17279 user with no global privs and with create priv in db can create databases 
- Use binary charset in acl_cache, to make searches case sensitive
 - Add testcase
 2006-02-27 16:41:58 +01:00
SergeyV@selena.
78b33e1835 Fixes bug #17595. UDFs are not initialized when running mysqld with 
--skip-grant-tables. However when deleting functions UDFs list was checked
regardless of whther UDFs are initialized or not. Additional check is added
into free_udf() and find_udf() functions to prevent possible runtime errors.
 2006-02-27 16:27:34 +03:00
msvensson@neptunus.(none)
4bbf5eb01c Bug#16795 ndb_cache_multi2 
- Change && to ||
 - Check for return value != 0 in "ndb->init()"
 2006-02-27 10:29:55 +01:00
sergefp@mysql.com
0048ea9bb3 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-bug17314
 2006-02-27 11:36:41 +03:00
msvensson@neptunus.(none)
1b115976b6 Trace mysqlcheck to file mysqlcheck.trcae 2006-02-26 23:36:53 +01:00
msvensson@neptunus.(none)
45c5c105fd Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-02-26 20:25:33 +01:00
msvensson@neptunus.(none)
90e5ca96be Look for and "convert" paths that start with $MYSQL_TMP_DIR 2006-02-26 19:54:09 +01:00
dlenev@mysql.com
4ca3409390 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime 
into  mysql.com:/home/dlenev/src/mysql-5.0-bg13525
 2006-02-26 21:20:13 +03:00
dlenev@mysql.com
480dcb7f39 Fixed test for bug #13525 "Rename table does not keep info of triggers" 
after merging fix for it with main tree.
 2006-02-26 20:25:24 +03:00
dlenev@mysql.com
0b422c635d Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime 
into  mysql.com:/home/dlenev/src/mysql-5.0-bg13525
 2006-02-26 16:38:48 +03:00
monty@mysql.com
6fd52639c0 Merge monty@192.168.0.9:/my/mysql-5.0 
into  mysql.com:/home/my/mysql-5.0
 2006-02-25 13:26:05 +02:00
monty@mysql.com
dd1d40f8f8 Fixed new introduced bug in binlog.test with --ps-protocol 2006-02-25 13:24:18 +02:00
dlenev@mysql.com
0c15039e74 Fix for bug #13525 "Rename table does not keep info of triggers". 
Let us transfer triggers associated with table when we rename it (but only if
we are not changing database to which table belongs, in the latter case we will
emit error).
 2006-02-24 23:50:36 +03:00
monty@mysql.com
aa4128f811 Merge monty@192.168.0.9:/my/mysql-5.0 
into  mysql.com:/home/my/mysql-5.0
 2006-02-24 18:36:09 +02:00
monty@mysql.com
82b77cdd90 Fixes to embedded server to be able to run tests with it 
(Needed for "list of pushes" web page and autopush)
 2006-02-24 18:34:15 +02:00
evgen@moonbone.local
776b05ea43 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into moonbone.local:/work/17530-bug-5.0-mysql
 2006-02-24 15:57:36 +03:00
knielsen@mysql.com
436587e997 Fix mysqldump.test to work with non-standard --vardir. 
(Backported from mysql-5.1-new)
 2006-02-24 13:51:04 +01:00