Commits · 2af06e0b3255312e6972a05358c989d866984f19 · Kirill Smelkov / mariadb

19 Jan, 2005 6 commits
- Merge mysql.com:/home/jonas/src/mysql-5.0 · 2af06e0b
  joreland@mysql.com authored Jan 19, 2005
```
into mysql.com:/home/jonas/src/mysql-5.0-ndb
```
  2af06e0b
- Merge mysql.com:/home/jonas/src/mysql-4.1 · 18bd4a25
  joreland@mysql.com authored Jan 19, 2005
```
into mysql.com:/home/jonas/src/mysql-5.0
```
  18bd4a25
- bug#7693 - ndb · b0b8f911
  joreland@mysql.com authored Jan 19, 2005
```
  when using shm transporter, set sigmask on each thread using pthread_sigmask
```
  b0b8f911
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · f8a0287f
  tomas@poseidon.ndb.mysql.com authored Jan 19, 2005
```
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
```
  f8a0287f
- changed "formatting" after sergs comments on prev chanset · 05bc9900
  tomas@poseidon.ndb.mysql.com authored Jan 19, 2005
  
  05bc9900
- Fixes of client_test on Solaris 64 bit · 733db0e6
  konstantin@mysql.com authored Jan 19, 2005
  
  733db0e6
18 Jan, 2005 34 commits
- Fix test results from merge, and fix the symlink test which had an · 20552486
  jimw@mysql.com authored Jan 18, 2005
```
out-of-sync test and result.
```
  20552486
- Merge from 4.1. · 1edf7279
  jimw@mysql.com authored Jan 18, 2005
  
  1edf7279
- Merge bk-internal:/home/bk/mysql-4.1 · 06f60f6d
  jimw@mysql.com authored Jan 18, 2005
```
into mysql.com:/home/jimw/my/mysql-4.1-clean
```
  06f60f6d
- after merge fixes · a2e0ecbf
  Sinisa@sinisa.nasamreza.org authored Jan 18, 2005
  
  a2e0ecbf
- Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1 · 08639a88
  Sinisa@sinisa.nasamreza.org authored Jan 18, 2005
```
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
```
  08639a88
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · a7c56a85
  tomas@poseidon.ndb.mysql.com authored Jan 18, 2005
```
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
```
  a7c56a85
- fixing wrong value for "examined rows" when UNION's are used. · 47704740
  Sinisa@sinisa.nasamreza.org authored Jan 18, 2005
  
  47704740
- Update type_float test results after merge. · 1ffa2a3d
  jimw@mysql.com authored Jan 18, 2005
  
  1ffa2a3d
- removed default usage of shared memory transporter as it is not verified on enough platforms · aabe1102
  tomas@poseidon.ndb.mysql.com authored Jan 18, 2005
  
  aabe1102
- Merge mysql.com:/home/jimw/my/mysql-4.1-6913 · 59ffad87
  jimw@mysql.com authored Jan 18, 2005
```
into mysql.com:/home/jimw/my/mysql-4.1-clean
```
  59ffad87
- Merge changed tests · 2fac8bd0
  jimw@mysql.com authored Jan 18, 2005
  
  2fac8bd0
- Merge mysql.com:/home/jimw/my/mysql-4.0-7700 · bc35532b
  jimw@mysql.com authored Jan 18, 2005
```
into mysql.com:/home/jimw/my/mysql-4.0-clean
```
  bc35532b
- After merge fix. · e906e861
  dlenev@brandersnatch.localdomain authored Jan 18, 2005
  
  e906e861
- Merge mysql.com:/home/dlenev/src/mysql-4.1-merges · 5f21e5ac
  dlenev@mysql.com authored Jan 18, 2005
```
into mysql.com:/home/dlenev/src/mysql-5.0-merges
```
  5f21e5ac
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 001aa109
  dlenev@mysql.com authored Jan 18, 2005
```
into mysql.com:/home/dlenev/src/mysql-5.0-merges
```
  001aa109
- Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 028ece57
  dlenev@mysql.com authored Jan 18, 2005
```
into mysql.com:/home/dlenev/src/mysql-4.1-merges
```
  028ece57
- Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0 · efe6ea93
  bar@mysql.com authored Jan 18, 2005
```
into mysql.com:/usr/home/bar/mysql-5.0
```
  efe6ea93
- ps_7ndb.result, ps_6bdb.result: · 4438d2d5
  bar@mysql.com authored Jan 18, 2005
```
  after merge clean-up
```
  4438d2d5
- Merge mysql.com:/home/dlenev/src/mysql-4.1-merges · af878017
  dlenev@mysql.com authored Jan 18, 2005
```
into mysql.com:/home/dlenev/src/mysql-5.0-merges
```
  af878017
- Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 · 04ee9572
  jani@ua141d10.elisa.omakaista.fi authored Jan 18, 2005
```
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
```
  04ee9572
- Added possibility to use --error <name> instead of --error <number> · 625ae2c5
  jani@ua141d10.elisa.omakaista.fi authored Jan 18, 2005
```
The old syntax works as well. WL#2356.
```
  625ae2c5
- After-merge clean-up · 05204a9b
  bar@mysql.com authored Jan 18, 2005
  
  05204a9b
- merge · f93bfe06
  bar@mysql.com authored Jan 18, 2005
  
  f93bfe06
- Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 · a55f4a5d
  sergefp@mysql.com authored Jan 18, 2005
```
into mysql.com:/home/psergey/mysql-5.0-fix-vg1
```
  a55f4a5d
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 1b8e1674
  tomas@poseidon.ndb.mysql.com authored Jan 18, 2005
```
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
```
  1b8e1674
- Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 · 0e5acfbb
  gluh@gluh.mysql.r18.ru authored Jan 18, 2005
```
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0
```
  0e5acfbb
- bug #7981: SHOW GLOBAL STATUS crashes server(fix after review) · 16a2f9d2
  gluh@gluh.mysql.r18.ru authored Jan 18, 2005
  
  16a2f9d2
- compile error: moved inline · 61f63776
  tomas@poseidon.ndb.mysql.com authored Jan 18, 2005
```
compile warning: changed eq_range -> eq_r
```
  61f63776
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 609c488b
  tomas@poseidon.ndb.mysql.com authored Jan 18, 2005
```
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
```
  609c488b
- compile bug fix · 03fd64aa
  tomas@poseidon.ndb.mysql.com authored Jan 18, 2005
  
  03fd64aa
- Added test for bug #7884 "Able to add invalid unique index on TIMESTAMP · 0787a97b
  dlenev@brandersnatch.localdomain authored Jan 18, 2005
```
prefix", which roots were fixed in 4.0 tree.
```
  0787a97b
- Fix for bug #7981: SHOW GLOBAL STATUS crashes server · c965dc34
  gluh@gluh.mysql.r18.ru authored Jan 18, 2005
  
  c965dc34
- Cleanups in Makefile.ams · 0e56df75
  konstantin@mysql.com authored Jan 18, 2005
  
  0e56df75
- Manual merge of fix for bug #7884 "Able to add invalid unique index on · 3d4eb575
  dlenev@mysql.com authored Jan 18, 2005
```
TIMESTAMP prefix" into 4.1 tree.
```
  3d4eb575