Commits · c882180ca2001a7b74db6eef1bc80ff2af4f4c81 · nexedi / MariaDB

13 Jun, 2007 32 commits

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

unknown authored Jun 13, 2007

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


BitKeeper/triggers/post-commit:
  Auto merged

c882180c

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

unknown authored Jun 13, 2007

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


BitKeeper/triggers/post-commit:
  Auto merged

2745704d

fix. · ef4a6f85

unknown authored Jun 13, 2007


BitKeeper/triggers/post-commit:
  send to correct address.

ef4a6f85

Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build · db85e777
unknown authored Jun 13, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
```
db85e777
fix make_win_bin_dist typo · 0870757f
unknown authored Jun 13, 2007
```
scripts/make_win_bin_dist:
  add missing backslash
```
0870757f
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build · c1111301
unknown authored Jun 13, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
```
c1111301
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-build · 166c9e71
unknown authored Jun 13, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
```
166c9e71
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build · e34891e8
unknown authored Jun 13, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build


configure.in:
  Auto merged
```
e34891e8
Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-4.1-build · 0e1871d4
unknown authored Jun 13, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-build
```
0e1871d4
Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-build · f7e83ad5
unknown authored Jun 13, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build


configure.in:
  Auto merged
```
f7e83ad5

Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1-build · 742dfdb1

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:
  Auto merged

742dfdb1

Merge trift2.:/MySQL/M50/push-5.0 · 6fc77871

unknown authored Jun 13, 2007

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


configure.in:
  Auto merged
netware/comp_err.def:
  Auto merged
netware/isamchk.def:
  Auto merged
netware/isamlog.def:
  Auto merged
netware/libmysql.def:
  Auto merged
netware/my_print_defaults.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
sql/Makefile.am:
  Auto merged

6fc77871

Merge trift2.:/MySQL/M41/push-4.1 · a7a10615
unknown authored Jun 13, 2007
```
into  trift2.:/MySQL/M50/push-5.0
```
a7a10615

Merge trift2.:/MySQL/M50/merge-5.0 · 53999adf

unknown authored Jun 13, 2007

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


configure.in:
  Auto merged
netware/comp_err.def:
  Auto merged
netware/isamchk.def:
  Auto merged
netware/isamlog.def:
  Auto merged
netware/libmysql.def:
  Auto merged
netware/my_print_defaults.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
sql/Makefile.am:
  Keep the existing version, the only difference is formatting.

53999adf

Merge trift2.:/MySQL/M51/merge-5.1 · 2f2efed3

unknown authored Jun 13, 2007

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


configure.in:
  Auto merged
netware/comp_err.def:
  Auto merged
netware/isamchk.def:
  Auto merged
netware/isamlog.def:
  Auto merged
netware/libmysql.def:
  Auto merged
netware/my_print_defaults.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
sql/Makefile.am:
  Keep the existing version, the only difference is formatting.

2f2efed3

Merge trift2.:/MySQL/M50/push-5.0 · 19f42b7f

unknown authored Jun 13, 2007

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


scripts/make_win_bin_dist:
  To be done separate, later.

19f42b7f

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

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

efdeca9b

Merge trift2.:/MySQL/M50/merge-5.0 · ea571aad

unknown authored Jun 13, 2007

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


configure.in:
  Auto merged
netware/myisam_ftdump.def:
  Auto merged
netware/myisamchk.def:
  Auto merged
netware/myisamlog.def:
  Auto merged
netware/myisampack.def:
  Auto merged
sql/Makefile.am:
  Auto merged
libmysqld/lib_sql.cc:
  "real_id" is not needed in 5.1, so the change need not propagate.
sql/item_func.cc:
  "real_id" is not needed in 5.1, so the change need not propagate.

ea571aad

Merge trift2.:/MySQL/M41/tmp-4.1 · e076792b

unknown authored Jun 13, 2007

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


configure.in:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
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
sql/item_func.cc:
  Auto merged
netware/my_print_defaults.def:
  5.0 already has 128 kB stack size.
sql/Makefile.am:
  Manual merge.

e076792b

Merge trift2.:/MySQL/M41/tmp-4.1 · e13168f3
unknown authored Jun 13, 2007
```
into  trift2.:/MySQL/M41/push-4.1
```
e13168f3

sql/item_func.cc · 99db65d6

unknown authored Jun 13, 2007

    Improved check for thread identity in the "embedded" case,
    provided by Monty.
    
    This finishes the fixes for bug#27078.


sql/item_func.cc:
  Improved check for thread identity in the "embedded" case,
  provided by Monty.
  
  This finishes the fixes for bug#27078.

99db65d6

Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-post-commit · e28ab53f
unknown authored Jun 13, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
```
e28ab53f
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1 · 38fe729a
unknown authored Jun 13, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
```
38fe729a
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0 · ab247bbc
unknown authored Jun 13, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
```
ab247bbc
Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-4.1 · 16cb9d4d
unknown authored Jun 13, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1
```
16cb9d4d
Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0 · b20c21f1
unknown authored Jun 13, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0


configure.in:
  Auto merged
```
b20c21f1

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

unknown authored Jun 13, 2007

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


configure.in:
  null-merge version number change

28f0b4b1

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

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

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

c884bf4a

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

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.

6995970b

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

BK changes for · bc0baebf

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.

bc0baebf

12 Jun, 2007 1 commit

make_win_bin_dist: · 5c6259e6

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'

5c6259e6

11 Jun, 2007 2 commits
- Merge trift2.:/MySQL/M50/push-5.0 · baf70fb2
  unknown authored Jun 11, 2007
```
into  trift2.:/MySQL/M51/push-5.1
```
  baf70fb2
- Merge trift2.:/MySQL/M41/push-4.1 · 66c59ea6
  unknown authored Jun 11, 2007
```
into  trift2.:/MySQL/M50/push-5.0
```
  66c59ea6
08 Jun, 2007 1 commit

Add a cast, needed by some platforms. · 3737db15

unknown authored Jun 08, 2007

Still part of the fix for bug#27078.


libmysqld/lib_sql.cc:
  Some platforms need a cast.
  Still part of the fix for bug#27078.

3737db15

07 Jun, 2007 4 commits

Do not use the "thd" pointer to identify a thread in the embedded lib, · c78aea1e

unknown authored Jun 07, 2007

but rather use the "thread_id" counter.

Fixes bug#27078:
Compile error: lib_sql.cc cast from 'THD*' to 'pthread_t' loses precision


libmysqld/lib_sql.cc:
  Avoid casting a pointer to a (possibly) int, which will not compile on some platforms:
  Do not use the "thd" pointer to identify a thread in the embedded lib,
  but rather use the "thread_id" counter.
  
  Patch is proposed by Monty.  Fixes bug#27078.

c78aea1e

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

Merge trift2.:/MySQL/M50/push-5.0 · a7bb31a7

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

a7bb31a7

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

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

c06e3435