Commits · 28562e9baf6b57c3adde6707c0bacd29ffe09f33 · nexedi / MariaDB

07 Sep, 2007 3 commits
- Merge production.mysql.com:/usersnfs/jperkin/bk/trees/build-gca/mysql-5.1 · 28562e9b
  unknown authored Sep 07, 2007
```
into  production.mysql.com:/usersnfs/jperkin/bk/trees/51/mysql-5.1
```
  28562e9b
- Merge production.mysql.com:/usersnfs/jperkin/bk/trees/50/mysql-5.0 · c287f9fc
  unknown authored Sep 07, 2007
```
into  production.mysql.com:/usersnfs/jperkin/bk/trees/51/mysql-5.1


BitKeeper/deleted/.del-CMakeLists.txt~dd682cce1d53c0b4:
  Auto merged
```
  c287f9fc
- Merge production.mysql.com:/usersnfs/jperkin/bk/tmp/bug-27520 · fa4b12f9
  unknown authored Sep 07, 2007
```
into  production.mysql.com:/usersnfs/jperkin/bk/trees/51/mysql-5.1


config/ac-macros/misc.m4:
  Auto merged
```
  fa4b12f9
05 Sep, 2007 2 commits
- Merge trift2.:/MySQL/M50/push-5.0 · 9bfd4509
  unknown authored Sep 05, 2007
```
into  trift2.:/MySQL/M51/push-5.1


libmysql/libmysql.c:
  Auto merged
```
  9bfd4509
- libmysql/libmysql.c : Correct a wrong automerge: Don't duplicate "DBUG_ENTER()". · 739465b6
  unknown authored Sep 05, 2007
```
libmysql/libmysql.c:
  Correct a wrong automerge: Don't duplicate "DBUG_ENTER()".
```
  739465b6
04 Sep, 2007 10 commits

Merge trift2.:/MySQL/M50/push-5.0 · 338bc58e
unknown authored Sep 04, 2007
```
into  trift2.:/MySQL/M51/push-5.1
```
338bc58e

Merge trift2.:/MySQL/M51/mysql-5.1 · 9d109fde

unknown authored Sep 04, 2007

into  trift2.:/MySQL/M51/push-5.1


configure.in:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
sql/field.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/log_event.h:
  Auto merged
sql/rpl_record.cc:
  Auto merged
sql/rpl_utility.cc:
  Auto merged
sql/rpl_utility.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged

9d109fde

Merge trift2.:/MySQL/M41/push-4.1 · ea10f623
unknown authored Sep 04, 2007
```
into  trift2.:/MySQL/M50/push-5.0
```
ea10f623
Merge trift2.:/MySQL/M50/mysql-5.0 · 689aaff9
unknown authored Sep 04, 2007
```
into  trift2.:/MySQL/M50/push-5.0
```
689aaff9
Merge trift2.:/MySQL/M41/mysql-4.1 · 5c02bcba
unknown authored Sep 04, 2007
```
into  trift2.:/MySQL/M41/push-4.1
```
5c02bcba
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build · 03d93ca6
unknown authored Sep 04, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
```
03d93ca6

Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work · 71469063

unknown authored Sep 04, 2007

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build


configure.in:
  Auto merged
BitKeeper/deleted/.del-ha_blackhole.cc~727c69ef7846623a:
  Auto merged
BitKeeper/deleted/.del-net_serv.cc~120fb81d7e670308:
  Auto merged
BitKeeper/deleted/.del-pack.c~4754cd15e3058c75:
  Auto merged
BitKeeper/deleted/.del-password.c~9d4b6a4c57887ac7:
  Auto merged
BitKeeper/deleted/.del-sql_state.c~3b39d30b649690f3:
  Auto merged
libmysql/libmysql.c:
  Auto merged
sql/CMakeLists.txt:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged

71469063

Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work · a7ca2a39
unknown authored Sep 04, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
```
a7ca2a39

Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work · ce845ef7

unknown authored Sep 04, 2007

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work


BitKeeper/deleted/.del-ha_blackhole.cc~727c69ef7846623a:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/include/have_bug25714.inc:
  Auto merged
sql/CMakeLists.txt:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
configure.in:
  null-merge
BitKeeper/deleted/.del-net_serv.cc:
  Auto merged
BitKeeper/deleted/.del-pack.c:
  Auto merged
BitKeeper/deleted/.del-password.c:
  Auto merged
BitKeeper/deleted/.del-sql_state.c:
  Auto merged

ce845ef7

Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0.48 · 0ec2e69d
unknown authored Sep 04, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work


libmysql/libmysql.c:
  Auto merged
```
0ec2e69d

03 Sep, 2007 2 commits
- Merge trift2.:/MySQL/M51/mysql-5.1 · 24539770
  unknown authored Sep 03, 2007
```
into  trift2.:/MySQL/M51/push-5.1
```
  24539770
- Merge trift2.:/MySQL/M50/push-5.0 · 68e21c77
  unknown authored Sep 03, 2007
```
into  trift2.:/MySQL/M51/push-5.1
```
  68e21c77
01 Sep, 2007 4 commits
- Merge bk-internal:/home/bk/mysql-5.1-maint · 943ed8fe
  unknown authored Sep 01, 2007
```
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
```
  943ed8fe
- Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint · 8ffb011b
  unknown authored Sep 01, 2007
```
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint


mysql-test/lib/mtr_misc.pl:
  Auto merged
```
  8ffb011b
- Merge pilot.(none):/data/msvensson/mysql/mysql-4.1-maint · 5ece0c9b
  unknown authored Sep 01, 2007
```
into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint


mysql-test/lib/mtr_misc.pl:
  Auto merged
