Commits · 7b30dc9e000a0a1d84efba99fb4a7afc53127bd9 · Kirill Smelkov / mariadb

12 May, 2006 10 commits

Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 7b30dc9e

unknown authored May 12, 2006

into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new-merge_060509


BitKeeper/deleted/.del-Makefile.am~de166d6fcac3b9b6:
  Auto merged
BitKeeper/deleted/.del-NOTES~e926d3e6929ac052:
  Auto merged
BitKeeper/deleted/.del-client-req.pem~efd482e1d290d4d8:
  Auto merged
BitKeeper/deleted/.del-server-req.pem~16301893cacf1be4:
  Auto merged
client/client_priv.h:
  Auto merged
client/mysql.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
client/mysqlimport.c:
  Auto merged
client/mysqltest.c:
  Auto merged
include/mysql.h:
  Auto merged
include/violite.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/information_schema.result:
  Auto merged
mysql-test/std_data/cacert.pem:
  Auto merged
mysql-test/std_data/client-cert.pem:
  Auto merged
mysql-test/std_data/client-key.pem:
  Auto merged
mysql-test/std_data/server-cert.pem:
  Auto merged
mysql-test/std_data/server-key.pem:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
mysql-test/t/information_schema.test:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql-common/client.c:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcInit.cpp:
  Auto merged
vio/vio.c:
  Auto merged
vio/viossl.c:
  Auto merged
vio/viosslfactories.c:
  Auto merged
mysql-test/Makefile.am:
  Manual merge.

7b30dc9e

Merge bk-internal:/home/bk/mysql-5.1-new · a8c13c34
unknown authored May 12, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1


sql/sql_acl.cc:
  Auto merged
```
a8c13c34
Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 74e7b09c
unknown authored May 12, 2006
```
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/FIXES/5.1-bug19728_regex_win
```
74e7b09c

Bug#19728: Test mysqldump failure · e005a5b3

unknown authored May 12, 2006

regex is fixed for windows.


mysql-test/t/mysqldump.test:
  Windows' suffix is accounted.

e005a5b3

Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1-md · e1827da7
unknown authored May 12, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
```
e1827da7
Rename cmakelists.txt -> CMakeLists.txt · e8a5d25b
unknown authored May 12, 2006

e8a5d25b

Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-new · f3d2b307

unknown authored May 12, 2006

into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new-merge_060509


configure.in:
  Auto merged
mysql-test/r/rpl_user_variables.result:
  Auto merged
mysql-test/t/having.test:
  Auto merged
mysql-test/t/rpl_user_variables.test:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

f3d2b307

Fix after merge 5.0->5.1 · 144c7622

unknown authored May 12, 2006


client/mysqlimport.c:
  Variable name changed mysql_connection -> mysql
include/violite.h:
  Type changed st_VioSSLAcceptorFd-> sl_VioSSLFd
vio/viosslfactories.c:
  Type changed st_VioSSLAcceptorFd-> sl_VioSSLFd

144c7622

Merge neptunus.(none):/home/msvensson/mysql/tmp/tmp_merge · 16d46c9c

unknown authored May 12, 2006

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


BitKeeper/deleted/.del-client-req.pem~efd482e1d290d4d8:
  Auto merged
BitKeeper/deleted/.del-server-req.pem~16301893cacf1be4:
  Auto merged
client/mysql.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
client/mysqlimport.c:
  Auto merged
BitKeeper/deleted/.del-Makefile.am~de166d6fcac3b9b6:
  Auto merged
BitKeeper/deleted/.del-NOTES~e926d3e6929ac052:
  Auto merged
client/mysqltest.c:
  Auto merged
include/mysql.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/information_schema.result:
  Auto merged
mysql-test/std_data/cacert.pem:
  Auto merged
mysql-test/std_data/client-cert.pem:
  Auto merged
mysql-test/std_data/client-key.pem:
  Auto merged
mysql-test/std_data/server-cert.pem:
  Auto merged
mysql-test/std_data/server-key.pem:
  Auto merged
mysql-test/t/information_schema.test:
  Auto merged
sql/item_func.cc:
  Auto merged
