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,849 Commits 3,270 Branches 1,096 Tags
e52bd4be2bdacb45a71223444860c36faeee0216
Commit Graph

14271 Commits

Author SHA1 Message Date
stewart@willster.(none)
6a98b6c39e Merge willster.(none):/home/stewart/Documents/MySQL/5.1/ndb 
into  willster.(none):/home/stewart/Documents/MySQL/5.1/bug20073
 2006-09-20 15:27:45 +10:00
brian@zim.(none)
63d78a7659 Removed ifdef need. 
Cleaned up test to no longer need have_
 2006-09-19 13:58:12 -07:00
svoj@mysql.com/april.(none)
c0ebc0fb2a BUG#10974 - No error message if merge table based on union of innodb, memory 
Fixed confusing error message from the storage engine when
it fails to open underlying table. The error message is issued
when a table is _opened_ (not when it is created).
 2006-09-20 01:40:59 +05:00
igor@rurik.mysql.com
0279c91d99 Post-merge corrections. 2006-09-19 12:18:24 -07:00
msvensson@shellback.(none)
21892f4161 Merge bk-internal:/home/bk/mysql-5.0-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-09-19 20:06:18 +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)
9cb40c6e91 Merge shellback.(none):/home/msvensson/mysql/work/my50-work 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-09-19 20:00:01 +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
sergefp@pylon.mylan
fb077c0efd Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  mysql.com:/home/psergey/mysql-5.1-bug22393
 2006-09-19 21:14:37 +04:00
msvensson@shellback.(none)
d3d7c74954 Merge shellback.(none):/home/msvensson/mysql/work/my50-work 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-09-19 19:11: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
igor@rurik.mysql.com
25368c359e Merge rurik.mysql.com:/home/igor/mysql-4.1-opt 
into  rurik.mysql.com:/home/igor/mysql-5.0-opt
 2006-09-19 10:09:02 -07: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
gkodinov/kgeorge@rakia.(none)
2da037c7d5 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  rakia.(none):/home/kgeorge/mysql/autopush/B21540-5.0-opt
 2006-09-19 19:18:52 +03: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
igor@rurik.mysql.com
294c0ccaa9 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1-opt 
into  rurik.mysql.com:/home/igor/mysql-4.1-opt
 2006-09-19 08:42:58 -07:00
msvensson@shellback.(none)
1515818276 Merge shellback.(none):/home/msvensson/mysql/work/my50-work 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-09-19 17:40:49 +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
mats@romeo.(none)
0d019e0380 Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl 
into  romeo.(none):/home/bk/w3259-mysql-5.1-new-rpl
 2006-09-19 13:47:15 +02:00
thek@kpdesk.mysql.com
f8dbb2dd3b Merge kpdesk.mysql.com:/home/thek/dev2/bug21139/my50-bug21139 
into  kpdesk.mysql.com:/home/thek/dev2/mysql-5.0-maint
 2006-09-19 12:45:04 +02:00
thek@kpdesk.mysql.com
59671a1b16 Merge kpdesk.mysql.com:/home/thek/dev2/bug21139/my41-bug21139 
into  kpdesk.mysql.com:/home/thek/dev2/mysql-4.1-maint
 2006-09-19 12:44:09 +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
mskold/marty@linux.site
e3c7886768 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
 2006-09-19 11:34:03 +02:00
mskold/marty@mysql.com/linux.site
e8abf51de1 Bug #18679 rpl_ndb_dd_advance.test fails randomly 2006-09-19 11:31:55 +02:00
stewart@willster.(none)
6ff9664d46 Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb 
into  willster.(none):/home/stewart/Documents/MySQL/5.1/bug20073
 2006-09-19 18:36:18 +10: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
mats@romeo.(none)
78ad0eee91 Fixing and checking result for mysqldump test. 2006-09-18 21:09:48 +02: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)
781aaaba66 Merge shellback.(none):/home/msvensson/mysql/work/my50-work 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-09-18 17:47:26 +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
stewart@willster.(none)
49eb41e09d BUG#20073 information_schema.FILES for UNDO LOG give incorrect EXTENT_SIZE, FREE_EXTENTS, 
Change things around so that we add a row for each log file group that lists
the free space for that log file group.
 2006-09-19 01:44:32 +10: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
svoj@may.pils.ru
43097593e3 Merge may.pils.ru:/home/svoj/devel/mysql/merge/mysql-4.1 
into  may.pils.ru:/home/svoj/devel/mysql/merge/mysql-4.1-engines
 2006-09-18 20:35:33 +05:00
gkodinov@dl145s.mysql.com
cf9d1c9152 Merge bk-internal:/home/bk/mysql-5.0 
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
 2006-09-18 19:01:07 +04: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