Commits · 6929772753939a49708c80abc2c91230ae269f61 · nexedi / MariaDB

12 May, 2006 21 commits

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

unknown authored May 12, 2006

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


sql/sql_parse.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged

69297727

Merge c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1-new · 53a69176
unknown authored May 12, 2006
```
into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19010
```
53a69176

Merge c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19140 · 508336fe

unknown authored May 12, 2006

into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19010


mysql-test/t/partition.test:
  Auto merged
sql/sql_partition.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
mysql-test/r/ndb_partition_key.result:
  manual merge
mysql-test/r/partition.result:
  manual merge
mysql-test/t/ndb_partition_key.test:
  manual merge

508336fe

merge · bff93cbe
unknown authored May 12, 2006

bff93cbe

Merge c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1-new · 2bbda91f

unknown authored May 12, 2006

into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19010


mysql-test/r/ndb_dd_basic.result:
  Auto merged
mysql-test/r/ndb_partition_key.result:
  Auto merged
mysql-test/t/ndb_partition_key.test:
  Auto merged
sql/ha_partition.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_partition.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/table.cc:
  Auto merged
sql/table.h:
  Auto merged
sql/unireg.cc:
  Auto merged

2bbda91f

Merge c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19502 · 34e8e53e

unknown authored May 12, 2006

into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19010


sql/ha_partition.cc:
  Auto merged
mysql-test/r/partition.result:
  manual merge
mysql-test/t/partition.test:
  manual merge

34e8e53e

Merge c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19501 · 8e1a2d3b

unknown authored May 12, 2006

into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19010


mysql-test/r/partition.result:
  manual merge
mysql-test/t/partition.test:
  manual merge

8e1a2d3b

Merge c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19062 · e0132e19
unknown authored May 12, 2006
```
into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19010
```
e0132e19
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-new · a6ffdda2
unknown authored May 12, 2006
```
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new-merge_060509
```
a6ffdda2
Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 4a831c3d
unknown authored May 12, 2006
```
into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
```
4a831c3d

rpl_row_basic_11bugs.test, rpl_multi_engine.test, rpl_flsh_tbls.test: · 722000fc

unknown authored May 12, 2006

  Updated per lars
rpl_row_flsh_tbls.test:
  updated per lars


mysql-test/extra/rpl_tests/rpl_flsh_tbls.test:
  Updated per lars
mysql-test/t/rpl_row_flsh_tbls.test:
  updated per lars
mysql-test/t/rpl_multi_engine.test:
  Updated per lars
mysql-test/t/rpl_row_basic_11bugs.test:
  Updated per lars

722000fc

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

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.

dfcaa4ca

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


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

Bug#19728: Test mysqldump failure · 6f9d4d44

unknown authored May 12, 2006

regex is fixed for windows.


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

6f9d4d44

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

7828e852

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

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

6f88b31b

Fix after merge 5.0->5.1 · 2bc41fbd

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

2bc41fbd

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

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

9dd5e128

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

11 May, 2006 19 commits

removed handlerton-win.cc (again) · 8e25368b

unknown authored May 11, 2006


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

8e25368b

Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new · e3907b6f
unknown authored May 11, 2006
```
into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
```
e3907b6f
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-new · bf9d95fb
unknown authored May 11, 2006
```
into  mysql.com:/home/mysql-5.1-19509
```
bf9d95fb
Merge linux.site:/home/reggie/work/mysql-5.1 · f06af62c
unknown authored May 11, 2006
```
into  linux.site:/home/reggie/work/mysql-5.1-test
```
f06af62c
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 9d671ecf
unknown authored May 11, 2006
```
into  mysql.com:/home/psergey/mysql-5.1-merge6
```
9d671ecf
Merge mysql.com:/home/psergey/tmp_merge3 · e707d315
unknown authored May 11, 2006
```
into  mysql.com:/home/psergey/mysql-5.1-merge6


configure.in:
  Auto merged
```
e707d315
Merge reggie@192.168.1.107:/home/reggie/work/mysql-5.1 · abb2184b
unknown authored May 11, 2006
```
into  big_geek.:C:/Work/mysql/mysql-5.1-test
```
abb2184b
Merge siva.hindu.god:/usr/home/tim/m/51/a · 954a04d3
unknown authored May 11, 2006
```
into  siva.hindu.god:/usr/home/tim/m/51/a.bug6061
```
954a04d3
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-new · e8d39321
unknown authored May 11, 2006
```
into  mysql.com:/home/psergey/mysql-5.1-merge6
```
e8d39321

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

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

a8408dee

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

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

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

8659a971

changes for when NDB is default engine · 141df3d1

unknown authored May 11, 2006


mysql-test/t/rpl_sp004.test:
  updated to work with default NDB engine
mysql-test/r/rpl_sp004.result:
  updated to work with default NDB engine
mysql-test/extra/rpl_tests/rpl_flsh_tbls.test:
  Updated to skip when ndb is default
mysql-test/t/rpl_multi_engine.test:
  Results will not match when ndb is default do to myisam table creates and show create
mysql-test/t/rpl_row_basic_11bugs.test:
  Disables for when ndb is default as the show binlog events will cause failure

141df3d1

Removed duplicate test. · 5edc6449

unknown authored May 11, 2006


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

5edc6449

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

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

efe19635

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

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

dfd99e36

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


sql/sql_select.cc:
  Auto merged
```
de284ead
Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 87c7bdf6
unknown authored May 11, 2006
```
into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
```
87c7bdf6