Commits · 52ca3326005eaaee5febd388e22bae0ced758306 · Kirill Smelkov / mariadb

28 Mar, 2007 2 commits
- Merge janus.mylan:/usr/home/serg/Abk/mysql-5.0-build · 52ca3326
  serg@janus.mylan authored Mar 28, 2007
```
into  janus.mylan:/usr/home/serg/Abk/mysql-5.1-build
```
  52ca3326
- restored run-time thread lib detection · e5b66048
  serg@janus.mylan authored Mar 28, 2007
  
  e5b66048
27 Mar, 2007 1 commit
- Merge trift-lap.fambruehe:/MySQL/M51/mysql-5.1 · 336f03d1
  joerg@trift-lap.fambruehe authored Mar 27, 2007
```
into  trift-lap.fambruehe:/MySQL/M51/push-5.1
```
  336f03d1
24 Mar, 2007 2 commits
- Merge sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1 · 1af6b027
  serg@sergbook.mysql.com authored Mar 24, 2007
```
into  sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0-build
```
  1af6b027
- nptl: typo fixed. sigaddset restored · 18a01e72
  serg@sergbook.mysql.com authored Mar 24, 2007
  
  18a01e72
23 Mar, 2007 18 commits
- bug in im* tests - missing --no-defaults in the mysql command line · 77718a3f
  serg@sergbook.mysql.com authored Mar 23, 2007
  
  77718a3f
- Merge sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1 · e4164cda
  serg@sergbook.mysql.com authored Mar 23, 2007
```
into  sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0-build
```
  e4164cda
- reverted linuxthreads thr_client_alarm fix (not future-proof) · d2d72bfc
  serg@sergbook.mysql.com authored Mar 23, 2007
```
fixed differently: wake up select_thread with THR_SERVER_ALARM instead
```
  d2d72bfc
- mysql-test/t/query_cache_sql_prepare.test : Prevent this test from running in "embedded". · 751531fc
  joerg@trift2. authored Mar 23, 2007
  
  751531fc
- Merge sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1 · 3e9d98b0
  serg@sergbook.mysql.com authored Mar 23, 2007
```
into  sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0-build
```
  3e9d98b0
- Merge bk-internal:/home/bk/mysql-5.0 · 1d64408c
  serg@sergbook.mysql.com authored Mar 23, 2007
```
into  sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0-build
```
  1d64408c
- Merge bk-internal:/home/bk/mysql-4.1-build · e786458d
  serg@sergbook.mysql.com authored Mar 23, 2007
```
into  sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1
```
  e786458d
- Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · b37c1975
  serg@sergbook.mysql.com authored Mar 23, 2007
```
into  sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1
```
  b37c1975
- Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · e2dd5743
  serg@sergbook.mysql.com authored Mar 23, 2007
```
into  sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1
```
  e2dd5743
- Merge bk@192.168.21.1:mysql-5.1 · 5e0596f4
  holyfoot/hf@hfmain.(none) authored Mar 23, 2007
```
into  mysql.com:/home/hf/work/mrg/mysql-5.1-opt
```
  5e0596f4
- move thr_client_alarm initialization to mysqld.cc · 2220fe27
  serg@sergbook.mysql.com authored Mar 23, 2007
```
(in thr_alarm.cc it happened too late).
```
  2220fe27
- Merge trift2.:/MySQL/M50/push-5.0 · d6880edd
  joerg@trift2. authored Mar 23, 2007
```
into  trift2.:/MySQL/M51/push-5.1
```
  d6880edd
- Merge trift2.:/MySQL/M50/clone-5.0 · a1ffb002
  joerg@trift2. authored Mar 23, 2007
```
into  trift2.:/MySQL/M50/push-5.0
```
  a1ffb002
- Merge trift2.:/MySQL/M50/mysql-5.0 · 4ab912c9
  joerg@trift2. authored Mar 23, 2007
```
into  trift2.:/MySQL/M50/push-5.0
```
  4ab912c9
- Merge trift2.:/MySQL/M50/clone-5.0 · dbad0e1c
  joerg@trift2. authored Mar 23, 2007
```
into  trift2.:/MySQL/M51/push-5.1
```
  dbad0e1c
- Merge trift2.:/MySQL/M51/mysql-5.1 · 2e5e79cf
  joerg@trift2. authored Mar 23, 2007
```
into  trift2.:/MySQL/M51/push-5.1
```
  2e5e79cf
