Commits · 9e01ae9f2ce8fc20ee0d969f2fffcef1bca134b1 · nexedi / MariaDB

03 Feb, 2007 1 commit

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

02 Feb, 2007 7 commits

After merge fix · 4df381fd
unknown authored Feb 02, 2007

4df381fd
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · 13390deb
unknown authored Feb 02, 2007
```
into  trift2.:/MySQL/M51/push-5.1


sql/item_func.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
```
13390deb

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

unknown authored Feb 02, 2007

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


include/my_pthread.h:
  Auto merged
include/thr_alarm.h:
  Auto merged
mysys/my_pthread.c:
  Auto merged
mysys/my_thr_init.c:
  Auto merged

141080fa

after merge fix · c01bbd33

unknown authored Feb 02, 2007


mysql-test/r/ndb_read_multi_range.result:
  result fix
mysql-test/t/ndb_read_multi_range.test:
  test case fix

c01bbd33

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

unknown authored Feb 02, 2007

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


include/my_pthread.h:
  Auto merged
include/thr_alarm.h:
  Auto merged
mysys/my_pthread.c:
  Auto merged
mysys/my_thr_init.c:
  Auto merged

d03d2987

After merge fix · 5305cd7c
unknown authored Feb 02, 2007

5305cd7c

Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt · ed0e4a96

unknown authored Feb 02, 2007

into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt


mysql-test/r/distinct.result:
  Auto merged
mysql-test/r/join_nested.result:
  Auto merged
mysql-test/r/null_key.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/r/subselect3.result:
  Auto merged
mysql-test/r/trigger.result:
  Auto merged
mysql-test/t/select.test:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
mysql-test/t/trigger.test:
  Auto merged
sql/filesort.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_sum.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_parse.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
mysql-test/r/func_time.result:
  manual merge
mysql-test/r/information_schema.result:
  manual merge
mysql-test/t/func_time.test:
  manual merge
mysql-test/t/information_schema.test:
  manual merge
sql/opt_range.cc:
  manual merge
sql/sql_delete.cc:
  manual merge
sql/sql_lex.h:
  manual merge

ed0e4a96

01 Feb, 2007 20 commits

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

unknown authored Feb 01, 2007

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


client/mysql.cc:
  Auto merged
include/my_global.h:
  Auto merged
include/thr_alarm.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/r/ps.result:
  Auto merged
mysql-test/r/symlink.result:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
mysql-test/t/symlink.test:
  Auto merged
mysys/default.c:
  Auto merged
mysys/my_pthread.c:
  Auto merged
mysys/my_thr_init.c:
  Auto merged
mysys/thr_alarm.c:
  Auto merged
sql/field_conv.cc:
  Auto merged
sql/gen_lex_hash.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
vio/viosslfactories.c:
  Auto merged
BitKeeper/deleted/.del-mysqld.cc.rej:
  Delete: sql/mysqld.cc.rej
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:
  Null merged
BitKeeper/deleted/.del-mysql.sln~76a9ff1e793b3547:
  Null 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
BUILD/SETUP.sh:
  Manual merged
Makefile.am:
  Manual merged
configure.in:
  Manual merged
include/my_pthread.h:
  Manual merged
mysql-test/Makefile.am:
  Manual merged
sql/mysqld.cc:
  Manual merged
support-files/mysql.spec.sh:
  Manual merged

baddc8bd

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

unknown authored Feb 01, 2007

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


BitKeeper/deleted/.del-valgrind.supp:
  Delete: mysql-test/valgrind.supp
mysql-test/r/ps.result:
  SCCS merged
mysql-test/r/symlink.result:
  Null merged
mysql-test/t/ps.test:
  SCCS merged
mysql-test/t/symlink.test:
  Null merged
sql/field_conv.cc:
  Null merged
sql/mysqld.cc:
  Null merged
vio/viosslfactories.c:
  Null merged

cd4670a7

Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · da984b33

unknown authored Feb 01, 2007

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


BUILD/SETUP.sh:
  Auto merged
configure.in:
  Auto merged

da984b33

Bug#23299 Some queries against INFORMATION_SCHEMA with subqueries fail · a3083046

