Commits · dbb51315f171b8b4820bf95df10d6036878228ec · nexedi / MariaDB

04 Sep, 2007 10 commits

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

Merge trift2.:/MySQL/M51/mysql-5.1 · da9f0690

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

da9f0690

Merge trift2.:/MySQL/M41/push-4.1 · c92b9a3d
unknown authored Sep 04, 2007
```
into  trift2.:/MySQL/M50/push-5.0
```
c92b9a3d
Merge trift2.:/MySQL/M50/mysql-5.0 · 1becd70e
unknown authored Sep 04, 2007
```
into  trift2.:/MySQL/M50/push-5.0
```
1becd70e
Merge trift2.:/MySQL/M41/mysql-4.1 · 54b5ec2b
unknown authored Sep 04, 2007
```
into  trift2.:/MySQL/M41/push-4.1
```
54b5ec2b
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build · eb9ca528
unknown authored Sep 04, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
```
eb9ca528

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

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

f887bad1

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

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

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

261be24c

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


libmysql/libmysql.c:
  Auto merged
```
7c38a20d

03 Sep, 2007 2 commits
- Merge trift2.:/MySQL/M51/mysql-5.1 · 84556660
  unknown authored Sep 03, 2007
```
into  trift2.:/MySQL/M51/push-5.1
```
  84556660
- Merge trift2.:/MySQL/M50/push-5.0 · 645369cc
  unknown authored Sep 03, 2007
```
into  trift2.:/MySQL/M51/push-5.1
```
  645369cc
01 Sep, 2007 4 commits
- Merge bk-internal:/home/bk/mysql-5.1-maint · c3f8e763
  unknown authored Sep 01, 2007
```
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
```
  c3f8e763
- Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint · 67024118
  unknown authored Sep 01, 2007
```
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint


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


mysql-test/lib/mtr_misc.pl:
  Auto merged
```
  053a3334
- Use eval around "rmtree" and use our own version of rmtree if it fails · 55858d7a
  unknown authored Sep 01, 2007
  
  55858d7a
31 Aug, 2007 5 commits
- Correct fix for test result. · eaa84de6
  unknown authored Aug 31, 2007
  
  eaa84de6
- Correct test result file for bug #27014 · 4c81f3a9
  unknown authored Aug 31, 2007
  
  4c81f3a9
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build · e7604b64
  unknown authored Aug 31, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work


configure.in:
  Auto merged
```
  e7604b64
- Fix test results for bug #27014 · ef82ff3c
  unknown authored Aug 31, 2007
  
  ef82ff3c
- Bug #27014: Imperfect error/warning message for STR_TO_DATE for invalid datetime value · 978e3d4d
  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")
```
  978e3d4d
30 Aug, 2007 4 commits
- Merge ramayana.hindu.god:/home/tsmith/m/bk/51-target22 · b32b06f0
  unknown authored Aug 30, 2007
```
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
```
  b32b06f0
- Merge ramayana.hindu.god:/home/tsmith/m/bk/51 · e33183b5
  unknown authored Aug 30, 2007
```
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
```
  e33183b5
- Disable rpl_ndb_2other, which has never worked on bigendian machines. · c0e5f06e
  unknown authored Aug 30, 2007
  
  c0e5f06e
- Merge bk-internal:/home/bk/mysql-5.1-maint · 53e145b3
  unknown authored Aug 30, 2007
```
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
```
  53e145b3
29 Aug, 2007 15 commits

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

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.

55881a99

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

libmysqld/sql_tablespace.cc · 6b4f7734

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

6b4f7734

Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build · 92e18ed4

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

92e18ed4

server-tools/instance-manager/sql_state.c · 49299703

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

49299703

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

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

cee6c0c1

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

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

d3708532

Added ORDER BY to udf select so that results are ordered. · 3dbbdbe4

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

3dbbdbe4

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

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

dc8ffcb1

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

unknown authored Aug 29, 2007

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


libmysql/libmysql.c:
  Auto merged
sql/CMakeLists.txt:
  Auto merged

aea15fd8

CMakeLists.txt: · f9590a36

unknown authored Aug 29, 2007

  Link with library "udf_example" depends on, needed for nmake
libmysql.c:
  DBUG_ENTER need to be in declaration section


libmysql/libmysql.c:
  DBUG_ENTER need to be in declaration section
sql/CMakeLists.txt:
  Link with library "udf_example" depends on, needed for nmake

f9590a36

Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-build · 04e3d3b7
unknown authored Aug 29, 2007
```
into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build


scripts/mysql_config.sh:
  Auto merged
```
04e3d3b7

mysql_config.sh: · 22488e09

unknown authored Aug 29, 2007

  Flag changed name in icc 10


scripts/mysql_config.sh:
  Flag changed name in icc 10

22488e09

Fix pushbuild test failures which occur on big-endian systems. · 952df32e

unknown authored Aug 29, 2007

  Do not convert innodb autoincrement value to little endian when on
  big endian systems.


storage/innobase/row/row0sel.c:
  Do not convert innodb autoincrement value to little endian when on
  big endian systems.

952df32e