Commits · f5ac6edfd4c4b3cdfa89b32053ea19614392e15c · Kirill Smelkov / mariadb

06 Feb, 2007 24 commits

Fix merge error · f5ac6edf
unknown authored Feb 06, 2007

f5ac6edf

Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint · 508b3f35

unknown authored Feb 06, 2007

into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint


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

508b3f35

Correct the non working check for --skip-log-bin in "extra_opt" · 38ae0976
unknown authored Feb 06, 2007

38ae0976

Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint · eb6c1b26

unknown authored Feb 06, 2007

into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint


configure.in:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/range.result:
  Auto merged
mysql-test/t/range.test:
  Auto merged
mysys/default.c:
  Auto merged
scripts/mysqld_multi.sh:
  Auto merged
sql/field.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged

eb6c1b26

Merge pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint · 56e9231f

unknown authored Feb 06, 2007

into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint


configure.in:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/range.result:
  Auto merged
mysql-test/t/range.test:
  Auto merged
mysys/default.c:
  Auto merged
scripts/mysqld_multi.sh:
  Auto merged
sql/field.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Merfge backport

56e9231f

Merge 192.168.0.10:mysql/mysql-5.1-maint · a2a6839e

unknown authored Feb 06, 2007

into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint


BitKeeper/etc/collapsed:
  auto-union
configure.in:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/range.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
mysql-test/t/select.test:
  Auto merged
scripts/mysqld_multi.sh:
  Auto merged
sql/field.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

a2a6839e

Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint · 7bba59bb

unknown authored Feb 06, 2007

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint


configure.in:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/t/select.test:
  Auto merged
mysys/default.c:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
Makefile.am:
  SCCS merged

7bba59bb

Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1 · 8c6fe358

unknown authored Feb 06, 2007

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint


BitKeeper/etc/ignore:
  auto-union
Makefile.am:
  Auto merged
cmd-line-utils/readline/display.c:
  Auto merged
configure.in:
  Auto merged
extra/yassl/include/buffer.hpp:
  Auto merged
extra/yassl/include/crypto_wrapper.hpp:
  Auto merged
extra/yassl/include/yassl_imp.hpp:
  Auto merged
extra/yassl/include/yassl_int.hpp:
  Auto merged
extra/yassl/src/crypto_wrapper.cpp:
  Auto merged
extra/yassl/taocrypt/include/algebra.hpp:
  Auto merged
extra/yassl/taocrypt/include/des.hpp:
  Auto merged
extra/yassl/taocrypt/include/hash.hpp:
  Auto merged
extra/yassl/taocrypt/include/hmac.hpp:
  Auto merged
extra/yassl/taocrypt/include/modarith.hpp:
  Auto merged
extra/yassl/taocrypt/include/modes.hpp:
  Auto merged
extra/yassl/taocrypt/include/rsa.hpp:
  Auto merged
extra/yassl/taocrypt/include/type_traits.hpp:
  Auto merged
extra/yassl/taocrypt/mySTL/list.hpp:
  Auto merged
extra/yassl/taocrypt/src/aes.cpp:
  Auto merged
extra/yassl/taocrypt/src/algebra.cpp:
  Auto merged
extra/yassl/taocrypt/src/asn.cpp:
  Auto merged
extra/yassl/testsuite/testsuite.cpp:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/mysqltest.result:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
mysys/default.c:
  Auto merged
sql/field.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/net_serv.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql-common/client.c:
  Auto merged
sql/sql_select.cc:
  Auto merged
extra/yassl/taocrypt/test/test.cpp:
  Manual merge
mysql-test/r/grant.result:
  Manual merge
mysql-test/r/select.result:
  Manual merge
mysql-test/t/grant.test:
  Manual merge
mysql-test/t/select.test:
  Manual merge
sql/field.h:
  Manual merge
sql/mysqld.cc:
  Manual merge

8c6fe358

Fix windows build · 2470806f
unknown authored Feb 06, 2007

2470806f

Merge 192.168.0.10:mysql/mysql-5.0-maint · dcafc4c4

unknown authored Feb 06, 2007

into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint


mysql-test/mysql-test-run.pl:
  Auto merged
sql/item_timefunc.cc:
  Auto merged

dcafc4c4

Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 · 56820e1c

unknown authored Feb 06, 2007

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


Makefile.am:
  Auto merged
configure.in:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysys/default.c:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
mysql-test/r/select.result:
  Manual merge
mysql-test/t/select.test:
  Manual merge

56820e1c

