Commits · 2cc25fd63c10931c2380fa156e0d0dedb84d5bb6 · nexedi / MariaDB

13 Jun, 2007 12 commits

Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build · 2cc25fd6

unknown authored Jun 13, 2007

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


configure.in:
  Auto merged
scripts/make_win_bin_dist:
  null merge

2cc25fd6

Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-post-commit · dabb72aa
unknown authored Jun 13, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
```
dabb72aa
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1 · a9d39c16
unknown authored Jun 13, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
```
a9d39c16
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0 · a2eb4b1f
unknown authored Jun 13, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
```
a2eb4b1f
Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-4.1 · 69ff5fff
unknown authored Jun 13, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1
```
69ff5fff
Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0 · e63306a8
unknown authored Jun 13, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0


configure.in:
  Auto merged
```
e63306a8

Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1 · a6b7ab6b

unknown authored Jun 13, 2007

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


configure.in:
  null-merge version number change

a6b7ab6b

Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-post-commit · 443e2819
unknown authored Jun 13, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0
```
443e2819

Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-post-commit · 3173e8ae

unknown authored Jun 13, 2007

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


BitKeeper/triggers/post-commit:
  SCCS merged

3173e8ae

Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-post-commit · 43e77e61

unknown authored Jun 13, 2007

into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-post-commit

BitKeeper/triggers/post-commit:
Remove dev-public@ / dev-bugs@ e-mail, is now handled differently. Merge fix for 5.0.

