database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-12 10:22:39 +03:00
Code Activity
38,069 Commits 3,270 Branches 1,096 Tags
fe0cfacf35514b6a271d5be99e16ca18bea08715
Commit Graph

13917 Commits

Author SHA1 Message Date
msvensson@shellback.(none)
fe0cfacf35 Merge shellback.(none):/home/msvensson/mysql/mysql-5.1 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-09-21 20:31:35 +02:00
msvensson@shellback.(none)
c898d8e144 Merge bk-internal:/home/bk/mysql-5.1-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-09-21 20:28:12 +02:00
msvensson@shellback.(none)
7029074c24 Merge shellback.(none):/home/msvensson/mysql/work/my51-work 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-09-20 18:02:11 +02:00
msvensson@shellback.(none)
0c429abd29 Merge shellback.(none):/home/msvensson/mysql/work/my50-work 
into  shellback.(none):/home/msvensson/mysql/work/my51-work
 2006-09-20 15:45:42 +02:00
msvensson@shellback.(none)
339cd91a98 Fix problem with testcase timeouts not working. The timeout value was always multiplied with 10 
since the $opt_valgrind variable was initialised to 0, thus being "defined"
 2006-09-20 15:41:46 +02:00
istruewing@chilla.local
77d610c2b4 Merge chilla.local:/home/mydev/mysql-5.1--team 
into  chilla.local:/home/mydev/mysql-5.1-tomain
 2006-09-20 14:36:32 +02:00
Kristofer.Pettersson@naruto.
3599c87654 Merge kpettersson@bk-internal:/home/bk/mysql-5.1-maint 
into  naruto.:C:/cpp/mysql-5.1-maint
 2006-09-20 12:21:49 +02:00
msvensson@neptunus.(none)
f4c0e4efac Fix check of parameter type in mysqld_start. 2006-09-20 07:43:03 +02:00
msvensson@shellback.(none)
1c4c34bc39 Merge bk-internal:/home/bk/mysql-5.1-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-09-19 20:04:42 +02:00
msvensson@shellback.(none)
30e3cce970 Merge shellback.(none):/home/msvensson/mysql/work/my51-work 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-09-19 20:01:40 +02:00
msvensson@shellback.(none)
be1187e171 Merge shellback.(none):/home/msvensson/mysql/work/my50-work 
into  shellback.(none):/home/msvensson/mysql/work/my51-work
 2006-09-19 19:58:51 +02:00
msvensson@shellback.(none)
5a912955d5 Increase suite timeout even more - 6 times - when running with valgrind 2006-09-19 19:41:41 +02:00
msvensson@shellback.(none)
bd6fc1ce66 Merge shellback.(none):/home/msvensson/mysql/work/my51-work 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-09-19 19:10:31 +02:00
msvensson@shellback.(none)
d8870f2bb3 Merge shellback.(none):/home/msvensson/mysql/work/my50-work 
into  shellback.(none):/home/msvensson/mysql/work/my51-work
 2006-09-19 18:41:48 +02:00
msvensson@shellback.(none)
883a3809c9 Pass --debug arguments to mysqld also when bootstrapping if --debug is tunrned on 2006-09-19 18:39:04 +02:00
msvensson@shellback.(none)
ee5ca6e231 Merge shellback.(none):/home/msvensson/mysql/work/my51-work 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-09-19 17:47:53 +02:00
msvensson@shellback.(none)
1b3094187a Fix warnings in mysql-test-run.pl 2006-09-19 17:45:27 +02:00
msvensson@shellback.(none)
0e7d18d8e4 Merge shellback.(none):/home/msvensson/mysql/work/my50-work 
into  shellback.(none):/home/msvensson/mysql/work/my51-work
 2006-09-19 17:08:07 +02:00
msvensson@shellback.(none)
895d986266 Don't bother to remove the pid_file in mtr_kill_leftovers as it could potentially remove a the pidfile before the process is killed. 
The pid file will be removed later when var/ directory is recreated.
 2006-09-19 16:48:01 +02:00
msvensson@shellback.(none)
fa26e83fd2 Fix warnings in mysql-test-run.pl 2006-09-19 16:43:42 +02:00
thek@kpdesk.mysql.com
a2467400b7 Merge kpdesk.mysql.com:/home/thek/dev2/bug21139/my50-bug21139 
into  kpdesk.mysql.com:/home/thek/dev2/bug21139/my51-bug21139
 2006-09-19 12:42:44 +02:00
thek@kpdesk.mysql.com
b4908ed35d Merge kpdesk.mysql.com:/home/thek/dev2/bug21139/my41-bug21139 
into  kpdesk.mysql.com:/home/thek/dev2/bug21139/my50-bug21139
 2006-09-19 12:41:15 +02:00
thek@kpdesk.mysql.com
66fa757e1f Bug#21139 Handling of database differs in "embedded" , test lowercase_fs_off fails 
- Access checks are omitted when compliled without --with-embedded-privilege-control
- Patch: skip this test
 2006-09-19 12:40:31 +02:00
