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
37,767 Commits 3,270 Branches 1,096 Tags
796452dbf575bb51a695f35b75e37f3e68f49d19
Commit Graph

13758 Commits

Author SHA1 Message Date
tnurnberg@salvation.intern.azundris.com
d7cbdfaa3d Merge salvation.intern.azundris.com:/home/tnurnberg/work/mysql-5.1-maint-i51 
into  salvation.intern.azundris.com:/home/tnurnberg/mysql-5.1
 2006-08-17 18:39:30 +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
evgen@moonbone.local
270629a158 ndb_condition_pushdown.result: 
Corrected test case result after fix for bug#18165
view.result, view.test:
  Corrected test case for bug#21261
 2006-08-17 18:50:53 +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
rburnett@bk-internal.mysql.com
1bfe766869 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
 2006-08-17 16:37:16 +02: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
mikael/pappa@dator5.(none)
ddbdc16a21 Merge dator5.(none):/home/pappa/bug21350 
into  dator5.(none):/home/pappa/bug21388
 2006-08-17 09:32:13 -04:00
mikael/pappa@dator5.(none)
82e942ef97 merge fix 2006-08-17 09:08:53 -04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
907f5db856 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/ram/work/4.1.b20695
 2006-08-17 11:36:03 +05: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
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
mikael/pappa@dator5.(none)
b738fd4db8 Merge dator5.(none):/home/pappa/clean-mysql-5.1-kt 
into  dator5.(none):/home/pappa/bug21388
 2006-08-16 14:46:30 -04: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
igor@rurik.mysql.com
cabb55a64f Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  rurik.mysql.com:/home/igor/mysql-5.0-opt
 2006-08-16 10:21:23 -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
igor@rurik.mysql.com
067d6fdfca Fixed bug #18165. 
Made [NOT]BETWEEN predicates SARGable in respect to the second and 
the third arguments.
 2006-08-16 09:37:19 -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
mikael/pappa@dator5.(none)
a6df8abf2c Merge dator5.(none):/home/pappa/bug21143 
into  dator5.(none):/home/pappa/bug21388
 2006-08-16 10:53:20 -04:00
mikael/pappa@dator5.(none)
8d8b2b38df Merge dator5.(none):/home/pappa/bug21173 
into  dator5.(none):/home/pappa/bug21388
 2006-08-16 10:47:13 -04:00
mikael/pappa@dator5.(none)
142af8c26f Merge dator5.(none):/home/pappa/bug15890 
into  dator5.(none):/home/pappa/bug21388
 2006-08-16 10:41:17 -04:00
mikael/pappa@dator5.(none)
9ba77eb876 Merge dator5.(none):/home/pappa/clean-mysql-5.1 
into  dator5.(none):/home/pappa/bug21388
 2006-08-16 10:36:01 -04:00
evgen@sunlight.local
db17048cac Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  sunlight.local:/local_work/21261-bug-5.0-mysql
 2006-08-16 18:17:58 +04: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
rburnett@bk-internal.mysql.com
f23643cc54 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
 2006-08-16 15:58:25 +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
jonas@perch.ndb.mysql.com
a13d114d02 Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-08-16 11:06:56 +02:00
jonas@perch.ndb.mysql.com
1425f18373 ndb - 
Increase deadlock-timeout to cater for slow test-machines (possibly running several tests in parallell)
  This will hopefully remove some volatile testfailures in pushbuild
    (i've seen a couple by looking at logs)
 2006-08-16 11:05:02 +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