Commits · 04d12fc9d6d538e8910f7a4d14352930da906cc5 · nexedi / MariaDB

05 Sep, 2007 2 commits
- Merge trift2.:/MySQL/M50/push-5.0 · 04d12fc9
  joerg@trift2. authored Sep 05, 2007
```
into  trift2.:/MySQL/M51/push-5.1
```
  04d12fc9
- libmysql/libmysql.c : Correct a wrong automerge: Don't duplicate "DBUG_ENTER()". · 04b56132
  joerg@trift2. authored Sep 05, 2007
  
  04b56132
04 Sep, 2007 10 commits
- Merge trift2.:/MySQL/M50/push-5.0 · 3042b5bf
  joerg@trift2. authored Sep 04, 2007
```
into  trift2.:/MySQL/M51/push-5.1
```
  3042b5bf
- Merge trift2.:/MySQL/M51/mysql-5.1 · a751c743
  joerg@trift2. authored Sep 04, 2007
```
into  trift2.:/MySQL/M51/push-5.1
```
  a751c743
- Merge trift2.:/MySQL/M41/push-4.1 · 7fc80ef6
  joerg@trift2. authored Sep 04, 2007
```
into  trift2.:/MySQL/M50/push-5.0
```
  7fc80ef6
- Merge trift2.:/MySQL/M50/mysql-5.0 · 1aa9d478
  joerg@trift2. authored Sep 04, 2007
```
into  trift2.:/MySQL/M50/push-5.0
```
  1aa9d478
- Merge trift2.:/MySQL/M41/mysql-4.1 · 150b9a5f
  joerg@trift2. authored Sep 04, 2007
```
into  trift2.:/MySQL/M41/push-4.1
```
  150b9a5f
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build · 48380a63
  df@pippilotta.erinye.com authored Sep 04, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
```
  48380a63
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work · 08337dd0
  df@pippilotta.erinye.com authored Sep 04, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
```
  08337dd0
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work · c5a33802
  df@pippilotta.erinye.com authored Sep 04, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
```
  c5a33802
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work · ab791bc1
  df@pippilotta.erinye.com authored Sep 04, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work
```
  ab791bc1
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0.48 · 59b504a5
  df@pippilotta.erinye.com authored Sep 04, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
```
  59b504a5
03 Sep, 2007 2 commits
- Merge trift2.:/MySQL/M51/mysql-5.1 · 83bb61d8
  joerg@trift2. authored Sep 03, 2007
```
into  trift2.:/MySQL/M51/push-5.1
```
  83bb61d8
- Merge trift2.:/MySQL/M50/push-5.0 · 53303665
  joerg@trift2. authored Sep 03, 2007
```
into  trift2.:/MySQL/M51/push-5.1
```
  53303665
01 Sep, 2007 4 commits
- Merge bk-internal:/home/bk/mysql-5.1-maint · 122f5f6c
  msvensson@pilot.(none) authored Sep 01, 2007
```
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
```
  122f5f6c
- Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint · 66ae8743
  msvensson@pilot.(none) authored Sep 01, 2007
```
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
```
  66ae8743
- Merge pilot.(none):/data/msvensson/mysql/mysql-4.1-maint · 0ccf3502
  msvensson@pilot.(none) authored Sep 01, 2007
```
into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
```
  0ccf3502
- Use eval around "rmtree" and use our own version of rmtree if it fails · c5ea7b06
  msvensson@pilot.(none) authored Sep 01, 2007
  
  c5ea7b06
31 Aug, 2007 5 commits
- Correct fix for test result. · b5c13a0f
  tsmith@ramayana.hindu.god authored Aug 31, 2007
  
  b5c13a0f
- Correct test result file for bug #27014 · d70e4b0c
  tsmith@ramayana.hindu.god authored Aug 31, 2007
  
  d70e4b0c
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build · 948cbc73
  df@pippilotta.erinye.com authored Aug 31, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work
```
  948cbc73
- Fix test results for bug #27014 · 47dc161f
  tsmith@ramayana.hindu.god authored Aug 31, 2007
  
  47dc161f
- Bug #27014: Imperfect error/warning message for STR_TO_DATE for invalid datetime value · f5fdb53a
  tsmith@ramayana.hindu.god authored Aug 30, 2007
```
Fix name of function in warning message.
```
  f5fdb53a
30 Aug, 2007 4 commits
- Merge ramayana.hindu.god:/home/tsmith/m/bk/51-target22 · cefe7a3c
  tsmith@ramayana.hindu.god authored Aug 30, 2007
```
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
```
  cefe7a3c
- Merge ramayana.hindu.god:/home/tsmith/m/bk/51 · ebe38940
  tsmith@ramayana.hindu.god authored Aug 30, 2007
```
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
```
  ebe38940
- Disable rpl_ndb_2other, which has never worked on bigendian machines. · 58ecaaa8
  tsmith@ramayana.hindu.god authored Aug 30, 2007
  
  58ecaaa8
- Merge bk-internal:/home/bk/mysql-5.1-maint · 45667e64
  msvensson@pilot.(none) authored Aug 30, 2007
```
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
```
  45667e64
29 Aug, 2007 13 commits
- Post-merge fixes, and disable buggy test case on embedded · 653f7341
  tsmith@sita.local authored Aug 29, 2007
  
  653f7341
- Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0-build · d3985375
  kent@kent-amd64.(none) authored Aug 30, 2007
```
into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build
```
  d3985375
- Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-build · 3978bf99
  kent@kent-amd64.(none) authored Aug 30, 2007
```
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build
```
  3978bf99
- libmysqld/sql_tablespace.cc · a7d6c464
  kent@mysql.com/kent-amd64.(none) authored Aug 30, 2007
```
libmysqld/scheduler.cc
libmysqld/sql_connect.cc
  Deleted BitKeeper soft links not needed
```
  a7d6c464
- Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build · b7632953
  kent@kent-amd64.(none) authored Aug 30, 2007
```
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build
```
  b7632953
- server-tools/instance-manager/sql_state.c · f3436e51
  kent@mysql.com/kent-amd64.(none) authored Aug 30, 2007
```
server-tools/instance-manager/pack.c
server-tools/instance-manager/password.c
server-tools/instance-manager/net_serv.cc
  Deleted BitKeeper soft links not needed
```
  f3436e51
- Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-build · 46a3913e
  kent@kent-amd64.(none) authored Aug 29, 2007
```
into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build
```
  46a3913e
- libmysql_r/client_settings.h libmysqld/ha_blackhole.cc · 57dd7bc8
  kent@mysql.com/kent-amd64.(none) authored Aug 29, 2007
```
  Deleted BitKeeper soft links not needed
```
  57dd7bc8
- Added ORDER BY to udf select so that results are ordered. · 52ae4496
  brian@piggy.tangent.org authored Aug 29, 2007
  
  52ae4496
- Merge sita.local:/Users/tsmith/m/bk/maint/51-target22 · e32bdff6
  tsmith@sita.local authored Aug 29, 2007
```
into  sita.local:/Users/tsmith/m/bk/maint/51
```
  e32bdff6
- Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build · ecbff124
  kent@kent-amd64.(none) authored Aug 29, 2007
```
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build
```
  ecbff124
- CMakeLists.txt: · edf772ae
  kent@mysql.com/kent-amd64.(none) authored Aug 29, 2007
```
  Link with library "udf_example" depends on, needed for nmake
libmysql.c:
  DBUG_ENTER need to be in declaration section
```
  edf772ae
- Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-build · 515d654e
  kent@kent-amd64.(none) authored Aug 29, 2007
```
into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build
```
  515d654e