sql-common/client.c:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcInit.cpp:
  Auto merged
vio/vio.c:
  Auto merged
client/client_priv.h:
  Merge 5.0 -> 5.1
include/violite.h:
  Merge 5.0 -> 5.1
mysql-test/Makefile.am:
  Merge 5.0 -> 5.1
mysql-test/t/disabled.def:
  Merge 5.0 -> 5.1
sql/mysqld.cc:
  Merge 5.0 -> 5.1
vio/viossl.c:
  Merge 5.0 -> 5.1
vio/viosslfactories.c:
  Merge 5.0 -> 5.1

16d46c9c

Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 0e33ad1f
unknown authored May 12, 2006
```
into  mysql.com:/home/mysql-5.1-19509.19509
```
0e33ad1f

11 May, 2006 23 commits

removed handlerton-win.cc (again) · 77dedc31

unknown authored May 11, 2006


BitKeeper/deleted/.del-handlerton-win.cc~322a7e59507976df:
  Delete: sql/handlerton-win.cc

77dedc31

Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-new · e7c70398
unknown authored May 11, 2006
```
into  mysql.com:/home/mysql-5.1-19509
```
e7c70398
Merge linux.site:/home/reggie/work/mysql-5.1 · c58ca1a8
unknown authored May 11, 2006
```
into  linux.site:/home/reggie/work/mysql-5.1-test
```
c58ca1a8
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 06045451
unknown authored May 11, 2006
```
into  mysql.com:/home/psergey/mysql-5.1-merge6
```
06045451
Merge mysql.com:/home/psergey/tmp_merge3 · 9d64fc50
unknown authored May 11, 2006
```
into  mysql.com:/home/psergey/mysql-5.1-merge6


configure.in:
  Auto merged
```
9d64fc50
Merge reggie@192.168.1.107:/home/reggie/work/mysql-5.1 · 1b2c75d4
unknown authored May 11, 2006
```
into  big_geek.:C:/Work/mysql/mysql-5.1-test
```
1b2c75d4
Merge siva.hindu.god:/usr/home/tim/m/51/a · 816e07e8
unknown authored May 11, 2006
```
into  siva.hindu.god:/usr/home/tim/m/51/a.bug6061
```
816e07e8
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-new · f6c4805f
unknown authored May 11, 2006
```
into  mysql.com:/home/psergey/mysql-5.1-merge6
```
f6c4805f

Merge mysql.com:/home/psergey/tmp_merge2 · c00a5644

unknown authored May 11, 2006

into  mysql.com:/home/psergey/mysql-5.1-merge6


mysql-test/r/rpl_user_variables.result:
  Auto merged
mysql-test/t/having.test:
  Auto merged
mysql-test/t/rpl_user_variables.test:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

c00a5644

Bug#19136: Manual 5.0->5.1 merge · 704a69eb
unknown authored May 11, 2006
```
sql/item_func.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
```
704a69eb

performing a set of bk mv on each CMakeLists.txt file to try and restore the... · 2dce7ff6

unknown authored May 11, 2006

performing a set of bk mv on each CMakeLists.txt file to try and restore the mixed case filenames since this seems to be required with Cmake 2.4 beta 1.
This is being pushed to a private tree and tested before being sent to the mainline.


client/CMakeLists.txt:
  Rename: client/cmakelists.txt.tmp -> client/CMakeLists.txt
libmysql/CMakeLists.txt:
  Rename: libmysql/cmakelists.txt.tmp -> libmysql/CMakeLists.txt
libmysqld/CMakeLists.txt:
  Rename: libmysqld/cmakelists.txt.tmp -> libmysqld/CMakeLists.txt
sql/CMakeLists.txt:
  Rename: sql/cmakelists.txt.tmp -> sql/CMakeLists.txt
zlib/CMakeLists.txt:
  Rename: zlib/cmakelists.txt.tmp -> zlib/CMakeLists.txt
extra/CMakeLists.txt:
  Rename: extra/cmakelists.txt.tmp -> extra/CMakeLists.txt
tests/CMakeLists.txt:
  Rename: tests/cmakelists.txt.tmp -> tests/CMakeLists.txt
