Commit graph

36999 commits

Author SHA1 Message Date
msvensson@shellback.(none)
447d2fefdf Break out and create new function 'run_testcase_check_skip_test' 2006-08-21 09:53:04 +02:00
msvensson@neptunus.(none)
0f54eccbb0 Move the initialisation of "NDB_STATUS_OK" env variable to after cluster has been intalled 2006-08-20 20:46:50 +02:00
tnurnberg@salvation.intern.azundris.com
9335cba3e4 17926 duplicates Bug#1989 in bug db
on up-merging 17926 from 5.0 tree it collides with near-identical fix 1989
in 5.1 tree. backing 17926 out of 5.1 tree.
2006-08-18 19:29:54 +02:00
tnurnberg@salvation.intern.azundris.com
e0592f53cb Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
into  salvation.intern.azundris.com:/home/tnurnberg/mysql-5.1-maint
2006-08-18 15:27:29 +02:00
tnurnberg@salvation.intern.azundris.com
da6943872a Merge salvation.intern.azundris.com:/home/tnurnberg/mysql-5.0-maint
into  salvation.intern.azundris.com:/home/tnurnberg/mysql-5.1-maint
2006-08-18 14:34:15 +02:00
tnurnberg@salvation.intern.azundris.com
c8d1c498fb innodb r702
innodb r719
2006-08-18 14:16:11 +02:00
cmiller@zippy.cornsilk.net
9e5db9f6ea Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1
into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1-new-maint
2006-08-18 07:09:21 -04:00
cmiller@zippy.cornsilk.net
dc1e177697 Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1
2006-08-18 06:50:08 -04:00
rburnett@production.mysql.com
284fa931bb A couple of adjustments to the merge to fix the broken build
instance.cc:
  Removed wrongly placed closing brace
item_geofunc.cc:
  needed to pass in a TABLE_SHARE* instead of a TABLE*
