msvensson@shellback.(none)
fa26e83fd2
Fix warnings in mysql-test-run.pl
2006-09-19 16:43:42 +02:00
mskold/marty@mysql.com/linux.site
b98987db17
C style comments
2006-09-19 15:18:43 +02:00
istruewing@chilla.local
c49c58cbf4
Merge chilla.local:/home/mydev/mysql-5.0-bug14400-monty
...
into chilla.local:/home/mydev/mysql-5.1-bug14400-monty
2006-09-19 14:33:29 +02:00
istruewing@chilla.local
7419f50245
After merge fix.
2006-09-19 14:26:18 +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
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
istruewing@chilla.local
5d509b32d4
Merge chilla.local:/home/mydev/mysql-4.1-bug14400-monty
...
into chilla.local:/home/mydev/mysql-5.0-bug14400-monty
2006-09-19 11:27:00 +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
istruewing@chilla.local
47dc3fbe8a
Merge bk-internal:/home/bk/mysql-4.0
...
into chilla.local:/home/mydev/mysql-4.1-bug14400-monty
2006-09-19 10:17:25 +02:00
istruewing@chilla.local
3307d448ee
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-engines
...
into chilla.local:/home/mydev/mysql-5.0--team
2006-09-19 09:26:42 +02:00
msvensson@shellback.(none)
de3a2e9237
Merge shellback.(none):/home/msvensson/mysql/bug19738/my50-bug19738
...
into shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
2006-09-19 08:22:42 +02:00
msvensson@shellback.(none)
49275c0cad
Merge shellback.(none):/home/msvensson/mysql/bug19738/my50-bug19738
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-09-19 08:18:40 +02:00
msvensson@shellback.(none)
e7fe105df8
Merge shellback.(none):/home/msvensson/mysql/bug19738/my50-bug19738
...
into shellback.(none):/home/msvensson/mysql/bug19738/my51-bug19738
2006-09-19 08:17:34 +02:00
msvensson@shellback.(none)
efcb56cb79
Bug#19738 "make install" tries to build files that "make" should already have built
...
- Remove the wildcard dependcy on the charset xml files
2006-09-19 08:15:42 +02:00
acurtis/antony@xiphis.org/ltamd64.xiphis.org
98a8537adf
Bug#22417
...
"plug.in not included in dist source"
2006-09-18 19:31:08 -07:00
acurtis/antony@xiphis.org/ltamd64.xiphis.org
844df8f085
post merge fixes
2006-09-18 15:52:16 -07:00
msvensson@shellback.(none)
dcb83c8300
Merge shellback.(none):/home/msvensson/mysql/bug19738/my51-bug19738
...
into shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
2006-09-18 21:55:56 +02:00
msvensson@shellback.(none)
d94fa53682
Merge shellback.(none):/home/msvensson/mysql/bug19738/my50-bug19738
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-09-18 21:55:20 +02: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)
af323655b7
Merge shellback.(none):/home/msvensson/mysql/bug19738/my50-bug19738
...
into shellback.(none):/home/msvensson/mysql/bug19738/my51-bug19738
2006-09-18 21:15:38 +02:00
msvensson@shellback.(none)
b50c843b25
BUG#19738 "make install" tries to build files that "make" should already have built
...
- Make built sources only depend on it's sources not the built tool
2006-09-18 21:11:34 +02:00
mats@romeo.(none)
78ad0eee91
Fixing and checking result for mysqldump test.
2006-09-18 21:09:48 +02:00
istruewing@chilla.local
418c1f30f8
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-engines
...
into chilla.local:/home/mydev/mysql-5.0--team
2006-09-18 21:02:47 +02:00
msvensson@shellback.(none)
17bc383ea5
Merge shellback.(none):/home/msvensson/mysql/work/my51-work
...
into shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
2006-09-18 19:48:04 +02:00
msvensson@shellback.(none)
52fd031f32
Merge shellback.(none):/home/msvensson/mysql/work/my50-work
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-09-18 19:42:26 +02:00
msvensson@shellback.(none)
da8fb51350
Merge shellback.(none):/home/msvensson/mysql/work/my50-work
...
into shellback.(none):/home/msvensson/mysql/work/my51-work
2006-09-18 19:40:12 +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)
2b014bedaf
Add directive to not update files from bitkeeper
2006-09-18 19:37:22 +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
gkodinov@dl145s.mysql.com
ba7a873172
Merge bk-internal:/home/bk/mysql-5.1
...
into dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1
2006-09-18 17:45:29 +02:00
svoj@april.(none)
bb859ecde4
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into april.(none):/home/svoj/devel/mysql/merge/mysql-5.1-engines
2006-09-18 20:45:04 +05: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
georg@lmy002.wdf.sap.corp
df606b28b1
In current 5.1 build we don't build embedded server for windows (this will be
...
fixed when 5.1-win will be pushed into main tree).
Commenting the libmysqld and libmysqld/example subdirectories will allow us
to upgrade from cmake 2.2 to 2.4.
2006-09-18 17:28:17 +02:00
gkodinov@dl145s.mysql.com
809d1cfe2f
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 17:06:13 +02: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
svoj@april.(none)
f53f015be6
Merge april.(none):/home/svoj/devel/bk/mysql-4.1-engines
...
into april.(none):/home/svoj/devel/mysql/merge/mysql-5.0-engines
2006-09-18 16:25:18 +05:00