Commits · cbb364b78c54bc207464b20272a6e148c0ec3f1e · Kirill Smelkov / mariadb

15 Jun, 2007 1 commit
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build · cbb364b7
  unknown authored Jun 15, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work
```
  cbb364b7
14 Jun, 2007 19 commits

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


sql/item_func.cc:
  SCCS merged
```
78d4f418
Merge trift2.:/MySQL/M41/push-4.1 · 863a953e
unknown authored Jun 14, 2007
```
into  trift2.:/MySQL/M50/push-5.0
```
863a953e
Merge trift2.:/MySQL/M41/mysql-4.1 · e4c320bf
unknown authored Jun 14, 2007
```
into  trift2.:/MySQL/M41/push-4.1
```
e4c320bf

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

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.

d0d6c42c

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


sql/item_func.cc:
  Auto merged
```
45eddbdc
Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt · f6a7490c
unknown authored Jun 14, 2007
```
into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
```
f6a7490c
Merge mysql.com:/d2/hf/mrg/mysql-4.1-opt · bcd6183f
unknown authored Jun 14, 2007
```
into  mysql.com:/d2/hf/mrg/mysql-5.0-opt
```
bcd6183f
fix the binlog-stm_ps.test for the embedded-server · 854353dd
unknown authored Jun 14, 2007
```
mysql-test/t/binlog_stm_ps.test:
  embedded server doesn't have binlogs
```
854353dd
Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt · d1614ae9
unknown authored Jun 14, 2007
```
into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
```
d1614ae9

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

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

db17ac9f

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

f0000401

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

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

dbc4abca

Merge bk@192.168.21.1:mysql-5.1 · 0662a9b7

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

0662a9b7

Merge bk@192.168.21.1:mysql-5.0 · 6f168d12

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

6f168d12

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

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

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

167751b3

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

Bug #28991: rpl_events failure in pushbuild · 37559e3d

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

37559e3d

13 Jun, 2007 20 commits

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

unknown authored Jun 13, 2007

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


BitKeeper/triggers/post-commit:
  Auto merged

ddc4aeb5

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

unknown authored Jun 13, 2007

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


BitKeeper/triggers/post-commit:
  Auto merged

6f5a6162

fix. · 4f60c511

unknown authored Jun 13, 2007


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

4f60c511

Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build · 476d23a9
unknown authored Jun 13, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
```
476d23a9
fix make_win_bin_dist typo · d1ee00ac
unknown authored Jun 13, 2007
```
scripts/make_win_bin_dist:
  add missing backslash
```
d1ee00ac

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

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.

c0ebdff9

Merge mhansson@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · 1ab7b066
unknown authored Jun 13, 2007
```
into  dl145s.mysql.com:/users/mhansson/mysql/autopush/5.1o-bug27634
```
1ab7b066
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build · 89ec16ac
unknown authored Jun 13, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
```
89ec16ac
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-build · 519e6451
unknown authored Jun 13, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
```
519e6451
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build · 253f994a
unknown authored Jun 13, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build


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


configure.in:
  Auto merged
```
f442dd9a
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build · 077e7306
unknown authored Jun 13, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work
```
077e7306

Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1-build · 659387db

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

659387db

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

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

6adb9d8f

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

Merge trift2.:/MySQL/M50/merge-5.0 · 9411bffb

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.

9411bffb

Merge trift2.:/MySQL/M51/merge-5.1 · b9416f20

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.

b9416f20

Merge trift2.:/MySQL/M50/push-5.0 · 541c5c6e

unknown authored Jun 13, 2007

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


scripts/make_win_bin_dist:
  To be done separate, later.

541c5c6e

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