2006-08-17 22:24:35 +02:00
cmiller@zippy.cornsilk.net
99b113f48e Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1
into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1-new-maint
2006-08-17 14:49:32 -04:00
cmiller@zippy.cornsilk.net
6d35e75cda Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1
2006-08-17 12:59:44 -04:00
rburnett@bk-internal.mysql.com
9d531c4f43 rename to avoid case sensitive collision 2006-08-17 18:50:58 +02:00
cmiller@zippy.cornsilk.net
e65a3e97b5 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1
into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1-new-maint
2006-08-17 12:38:30 -04:00
cmiller@zippy.cornsilk.net
c821fa8bc6 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0
into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1
2006-08-17 12:17:52 -04:00
rburnett@bk-internal.mysql.com
d65095b451 Merge bk-internal.mysql.com:/data0/bk/tmp_reg
into  bk-internal.mysql.com:/data0/bk/mysql-5.1
2006-08-17 17:19:41 +02:00
cmiller@zippy.cornsilk.net
64092ca93b Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/tmp_merge
into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0
2006-08-17 10:55:57 -04:00
cmiller@zippy.cornsilk.net
6998c5140b Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/tmp_merge
into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0
2006-08-17 10:53:12 -04:00
cmiller@zippy.cornsilk.net
7d38d61398 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/tmp_merge
into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0
2006-08-17 10:49:56 -04:00
cmiller@zippy.cornsilk.net
030ddb48f3 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/tmp_merge
into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0
2006-08-17 10:47:23 -04:00
cmiller@zippy.cornsilk.net
c627a6ce84 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/tmp_merge
into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0
2006-08-17 10:42:50 -04:00
tnurnberg@maint1.mysql.com
781658d64b Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint
into  maint1.mysql.com:/data/localhome/tnurnberg/mysql-5.1-maint-i51
2006-08-17 16:15:09 +02:00
tnurnberg@salvation.intern.azundris.com
d1e1ea2c27 temporarily disabled partition test, fails w/ PS protocol, filed as Bug#21658 2006-08-17 16:01:33 +02:00
pgalbraith/patg@govinda.patg.net
dd1d46c2cd merge warning test results (!) 2006-08-16 20:39:33 -07:00
pgalbraith/patg@govinda.patg.net
ceb7cb55e7 test result changes (non-functional) for 5.1-5.0 merge 2006-08-16 17:16:36 -07:00
iggy@rolltop.ignatz42.dyndns.org
00ab7be7b9 Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-4.1-maint_20328
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-merge
2006-08-16 19:31:33 -04:00
iggy@rolltop.ignatz42.dyndns.org
af844dbed6 manual merge 2006-08-16 19:19:49 -04:00
tnurnberg@salvation.intern.azundris.com
4550b9d044 manual merge 2006-08-16 23:45:01 +02:00
iggy@rolltop.ignatz42.dyndns.org
ca6532af50 Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-4.1-maint_20328
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint_20328
2006-08-16 16:16:10 -04:00
tnurnberg@salvation.intern.azundris.com
2c16439d02 Merge tnurnberg@maint1:/data/localhome/tnurnberg/i51
into  salvation.intern.azundris.com:/home/tnurnberg/work/mysql-5.1-maint-i51
2006-08-16 21:34:20 +02:00
iggy@rolltop.ignatz42.dyndns.org
a86f035a08 Bug#20328 - Correction to test/result for broken Windows build. 2006-08-16 13:55:16 -04:00
pgalbraith/patg@govinda.patg.net
370f22418b merge 5.0 -> 5.1, re-enabling federated, disabled partition 2006-08-16 10:47:53 -07:00
patg@govinda.patg.net
b56ff54805 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
into  govinda.patg.net:/home/patg/mysql-build/mysql-5.1-clean2
2006-08-16 10:05:24 -07:00
patg@govinda.patg.net
79ad722e39 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1
into  govinda.patg.net:/home/patg/mysql-build/mysql-5.1-clean2
2006-08-16 10:03:24 -07:00
rburnett@bk-internal.mysql.com
38a36da86d Merge bk-internal.mysql.com:/data0/bk/mysql-5.0
into  bk-internal.mysql.com:/data0/bk/mysql-5.0-kt
2006-08-16 17:47:20 +02:00
reggie@big_geek.
55165b2f55 small fix to enable the test suite to find executables and scripts on Windows 2006-08-16 10:19:48 -05:00
msvensson@shellback.(none)
da60a5194c Merge shellback.(none):/home/msvensson/mysql/bug20328/my50-bug20328
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-08-16 17:14:40 +02:00
msvensson@shellback.(none)
c400562897 Merge shellback.(none):/home/msvensson/mysql/bug20328/my51-bug20328
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-08-16 17:07:58 +02:00
msvensson@shellback.(none)
496a04ccfa Merge shellback.(none):/home/msvensson/mysql/bug20328/my50-bug20328
into  shellback.(none):/home/msvensson/mysql/bug20328/my51-bug20328
2006-08-16 17:05:43 +02:00
msvensson@shellback.(none)
98eaa07600 Bug#20328 mysql client: dumb about trailing spaces on 'help' command
Fix testcase to also work on windows
2006-08-16 17:03:41 +02:00
rburnett@bk-internal.mysql.com
8baecf7ed6 Merge bk-internal.mysql.com:/data0/bk/mysql-5.0
into  bk-internal.mysql.com:/data0/bk/mysql-5.0-kt
2006-08-16 16:04:10 +02:00
msvensson@shellback.(none)
27a4154631 Merge shellback.(none):/home/msvensson/mysql/bug20219/my50-bug20219
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-08-16 15:52:52 +02:00
msvensson@shellback.(none)
b963293595 Merge shellback.(none):/home/msvensson/mysql/mysql-5.0
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-08-16 15:50:50 +02:00
msvensson@shellback.(none)
685937a702 Merge shellback.(none):/home/msvensson/mysql/bug20219/my51-bug20219
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-08-16 15:43:02 +02:00
msvensson@shellback.(none)
a163faf0d3 Merge shellback.(none):/home/msvensson/mysql/bug20219/my50-bug20219
into  shellback.(none):/home/msvensson/mysql/bug20219/my51-bug20219
2006-08-16 15:29:58 +02:00
msvensson@shellback.(none)
ba1ac55acf Bug#20219 make bin-dist produces unportable for testing tarball
- Setup LD_LIBRARY_PATH to favor local libs
2006-08-16 15:25:30 +02:00
msvensson@shellback.(none)
f03e672c4e Fix indentation 2006-08-16 13:47:01 +02:00
msvensson@shellback.(none)
40983a32dc Merge bk-internal:/home/bk/mysql-5.1-new-maint
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-08-16 10:43:08 +02:00
msvensson@shellback.(none)
0c41fd3abb Move initializations of environment variables that are constant during the whole testrun to 'environment_setup'
Split out functions that detects if we need master or slave restarts
2006-08-16 10:30:22 +02:00
holyfoot/hf@mysql.com/deer.(none)
c965eea789 Merge bk@192.168.21.1:mysql-5.0-kt
into  mysql.com:/home/hf/work/mysql-5.0.20910
2006-08-16 09:57:05 +05:00
brian@zim.(none)
183f028633 Cheery picked Antony's patch to allow for Window's builds in 5.1 2006-08-15 21:49:26 -07:00