Commits · a75c30c7130bb574a084493031f5647f583ffd7f · Kirill Smelkov / mariadb

22 Aug, 2006 11 commits
- Merge orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my50-ndb · a75c30c7
  pekka@orca.ndb.mysql.com authored Aug 22, 2006
```
into  orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-ndb
```
  a75c30c7
- 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 pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb · 26e5b932
  pekka@orca.ndb.mysql.com authored Aug 22, 2006
```
into  orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-ndb
```
  26e5b932
- Merge perch.ndb.mysql.com:/home/jonas/src/51-work · 5067c421
  jonas@perch.ndb.mysql.com authored Aug 22, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
```
  5067c421
- ndb - reenable "random" failing test · 770c2edc
  jonas@perch.ndb.mysql.com authored Aug 22, 2006
  
  770c2edc
- ndb - · 2ae18a6b
  jonas@perch.ndb.mysql.com authored Aug 22, 2006
```
  add another possible ok error in testcase
```
  2ae18a6b
- 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
- Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1 · b97a4b7f
  pekka@orca.ndb.mysql.com authored Aug 22, 2006
```
into  orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-ndb
```
  b97a4b7f
- Merge perch.ndb.mysql.com:/home/jonas/src/51-work · a1ea21bf
  jonas@perch.ndb.mysql.com authored Aug 22, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
```
  a1ea21bf
- ndb - · 66801f44
  jonas@perch.ndb.mysql.com authored Aug 22, 2006
```
  reenable some test after adding sync_with_master to end of test
    to make sure that binlog has been applied to slave before end of test
```
  66801f44
- ndb - · e0f7590e
  jonas@perch.ndb.mysql.com authored Aug 22, 2006
```
   fix incorrect assertion in dbacc
```
  e0f7590e
21 Aug, 2006 11 commits
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · d170f1b1
  cmiller@zippy.cornsilk.net authored Aug 21, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1
```
  d170f1b1
- Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 · f98b21b7
  rburnett@bk-internal.mysql.com authored Aug 21, 2006
```
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
```
  f98b21b7
- Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0 · f2f90320
  cmiller@zippy.cornsilk.net authored Aug 21, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1
```
  f2f90320
- Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/tmp_merge · ff57b304
  cmiller@zippy.cornsilk.net authored Aug 21, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1
```
  ff57b304
- mysql-test/mysql-test-run.pl : Use fixed path names for all NDB binaries, · 47d6296b
  joerg@trift2. authored Aug 21, 2006
```
because searching for them makes the script abort with all non-NDB builds.
```
  47d6296b
- Many files: · b329f2c3
  kent@mysql.com/g4-2.local authored Aug 21, 2006
```
  Deleted config/ac-macros/ha_berkeley.m4
  Removed more referenses to bdb
```
  b329f2c3
- Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 · e37e0786
  rburnett@bk-internal.mysql.com authored Aug 21, 2006
```
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
```
  e37e0786
- ndb - bug#16310 · c7a78551
  jonas@perch.ndb.mysql.com authored Aug 21, 2006
```
  better error message for creating table with non-existing tablespace
```
  c7a78551
- Merge perch.ndb.mysql.com:/home/jonas/src/51-work · 41c876c3
  jonas@perch.ndb.mysql.com authored Aug 21, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
```
  41c876c3
- ndb - bug#21710 · 8ea0b133
  jonas@perch.ndb.mysql.com authored Aug 21, 2006
```
  fix bug in drop_file during pageout (LCP)
```
  8ea0b133
- ndb - revert timeout changes, as a test depends on it, it mysterious ways · 21bfd984
  jonas@perch.ndb.mysql.com authored Aug 21, 2006
```
      (mysql-test-run only)
```
  21bfd984
20 Aug, 2006 1 commit
- Fix for bug #21642: "configure" with no arguments does not build · 56443ae2
  jpipes@shakedown.(none) authored Aug 20, 2006
  
  56443ae2
18 Aug, 2006 3 commits
- Fix for the failing gis.test · cf76884b
  holyfoot/hf@mysql.com/deer.(none) authored Aug 18, 2006
  
  cf76884b
- mysql-test-run.pl : Fix the search path for "ndb_mgmd" and "ndbd". bug#21721 · 1f79db41
  joerg@trift2. authored Aug 18, 2006
  
  1f79db41
- Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 · d094b5f2
  rburnett@bk-internal.mysql.com authored Aug 18, 2006
```
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
```
  d094b5f2
17 Aug, 2006 14 commits
- Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 · 4b7e3775
  rburnett@bk-internal.mysql.com authored Aug 17, 2006
```
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
```
  4b7e3775
- A couple of adjustments to the merge to fix the broken build · 284fa931
  rburnett@production.mysql.com authored Aug 17, 2006
```
instance.cc:
  Removed wrongly placed closing brace
item_geofunc.cc:
  needed to pass in a TABLE_SHARE* instead of a TABLE*
```
  284fa931
- ndb - rpl_ndb_basic · 40754dd6
  jonas@perch.ndb.mysql.com authored Aug 17, 2006
```
fix for change of deadlock timeout in config.ini
```
  40754dd6
- merge · a1420b1d
  jonas@perch.ndb.mysql.com authored Aug 17, 2006
  
  a1420b1d
- Merge perch.ndb.mysql.com:/home/jonas/src/51-clean · 560fc3e3
  jonas@perch.ndb.mysql.com authored Aug 17, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
```
  560fc3e3
- rename to avoid case sensitive collision · 9d531c4f
  rburnett@bk-internal.mysql.com authored Aug 17, 2006
  
  9d531c4f
- Merge bk-internal.mysql.com:/data0/bk/tmp_reg · d65095b4
  rburnett@bk-internal.mysql.com authored Aug 17, 2006
```
into  bk-internal.mysql.com:/data0/bk/mysql-5.1
```
  d65095b4
- 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
- Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 · 1bfe7668
  rburnett@bk-internal.mysql.com authored Aug 17, 2006
```
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
```
  1bfe7668
- Merge perch.ndb.mysql.com:/home/jonas/src/51-work · ed1e0b08
  jonas@perch.ndb.mysql.com authored Aug 17, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
```
  ed1e0b08