Commits · 993ac2550a24f58b738a56cbbbb6e065bfc81f40 · nexedi / MariaDB

15 Jun, 2007 2 commits

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

unknown authored Jun 15, 2007

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


BitKeeper/deleted/.del-CMakeLists.txt~7:
  Auto merged

993ac255

Added yassl and taocrypt sources to mysqlclientlib · fbe69396
unknown authored Jun 15, 2007
```
client/CMakeLists.txt:
  Fix for bug #27861: unresolved externals (yassl and taocrypt)
```
fbe69396

14 Jun, 2007 19 commits

Merge trift2.:/MySQL/M50/push-5.0 · 3a2f0418
unknown authored Jun 14, 2007
```
into  trift2.:/MySQL/M51/push-5.1


sql/item_func.cc:
  SCCS merged
```
3a2f0418
Merge trift2.:/MySQL/M41/push-4.1 · 56a20fea
unknown authored Jun 14, 2007
```
into  trift2.:/MySQL/M50/push-5.0
```
56a20fea
Merge trift2.:/MySQL/M41/mysql-4.1 · 77961c89
unknown authored Jun 14, 2007
```
into  trift2.:/MySQL/M41/push-4.1
```
77961c89

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

unknown authored Jun 14, 2007

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


sql/item_func.cc:
  Manual merge: thread identity check was gone from this place in main 5.0.

d25a72a1

Merge trift2.:/MySQL/M51/mysql-5.1 · 68ede71d
unknown authored Jun 14, 2007
```
into  trift2.:/MySQL/M51/push-5.1


sql/item_func.cc:
  Auto merged
```
68ede71d
Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt · 1fcf80e9
unknown authored Jun 14, 2007
```
into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
```
1fcf80e9
Merge mysql.com:/d2/hf/mrg/mysql-4.1-opt · f26f2e26
unknown authored Jun 14, 2007
```
into  mysql.com:/d2/hf/mrg/mysql-5.0-opt
```
f26f2e26
fix the binlog-stm_ps.test for the embedded-server · f3984865
unknown authored Jun 14, 2007
```
mysql-test/t/binlog_stm_ps.test:
  embedded server doesn't have binlogs
```
f3984865
Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt · 96484c21
unknown authored Jun 14, 2007
```
into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
```
96484c21

Merge magare.gmz:/home/kgeorge/mysql/work/valgrind-errs-5.0-opt · be2ac023

unknown authored Jun 14, 2007

into  magare.gmz:/home/kgeorge/mysql/work/valgrind-errs-5.1-opt


tests/mysql_client_test.c:
  manual merge 5.0-opt -> 5.1-opt

be2ac023

Merge bk-internal:/home/bk/mysql-5.0-opt · 19aa79e7
unknown authored Jun 14, 2007
```
into  magare.gmz:/home/kgeorge/mysql/work/valgrind-errs-merge-5.0-opt
```
19aa79e7
corrected valgrind problems for bug 28505 and 28934 · 5138dcd9
unknown authored Jun 14, 2007

5138dcd9

Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt · 89794f8f

unknown authored Jun 14, 2007

into  mysql.com:/d2/hf/mrg/mysql-5.1-opt


client/mysqltest.c:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
mysql-test/include/mix1.inc:
  merging
mysql-test/r/innodb_mysql.result:
  merging

89794f8f

Merge bk@192.168.21.1:mysql-5.1 · ac3f6914

unknown authored Jun 14, 2007

into  mysql.com:/d2/hf/mrg/mysql-5.1-opt


client/mysqltest.c:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
mysql-test/include/mix1.inc:
  merging
mysql-test/r/innodb_mysql.result:
  merging
sql/sql_select.cc:
  merging

ac3f6914

Merge bk@192.168.21.1:mysql-5.0 · ab5b1887

unknown authored Jun 14, 2007

into  mysql.com:/d2/hf/mrg/mysql-5.0-opt


client/mysqltest.c:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
mysql-test/r/innodb_mysql.result:
  merging
mysql-test/t/innodb_mysql.test:
  merging
sql/sql_select.cc:
  merging

ab5b1887

Merge bk@192.168.21.1:mysql-4.1 · 102d4c92
unknown authored Jun 14, 2007
```
into  mysql.com:/d2/hf/mrg/mysql-4.1-opt
```
102d4c92

Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt · fec318f4

unknown authored Jun 14, 2007

into  mysql.com:/d2/hf/mrg/mysql-5.1-opt


mysql-test/r/type_decimal.result:
  Auto merged
sql/item_func.cc:
  Auto merged

fec318f4

Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · dc50079b
unknown authored Jun 14, 2007
```
into  magare.gmz:/home/kgeorge/mysql/autopush/B28991-5.1-opt
```
dc50079b

Bug #28991: rpl_events failure in pushbuild · e5ec2aa4

unknown authored Jun 14, 2007

In tests waiting on a timeout is not deterministic enough
to make sure that an event actually finished executing.
Fixed the test by waiting in a loop and checking the effect
that the event is supposed to produce.


mysql-test/include/rpl_events.inc:
  Bug #28991: wait until event has taken effect

e5ec2aa4

13 Jun, 2007 19 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

Fixed bug #28980: the result of ROUND(<decimal expr>,<int column>) · 16d45603

unknown authored Jun 13, 2007

was erroneously converted to double, while the result of
ROUND(<decimal expr>, <int literal>) was preserved as decimal.
As a result of such a conversion the value of ROUND(D,A) could
differ from the value of ROUND(D,val(A)) if D was a decimal expression.

Now the result of the ROUND function is never converted to 
double if the first argument is decimal.  


mysql-test/r/type_decimal.result:
  Added a test case for bug #28980.
mysql-test/t/type_decimal.test:
  Added a test case for bug #28980.

16d45603

Merge mhansson@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · fb1c6c95
unknown authored Jun 13, 2007
```
into  dl145s.mysql.com:/users/mhansson/mysql/autopush/5.1o-bug27634
```
fb1c6c95
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