43e77e61

Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-post-commit · d87c9875
unknown authored Jun 13, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1
```
d87c9875

BK changes for · ff265ac8

unknown authored Jun 13, 2007

https://inside.mysql.com/wiki/MySQL's_Code_Reviews_Published_Externally

BitKeeper/triggers/post-commit:
1) Add additional method of detecting merge changesets.
2) Remove code sending e-mail to dev-public@ or dev-bugs@.
3) Change code sending e-mail to commits@ to send to dev-private@ if a specific file is present in the BK root directory, denoting this tree as private.

ff265ac8

12 Jun, 2007 1 commit

make_win_bin_dist: · 06b6749e

unknown authored Jun 12, 2007

  Aligned headers to include with Unix 'make install'


scripts/make_win_bin_dist:
  Aligned headers to include with Unix 'make install'

06b6749e

11 Jun, 2007 2 commits
- Merge trift2.:/MySQL/M50/push-5.0 · 1e15a17e
  unknown authored Jun 11, 2007
```
into  trift2.:/MySQL/M51/push-5.1
```
  1e15a17e
- Merge trift2.:/MySQL/M41/push-4.1 · a28ec7b8
  unknown authored Jun 11, 2007
```
into  trift2.:/MySQL/M50/push-5.0
```
  a28ec7b8
07 Jun, 2007 4 commits

Merge trift2.:/MySQL/M41/bug23504-4.1 · 35a948f7
unknown authored Jun 07, 2007
```
into  trift2.:/MySQL/M41/push-4.1
```
35a948f7

Merge trift2.:/MySQL/M50/push-5.0 · 73016f8f

unknown authored Jun 07, 2007

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


BitKeeper/deleted/.del-CMakeLists.txt~1:
  Auto merged
mysql-test/extra/binlog_tests/ctype_cp932_binlog.test:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
netware/myisam_ftdump.def:
  Auto merged
netware/myisamchk.def:
  Auto merged
netware/myisamlog.def:
  Auto merged
netware/myisampack.def:
  Auto merged

73016f8f

Merge trift2.:/MySQL/M41/bug23504-4.1 · d37e1642

unknown authored Jun 07, 2007

into  trift2.:/MySQL/M50/push-5.0


netware/comp_err.def:
  Auto merged
netware/isamchk.def:
  Auto merged
netware/isamlog.def:
  Auto merged
netware/libmysql.def:
  Auto merged
netware/myisam_ftdump.def:
  Auto merged
netware/myisamchk.def:
  Auto merged
netware/myisamlog.def:
  Auto merged
netware/myisampack.def:
  Auto merged
netware/mysql.def:
  Auto merged
netware/mysql_install_db.def:
  Auto merged
netware/mysql_test_run.def:
  Auto merged
netware/mysql_waitpid.def:
  Auto merged
netware/mysqladmin.def:
  Auto merged
netware/mysqlbinlog.def:
  Auto merged
netware/mysqlcheck.def:
  Auto merged
netware/mysqld.def:
  Auto merged
netware/mysqld_safe.def:
  Auto merged
netware/mysqldump.def:
  Auto merged
netware/mysqlimport.def:
  Auto merged
netware/mysqlshow.def:
  Auto merged
netware/mysqltest.def:
  Auto merged
netware/pack_isam.def:
  Auto merged
netware/perror.def:
  Auto merged
netware/replace.def:
  Auto merged
netware/resolve_stack_dump.def:
  Auto merged
netware/resolveip.def:
  Auto merged
netware/my_print_defaults.def:
  Use 5.0 version

d37e1642

netware/*.def : Allocate 128K stack for all executables (bug#23504) · bc671e2f

unknown authored Jun 07, 2007


netware/comp_err.def:
  Allocate 128K stack for all executables (bug#23504)
netware/isamchk.def:
  Allocate 128K stack for all executables (bug#23504)
netware/isamlog.def:
  Allocate 128K stack for all executables (bug#23504)
netware/libmysql.def:
  Allocate 128K stack for all executables (bug#23504)
netware/my_print_defaults.def:
  Allocate 128K stack for all executables (bug#23504)
netware/myisam_ftdump.def:
  Allocate 128K stack for all executables (bug#23504)
netware/myisamchk.def:
  Allocate 128K stack for all executables (bug#23504)
netware/myisamlog.def:
  Allocate 128K stack for all executables (bug#23504)
netware/myisampack.def:
  Allocate 128K stack for all executables (bug#23504)
netware/mysql.def:
  Allocate 128K stack for all executables (bug#23504)
netware/mysql_install_db.def:
  Allocate 128K stack for all executables (bug#23504)
netware/mysql_test_run.def:
  Allocate 128K stack for all executables (bug#23504)
netware/mysql_waitpid.def:
  Allocate 128K stack for all executables (bug#23504)
netware/mysqladmin.def:
  Allocate 128K stack for all executables (bug#23504)
netware/mysqlbinlog.def:
  Allocate 128K stack for all executables (bug#23504)
netware/mysqlcheck.def:
  Allocate 128K stack for all executables (bug#23504)
netware/mysqld.def:
  Allocate 128K stack for all executables (bug#23504)
netware/mysqld_safe.def:
  Allocate 128K stack for all executables (bug#23504)
netware/mysqldump.def:
  Allocate 128K stack for all executables (bug#23504)
netware/mysqlimport.def:
  Allocate 128K stack for all executables (bug#23504)
netware/mysqlshow.def:
  Allocate 128K stack for all executables (bug#23504)
netware/mysqltest.def:
  Allocate 128K stack for all executables (bug#23504)
netware/pack_isam.def:
  Allocate 128K stack for all executables (bug#23504)
netware/perror.def:
  Allocate 128K stack for all executables (bug#23504)
netware/replace.def:
  Allocate 128K stack for all executables (bug#23504)
netware/resolve_stack_dump.def:
  Allocate 128K stack for all executables (bug#23504)
netware/resolveip.def:
  Allocate 128K stack for all executables (bug#23504)

bc671e2f

06 Jun, 2007 12 commits

Merge trift2.:/MySQL/M41/mysql-4.1 · 1811c893
unknown authored Jun 06, 2007
```
into  trift2.:/MySQL/M41/push-4.1
```
1811c893

Merge trift2.:/MySQL/M50/mysql-5.0 · cdf0327e

unknown authored Jun 06, 2007

into  trift2.:/MySQL/M50/push-5.0


CMakeLists.txt:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/ctype_cp932_binlog.test:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged

cdf0327e

Merge trift2.:/MySQL/M51/mysql-5.1 · 92a46e05

unknown authored Jun 06, 2007

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


BitKeeper/deleted/.del-CMakeLists.txt~1:
  Auto merged
CMakeLists.txt:
  Auto merged
mysql-test/extra/binlog_tests/ctype_cp932_binlog.test:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
sql/sql_parse.cc:
  Auto merged

92a46e05

Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-4.1 · cb17b801
unknown authored Jun 06, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/41
```
cb17b801
Merge trift2.:/MySQL/M50/push-5.0 · d05a9580
unknown authored Jun 06, 2007
```
into  trift2.:/MySQL/M51/push-5.1


configure.in:
  Auto merged
```
d05a9580

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb · 035b5005