Merge 192.168.0.10:mysql/mysql-4.1-maint · 31aee856

unknown authored Feb 06, 2007

into  pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint


mysys/default.c:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged

31aee856

Merge neptunus.(none):/home/msvensson/mysql/my41-nmj · b93d81a8
unknown authored Feb 06, 2007
```
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint


sql/sql_prepare.cc:
  Auto merged
```
b93d81a8

Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint · 4c8f6078

unknown authored Feb 06, 2007

into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint


BitKeeper/etc/collapsed:
  auto-union
configure.in:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/cast.result:
  Auto merged
mysql-test/r/range.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/t/cast.test:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
mysql-test/t/select.test:
  Auto merged
scripts/mysqld_multi.sh:
  Auto merged
sql/field.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

4c8f6078

Merge pilot.mysql.com:/home/msvensson/mysql/bug24805/my50-bug24805 · 14e7f52f

unknown authored Feb 06, 2007

into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged

14e7f52f

Merge bk-internal:/home/bk/mysql-4.1-maint · 4660f6d5
unknown authored Feb 06, 2007
```
into  pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint
```
4660f6d5

Merge 192.168.0.10:mysql/mysql-4.1-maint · f58351c1

unknown authored Feb 06, 2007

into  pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint


sql/sql_prepare.cc:
  Auto merged

f58351c1

Merge pilot.mysql.com:/home/msvensson/mysql/bug24805/my50-bug24805 · 618c8c87

unknown authored Feb 06, 2007

into  pilot.mysql.com:/home/msvensson/mysql/bug24805/my51-bug24805


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/disabled.def:
  Manual merge

618c8c87

Bug#24805 mtr.pl can't handle test with --disable-log-bin · 04b52251

unknown authored Feb 06, 2007

- Don't give mysqld the --log-bin argument if .opt file
  contains --skip-log-bin
- Enable flush2 test


mysql-test/mysql-test-run.pl:
  Don't give mysqld the --log-bin argument if .opt file contains --skip-log-bin 
  Don't pass mysqld --binlog-format=s if --skip-log-bin
mysql-test/t/disabled.def:
  Enable flush2
mysql-test/t/flush2-master.opt:
  Use --skip-log-bin in flush2 to test flush without bin logging

04b52251

Bug#8983 one place that isn't strict-aliasing-safe · 1d2d9a03

unknown authored Feb 06, 2007

 - Backport fix from 5.0


sql/sql_prepare.cc:
  Avoid problems with -no-strict-aliasing in gcc 4.0+

1d2d9a03

Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint · aff6c2e7

unknown authored Feb 06, 2007

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint


BitKeeper/etc/collapsed:
  auto-union
configure.in:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/range.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/t/select.test:
  Auto merged
scripts/mysqld_multi.sh:
  Auto merged
sql/field.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

aff6c2e7

Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maint · 70323365
unknown authored Feb 06, 2007
```
into  mysql.com:/usr/home/ram/work/bug23938/my41-bug23938


sql/item_timefunc.cc:
  Auto merged
```
70323365
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · e976ea37
unknown authored Feb 06, 2007
```
into  mysql.com:/usr/home/ram/work/bug23938/my50-bug23938


sql/item_timefunc.cc:
  Auto merged
```
e976ea37

Merge mysql.com:/usr/home/ram/work/bug23938/my41-bug23938 · 61b286e4

unknown authored Feb 06, 2007

into  mysql.com:/usr/home/ram/work/bug23938/my50-bug23938


sql/item_timefunc.cc:
  Auto merged
mysql-test/r/cast.result:
  SCCS merged
mysql-test/t/cast.test:
  SCCS merged

61b286e4

05 Feb, 2007 6 commits

Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1 · c52165de

unknown authored Feb 05, 2007

into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines


BUILD/SETUP.sh:
  Auto merged
Makefile.am:
  Auto merged
client/mysql.cc:
  Auto merged
configure.in:
  Auto merged
include/my_global.h:
  Auto merged
include/my_pthread.h:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
mysys/default.c:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
storage/myisammrg/ha_myisammrg.cc:
  Auto merged
storage/myisam/ha_myisam.cc:
  Manually merged.

