Commits · ee0a4499903245d0ba16b26c2a29c89efbceab56 · nexedi / MariaDB

01 Feb, 2005 1 commit
- Fixed failed merge · ee0a4499
  mskold@mysql.com authored Feb 01, 2005
  
  ee0a4499
26 Jan, 2005 8 commits
- Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb · d4c7c4ff
  mskold@mysql.com authored Jan 26, 2005
```
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb
```
  d4c7c4ff
- Merge mysql.com:/home/jonas/src/mysql-5.0 · 8f51f4f7
  joreland@mysql.com authored Jan 26, 2005
```
into mysql.com:/home/jonas/src/mysql-5.0-ndb
```
  8f51f4f7
- ndb - make sure all used tables are dropped in beginning of test case · f63c1120
  joreland@mysql.com authored Jan 26, 2005
  
  f63c1120
- Merge mysql.com:/home/jonas/src/mysql-5.0 · 5b29c6ea
  joreland@mysql.com authored Jan 26, 2005
```
into mysql.com:/home/jonas/src/mysql-5.0-ndb
```
  5b29c6ea
- Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 · 04bffe10
  joreland@mysql.com authored Jan 26, 2005
```
into mysql.com:/home/jonas/src/mysql-5.0
```
  04bffe10
- ndb - make sure all used tables are dropped in beginning of test case · bff80646
  joreland@mysql.com authored Jan 26, 2005
  
  bff80646
- change to Makefile.am per Serg's request · 7db99fa5
  patg@krsna.patg.net authored Jan 25, 2005
  
  7db99fa5
- Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 · 93f87957
  joreland@mysql.com authored Jan 26, 2005
```
into mysql.com:/home/jonas/src/mysql-5.0
```
  93f87957
25 Jan, 2005 31 commits
- rem0rec.h: · 81ce1c8d
  marko@hundin.mysql.fi authored Jan 25, 2005
```
  Corrected formatting of comments.
rem0rec.ic:
  rec_set_info_and_status_bits(): pass arguments to rec_set_info_bits()
  in the correct order.
  Corrected formatting of comments.
```
  81ce1c8d
- Merge mysql.com:/home/jonas/src/mysql-5.0 · 08a90661
  joreland@mysql.com authored Jan 25, 2005
```
into mysql.com:/home/jonas/src/mysql-5.0-ndb
```
  08a90661
- Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 · f461b4bc
  joreland@mysql.com authored Jan 25, 2005
```
into mysql.com:/home/jonas/src/mysql-5.0
```
  f461b4bc
- merge · 1401be5c
  joreland@mysql.com authored Jan 25, 2005
  
  1401be5c
- Some minor fixes. · 4341ffda
  jani@ua141d10.elisa.omakaista.fi authored Jan 25, 2005
  
  4341ffda
- Merge · d77dc4f6
  jani@ua141d10.elisa.omakaista.fi authored Jan 25, 2005
  
  d77dc4f6
- Some bug fixes and a feature add to mysql-test-run · d5f76d50
  jani@ua141d10.elisa.omakaista.fi authored Jan 25, 2005
  
  d5f76d50
- Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 · 1ba93bd4
  mskold@mysql.com authored Jan 25, 2005
```
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
```
  1ba93bd4
- Merge mysql.com:/home/jonas/src/mysql-5.0 · dd89b7bd
  joreland@mysql.com authored Jan 25, 2005
```
into mysql.com:/home/jonas/src/mysql-5.0-ndb
```
  dd89b7bd
- merge · ed32be8a
  joreland@mysql.com authored Jan 25, 2005
  
  ed32be8a
- Merge mysql.com:/home/jonas/src/mysql-5.0 · 81ac7a33
  joreland@mysql.com authored Jan 25, 2005
```
into mysql.com:/home/jonas/src/mysql-5.0-ndb
```
  81ac7a33
- Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 · fa4f07b8
  joreland@mysql.com authored Jan 25, 2005
```
into mysql.com:/home/jonas/src/mysql-4.1
```
  fa4f07b8
- ndb - Move mysql-test-run & testBackup into "basic suite" · 5e1bea84
  joreland@mysql.com authored Jan 25, 2005
  
  5e1bea84
- Fix two typos in comments. · 6c3a4aee
  konstantin@mysql.com authored Jan 25, 2005
  
  6c3a4aee
- Fix for failing INSERT IGNORE in test ndb_insert · da658b9f
  mskold@mysql.com authored Jan 25, 2005
  
  da658b9f
- Merge 4.1 -> 5.0 · 8a5316a4
  jani@ua141d10.elisa.omakaista.fi authored Jan 25, 2005
  
  8a5316a4
- One more after merge fix of Jan Lindström's changeset in 4.1 · 72de651a
  marko@hundin.mysql.fi authored Jan 25, 2005
  
  72de651a
- After merge fixes · 7eaec7ef
  marko@hundin.mysql.fi authored Jan 25, 2005
  
  7eaec7ef
- Makefile.am: · d4a52f5f
  bar@mysql.com authored Jan 25, 2005
```
  after merge fix
```
  d4a52f5f
- Merge hundin.mysql.fi:/home/marko/k/mysql-4.0 · ee224155
  marko@hundin.mysql.fi authored Jan 25, 2005
```
into hundin.mysql.fi:/home/marko/k/mysql-4.1
```
  ee224155
- InnoDB: Enable ut_ad() assertions in MySQL debug builds. · ea1bd1d5
  marko@hundin.mysql.fi authored Jan 25, 2005
  
  ea1bd1d5
- updated logevent example · 1a94812b
  tomas@poseidon.ndb.mysql.com authored Jan 25, 2005
```
added handling of Arbit log events
```
  1a94812b
- Merge marko@bk-internal.mysql.com:/home/bk/mysql-5.0 · a698e5a0
  marko@hundin.mysql.fi authored Jan 25, 2005
```
into hundin.mysql.fi:/home/marko/j/mysql-5.0
```
  a698e5a0
- InnoDB: Write status bits to MLOG_COMP_REC_INSERT entries. · fbb7d9a9
  marko@hundin.mysql.fi authored Jan 25, 2005
```
It is not safe to infer the status bits from the B-tree page
level, because after MLOG_COMP_LIST_END_COPY_CREATED, the
level will not be initialized before the records have been inserted.
(Bug #7973)
```
  fbb7d9a9
- Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 · bb1fe733
  ram@gw.mysql.r18.ru authored Jan 25, 2005
```
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b7261
```
  bb1fe733
- Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 · 51def113
  tomas@poseidon.ndb.mysql.com authored Jan 25, 2005
```
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
```
  51def113
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 89359d59
  tomas@poseidon.ndb.mysql.com authored Jan 25, 2005
```
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
```
  89359d59
- Merge gw.mysql.r18.ru:/usr/home/ram/work/4.1.b7261 · 3350a7ec
  ram@gw.mysql.r18.ru authored Jan 25, 2005
```
into gw.mysql.r18.ru:/usr/home/ram/work/5.0
```
  3350a7ec
- Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1 · b74ddc6a
  tomas@poseidon.ndb.mysql.com authored Jan 25, 2005
```
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
```
  b74ddc6a
- backported ndb_mgm options from 5.0 · 1baa14bb
  tomas@poseidon.ndb.mysql.com authored Jan 25, 2005
```
    changed ndb_restore test somewhat to fisrt make the tables in myisam
```
  1baa14bb
- Merge · 98fbdecc
  tomas@poseidon.ndb.mysql.com authored Jan 25, 2005
  
  98fbdecc