Commits · 30de858c8eb3e32d2202e2dd9325f28bfa46c700 · nexedi / MariaDB

20 Mar, 2007 27 commits

Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-build · 30de858c
unknown authored Mar 20, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/mar20/maint/51
```
30de858c

Merge qualinost.(none):/home/mtaylor/src/mysql-5.0-maint · dadf01b6

unknown authored Mar 20, 2007

into  qualinost.(none):/home/mtaylor/src/mysql-5.1-new-maint


sql/slave.cc:
  Auto merged
support-files/mysql.server.sh:
  Auto merged

dadf01b6

Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build · 04cc09a3
unknown authored Mar 20, 2007
```
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build
```
04cc09a3
Merge qualinost.(none):/home/mtaylor/src/mysql-5.0-init · 5887de11
unknown authored Mar 20, 2007
```
into  qualinost.(none):/home/mtaylor/src/mysql-5.0-maint
```
5887de11

echo.c: · c2502d04

unknown authored Mar 20, 2007

  Corrected GPL to be version 2 only


client/echo.c:
  Corrected GPL to be version 2 only

c2502d04

Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build · 72ef6315

unknown authored Mar 20, 2007

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


BitKeeper/etc/ignore:
  auto-union
BitKeeper/deleted/.del-comp_err.vcproj~45c167ae5ddd5a96:
  Auto merged
BitKeeper/deleted/.del-gen_lex_hash.vcproj~544be6b6:
  Auto merged
BitKeeper/deleted/.del-heap.vcproj~4382203ba03f4038:
  Auto merged
BitKeeper/deleted/.del-myTest.vcproj~dba5adc4fad3c06:
  Auto merged
BitKeeper/deleted/.del-my_print_defaults.vcproj~c8aa2bd86e13c3f9:
  Auto merged
BitKeeper/deleted/.del-myisam_ftdump.vcproj~409c19b0274b7f8e:
  Auto merged
BitKeeper/deleted/.del-myisamchk.vcproj~982ebe5673e58fb6:
  Auto merged
BitKeeper/deleted/.del-myisamlog.vcproj~daa6596ea386e5a7:
  Auto merged
BitKeeper/deleted/.del-myisampack.vcproj~3f7d4ec0cb56a9a0:
  Auto merged
BitKeeper/deleted/.del-mysql.vcproj~f7bfe13a8836eea0:
  Auto merged
BitKeeper/deleted/.del-mysql_client_test.vcproj~22188dcd372bc9de:
  Auto merged
BitKeeper/deleted/.del-mysql_upgrade.vcproj~54815b7265120589:
  Auto merged
BitKeeper/deleted/.del-mysqladmin.vcproj~178fa55cba442d50:
  Auto merged
BitKeeper/deleted/.del-mysqlbinlog.vcproj~b2a5b1868f5d6596:
  Auto merged
BitKeeper/deleted/.del-mysqlcheck.vcproj~7022581c8b8a7ea2:
  Auto merged
BitKeeper/deleted/.del-mysqlclient.vcproj~e78a73e31368a44a:
  Auto merged
BitKeeper/deleted/.del-mysqlimport.vcproj~5a30228ef641c081:
  Auto merged
BitKeeper/deleted/.del-mysqlshow.vcproj~797d4fa322faa148:
  Auto merged
BitKeeper/deleted/.del-mysqltest.vcproj~21878840704179ef:
  Auto merged
BitKeeper/deleted/.del-perror.vcproj~86ad9dc660a048ad:
  Auto merged
BitKeeper/deleted/.del-regex.vcproj~9dea9caafa801b26:
  Auto merged
BitKeeper/deleted/.del-replace.vcproj~9620b1ced86e527a:
  Auto merged
BitKeeper/deleted/.del-strings.vcproj~6d1126ae59e4bf82:
  Auto merged
BitKeeper/deleted/.del-test1.vcproj~c474b4614c67e2d2:
  Auto merged
BitKeeper/deleted/.del-test_libmysqld.vcproj~fb301d42d5c4e6f4:
  Auto merged
BitKeeper/deleted/.del-thr_test.vcproj~fc0e15c1e6880160:
  Auto merged
BitKeeper/deleted/.del-vio.vcproj~b7c21b4e2d6a9b85:
  Auto merged
BitKeeper/deleted/.del-zlib.vcproj~9b1a681d56dae190:
  Auto merged
extra/yassl/taocrypt/taocrypt.vcproj:
  Auto merged
extra/yassl/yassl.vcproj:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/delayed.result:
  Auto merged
mysql-test/r/loaddata.result:
  Auto merged
mysql-test/r/merge.result:
  Auto merged
mysql-test/t/delayed.test:
  Auto merged
mysql-test/t/init_connect.test:
  Auto merged
mysql-test/t/loaddata.test:
  Auto merged
mysql-test/t/merge.test:
  Auto merged
netware/Makefile.am:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
storage/ndb/src/cw/cpcc-win32/C++/CPC_GUI.vcproj:
  Auto merged
mysql-test/install_test_db.sh:
  SCCS merged

72ef6315

Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1 · 575013fa
unknown authored Mar 20, 2007
```
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build
```
575013fa
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint · 750f2d82
unknown authored Mar 20, 2007
```
into  recycle.(none):/src/bug25765/my51-bug25765
```
750f2d82
Merge polly.local:/tmp/maint/bug23775/my50-bug23775 · 0fd0ab24
unknown authored Mar 20, 2007
```
into  polly.local:/home/kaa/src/maint/mysql-5.0-maint


