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
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
mleich@three.local.lan
1a8c9130db This changeset belongs to 
WL#3397 Refactoring storage engine test cases (for falcon)
      It contains fixes according to second code review.
- Remove any occurence of hardcoded assignments of storage engines
- Use variable names exact telling what it is used for
- Updated comments
- remove trailing spaces
 2006-08-16 19:29:49 +02: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
mleich@three.local.lan
aaa9ed3eff This changeset belongs to 
WL#3397 Refactoring storage engine test cases (for falcon)
    It contains also fixes according to code review.
    Contents: Testcases which were in history dedicated to InnoDB or MyISAM only.
    Modifications:
    1. Shift the main testing code into include/<testing field>.inc
       Introduce $variables which can be used to omit tests for features which are not supported by
       certain storage engines.
    2. The storage engine to be tested is assigned within the toplevel script (t/<whatever>_<engine>.test)
       via variable $engine_type and the the main testing code is sourced from 
       include/<testing field>.inc
    3. Some toplevel testscripts have to be renamed to
       - avoid immediate or future namespace clashes
       - show via filename which storage engine is tested
    4. Minor code cleanup like remove trailing spaces, some additional comments ....
 2006-08-16 14:58:49 +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
bar@mysql.com/bar.intranet.mysql.r18.ru
39860d67de Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/bar/mysql-4.1.b9509
 2006-08-16 12:42:22 +05: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
ramil/rkalimullin@production.mysql.com
4ef5116425 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  production.mysql.com:/usersnfs/rkalimullin/mysql-5.0
 2006-08-16 06:37:39 +02:00
bar@mysql.com/bar.intranet.mysql.r18.ru
b1f9b63a54 Merge mysql.com:/usr/home/bar/mysql-4.1 
into  mysql.com:/usr/home/bar/mysql-4.1.b9509
 2006-08-16 09:31:24 +05:00
brian@zim.(none)
8d83366bac Merge zim.(none):/home/brian/mysql/dep-5.1 
into  zim.(none):/home/brian/mysql/remove-bdb-5.1
 2006-08-15 13:53:13 -07:00
evgen@moonbone.local
9b10c3a0fc Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  moonbone.local:/work/15950-bug-5.0-opt-mysql
 2006-08-15 21:48:07 +04:00
evgen@sunlight.local
dd9a07706b Fixed bug#21261: Wrong access rights was required for an insert into a view 
SELECT right instead of INSERT right was required for an insert into to a view.
This wrong behaviour appeared after the fix for bug #20989. Its intention was
to ask only SELECT right for all tables except the very first for a complex
INSERT query. But that patch has done it in a wrong way and lead to asking 
a wrong access right for an insert into a view.

The setup_tables_and_check_access() function now accepts two want_access
parameters. One will be used for the first table and the second for other
tables.
 2006-08-15 21:45:24 +04:00
cmiller@maint1.mysql.com
a90dd98bd1 Merge maint1.mysql.com:/data/localhome/cmiller/bug20908/my50-bug20908 
into  maint1.mysql.com:/data/localhome/cmiller/mysql-5.0-maint
 2006-08-15 19:34:53 +02:00
cmiller@maint1.mysql.com
686074f077 Merge maint1.mysql.com:/data/localhome/cmiller/bug20908/my51-bug20908 
into  maint1.mysql.com:/data/localhome/cmiller/mysql-5.1-new-maint
 2006-08-15 19:33:51 +02:00