Commits · a551b21e93f4ae1dabc8afea1f1b45e364531e92 · nexedi / MariaDB

30 Nov, 2006 1 commit
- Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build · a551b21e
  unknown authored Nov 30, 2006
```
into  trift2.:/MySQL/M51/push-5.1
```
  a551b21e
29 Nov, 2006 22 commits

Merge mysql.com:/home/kent/bk/mysql-5.0-build · 387ee8b4
unknown authored Nov 29, 2006
```
into  mysql.com:/home/kent/bk/mysql-5.1-build


Makefile.am:
  Auto merged
```
387ee8b4
Merge mysql.com:/home/kent/bk/mysql-4.1-build · e79e0c82
unknown authored Nov 29, 2006
```
into  mysql.com:/home/kent/bk/mysql-5.0-build


Makefile.am:
  SCCS merged
```
e79e0c82

unknown authored Nov 29, 2006

  Remove soft links before creating source TAR, to avoid file copies (bug#11865)


Makefile.am:
  Remove soft links before creating source TAR, to avoid file copies (bug#11865)

dd1f0848

Merge mysql.com:/home/kent/bk/mysql-5.0-build · 1fc92afe
unknown authored Nov 29, 2006
```
into  mysql.com:/home/kent/bk/mysql-5.1-build


Makefile.am:
  Auto merged
```
1fc92afe

Makefile.am: · 081caba6

unknown authored Nov 29, 2006

  Corrected change to create "win" directory


Makefile.am:
  Corrected change to create "win" directory

081caba6

Merge mysql.com:/home/kent/bk/mysql-5.0-build · dc9350ed
unknown authored Nov 29, 2006
```
into  mysql.com:/home/kent/bk/mysql-5.1-build


Makefile.am:
  Auto merged
```
dc9350ed

Makefile.am: · 07469e3c

unknown authored Nov 29, 2006

  "make distcheck" fix, "win" directory


Makefile.am:
  "make distcheck" fix, "win" directory

07469e3c

Merge trift2.:/MySQL/M51/mysql-5.1 · ff16d872
unknown authored Nov 29, 2006
```
into  trift2.:/MySQL/M51/push-5.1


sql-common/my_time.c:
  Auto merged
```
ff16d872

Many files: · c41da42c

unknown authored Nov 29, 2006

  Changed paths to ndb include directory to include "storage"
Makefile.am:
  Adjusted path to yaSSL libtool libraries
ssl.m4:
  Use libtool way of specifying yaSSL libraries


config/ac-macros/ssl.m4:
  Use libtool way of specifying yaSSL libraries
libmysqld/Makefile.am:
  Adjusted path to yaSSL libtool libraries
storage/ndb/config/type_kernel.mk.am:
  Changed paths to ndb include directory to include "storage"
storage/ndb/config/type_ndbapi.mk.am:
  Changed paths to ndb include directory to include "storage"
storage/ndb/config/type_ndbapitest.mk.am:
  Changed paths to ndb include directory to include "storage"
storage/ndb/config/type_ndbapitools.mk.am:
  Changed paths to ndb include directory to include "storage"
storage/ndb/config/type_util.mk.am:
  Changed paths to ndb include directory to include "storage"

c41da42c

Merge mysql.com:/home/kent/bk/mysql-5.0-build · c68df141

unknown authored Nov 29, 2006

into  mysql.com:/home/kent/bk/mysql-5.1-build


Docs/Makefile.am:
  Auto merged
extra/yassl/taocrypt/benchmark/benchmark.dsp:
  Auto merged
extra/yassl/taocrypt/taocrypt.dsp:
  Auto merged
extra/yassl/taocrypt/taocrypt.vcproj:
  Auto merged
extra/yassl/taocrypt/test.dsp:
  Auto merged
extra/yassl/testsuite/testsuite.dsp:
  Auto merged
extra/yassl/yassl.dsp:
  Auto merged
extra/yassl/yassl.vcproj:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
mysql-test/t/type_newdecimal.test:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql-common/client.c:
  Auto merged
sql-common/my_time.c:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/table.cc:
  Auto merged
strings/decimal.c:
  Auto merged

c68df141

Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1 · f0dd9dd3
unknown authored Nov 29, 2006
```
into  mysql.com:/home/kent/bk/mysql-5.1-build


sql-common/my_time.c:
  Auto merged
```
f0dd9dd3
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-build · 4c2a1ef0
unknown authored Nov 29, 2006
```
into  mysql.com:/home/kent/bk/mysql-5.1-build


mysql-test/mysql-test-run.pl:
  Auto merged
```
4c2a1ef0
Merge mysql.com:/home/kent/bk/mysql-4.1-build · 0907cd18
unknown authored Nov 29, 2006
```
into  mysql.com:/home/kent/bk/mysql-5.0-build
```
0907cd18
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build · f8552587
unknown authored Nov 29, 2006
```
into  trift2.:/MySQL/M51/push-5.1
```
f8552587
Merge trift2.:/MySQL/M51/mysql-5.1 · c162a0e3
unknown authored Nov 29, 2006
```
into  trift2.:/MySQL/M51/push-5.1


sql-common/my_time.c:
  Auto merged
```
c162a0e3
Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build · 90ac2513
unknown authored Nov 29, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work
```
90ac2513

Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build · e5cdaadc

unknown authored Nov 29, 2006

into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work


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

e5cdaadc

Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work · 8d2295b5
unknown authored Nov 29, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build


mysql-test/mysql-test-run.pl:
  Auto merged
```
8d2295b5

Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work · d1f8c80b

unknown authored Nov 29, 2006

into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work


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

d1f8c80b

minor fix · 45366d19

unknown authored Nov 29, 2006


mysql-test/mysql-test-run.pl:
  remove dependency on Data::Dumper, it's not used anywhere

45366d19

Merge bk-internal:/home/bk/mysql-5.1 · 76a41731

unknown authored Nov 29, 2006

into  dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-5.1-opt


sql/sql_parse.cc:
  Auto merged

76a41731

Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1 · bc13ba1b
unknown authored Nov 29, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build
```
bc13ba1b

28 Nov, 2006 17 commits

Merge trift2.:/MySQL/M51/mysql-5.1 · a0bb290b
unknown authored Nov 28, 2006
```
into  trift2.:/MySQL/M51/push-5.1
```
a0bb290b

Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-build · f6ad589b

unknown authored Nov 28, 2006

into  mysql.com:/home/kent/bk/mysql-5.1-build


client/mysql_upgrade.c:
  Auto merged
mysql-test/lib/mtr_report.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
sql-common/my_time.c:
  Auto merged

f6ad589b

Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 79e7d778
unknown authored Nov 28, 2006
```
into  bodhi.local:/opt/local/work/mysql-5.1-24486


sql/sql_parse.cc:
  Auto merged
```
79e7d778

Merge kahlann.erinye.com:/home/df/mysql/build/51 · 722b5cba

unknown authored Nov 28, 2006

into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build-merge


client/mysql_upgrade.c:
  Auto merged
mysql-test/lib/mtr_report.pl:
  Auto merged
sql-common/my_time.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  SCCS merged

722b5cba

A fix for Bug#24486 "Valgrind warnings: sp_head(), · 31855d98

unknown authored Nov 28, 2006

deadlock_innodb:events_grant". This was a memory leak introduced by 
the patch for Bug 22830.
Post-review fixes.


sql/sql_parse.cc:
  A fix for Bug#24486 "Valgrind warnings: sp_head(),
   deadlock_innodb:events_grant": delete the sphead object before
  returning with an error.

31855d98

Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0-build · 9a132e36
unknown authored Nov 28, 2006
```
into  trift2.:/MySQL/M50/push-5.0
```
9a132e36
Merge trift2.:/M50/mysql-5.0 · 4ce74b9a
unknown authored Nov 28, 2006
```
into  trift2.:/MySQL/M50/push-5.0
```
4ce74b9a

netware/BUILD/nwbootstrap : Editing "mwenv" is now obsolete and even plain wrong - drop it. · 299dfead

unknown authored Nov 28, 2006


netware/BUILD/nwbootstrap:
  Editing "mwenv" is now obsolete,
  as this file gets its variable settings from the environment already;
  and it is even plain wrong,
  because the assignments to those variables are written in such a way that
  replacing the variables by values (as tried here) yields invalid shell lines.

299dfead

Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1 · 5d717e1a

unknown authored Nov 28, 2006

into  mysql.com:/home/kent/bk/mysql-5.1-build


client/mysql_upgrade.c:
  Auto merged
mysql-test/lib/mtr_report.pl:
  Auto merged
sql-common/my_time.c:
  Auto merged

5d717e1a

Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0-build · 20b0bb48
unknown authored Nov 28, 2006
```
into  mysql.com:/home/kent/bk/mysql-5.0-build
```
20b0bb48

Makefile.am: · da441ffe

unknown authored Nov 28, 2006

  Handle the case "sql_yacc.cc" is pregenerated or not, and that the
  case where the source and build tree is the same or not.


sql/Makefile.am:
  Handle the case "sql_yacc.cc" is pregenerated or not, and that the
  case where the source and build tree is the same or not.

da441ffe

Merge mysql.com:/home/kent/bk/mysql-4.1-build · ce279937
unknown authored Nov 28, 2006
```
into  mysql.com:/home/kent/bk/mysql-5.0-build


Docs/Makefile.am:
  Auto merged
```
ce279937

Makefile.am: · 3d9319e6

unknown authored Nov 28, 2006

  If using \$(srcdir)/mysql.info in action, use same in rule.


Docs/Makefile.am:
  If using \$(srcdir)/mysql.info in action, use same in rule.

3d9319e6

Merge bk-internal:/home/bk/mysql-5.1 · c9682d13

unknown authored Nov 28, 2006

into  dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-5.1-opt


client/mysqltest.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/r/information_schema.result:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
mysql-test/t/information_schema.test:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
mysql-test/t/type_newdecimal.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql-common/client.c:
  Auto merged
sql-common/my_time.c:
  Auto merged
sql/table.cc:
  Auto merged
strings/decimal.c:
  Auto merged

c9682d13

opt_range.cc: · d607f40b

unknown authored Nov 28, 2006

  dummy commit to trigger pushbuild


sql/opt_range.cc:
  dummy commit to trigger pushbuild

d607f40b

Merge trift2.:/M50/mysql-5.0 · 6ba1d4bf

unknown authored Nov 28, 2006

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


extra/yassl/taocrypt/taocrypt.dsp:
  Auto merged
extra/yassl/yassl.dsp:
  Auto merged
extra/yassl/yassl.vcproj:
  Auto merged
extra/yassl/taocrypt/taocrypt.vcproj:
  Auto merged
extra/yassl/taocrypt/benchmark/benchmark.dsp:
  Auto merged
extra/yassl/taocrypt/test.dsp:
  Auto merged
extra/yassl/testsuite/testsuite.dsp:
  Auto merged

6ba1d4bf

Fixed portablity problem · 5b3fa09b

unknown authored Nov 28, 2006

Removed warnings from mysqltest scripts


cmd-line-utils/readline/undo.c:
  Fixed portability problem
mysql-test/include/mix2.inc:
  Removed mysqltest warnings
mysql-test/include/query_cache.inc:
  Removed mysqltest warnings
mysql-test/r/ndb_binlog_ddl_multi.result:
  Update tests after fixing wrong connection command in test
mysql-test/t/greedy_optimizer.test:
  Removed mysqltest warnings
mysql-test/t/join.test:
  Removed mysqltest warnings
mysql-test/t/ndb_binlog_ddl_multi.test:
  Removed mysqltest warnings
mysql-test/t/ndb_blob_partition.test:
  Removed mysqltest warnings
mysql-test/t/ndb_index_ordered.test:
  Removed mysqltest warnings
storage/ndb/src/kernel/vm/Rope.cpp:
  Removed compiler warning

5b3fa09b