acurtis/antony@xiphis.org/ltamd64.xiphis.org
844df8f085 post merge fixes 2006-09-18 15:52:16 -07:00
acurtis/antony@ltamd64.xiphis.org
424857e0e4 Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.0-engines 
into  xiphis.org:/home/antony/work2/engines-merge
 2006-09-18 12:16:03 -07:00
msvensson@shellback.(none)
db1adb2234 Fix merge error, path_mysock has been renamed to path_sock 2006-09-18 19:38:59 +02:00
msvensson@shellback.(none)
7dabd8c683 Merge shellback.(none):/home/msvensson/mysql/work/my51-work 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-09-18 18:06:10 +02:00
msvensson@shellback.(none)
8244e4fb73 Merge shellback.(none):/home/msvensson/mysql/work/my50-work 
into  shellback.(none):/home/msvensson/mysql/work/my51-work
 2006-09-18 18:04:47 +02:00
msvensson@shellback.(none)
dafb50055f Add character-sets-dir argument to "mysql". That avoids a local 
installed charset dir being used.
 2006-09-18 17:46:36 +02:00
svoj@april.(none)
36be4318da Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1-engines 
into  april.(none):/home/svoj/devel/mysql/merge/mysql-5.1-engines
 2006-09-18 20:43:36 +05:00
mleich@three.local.lan
5f5d1507ec 1. Cumulated fix for Bug#22398, #22404 and #22405 
2. Correct some logical bugs within the tests, which were caused by
   automatic resolve of BitKeeper
 2006-09-18 16:55:56 +02:00
svoj@april.(none)
419a51c5a5 Merge april.(none):/home/svoj/devel/bk/mysql-5.1 
into  april.(none):/home/svoj/devel/mysql/merge/mysql-5.1-engines
 2006-09-18 19:43:33 +05:00
gkodinov@dl145s.mysql.com
c1035c210b Merge bk-internal:/home/bk/mysql-5.1-opt 
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1
 2006-09-18 18:33:11 +04:00
gkodinov@dl145s.mysql.com
f1100c007d merge fixes 2006-09-18 18:30:51 +04:00
msvensson@shellback.(none)
45a8c28498 Fix spelling error in Makefile 2006-09-18 13:24:03 +02:00
svoj@april.(none)
f21eadfc74 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  april.(none):/home/svoj/devel/mysql/merge/mysql-5.0-engines
 2006-09-18 16:23:45 +05:00
gkodinov@dl145s.mysql.com
ce8ed889d7 Merge dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt 
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1
 2006-09-18 12:57:20 +02:00
msvensson@shellback.(none)
16c07bd02c No need to use environment variable NDB_STATUS_OK and NDB_SLAVE_STATUS_OK anymore 
when mysql-test-run.pl has full control of all ndb processes. It will now know if
install has failed.
 2006-09-18 12:45:04 +02:00
msvensson@shellback.(none)
60b395a950 Remove extra semicolon 2006-09-18 12:24:10 +02:00
gkodinov@dl145s.mysql.com
2ec485f06e Merge bk-internal:/home/bk/mysql-5.0-opt 
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
 2006-09-18 12:20:20 +02:00
gkodinov@dl145s.mysql.com
fae596aafd merge fixes 2006-09-18 12:14:27 +02:00
evgen@moonbone.local
f42385e0d1 disabled.def: 
Enabled rpl_sp_effects test due to fixed bug.
 2006-09-18 13:53:30 +04:00
msvensson@shellback.(none)
f415523c17 Merge bk-internal:/home/bk/mysql-5.1-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-09-18 11:34:07 +02:00
msvensson@shellback.(none)
0a59967cb0 Remove trailing whitespace 
Add linebreak
 2006-09-18 11:27:21 +02:00
msvensson@shellback.(none)
dd76996955 Move mysql-test-run.sh to new name mysql-test-run-shell.sh 
Symlink mysql-test-run to mysql-test-run.pl
 2006-09-18 11:22:51 +02:00
gkodinov@dl145s.mysql.com
522823b5d3 Merge dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-4.1-opt 
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
 2006-09-18 11:19:40 +02:00
msvensson@shellback.(none)
dedcdda5df BUG#22396 crash_commit_before 
- Disable generation of core file and stacktrace when running this testcase, which would
   otherwise mark the whole testsuite as failed.
 2006-09-17 20:54:06 +02:00
Kristofer.Pettersson@naruto.
8ec47c091e Merge naruto.:C:/cpp/bug20789/my50-bug20789 
into  naruto.:C:/cpp/mysql-5.1-new-maint
 2006-09-17 14:06:29 +02:00
istruewing@chilla.local
33acddb568 Merge 5.1 -> 5.1-engines 
Disabled im_instance_conf to get autopush through
 2006-09-16 20:32:01 +02:00
igor@rurik.mysql.com
d3d3cef88c Fixed bug #21493: crash for the second execution of a function 
containing a select statement that uses an aggregating IN subquery.
Added a parameter to the function fix_prepare_information 
to restore correctly the having clause for the second execution.
Saved andor structure of the having conditions at the proper moment
before any calls of split_sum_func2 that could modify the having structure
adding new Item_ref objects. (These additions, are produced not with 
the statement mem_root, but rather with the execution mem_root.)
 2006-09-16 09:50:48 -07:00