unknown authored Feb 01, 2007

additional call of file->extra() method with HA_EXTRA_NO_CACHE parameter


mysql-test/r/information_schema.result:
  test result
mysql-test/t/information_schema.test:
  test case
sql/sql_show.cc:
  additional call of file->extra() method with HA_EXTRA_NO_CACHE parameter

a3083046

Bug#25844: "make test" does not find mysql-test-run.pl · 8c2c5271
unknown authored Feb 01, 2007
```
Need to change directory before calling mysql-test-run.pl
```
8c2c5271
Merge trift2.:/MySQL/M51/mysql-5.1 · f20a72e1
unknown authored Feb 01, 2007
```
into  trift2.:/MySQL/M51/push-5.1
```
f20a72e1

Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 5698114c

unknown authored Feb 01, 2007

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


mysql-test/r/symlink.result:
  Auto merged
mysql-test/t/symlink.test:
  Auto merged
sql/mysqld.cc:
  Auto merged

5698114c

Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 42236fd9
unknown authored Feb 01, 2007
```
into  chilla.local:/home/mydev/mysql-5.1-axmrg


mysql-test/t/merge.test:
  Auto merged
```
42236fd9

Valgrind error fixes · 2df29225

unknown authored Feb 01, 2007

Notes:
This patch doesn't fix all issues in the tree and we need jani's fix for that
This patch shoud not be merged into 5.0


mysql-test/r/ps.result:
  result fix
mysql-test/r/symlink.result:
  result fix
mysql-test/t/ps.test:
  test is moved to 'symlink' test
mysql-test/t/symlink.test:
  test from 'ps' test
sql/field_conv.cc:
  valgrind error fix: backport from 5.0
sql/mysqld.cc:
  release of ssl_context
vio/viosslfactories.c:
  release of ssl_context
mysql-test/valgrind.supp:
  New BitKeeper file ``mysql-test/valgrind.supp''
  This file is backported from 5.0, added suppressing of OpenSSL errors

2df29225

Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 1ff126e9
unknown authored Feb 01, 2007
```
into  rakia.gmz:/home/kgeorge/mysql/autopush/B23556-5.0-opt
```
1ff126e9

trigger.result: · 0c523325

unknown authored Feb 01, 2007

  merge of the 5.0-opt tree


mysql-test/r/trigger.result:
  merge of the 5.0-opt tree

0c523325

Merge chilla.local:/home/mydev/mysql-4.1-axmrg · 8772cb16

unknown authored Feb 01, 2007

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


include/my_global.h:
  Auto merged
include/thr_alarm.h:
  Auto merged
mysys/my_pthread.c:
  Auto merged
mysys/thr_alarm.c:
  Auto merged
include/my_pthread.h:
  Manual merged
mysys/default.c:
  Manual merged
mysys/my_thr_init.c:
  Manual merged
sql/mysqld.cc:
  Manual merged

8772cb16

Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 020e82c6

unknown authored Feb 01, 2007

into  rakia.gmz:/home/kgeorge/mysql/autopush/B23556-5.0-opt


mysql-test/t/trigger.test:
  Auto merged
sql/sql_delete.cc:
  Auto merged

020e82c6

Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · 4ebef052

unknown authored Feb 01, 2007

into  rakia.gmz:/home/kgeorge/mysql/autopush/B23556-5.1-opt


mysql-test/r/grant.result:
  Auto merged
mysql-test/t/grant.test:
  Auto merged
sql/sql_parse.cc:
  Auto merged

4ebef052

Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 6bddf2a0
unknown authored Feb 01, 2007
```
into  rakia.gmz:/home/kgeorge/mysql/autopush/B25551-5.0-opt


sql/sql_select.cc:
  Auto merged
```
6bddf2a0
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-engines · ad7a4ebb
unknown authored Feb 01, 2007
```
into  chilla.local:/home/mydev/mysql-5.0-axmrg
```
ad7a4ebb

Merge chilla.local:/home/mydev/mysql-4.0-axmrg · 62fdcb54

unknown authored Feb 01, 2007

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


include/my_global.h:
  Auto merged
include/my_pthread.h:
  Auto merged
