Commits · 228a63d33776a7de9d3bbb617fa10ad93d1bd3a6 · nexedi / MariaDB

01 Jan, 2005 4 commits
- ndb - post merge fixes · 228a63d3
  joreland@mysql.com authored Jan 01, 2005
  
  228a63d3
- merge · fe8f4ab0
  joreland@mysql.com authored Jan 01, 2005
  
  fe8f4ab0
- ndb - more removal of old constructor usage in test prgs · 0de1b0f2
  joreland@mysql.com authored Jan 01, 2005
  
  0de1b0f2
- Merge mysql.com:/home/jonas/src/mysql-5.0 · a7c2a9e0
  joreland@mysql.com authored Jan 01, 2005
```
into mysql.com:/home/jonas/src/mysql-5.0-ndb
```
  a7c2a9e0
31 Dec, 2004 29 commits
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · a5ccba28
  serg@sergbook.mysql.com authored Dec 31, 2004
```
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0
```
  a5ccba28
- post-merge · a9c7fb9d
  serg@sergbook.mysql.com authored Dec 31, 2004
  
  a9c7fb9d
- manually merged · a04fc26c
  serg@sergbook.mysql.com authored Dec 31, 2004
  
  a04fc26c
- row0upd.c: · e97584fb
  heikki@hundin.mysql.fi authored Dec 31, 2004
```
  Manually merge the little InnoDB bug fix from 4.1 to 5.0; Marko can then run tests on the fixed version
```
  e97584fb
- Make test results independent on who runs them · 98ccc210
  sergefp@mysql.com authored Dec 31, 2004
  
  98ccc210
- Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 · 849d1203
  sergefp@mysql.com authored Dec 31, 2004
```
into mysql.com:/home/psergey/mysql-5.0-debug-31dec
```
  849d1203
- Remove display of join buffer size, test fails when someone changes the minimum · b572374c
  sergefp@mysql.com authored Dec 31, 2004
  
  b572374c
- Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 · 91ab26ea
  sergefp@mysql.com authored Dec 31, 2004
```
into mysql.com:/dbdata/psergey/mysql-5.0-build-fix-31dec
```
  91ab26ea
- Fix test results to account for difference between release BDB, debug BDB and MyISAM. · 034c59ed
  sergefp@mysql.com authored Dec 31, 2004
  
  034c59ed
- Yet another after merge fix. · 4e17aab2
  dlenev@brandersnatch.localdomain authored Dec 31, 2004
```
Now max_user_connections is 36th field in mysql.user table
(two new SP-related privileges were added).
```
  4e17aab2
- post-merge · 45ce994e
  serg@sergbook.mysql.com authored Dec 31, 2004
  
  45ce994e
- Merge mysql.com:/home/jonas/src/mysql-5.0 · 3c52b247
  joreland@mysql.com authored Dec 31, 2004
```
into mysql.com:/home/jonas/src/mysql-5.0-ndb
```
  3c52b247
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 2f8dcec0
  dlenev@mysql.com authored Dec 31, 2004
```
into mysql.com:/home/dlenev/src/mysql-5.0-1339
```
  2f8dcec0
- Merge mysql.com:/dbdata/psergey/mysql-5.0-bug7264 · a09df748
  sergefp@mysql.com authored Dec 31, 2004
```
into mysql.com:/dbdata/psergey/mysql-5.0-build-fix-31dec
```
  a09df748
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 08416134
  monty@mysql.com authored Dec 31, 2004
```
into mysql.com:/home/my/mysql-5.0
```
  08416134
- Fix max_key_length and max_unique_length to take into account varchar and null extra lengths · e4ffff29
  monty@mysql.com authored Dec 31, 2004
```
This fixes a bug found by bdb.test
Fixes a portability issue with bdb tables
```
  e4ffff29
- Manual merge. · 536cb921
  dlenev@mysql.com authored Dec 31, 2004
  
  536cb921
- Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 · 2745a694
  mronstrom@mysql.com authored Dec 31, 2004
```
into mysql.com:/Users/mikron/mysql-5.0
```
  2745a694
- Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb · 4a26906b
  joreland@mysql.com authored Dec 31, 2004
```
into mysql.com:/home/jonas/src/mysql-5.0-ndb
```
  4a26906b
- merge · e4197f2e
  joreland@mysql.com authored Dec 31, 2004
  
  e4197f2e
- Merge mysql.com:/home/jonas/src/mysql-5.0 · 7f6fb4d9
  joreland@mysql.com authored Dec 31, 2004
```
into mysql.com:/home/jonas/src/mysql-5.0-ndb
```
  7f6fb4d9
- Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 · 7b7113a9
  joreland@mysql.com authored Dec 31, 2004
```
into mysql.com:/home/jonas/src/mysql-5.0
```
  7b7113a9
- merge · e9c5ad80
  joreland@mysql.com authored Dec 31, 2004
  
  e9c5ad80
- Merge bk-internal:/home/bk/mysql-5.0 · ae1b969c
  vtkachenko@intelp4d.mysql.com authored Dec 31, 2004
```
into intelp4d.mysql.com:/users/vtkachenko/bk/mysql-5.0
```
  ae1b969c
- merge · 8f2d0ec1
  joreland@mysql.com authored Dec 31, 2004
  
  8f2d0ec1
- Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 · dd32940b
  joreland@mysql.com authored Dec 31, 2004
```
into mysql.com:/home/jonas/src/mysql-5.0
```
  dd32940b
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 8f7a2bba
  monty@mysql.com authored Dec 31, 2004
```
into mysql.com:/home/my/mysql-merge
```
  8f7a2bba
- After merge fixes · 5e03ebbc
  monty@mysql.com authored Dec 31, 2004
```
Cleanup of mi_print_error() handling
Deleted 'merge' directory
```
  5e03ebbc
- Bug #7593 · 91f15dc6
  mronstrom@mysql.com authored Dec 31, 2004
```
Caused a hard limit of 64 unique indexes in cluster
```
  91f15dc6
30 Dec, 2004 7 commits
- page0page.c: · 526b996a
  marko@hundin.mysql.fi authored Dec 31, 2004
```
  page_dir_find_owner_slot(): Fix bug in corruption diagnostics.
```
  526b996a
- Merge with global tree · 34d5331c
  monty@mysql.com authored Dec 31, 2004
  
  34d5331c
- row0upd.c: · b9fdd876
  marko@hundin.mysql.fi authored Dec 31, 2004
```
  row_upd_clust_rec(): Call btr_cur_get_rec() after
  btr_pcur_restore_position(), not before.  (Bug #7598)
```
  b9fdd876
- After merge fixes · d71c0305
  monty@mysql.com authored Dec 31, 2004
  
  d71c0305
- NdbDictionary.hpp: · 598ae38f
  tulin@build.mysql.com authored Dec 30, 2004
```
  updated ndb dictionary docs
```
  598ae38f
- merged · c7e756f9
  serg@sergbook.mysql.com authored Dec 30, 2004
  
  c7e756f9
- unsufficient privilege checks in GRANT, when a grantor has column-level privileges · 12bf7dcd
  serg@sergbook.mysql.com authored Dec 30, 2004
  
  12bf7dcd