unknown authored Jun 06, 2007

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-build


storage/ndb/src/kernel/vm/Configuration.cpp:
  Auto merged

035b5005

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-build · 6b81af5f

unknown authored Jun 06, 2007

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-build


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
storage/ndb/src/common/transporter/Packer.cpp:
  Auto merged
storage/ndb/src/common/transporter/TCP_Transporter.hpp:
  Auto merged
storage/ndb/src/common/transporter/TransporterRegistry.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/test/ndbapi/testNdbApi.cpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  SCCS merged

6b81af5f

Merge trift2.:/MySQL/M41/push-4.1 · 8a9e32bc

unknown authored Jun 06, 2007

into  trift2.:/MySQL/M50/push-5.0


configure.in:
  Version change in 4.1 does not propagate to 5.0

8a9e32bc

Merge trift2.:/MySQL/M41/mysql-4.1 · b33b1bc7
unknown authored Jun 06, 2007
```
into  trift2.:/MySQL/M41/push-4.1


configure.in:
  Auto merged
```
b33b1bc7
Raise version number after cloning 4.1.23 · d3e8ed2c
unknown authored Jun 06, 2007

d3e8ed2c

Merge trift2.:/MySQL/M50/mysql-5.0 · 7ffa8c91

unknown authored Jun 06, 2007

into  trift2.:/MySQL/M50/push-5.0


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged

7ffa8c91

mtr_report.pl: · 10a21ed0

unknown authored Jun 06, 2007

Add another exception to the acceptable mysqld errors, for test case for bug 28436

mysql-test/lib/mtr_report.pl:
Add another exception to the acceptable mysqld errors, for test case for bug 28436

10a21ed0

05 Jun, 2007 9 commits

ctype-bin.c: · 12ffd574

unknown authored Jun 06, 2007

  Post-merge fix warning


strings/ctype-bin.c:
  Post-merge fix warning

12ffd574

sql_prepare.cc: · 4a6f4be2

unknown authored Jun 05, 2007

  Post-merge fix (byte -> uchar)


sql/sql_prepare.cc:
  Post-merge fix (byte -> uchar)

4a6f4be2

Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/50 · 38cf3b52

unknown authored Jun 05, 2007

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/51


client/mysqldump.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

38cf3b52

Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1 · 6d7cd0b2

unknown authored Jun 05, 2007

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/51


client/mysqldump.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/innodb_mysql.result:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

6d7cd0b2

Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0 · f5bc5381

unknown authored Jun 05, 2007

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/50


client/mysqldump.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

f5bc5381

Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/50 · a31f2dde

unknown authored Jun 05, 2007

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/51


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

a31f2dde

Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/41 · bf70c5df
unknown authored Jun 05, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/50
```
bf70c5df

Merge poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca · ab4c64b4

unknown authored Jun 05, 2007

into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb


mysql-test/ndb/ndb_config_2_node.ini:
  Auto merged
storage/ndb/include/ndb_global.h.in:
  Auto merged
storage/ndb/src/common/portlib/NdbTick.c:
  Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/restore.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.hpp:
  Auto merged
storage/ndb/src/kernel/vm/WatchDog.cpp:
  Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
storage/ndb/tools/restore/Restore.cpp:
  Auto merged

ab4c64b4

Merge trift2.:/MySQL/M51/clone-5.1 · 893460d0

unknown authored Jun 05, 2007

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


sql/my_decimal.h:
  Auto merged
mysql-test/r/ps_2myisam.result:
  Do not use the "result" file from the 5.1.19 tree, rather the main one.
mysql-test/r/ps_3innodb.result:
  Do not use the "result" file from the 5.1.19 tree, rather the main one.
mysql-test/r/ps_4heap.result:
  Do not use the "result" file from the 5.1.19 tree, rather the main one.
mysql-test/r/ps_5merge.result:
  Do not use the "result" file from the 5.1.19 tree, rather the main one.
mysql-test/r/ps_7ndb.result:
  Do not use the "result" file from the 5.1.19 tree, rather the main one.

893460d0