include/thr_alarm.h:
  Auto merged
mysys/default.c:
  Auto merged
mysys/my_pthread.c:
  Auto merged
mysys/thr_alarm.c:
  Auto merged
mysys/my_thr_init.c:
  Manual merged
sql/mysqld.cc:
  Manual merged

62fdcb54

Merge bk-internal.mysql.com:/home/bk/mysql-4.1-engines · a94b1b50
unknown authored Feb 01, 2007
```
into  chilla.local:/home/mydev/mysql-4.1-axmrg
```
a94b1b50

Reworked a section of code that caused valgrind errors (and that partitioning... · f1be4063

unknown authored Jan 31, 2007

Reworked a section of code that caused valgrind errors (and that partitioning was not happy about). 


storage/archive/ha_archive.cc:
  Put checks around the code

f1be4063

Fixed bug #25407. · c15b2e41

unknown authored Jan 31, 2007

The bug could cause choosing a sub-optimal execution plan for 
a single-table query if a unique index with many null keys were 
defined for the table. 
It happened because the code of the check_quick_keys function 
made an assumption that any key may occur in an unique index 
only once. Yet this is not true for keys with nulls that may 
have multiple occurrences in the index.


mysql-test/r/null_key.result:
  Fixed bug #25407
  Adjusted result after the fix.
mysql-test/r/select.result:
  Added a test case for bug #25407.
mysql-test/t/select.test:
  Added a test case for bug #25407.

c15b2e41

31 Jan, 2007 12 commits
- use MTR_BUILD_THREAD=auto for rpm builds · 5ab91b8e
  unknown authored Jan 31, 2007
```
support-files/mysql.spec.sh:
  use MTR_BUILD_THREAD=auto
```
  5ab91b8e
- Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work · 79728607
  unknown authored Jan 31, 2007
```
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build-work


support-files/mysql.spec.sh:
  merge fix
```
  79728607
- Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build · 4a7724b7
  unknown authored Jan 31, 2007
```
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work


support-files/mysql.spec.sh:
  Auto merged
```
  4a7724b7
- Merge trift2.:/MySQL/M50/push-5.0 · bd49a2df
  unknown authored Jan 31, 2007
```
into  trift2.:/MySQL/M51/push-5.1


client/mysql.cc:
  Auto merged
configure.in:
  Auto merged
```
  bd49a2df
- MTR_BUILD_THREAD=auto for test runs during RPM build · 50c3198d
  unknown authored Jan 31, 2007
```
support-files/mysql.spec.sh:
  MTR_BUILD_THREAD=auto for test runs
```
  50c3198d
- Merge trift2.:/MySQL/M50/bug23293-5.0 · 717850d3
  unknown authored Jan 31, 2007
```
into  trift2.:/MySQL/M50/push-5.0
```
  717850d3
- Merge trift2.:/MySQL/M50/bug12676-5.0 · 30b90282
  unknown authored Jan 31, 2007
```
into  trift2.:/MySQL/M50/push-5.0


configure.in:
  Auto merged
```
  30b90282
- Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · c118eeae
  unknown authored Jan 31, 2007
```
into  olga.mysql.com:/home/igor/mysql-5.0-opt
```
  c118eeae
- Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 0375a7a8
  unknown authored Jan 31, 2007
```
into  mysql.com:/home/hf/work/25973/my50-25973
```
  0375a7a8
- merging · 036314d9
  unknown authored Jan 31, 2007
```
mysql-test/t/ps_1general.test:
  replace_result fixed
```
  036314d9
- Merge mysql.com:/home/svoj/devel/mysql/WL3567/mysql-5.0-engines · 09b394b6
  unknown authored Jan 31, 2007
```
into  mysql.com:/home/svoj/devel/mysql/WL3567/mysql-5.1-engines


mysql-test/r/merge.result:
  Auto merged
mysql-test/t/merge.test:
  Auto merged
storage/myisam/ha_myisam.cc:
  Manually merged.
storage/myisammrg/ha_myisammrg.cc:
  Manually merged.
```
  09b394b6
- After merge fix (WL#3567). · 8233b914
  unknown authored Jan 31, 2007
  
  8233b914