Commits · b6f39522de3bf5a045a28bc4ce8223c50efb73de · Kirill Smelkov / mariadb

31 Jan, 2007 5 commits
- Merge mysql.com:/home/svoj/devel/mysql/WL3567/mysql-5.0-engines · b6f39522
  svoj@june.mysql.com authored Jan 31, 2007
```
into  mysql.com:/home/svoj/devel/mysql/WL3567/mysql-5.1-engines
```
  b6f39522
- After merge fix (WL#3567). · 11322bfa
  svoj@mysql.com/june.mysql.com authored Jan 31, 2007
  
  11322bfa
- Merge mysql.com:/home/svoj/devel/mysql/WL3567/mysql-4.1-engines · a28b2ca1
  svoj@mysql.com/june.mysql.com authored Jan 31, 2007
```
into  mysql.com:/home/svoj/devel/mysql/WL3567/mysql-5.0-engines
```
  a28b2ca1
- Merge mysql.com:/home/svoj/devel/bk/mysql-4.1-engines · a6910759
  svoj@mysql.com/june.mysql.com authored Jan 31, 2007
```
into  mysql.com:/home/svoj/devel/mysql/WL3567/mysql-4.1-engines
```
  a6910759
- WL#3567 - MERGE engine: a check for underlying table conformance · a51aae60
  svoj@mysql.com/june.mysql.com authored Jan 31, 2007
```
When a merge table is opened compare column and key definition of
underlying tables against column and key definition of merge table.

If any of underlying tables have different column/key definition
refuse to open merge table.
```
  a51aae60
24 Jan, 2007 24 commits
- Merge mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines · f05c519a
  svoj@april.(none) authored Jan 25, 2007
```
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
```
  f05c519a
- Merge mysql.com:/home/svoj/devel/bk/mysql-5.1 · 3efc2965
  svoj@april.(none) authored Jan 25, 2007
```
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
```
  3efc2965
- Merge mysql.com:/home/svoj/devel/bk/mysql-5.0 · de1572d6
  svoj@mysql.com/april.(none) authored Jan 25, 2007
```
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
```
  de1572d6
- Merge mysql.com:/home/svoj/devel/bk/mysql-5.0 · ea7fe60f
  svoj@mysql.com/april.(none) authored Jan 25, 2007
```
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
```
  ea7fe60f
- Merge bk-internal.mysql.com:/home/bk/mysql-4.1-engines · 06a8c16f
  istruewing@chilla.local authored Jan 24, 2007
```
into  chilla.local:/home/mydev/mysql-4.1-bug24607
```
  06a8c16f
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0-engines · 0dc06453
  istruewing@chilla.local authored Jan 24, 2007
```
into  chilla.local:/home/mydev/mysql-5.0-bug24607
```
  0dc06453
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines · b9b31205
  istruewing@chilla.local authored Jan 24, 2007
```
into  chilla.local:/home/mydev/mysql-5.1-bug24607
```
  b9b31205
- After merge fix · e74331b3
  istruewing@chilla.local authored Jan 24, 2007
  
  e74331b3
- Merge chilla.local:/home/mydev/mysql-5.0-bug24607 · 1417840c
  istruewing@chilla.local authored Jan 24, 2007
```
into  chilla.local:/home/mydev/mysql-5.1-bug24607
```
  1417840c
- Bug#24607 - MyISAM pointer size determined incorrectly · 23debf86
  istruewing@chilla.local authored Jan 24, 2007
```
After merge fix
```
  23debf86
- Merge chilla.local:/home/mydev/mysql-4.1-bug24607 · 050ddb20
  istruewing@chilla.local authored Jan 24, 2007
```
into  chilla.local:/home/mydev/mysql-5.0-bug24607
```
  050ddb20
- Bug#24607 - MyISAM pointer size determined incorrectly · 928d672c
  istruewing@chilla.local authored Jan 24, 2007
```
Fixed test. On 32-bit machines which compile without
-DBIG_TABLES, MAX_ROWS is truncated to a 32-bit value.
Using a value below 4G is portable.
```
  928d672c
- Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0 · cb6c5f7e
  df@kahlann.erinye.com authored Jan 24, 2007
```
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
```
  cb6c5f7e
- Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.1 · 729f0158
  df@kahlann.erinye.com authored Jan 24, 2007
```
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build-work
```
  729f0158
- Merge mysql.com:/home/svoj/devel/mysql/BUG24401/mysql-5.0-engines · a6de0419
  svoj@june.mysql.com authored Jan 24, 2007
```
into  mysql.com:/home/svoj/devel/mysql/BUG24401/mysql-5.1-engines
```
  a6de0419
- Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1-engines · 77515e27
  svoj@june.mysql.com authored Jan 24, 2007
```
into  mysql.com:/home/svoj/devel/mysql/BUG24401/mysql-5.1-engines
```
  77515e27
- After merge fix. · 0e5aa80e
  svoj@mysql.com/june.mysql.com authored Jan 24, 2007
  
  0e5aa80e
- Merge mysql.com:/home/svoj/devel/mysql/BUG24401/mysql-4.1-engines · 603dcb4d
  svoj@mysql.com/june.mysql.com authored Jan 24, 2007
```
into  mysql.com:/home/svoj/devel/mysql/BUG24401/mysql-5.0-engines
```
  603dcb4d
- Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0-engines · 94d834c7
  svoj@mysql.com/june.mysql.com authored Jan 24, 2007
```
into  mysql.com:/home/svoj/devel/mysql/BUG24401/mysql-5.0-engines
```
  94d834c7
- Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1-engines · 02212e6a
  svoj@mysql.com/june.mysql.com authored Jan 24, 2007
```
into  mysql.com:/home/svoj/devel/mysql/BUG24401/mysql-4.1-engines
```
  02212e6a
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0-ndb · b0d94e9d
  stewart@willster.(none) authored Jan 24, 2007
```
into  willster.(none):/home/stewart/Documents/MySQL/5.0/ndb-work
```
  b0d94e9d
- Merge willster.(none):/home/stewart/Documents/MySQL/5.0/ndb-work · 76d41913
  stewart@willster.(none) authored Jan 24, 2007
```
into  willster.(none):/home/stewart/Documents/MySQL/5.1/ndb-work
```
  76d41913
- fix hpux build problem and some ndb connect errors being missed · 4889ea23
  stewart@willster.(none) authored Jan 24, 2007
  
  4889ea23
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · f869a0d6
  tomas@poseidon.mysql.com authored Jan 24, 2007
```
into  poseidon.mysql.com:/home/tomas/mysql-5.0-ndb
```
  f869a0d6
23 Jan, 2007 11 commits
- Merge bk-internal.mysql.com:/home/bk/mysql-4.1-engines · 26153490
  istruewing@chilla.local authored Jan 23, 2007
```
into  chilla.local:/home/mydev/mysql-4.1-bug24607
```
  26153490
- Merge bk-internal:/home/bk/mysql-5.1 · 2e174533
  mjorgensen@production.mysql.com authored Jan 23, 2007
```
into  production.mysql.com:/usersnfs/mjorgensen/bktrees/mysql-5.1-build
```
  2e174533
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0-engines · b381fd87
  istruewing@chilla.local authored Jan 23, 2007
```
into  chilla.local:/home/mydev/mysql-5.0-bug24607
```
  b381fd87
- Merge xiphis.org:/home/antony/work2/p1-bug25396.4 · 37f76ab4
  acurtis/antony@ltamd64.xiphis.org authored Jan 23, 2007
```
into  xiphis.org:/home/antony/work2/p1-bug25396.5
```
  37f76ab4
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines · 45178e66
  istruewing@chilla.local authored Jan 23, 2007
```
into  chilla.local:/home/mydev/mysql-5.1-bug24607
```
  45178e66
- Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb · d3462b9a
  pekka@clam.ndb.mysql.com/clam.(none) authored Jan 23, 2007
```
into  clam.ndb.mysql.com:/export/space/pekka/ndb/version/my50-ndb
```
  d3462b9a
- Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb · f2157aed
  pekka@clam.(none) authored Jan 23, 2007
```
into  clam.ndb.mysql.com:/export/space/pekka/ndb/version/my51-ndb
```
  f2157aed
- Merge mysql.com:/data0/mysqldev/users/tomas/mysql-5.0-build · e916f08a
  tulin/mysqldev@mysql.com/production.mysql.com authored Jan 23, 2007
```
into  mysql.com:/data0/mysqldev/users/tomas/mysql-5.1-build
```
  e916f08a
- Merge willster.(none):/home/stewart/Documents/MySQL/5.0/ndb · a1a78161
  stewart@willster.(none) authored Jan 24, 2007
```
into  willster.(none):/home/stewart/Documents/MySQL/5.0/bug25487
```
  a1a78161
- Merge willster.(none):/home/stewart/Documents/MySQL/5.1/ndb · 6d267551
  stewart@willster.(none) authored Jan 24, 2007
```
into  willster.(none):/home/stewart/Documents/MySQL/5.1/bug25567
```
  6d267551
- Merge willster.(none):/home/stewart/Documents/MySQL/5.0/bug25487 · dbaab7f4
  stewart@willster.(none) authored Jan 24, 2007
```
into  willster.(none):/home/stewart/Documents/MySQL/5.1/bug25567
```
  dbaab7f4