c52165de

Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maint · 30edb3cd
unknown authored Feb 05, 2007
```
into  mysql.com:/usr/home/ram/work/bug10798/my41-bug10798


sql/slave.cc:
  Auto merged
```
30edb3cd
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint · 9e639bac
unknown authored Feb 05, 2007
```
into  mysql.com:/usr/home/ram/work/bug10798/my51-bug10798


sql/slave.cc:
  Auto merged
```
9e639bac
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · cbace0b7
unknown authored Feb 05, 2007
```
into  mysql.com:/usr/home/ram/work/bug10798/my50-bug10798


sql/slave.cc:
  Auto merged
```
cbace0b7
Merge mysql.com:/usr/home/ram/work/bug10798/my50-bug10798 · aaf1a39b
unknown authored Feb 05, 2007
```
into  mysql.com:/usr/home/ram/work/bug10798/my51-bug10798


sql/slave.cc:
  Auto merged
```
aaf1a39b
Merge mysql.com:/usr/home/ram/work/bug10798/my41-bug10798 · f27ea1b1
unknown authored Feb 05, 2007
```
into  mysql.com:/usr/home/ram/work/bug10798/my50-bug10798


sql/slave.cc:
  merging
```
f27ea1b1

04 Feb, 2007 2 commits
- Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 · 26f9af9f
  unknown authored Feb 05, 2007
```
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
```
  26f9af9f
- Fixed bug#26027 · 72413cb6
  unknown authored Feb 04, 2007
```
Just a bad copy/paste of help info


client/mysqlslap.c:
  Fixed for bad option name
```
  72413cb6
03 Feb, 2007 3 commits

Merge chilla.local:/home/mydev/mysql-5.0-axmrg · 34414314

unknown authored Feb 03, 2007

into  chilla.local:/home/mydev/mysql-5.1-axmrg


mysql-test/Makefile.am:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
storage/csv/ha_tina.cc:
  Auto merged
storage/csv/ha_tina.h:
  Auto merged

34414314

Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 9e01ae9f

unknown authored Feb 03, 2007

into  chilla.local:/home/mydev/mysql-5.1-axmrg


BUILD/SETUP.sh:
  Auto merged
configure.in:
  Auto merged
BitKeeper/deleted/.del-my_create_tables.c~c121a0c4c427ebb:
  Auto merged
BitKeeper/deleted/.del-my_manage.c~4de50e721d227d19:
  Auto merged
BitKeeper/deleted/.del-my_manage.h~9d2cbc1e8bc894f:
  Auto merged
BitKeeper/deleted/.del-mysql.dsw~7ea9e16395f139f4:
  Auto merged
BitKeeper/deleted/.del-mysql.sln~76a9ff1e793b3547:
  Auto merged
BitKeeper/deleted/.del-mysql_test_run_new.c~a23ab2c4b28b25ad:
  Auto merged
BitKeeper/deleted/.del-mysql_test_run_new.dsp~9d8078f3f02fcc8e:
  Auto merged
BitKeeper/deleted/.del-mysql_test_run_new.vcproj~1ddaed30361efefe:
  Auto merged
BitKeeper/deleted/.del-mysql_test_run_new_ia64.dsp~e7ee71ec8d2995e3:
  Auto merged
client/mysql.cc:
  Auto merged
mysql-test/Makefile.am:
  Auto merged
sql/gen_lex_hash.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysqld.cc:
  Manual merged
support-files/mysql.spec.sh:
  Manual merged

9e01ae9f

After merge fix · d3c1511a
unknown authored Feb 03, 2007

d3c1511a

02 Feb, 2007 5 commits

Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1 · 3f3d9093

unknown authored Feb 03, 2007

into  a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1


BUILD/SETUP.sh:
  Auto merged
client/mysql.cc:
  Auto merged
configure.in:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_plugin.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
storage/archive/ha_archive.cc:
  Auto merged
plugin/daemon_example/daemon_example.cc:
  Merged with main 5.1
sql/mysqld.cc:
  Merged with main 5.1

3f3d9093

Merge chilla.local:/home/mydev/mysql-4.1-axmrg · 8a9c521b

unknown authored Feb 02, 2007

into  chilla.local:/home/mydev/mysql-5.0-axmrg


sql/handler.cc:
  Auto merged
sql/examples/ha_tina.cc:
  Auto merged
sql/examples/ha_tina.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
mysql-test/Makefile.am:
  Manual merged

8a9c521b

Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 3c0aca02
unknown authored Feb 02, 2007
```
into  chilla.local:/home/mydev/mysql-5.0-axmrg


sql/item_func.cc:
  Auto merged
```
3c0aca02
Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 0dc19dad
unknown authored Feb 02, 2007
```
into  chilla.local:/home/mydev/mysql-4.1-axmrg
```
0dc19dad
After merge fix · 98b9ac69
unknown authored Feb 02, 2007

98b9ac69