```
  5ece0c9b
- Use eval around "rmtree" and use our own version of rmtree if it fails · 55566a66
  unknown authored Sep 01, 2007
  
  55566a66
31 Aug, 2007 5 commits
- Correct fix for test result. · 436cca53
  unknown authored Aug 31, 2007
  
  436cca53
- Correct test result file for bug #27014 · c11de568
  unknown authored Aug 31, 2007
  
  c11de568
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build · 25928276
  unknown authored Aug 31, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work


configure.in:
  Auto merged
```
  25928276
- Fix test results for bug #27014 · 871172dd
  unknown authored Aug 31, 2007
  
  871172dd
- Bug #27014: Imperfect error/warning message for STR_TO_DATE for invalid datetime value · 333a28bc
  unknown authored Aug 30, 2007
```
Fix name of function in warning message.


sql/item_timefunc.cc:
  Fix error message in extract_date_time(); ("str_to_time" -> "str_to_date")
```
  333a28bc
30 Aug, 2007 4 commits
- Merge ramayana.hindu.god:/home/tsmith/m/bk/51-target22 · 66baabd4
  unknown authored Aug 30, 2007
```
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
```
  66baabd4
- Merge ramayana.hindu.god:/home/tsmith/m/bk/51 · cebc1abc
  unknown authored Aug 30, 2007
```
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
```
  cebc1abc
- Disable rpl_ndb_2other, which has never worked on bigendian machines. · 7de80833
  unknown authored Aug 30, 2007
  
  7de80833
- Merge bk-internal:/home/bk/mysql-5.1-maint · ad49aa06
  unknown authored Aug 30, 2007
```
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
```
  ad49aa06
29 Aug, 2007 10 commits

Post-merge fixes, and disable buggy test case on embedded · c8648fa3

unknown authored Aug 29, 2007


mysql-test/t/query_cache.test:
  Disable query_cache test on embedded, due to bug 30710.
sql/log_event_old.cc:
  Post-merge fix, change RELAY_LOG_INFO to Relay_log_info.

c8648fa3

Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0-build · 3a94acf4
unknown authored Aug 30, 2007
```
into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build
```
3a94acf4
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-build · 3e22e3ca
unknown authored Aug 30, 2007
```
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build
```
3e22e3ca

libmysqld/sql_tablespace.cc · 47874b60

unknown authored Aug 30, 2007

libmysqld/scheduler.cc
libmysqld/sql_connect.cc
  Deleted BitKeeper soft links not needed


BitKeeper/deleted/.del-scheduler.cc:
  Delete: libmysqld/scheduler.cc
BitKeeper/deleted/.del-sql_connect.cc:
  Delete: libmysqld/sql_connect.cc
BitKeeper/deleted/.del-sql_tablespace.cc:
  Delete: libmysqld/sql_tablespace.cc

47874b60

Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build · 7894f39a

unknown authored Aug 30, 2007

into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build


BitKeeper/deleted/.del-ha_blackhole.cc~727c69ef7846623a:
  Auto merged
BitKeeper/deleted/.del-net_serv.cc~120fb81d7e670308:
  Auto merged
BitKeeper/deleted/.del-pack.c~4754cd15e3058c75:
  Auto merged
BitKeeper/deleted/.del-password.c~9d4b6a4c57887ac7:
  Auto merged
BitKeeper/deleted/.del-sql_state.c~3b39d30b649690f3:
  Auto merged

7894f39a

server-tools/instance-manager/sql_state.c · 3d491888

unknown 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


BitKeeper/deleted/.del-net_serv.cc:
  Delete: server-tools/instance-manager/net_serv.cc
BitKeeper/deleted/.del-pack.c:
  Delete: server-tools/instance-manager/pack.c
BitKeeper/deleted/.del-password.c:
  Delete: server-tools/instance-manager/password.c
BitKeeper/deleted/.del-sql_state.c:
  Delete: server-tools/instance-manager/sql_state.c

3d491888

Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-build · 1c1ea230

unknown authored Aug 29, 2007

into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build


BitKeeper/deleted/.del-ha_blackhole.cc~727c69ef7846623a:
  Auto merged

1c1ea230

libmysql_r/client_settings.h libmysqld/ha_blackhole.cc · f3b2c398

unknown authored Aug 29, 2007

  Deleted BitKeeper soft links not needed


BitKeeper/deleted/.del-client_settings.h:
  Delete: libmysql_r/client_settings.h
BitKeeper/deleted/.del-ha_blackhole.cc:
  Delete: libmysqld/ha_blackhole.cc

f3b2c398

Added ORDER BY to udf select so that results are ordered. · 674f49f8

unknown authored Aug 29, 2007


mysql-test/include/rpl_udf.inc:
  ORDER BY to force order
mysql-test/suite/rpl/r/rpl_udf.result:
  Fix for ORDER BY

674f49f8

Merge sita.local:/Users/tsmith/m/bk/maint/51-target22 · 48193af4

unknown authored Aug 29, 2007

into  sita.local:/Users/tsmith/m/bk/maint/51


sql/field.cc:
  Auto merged
sql/log_event_old.cc:
  Auto merged
sql/rpl_record.h:
  Auto merged
sql/rpl_utility.cc:
  Auto merged
sql/rpl_utility.h:
  Auto merged
sql/slave.h:
  Auto merged
storage/innobase/handler/ha_innodb.cc:
  Auto merged
sql/log_event.cc:
  Manual merge
sql/log_event.h:
  Manual merge
sql/log_event_old.h:
  Manual merge
sql/rpl_record.cc:
  Manual merge
sql/slave.cc:
  Manual merge

48193af4