Commits · e2ff7622c5c0157a28f17128e5ff1d03cdb1db4e · Kirill Smelkov / mariadb

01 Sep, 2006 1 commit
- Merge dli@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb-bj · e2ff7622
  dli@dev3-76.dev.cn.tlan authored Sep 01, 2006
```
into  dev3-76.dev.cn.tlan:/home/dli/mysql/mysql-5.0/mysql-5.0-ndb-bj
```
  e2ff7622
29 Aug, 2006 3 commits
- merge from ndb-5.0-ndb and ndb-5.0-ndb-bj · 0f51ee9e
  gni/root@dev3-127.(none) authored Aug 29, 2006
  
  0f51ee9e
- BUG#19873 Merge dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.0-ndb-bj · 169adf95
  gni/root@dev3-127.(none) authored Aug 29, 2006
```
into  dev3-127.(none):/mnt/mysql/home/ngb/bug19873
```
  169adf95
- Merge gni@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb · 0a3778c0
  gni/root@dev3-127.(none) authored Aug 29, 2006
```
into  dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.0-ndb-bj
```
  0a3778c0
25 Aug, 2006 1 commit
- Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0 · f03cdb01
  jonas@perch.ndb.mysql.com authored Aug 25, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
```
  f03cdb01
23 Aug, 2006 1 commit
- Merge perch.ndb.mysql.com:/home/jonas/src/50-work · 4cab7017
  jonas@perch.ndb.mysql.com authored Aug 23, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
```
  4cab7017
22 Aug, 2006 10 commits
- Merge salvation.intern.azundris.com:/home/tnurnberg/work/mysql-5.0-maint-20411 · f0793773
  tnurnberg@salvation.intern.azundris.com authored Aug 22, 2006
```
into  salvation.intern.azundris.com:/home/tnurnberg/work/mysql-5.0-maint-20987
```
  f0793773
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint · a74c4c0d
  tnurnberg@salvation.intern.azundris.com authored Aug 22, 2006
```
into  salvation.intern.azundris.com:/home/tnurnberg/work/mysql-5.0-maint-20987
```
  a74c4c0d
- Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0-maint · 34fd7045
  cmiller@zippy.cornsilk.net authored Aug 22, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0
```
  34fd7045
- Merge orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my50-ndb · a5b835ab
  pekka@orca.ndb.mysql.com authored Aug 22, 2006
```
into  orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my50-bug21017
```
  a5b835ab
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 10c351b1
  tnurnberg@salvation.intern.azundris.com authored Aug 22, 2006
```
into  salvation.intern.azundris.com:/home/tnurnberg/work/mysql-5.0-maint-20411
```
  10c351b1
- Bug#20411: "GRANT ... REQUIRE ISSUER nnn AND SUBJECT mmm" fails to require both · 002adef0
  tnurnberg@salvation.intern.azundris.com authored Aug 22, 2006
```
when X.509 subject was required for a connect, we tested whether it was the right
one, but did not refuse the connexion if not. fixed.

(corrected CS now --replace_results socket-path)
```
  002adef0
- ndb - post-merge fix 5.0 to 5.0-ndb: number of frags if --without-big-tables · 9dc6087d
  pekka@orca.ndb.mysql.com authored Aug 22, 2006
  
  9dc6087d
- Merge salvation.intern.azundris.com:/home/tnurnberg/work/mysql-4.1-maint-20987 · 0ead4ec8
  tnurnberg@salvation.intern.azundris.com authored Aug 22, 2006
```
into  salvation.intern.azundris.com:/home/tnurnberg/work/mysql-5.0-maint-20987
```
  0ead4ec8
- Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0 · f301613f
  pekka@orca.ndb.mysql.com authored Aug 22, 2006
```
into  orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my50-ndb
```
  f301613f
- Bug#21757: mysql_client_test fails in testcase when reading master.log file · 39a8fe6e
  iggy@rolltop.ignatz42.dyndns.org authored Aug 21, 2006
  
  39a8fe6e
21 Aug, 2006 3 commits
- Merge bk-internal:/home/bk/mysql-5.0-maint · adaa3a2a
  msvensson@shellback.(none) authored Aug 21, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
```
  adaa3a2a
- Print lines from log file to see what's in them · 2b2985e0
  msvensson@shellback.(none) authored Aug 21, 2006
  
  2b2985e0
- Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 · 6dc11220
  jani@hasky.mysql.fi authored Aug 21, 2006
```
into  hasky.mysql.fi:/home/jani/mysql-5.0_bug21537
```
  6dc11220
18 Aug, 2006 4 commits
- Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 30ef47a9
  petr/cps@mysql.com/owlet authored Aug 18, 2006
```
into  mysql.com:/home/cps/mysql/trees/mysql-5.0-virgin
```
  30ef47a9
- innodb r702 · c8d1c498
  tnurnberg@salvation.intern.azundris.com authored Aug 18, 2006
```
innodb r719
```
  c8d1c498
- ndb - bug#18781 bug#21017 bug#21050 : block index ops during NR + fix asserts · 1b6f2f1c
  pekka@orca.ndb.mysql.com authored Aug 18, 2006
  
  1b6f2f1c
- Merge dev3-76.dev.cn.tlan:/home/lisj/mysql/mysql-4.1/mysql-4.1-ndb-bj · b4b97335
  dli/root@dev3-76.dev.cn.tlan authored Aug 18, 2006
```
into  dev3-76.dev.cn.tlan:/home/lisj/mysql/mysql-5.0/mysql-5.0-ndb-bj
```
  b4b97335
17 Aug, 2006 5 commits
- Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/tmp_merge · 64092ca9
  cmiller@zippy.cornsilk.net authored Aug 17, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0
```
  64092ca9
- Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/tmp_merge · 6998c514
  cmiller@zippy.cornsilk.net authored Aug 17, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0
```
  6998c514
- Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/tmp_merge · 7d38d613
  cmiller@zippy.cornsilk.net authored Aug 17, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0
```
  7d38d613
- Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/tmp_merge · 030ddb48
  cmiller@zippy.cornsilk.net authored Aug 17, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0
```
  030ddb48
- Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/tmp_merge · c627a6ce
  cmiller@zippy.cornsilk.net authored Aug 17, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0
```
  c627a6ce
16 Aug, 2006 12 commits
- Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-4.1-maint_20328 · 00ab7be7
  iggy@rolltop.ignatz42.dyndns.org authored Aug 16, 2006
```
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-merge
```
  00ab7be7
- manual merge · af844dbe
  iggy@rolltop.ignatz42.dyndns.org authored Aug 16, 2006
  
  af844dbe
- Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-4.1-maint_20328 · ca6532af
  iggy@rolltop.ignatz42.dyndns.org authored Aug 16, 2006
```
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint_20328
```
  ca6532af
- Remove duplicate free of "ds_res" · a6a8ea0b
  msvensson@shellback.(none) authored Aug 16, 2006
  
  a6a8ea0b
- Bug#20328 - Correction to test/result for broken Windows build. · a86f035a
  iggy@rolltop.ignatz42.dyndns.org authored Aug 16, 2006
  
  a86f035a
- Fix for bug#21537, "Error at startup" · 88b91d1e
  jani@ua141d10.elisa.omakaista.fi authored Aug 16, 2006
```
These variables must be defined for Netware, or it fails
to recognize hard paths starting from the device.
```
  88b91d1e
- Merge bk-internal.mysql.com:/data0/bk/mysql-5.0 · 38a36da8
  rburnett@bk-internal.mysql.com authored Aug 16, 2006
```
into  bk-internal.mysql.com:/data0/bk/mysql-5.0-kt
```
  38a36da8
- Merge shellback.(none):/home/msvensson/mysql/mysql-5.0 · 510d5f14
  msvensson@shellback.(none) authored Aug 16, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
```
  510d5f14
- small fix to enable the test suite to find executables and scripts on Windows · 55165b2f
  reggie@big_geek. authored Aug 16, 2006
  
  55165b2f
- Merge shellback.(none):/home/msvensson/mysql/bug20328/my50-bug20328 · da60a519
  msvensson@shellback.(none) authored Aug 16, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
```
  da60a519
- Bug#20328 mysql client: dumb about trailing spaces on 'help' command · 98eaa076
  msvensson@shellback.(none) authored Aug 16, 2006
```
 Fix testcase to also work on windows
```
  98eaa076
- Merge bk-internal.mysql.com:/data0/bk/mysql-5.0 · 8baecf7e
  rburnett@bk-internal.mysql.com authored Aug 16, 2006
```
into  bk-internal.mysql.com:/data0/bk/mysql-5.0-kt
```
  8baecf7e