sql/slave.cc:
  Auto merged
```
0fd0ab24
Post Merge Fix. · 23b084f6
unknown authored Mar 20, 2007

23b084f6
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint · c9d0a657
unknown authored Mar 20, 2007
```
into  polly.local:/tmp/maint/mysql-5.1-maint
```
c9d0a657
Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-build · f4abd8d1
unknown authored Mar 20, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
```
f4abd8d1

Merge recycle.(none):/src/bug25765/my50-bug25765 · 5832d8f6

unknown authored Mar 20, 2007

into  recycle.(none):/src/bug25765/my51-bug25765


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

5832d8f6

Bug#25765 too many dbg heap assertions on windows · 37f1f6f5

unknown authored Mar 20, 2007

- SAFEMALLOC should be defined for each project in debug Windows builds.
SAFEMALLOC was not defined for the innodb project. Debug asserts caused 
due to mixed SAFEMALLOC defines.


innobase/CMakeLists.txt:
  Bug#25765 too many dbg heap assertions on windows
  - Make sure that *_DEBUG defaults are not overwritten.
  - Define SAFEMALLOC and SAFE_MUTEX for debug innodb builds.

37f1f6f5

tests fixed to work in embedded server · 16899120

unknown authored Mar 20, 2007


mysql-test/r/delayed.result:
  result fixed
mysql-test/r/merge.result:
  result fixed
mysql-test/t/delayed.test:
  moved here from merge.test
mysql-test/t/init_connect.test:
  test fixed as it created users, then stopped without deletion, what caused
  problems in consequent tests
mysql-test/t/merge.test:
  moved to delayed.test
mysql-test/t/mysqlbinlog-cp932.test:
  disabled in embedded server

16899120

Merge polly.local:/tmp/maint/bug23775/my51-bug23775 · f538b1ea
unknown authored Mar 20, 2007
```
into  polly.local:/tmp/maint/mysql-5.1-maint


sql/slave.cc:
  Auto merged
```
f538b1ea
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work · 3d2be31a
unknown authored Mar 20, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build


netware/Makefile.am:
  Auto merged
```
3d2be31a
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work · 550ed5e0
unknown authored Mar 20, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work


netware/Makefile.am:
  Auto merged
```
550ed5e0

small build fix · 3fe0ef22

unknown authored Mar 20, 2007


netware/Makefile.am:
  use detected awk variant instead of using awk directly

3fe0ef22

build fix for netware · 8c72ed0c

unknown authored Mar 20, 2007


include/my_global.h:
  netware does not have <new>, so we define placement versions of operator new and delete ourselves

8c72ed0c

Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build · 7ddfde9a
unknown authored Mar 20, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
```
7ddfde9a
Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-build · 91348915
unknown authored Mar 20, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
```
91348915
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50 · d6330f36
unknown authored Mar 20, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
```
d6330f36
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51 · 3ff3bea0
unknown authored Mar 20, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
```
3ff3bea0
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50 · 40422637
unknown authored Mar 20, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
```
40422637
Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1-build · d2ee2e4e
unknown authored Mar 20, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
```
d2ee2e4e
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 · c50f7219
unknown authored Mar 20, 2007
```
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-opt


sql/sql_insert.cc:
  Auto merged
```
c50f7219

19 Mar, 2007 13 commits

Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50 · 8f15cd48
unknown authored Mar 19, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51


include/my_pthread.h:
  Auto merged
```
8f15cd48

sql_insert.cc: · 8eae769c

unknown authored Mar 20, 2007

  After merge fix.


sql/sql_insert.cc:
  After merge fix.

8eae769c

Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51 · 517e7424
unknown authored Mar 19, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51


BUILD/check-cpu:
  Auto merged
```
517e7424

Merge moonbone.local:/mnt/gentoo64/work/27006-bug-5.0-opt-mysql · 9e408f2d

unknown authored Mar 20, 2007

into  moonbone.local:/mnt/gentoo64/work/test-5.1-opt-mysql


mysql-test/r/trigger.result:
  Auto merged
mysql-test/t/trigger.test:
  Auto merged
sql/sql_insert.cc:
  Manually merged.