- Raise version number after cloning 5.1.17-beta · b9a317de
  dfischer/mysqldev@mysql.com/production.mysql.com authored Mar 23, 2007
  
  b9a317de
- fixes to make embedded-server test working · e06a8826
  holyfoot/hf@mysql.com/hfmain.(none) authored Mar 23, 2007
  
  e06a8826
22 Mar, 2007 17 commits
- Merge linux.site:/home/omer/source/bld50_0321 · cbdd03c5
  omer@linux.site authored Mar 22, 2007
```
into  linux.site:/home/omer/source/bld51_0322
```
  cbdd03c5
- merging · 7eb78d8d
  holyfoot/hf@mysql.com/hfmain.(none) authored Mar 23, 2007
  
  7eb78d8d
- Merge mysql.com:/home/hf/work/mrg/mysql-5.0-opt · 2a54dcd9
  holyfoot/hf@hfmain.(none) authored Mar 23, 2007
```
into  mysql.com:/home/hf/work/mrg/mysql-5.1-opt
```
  2a54dcd9
- merging · e1044ab5
  holyfoot/hf@mysql.com/hfmain.(none) authored Mar 23, 2007
  
  e1044ab5
- Merge obarnir@bk-internal.mysql.com:/home/bk/mysql-5.0-build · 6592ecef
  omer@linux.site authored Mar 22, 2007
```
into  linux.site:/home/omer/source/bld50_0321
```
  6592ecef
- Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · a2219567
  evgen@moonbone.local authored Mar 22, 2007
```
into  moonbone.local:/mnt/gentoo64/work/26813-bug-5.0-opt-mysql
```
  a2219567
- sql_view.cc: · 38e02378
  evgen@moonbone.local authored Mar 22, 2007
```
  Post-fix for bug#26813.
```
  38e02378
- Merge mysql.com:/home/hf/work/mrg/mysql-5.0-opt · a7f5f07b
  holyfoot/hf@hfmain.(none) authored Mar 23, 2007
```
into  mysql.com:/home/hf/work/mrg/mysql-5.1-opt
```
  a7f5f07b
- Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · fc23f335
  holyfoot/hf@mysql.com/hfmain.(none) authored Mar 23, 2007
```
into  mysql.com:/home/hf/work/mrg/mysql-5.0-opt
```
  fc23f335
- Merge mysql.com:/home/hf/work/mrg/mysql-5.0-opt · 81b59fb3
  holyfoot/hf@hfmain.(none) authored Mar 22, 2007
```
into  mysql.com:/home/hf/work/mrg/mysql-5.1-opt
```
  81b59fb3
- Merge bk@192.168.21.1:mysql-5.0-opt · 68f9ff12
  holyfoot/hf@mysql.com/hfmain.(none) authored Mar 22, 2007
```
into  mysql.com:/home/hf/work/mrg/mysql-5.0-opt
```
  68f9ff12
- Merge mysql.com:/home/hf/work/mrg/mysql-5.0-opt · 0d556669
  holyfoot/hf@hfmain.(none) authored Mar 22, 2007
```
into  mysql.com:/home/hf/work/mrg/mysql-5.1-opt
```
  0d556669
- Merge mysql.com:/home/hf/work/mrg/mysql-4.1-opt · e556a043
  holyfoot/hf@mysql.com/hfmain.(none) authored Mar 22, 2007
```
into  mysql.com:/home/hf/work/mrg/mysql-5.0-opt
```
  e556a043
- Merge bk@192.168.21.1:mysql-5.1 · 09d45294
  holyfoot/hf@hfmain.(none) authored Mar 22, 2007
```
into  mysql.com:/home/hf/work/mrg/mysql-5.1-opt
```
  09d45294
- Merge bk@192.168.21.1:mysql-5.0 · 0102d38e
  holyfoot/hf@mysql.com/hfmain.(none) authored Mar 22, 2007
```
into  mysql.com:/home/hf/work/mrg/mysql-5.0-opt
```
  0102d38e
- Merge bk@192.168.21.1:mysql-4.1 · 1d0efa17
  holyfoot/hf@mysql.com/hfmain.(none) authored Mar 22, 2007
```
into  mysql.com:/home/hf/work/mrg/mysql-4.1-opt
```
  1d0efa17
- Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · b1f852b9
  evgen@moonbone.local authored Mar 22, 2007
```
into  moonbone.local:/mnt/gentoo64/work/26813-bug-5.0-opt-mysql
```
  b1f852b9