extra/yassl/CMakeLists.txt:
  Rename: extra/yassl/cmakelists.txt.tmp -> extra/yassl/CMakeLists.txt
extra/yassl/taocrypt/CMakeLists.txt:
  Rename: extra/yassl/taocrypt/cmakelists.txt.tmp -> extra/yassl/taocrypt/CMakeLists.txt
storage/heap/CMakeLists.txt:
  Rename: storage/heap/cmakelists.txt.tmp -> storage/heap/CMakeLists.txt
storage/myisam/CMakeLists.txt:
  Rename: storage/myisam/cmakelists.txt.tmp -> storage/myisam/CMakeLists.txt
storage/myisammrg/CMakeLists.txt:
  Rename: storage/myisammrg/cmakelists.txt.tmp -> storage/myisammrg/CMakeLists.txt
storage/csv/CMakeLists.txt:
  Rename: storage/csv/cmakelists.txt.tmp -> storage/csv/CMakeLists.txt
storage/innobase/CMakeLists.txt:
  Rename: storage/innobase/cmakelists.txt.tmp -> storage/innobase/CMakeLists.txt
server-tools/instance-manager/CMakeLists.txt:
  Rename: server-tools/instance-manager/cmakelists.txt.tmp -> server-tools/instance-manager/CMakeLists.txt
libmysqld/examples/CMakeLists.txt:
  Rename: libmysqld/examples/cmakelists.txt.tmp -> libmysqld/examples/CMakeLists.txt
vio/CMakeLists.txt:
  Rename: vio/cmakelists.txt.tmp -> vio/CMakeLists.txt
dbug/CMakeLists.txt:
  Rename: dbug/cmakelists.txt.tmp -> dbug/CMakeLists.txt
strings/CMakeLists.txt:
  Rename: strings/cmakelists.txt.tmp -> strings/CMakeLists.txt
regex/CMakeLists.txt:
  Rename: regex/cmakelists.txt.tmp -> regex/CMakeLists.txt
mysys/CMakeLists.txt:
  Rename: mysys/cmakelists.txt.tmp -> mysys/CMakeLists.txt
storage/archive/CMakeLists.txt:
  Rename: storage/archive/cmakelists.txt.tmp -> storage/archive/CMakeLists.txt
storage/bdb/CMakeLists.txt:
  Rename: storage/bdb/cmakelists.txt.tmp -> storage/bdb/CMakeLists.txt
storage/blackhole/CMakeLists.txt:
  Rename: storage/blackhole/cmakelists.txt.tmp -> storage/blackhole/CMakeLists.txt
storage/example/CMakeLists.txt:
  Rename: storage/example/cmakelists.txt.tmp -> storage/example/CMakeLists.txt
CMakeLists.txt:
  Rename: cmakelists.txt.tmp -> CMakeLists.txt

2dce7ff6

Removed duplicate test. · e0949d6d

unknown authored May 11, 2006


mysql-test/t/mysqldump.test:
  Removed duplicate test. This is already in the test file.

e0949d6d

bringing handlerton-win.cc back after incorrectly deleteing it. It is not... · a04f6024

unknown authored May 11, 2006

bringing handlerton-win.cc back after incorrectly deleteing it. It is not needed for 5.1 or later but is used by 5.0

sql/handlerton-win.cc:
Rename: BitKeeper/deleted/.del-handlerton-win.cc~322a7e59507976df -> sql/handlerton-win.cc

a04f6024

Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-new · dd3430e0

unknown authored May 11, 2006

into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new-merge_060509


BitKeeper/deleted/.del-changelog-4.0.xml~8f56ee8a913e848b:
  Auto merged
BitKeeper/deleted/.del-changelog-4.1.xml~8aa496ebed09d868:
  Auto merged
mysql-test/r/func_misc.result:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_acl.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