9e408f2d

Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50 · eef0999a
unknown authored Mar 19, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
```
eef0999a

sql_insert.cc: · a72aa6a6

unknown authored Mar 20, 2007

  Removed wrong fix for the bug#27006.
  The bug was added by the fix for the bug#19978 and fixed by Monty on 2007/02/21.
trigger.test, trigger.result:
  Corrected test case for the bug#27006.


sql/sql_insert.cc:
  Removed wrong fix for the bug#27006.
  The bug was added by the fix for the bug#19978 and fixed by Monty on 2007/02/21.
mysql-test/t/trigger.test:
  Corrected test case for the bug#27006.
mysql-test/r/trigger.result:
  Corrected test case for the bug#27006.

a72aa6a6

Merge trift2.:/MySQL/M50/clone-5.0 · 70aec3a0
unknown authored Mar 19, 2007
```
into  trift2.:/MySQL/M50/push-5.0


sql/mysql_priv.h:
  Auto merged
```
70aec3a0

BUG#27270 Can't compile latest 5.1-main · 70237fb8

unknown authored Mar 19, 2007


sql/sql_yacc.yy:
  BUG#27270 remove semicolon that is ignored by newer versions of bison but an error with 1.875

70237fb8

make_win_bin_dist: · 20768ead

unknown authored Mar 19, 2007

  Restore accidently removed line


scripts/make_win_bin_dist:
  Restore accidently removed line

20768ead

Many files: · d4ac854d

unknown authored Mar 19, 2007

  Major cleanup of old Visual Studio project files, aligning engines etc


VC++Files/bdb/bdb.vcproj:
  Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/client/mysql.vcproj:
  Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/client/mysql_upgrade.vcproj:
  Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/client/mysqladmin.vcproj:
  Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/client/mysqlclient.vcproj:
  Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/client/mysqldump.vcproj:
  Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/client/mysqlimport.vcproj:
  Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/client/mysqlshow.vcproj:
  Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/client/mysqltest.vcproj:
  Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/comp_err/comp_err.vcproj:
  Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/dbug/dbug.vcproj:
  Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/heap/heap.vcproj:
  Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/innobase/innobase.vcproj:
  Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/libmysql/libmysql.vcproj:
  Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/libmysqld/examples/test_libmysqld.vcproj:
  Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/libmysqld/libmysqld.vcproj:
  Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/libmysqltest/myTest.vcproj:
  Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/my_print_defaults/my_print_defaults.vcproj:
  Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/myisam/myisam.vcproj:
  Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/myisam_ftdump/myisam_ftdump.vcproj:
  Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/myisamchk/myisamchk.vcproj:
  Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/myisamlog/myisamlog.vcproj:
  Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/myisammrg/myisammrg.vcproj:
  Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/myisampack/myisampack.vcproj:
  Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/mysql.sln:
  Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/mysqlbinlog/mysqlbinlog.vcproj:
  Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/mysqlcheck/mysqlcheck.vcproj:
  Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/mysqldemb/mysqldemb.vcproj:
  Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/mysqlserver/mysqlserver.vcproj:
  Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/mysys/mysys.vcproj:
  Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/perror/perror.vcproj:
  Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/regex/regex.vcproj:
  Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/replace/replace.vcproj:
  Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/sql/gen_lex_hash.vcproj:
  Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/sql/mysqld.vcproj:
  Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/strings/strings.vcproj:
  Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/test1/test1.vcproj:
  Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/tests/mysql_client_test.vcproj:
  Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/thr_test/thr_test.vcproj:
  Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/vio/vio.vcproj:
  Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/zlib/zlib.vcproj:
  Major cleanup of old Visual Studio project files, aligning engines etc
extra/yassl/taocrypt/taocrypt.vcproj:
  Major cleanup of old Visual Studio project files, aligning engines etc
extra/yassl/yassl.vcproj:
  Major cleanup of old Visual Studio project files, aligning engines etc
ndb/src/cw/cpcc-win32/C++/CPC_GUI.vcproj:
  Major cleanup of old Visual Studio project files, aligning engines etc
scripts/make_win_bin_dist:
  Major cleanup of old Visual Studio project files, aligning engines etc
server-tools/instance-manager/mysqlmanager.vcproj:
  Major cleanup of old Visual Studio project files, aligning engines etc

d4ac854d

Merge mysqldev@production.mysql.com:my/mysql-5.0-release/ · 68270172
unknown authored Mar 19, 2007
```
into  trift2.:/MySQL/M50/clone-5.0
```
68270172
netware/Makefile.am : "libmysql.imp" must survive a "make clean" for the NetWare builds. · 153fd642
unknown authored Mar 19, 2007
```
netware/Makefile.am:
  "libmysql.imp" must survive a "make clean" for the NetWare builds.
```
153fd642

Merge dev:my/mysql-5.0-release · 1a63835a

unknown authored Mar 19, 2007

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


scripts/make_win_bin_dist:
  Auto merged

1a63835a