dd3430e0

Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-new · ca42197d
unknown authored May 11, 2006
```
into  mysql.com:/home/psergey/mysql-5.1-merge5
```
ca42197d
Merge mysql.com:/home/psergey/tmp_merge · 75066a6a
unknown authored May 11, 2006
```
into  mysql.com:/home/psergey/mysql-5.1-merge5


sql/sql_select.cc:
  Auto merged
```
75066a6a
Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new · a8cabd18
unknown authored May 11, 2006
```
into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
```
a8cabd18
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-new · fb063522
unknown authored May 11, 2006
```
into  mysql.com:/home/mysql-5.1-19509


sql/sql_acl.cc:
  Auto merged
```
fb063522

Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-new · d3747a56

unknown authored May 11, 2006

into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new-merge_060509


BitKeeper/deleted/.del-changelog-5.0.xml~f4c50926ccdd7434:
  Auto merged
mysql-test/r/date_formats.result:
  Auto merged
mysql-test/r/ndb_condition_pushdown.result:
  Auto merged
mysql-test/t/date_formats.test:
  Auto merged
mysql-test/t/ndb_condition_pushdown.test:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
storage/ndb/include/ndbapi/NdbOperation.hpp:
  Auto merged
storage/ndb/include/util/NdbSqlUtil.hpp:
  Auto merged
storage/ndb/src/common/util/NdbSqlUtil.cpp:
  Auto merged

d3747a56

Merge mysql.com:/home/tomash/src/mysql_ab/tmp_merge · 4db329fb

unknown authored May 11, 2006

into  mysql.com:/home/tomash/src/mysql_ab/mysql-5.1-merge


BitKeeper/deleted/.del-changelog-4.0.xml~8f56ee8a913e848b:
  Auto merged
BitKeeper/deleted/.del-changelog-4.1.xml~8aa496ebed09d868:
  Auto merged
mysql-test/r/func_misc.result:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_acl.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged

4db329fb

Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new · 56261e0e

unknown authored May 11, 2006

into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new-merge_060509


configure.in:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/auto_increment.result:
  Auto merged
mysql-test/r/gis-rtree.result:
  Auto merged
mysql-test/r/mysqldump.result:
  Auto merged
mysql-test/r/symlink.result:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
mysql-test/t/mysqldump.test:
  Manual merge.
sql/sql_show.cc:
  Manual merge.

56261e0e

Some fixes that were not done in original merge, compilation revealed. · c8e0b5e8

unknown authored May 11, 2006


client/mysqlimport.c:
  Fixed a problem with merge.
include/violite.h:
  Struct name changed, but forgot to change it here.
sql/sql_show.cc:
  Added missing variable.

c8e0b5e8

Merge siva.hindu.god:/usr/home/tim/m/51/a · a2fe772b
unknown authored May 10, 2006
```
into  siva.hindu.god:/usr/home/tim/m/51/a.bug6061
```
a2fe772b

10 May, 2006 7 commits

Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 7c11c311
unknown authored May 11, 2006
```
into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
```
7c11c311

rpl_log.test: · f82ae1c5

unknown authored May 11, 2006

  Remove comments not needed


mysql-test/extra/rpl_tests/rpl_log.test:
  Remove comments not needed

f82ae1c5

rpl_log.test: · c4c0e1ed

unknown authored May 11, 2006

  Correct fix for test bug #19158


mysql-test/extra/rpl_tests/rpl_log.test:
  Correct fix for test bug #19158

c4c0e1ed

Merge neptunus.(none):/home/msvensson/mysql/tmp/tmp_merge · bd484191

unknown authored May 10, 2006

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


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

bd484191

Merge neptunus.(none):/home/msvensson/mysql/tmp/tmp_merge · ad97a0d0

unknown authored May 10, 2006

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


BitKeeper/deleted/.del-changelog-5.0.xml~f4c50926ccdd7434:
  Auto merged
mysql-test/r/ndb_condition_pushdown.result:
  Auto merged
mysql-test/t/ndb_condition_pushdown.test:
  Auto merged
storage/ndb/include/ndbapi/NdbOperation.hpp:
  Auto merged
storage/ndb/include/util/NdbSqlUtil.hpp:
  Auto merged
storage/ndb/src/common/util/NdbSqlUtil.cpp:
  Auto merged

ad97a0d0

Add missing drop table · fad18fe9
unknown authored May 10, 2006

fad18fe9
Update test results for 5.1 · 1f518929
unknown authored May 10, 2006

1f518929