Commits · 1d3497702ae17e5db08c4734098c511b3ca0a675 · Kirill Smelkov / mariadb

30 Sep, 2005 40 commits

Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-release · 1d349770

unknown authored Sep 30, 2005

into mysql.com:/Users/kent/mysql/bk/mysql-5.0


mysql-test/lib/mtr_report.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged

1d349770

Merge mysqldev@production.mysql.com:my/mysql-5.0-release · 93875e07
unknown authored Sep 30, 2005
```
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
```
93875e07

Merge · f69c1867

unknown authored Sep 30, 2005


sql/ha_ndbcluster.cc:
  SCCS merged
sql/handler.h:
  SCCS merged

f69c1867

Bug#11238 · 8f842e8f

unknown authored Sep 30, 2005

"SELECT ... FOR UPDATE executed as consistent read inside LOCK TABLES"
Do not discard lock_type information as handler::start_stmt() may require knowledge.
(fixed by Antony)

8f842e8f

Merge mysql.com:/home/dlenev/src/mysql-5.0-bg13629 · eeae3fc3
unknown authored Sep 30, 2005
```
into  mysql.com:/home/dlenev/src/mysql-5.0-merges
```
eeae3fc3
Merge mysqldev@production.mysql.com:/data0/mysqldev/my/mysql-5.0-release · 246bd8ca
unknown authored Sep 30, 2005
```
into  mysql.com:/home/dlenev/src/mysql-5.0-bg13629
```
246bd8ca
Merge hholzgraefe@bk-internal.mysql.com:/home/bk/mysql-5.0 · 7d3c939e
unknown authored Sep 30, 2005
```
into  mysql.com:/home/hartmut/projects/mysql/dev/5.0


ndb/tools/ndb_config.cpp:
  Auto merged
```
7d3c939e
CygWin build fix (Bug #13640) · 0585fcbe
unknown authored Sep 30, 2005

0585fcbe

Many files: · 8e7fe376

unknown authored Sep 30, 2005

  Revert back 5.0 changes to Visual Studio .Net project files


VC++Files/client/mysqlclient.vcproj:
  Revert back 5.0 changes to Visual Studio .Net project files
VC++Files/libmysql/libmysql.vcproj:
  Revert back 5.0 changes to Visual Studio .Net project files
VC++Files/libmysqld/libmysqld.vcproj:
  Revert back 5.0 changes to Visual Studio .Net project files
VC++Files/mysql.sln:
  Revert back 5.0 changes to Visual Studio .Net project files
VC++Files/mysys/mysys.vcproj:
  Revert back 5.0 changes to Visual Studio .Net project files
VC++Files/sql/mysqld.vcproj:
  Revert back 5.0 changes to Visual Studio .Net project files
VC++Files/strings/strings.vcproj:
  Revert back 5.0 changes to Visual Studio .Net project files

8e7fe376

Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1 · f3c62235

unknown authored Sep 30, 2005

into mysql.com:/Users/kent/mysql/bk/mysql-5.0-release


BUILD/SETUP.sh:
  Auto merged
client/mysql.cc:
  Auto merged
mysql-test/lib/mtr_report.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
scripts/make_win_src_distribution.sh:
  Auto merged
sql/des_key_file.cc:
  Auto merged

f3c62235

Removed all Visual Studio .Net .vcproj files to be able to · 24770926

unknown authored Sep 30, 2005

back-port to 4.1 and merge forward to 5.x again properly.


BitKeeper/deleted/.del-bdb.vcproj~ed8534936e40cefb:
  Delete: VC++Files/bdb/bdb.vcproj
BitKeeper/deleted/.del-mysql.vcproj~f542eaa36b79459d:
  Delete: VC++Files/client/mysql.vcproj
BitKeeper/deleted/.del-mysqladmin.vcproj~4735738126ddd45f:
  Delete: VC++Files/client/mysqladmin.vcproj
BitKeeper/deleted/.del-mysqlclient.vcproj~4e8fd6c239c455e7:
  Delete: VC++Files/client/mysqlclient.vcproj
BitKeeper/deleted/.del-mysqldump.vcproj~72e1d52e8264ee24:
  Delete: VC++Files/client/mysqldump.vcproj
BitKeeper/deleted/.del-mysqlimport.vcproj~f3413e59c84590a6:
  Delete: VC++Files/client/mysqlimport.vcproj
BitKeeper/deleted/.del-mysqlshow.vcproj~89671830c737ad67:
  Delete: VC++Files/client/mysqlshow.vcproj
BitKeeper/deleted/.del-comp_err.vcproj~43c2674631ff6dcd:
  Delete: VC++Files/comp_err/comp_err.vcproj
BitKeeper/deleted/.del-dbug.vcproj~cec9ed672efe1999:
  Delete: VC++Files/dbug/dbug.vcproj
BitKeeper/deleted/.del-heap.vcproj~70c0cc1d680a51c1:
  Delete: VC++Files/heap/heap.vcproj
BitKeeper/deleted/.del-innobase.vcproj~71e1de81f11138bf:
  Delete: VC++Files/innobase/innobase.vcproj
BitKeeper/deleted/.del-mysqltest.vcproj~bba9139c2e68286a:
  Delete: VC++Files/client/mysqltest.vcproj
BitKeeper/deleted/.del-libmysql.vcproj~76b7601f350cd80c:
  Delete: VC++Files/libmysql/libmysql.vcproj
BitKeeper/deleted/.del-libmysqld.vcproj~a1d46f8635014df2:
  Delete: VC++Files/libmysqld/libmysqld.vcproj
BitKeeper/deleted/.del-myTest.vcproj~9dcbfc99784da76d:
  Delete: VC++Files/libmysqltest/myTest.vcproj
BitKeeper/deleted/.del-my_print_defaults.vcproj~805e02c029c13a3d:
  Delete: VC++Files/my_print_defaults/my_print_defaults.vcproj
BitKeeper/deleted/.del-test_libmysqld.vcproj~8ff2f936c65b4814:
  Delete: VC++Files/libmysqld/examples/test_libmysqld.vcproj
BitKeeper/deleted/.del-myisam.vcproj~32bb9e4a163fcb5a:
  Delete: VC++Files/myisam/myisam.vcproj
BitKeeper/deleted/.del-myisam_ftdump.vcproj~cf156af17f00e691:
  Delete: VC++Files/myisam_ftdump/myisam_ftdump.vcproj
BitKeeper/deleted/.del-myisamchk.vcproj~ca51391a749b5066:
  Delete: VC++Files/myisamchk/myisamchk.vcproj
BitKeeper/deleted/.del-myisamlog.vcproj~b642178bf2a443e:
  Delete: VC++Files/myisamlog/myisamlog.vcproj
BitKeeper/deleted/.del-myisammrg.vcproj~6534e59acbfbb63:
  Delete: VC++Files/myisammrg/myisammrg.vcproj
BitKeeper/deleted/.del-myisampack.vcproj~3df8a31f3b603a8:
  Delete: VC++Files/myisampack/myisampack.vcproj
BitKeeper/deleted/.del-mysql.sln~f2120278f8a437be:
  Delete: VC++Files/mysql.sln
BitKeeper/deleted/.del-mysql_test_run_new.vcproj~c953b417c83523a0:
  Delete: VC++Files/mysql-test/mysql_test_run_new.vcproj
BitKeeper/deleted/.del-mysqlbinlog.vcproj~d3fd2c6ed118cd99:
  Delete: VC++Files/mysqlbinlog/mysqlbinlog.vcproj
BitKeeper/deleted/.del-mysqlcheck.vcproj~562fe5a45c9337df:
  Delete: VC++Files/mysqlcheck/mysqlcheck.vcproj
BitKeeper/deleted/.del-mysqldemb.vcproj~a3e9e254c6b572ff:
  Delete: VC++Files/mysqldemb/mysqldemb.vcproj
BitKeeper/deleted/.del-mysqlserver.vcproj~31349c409587c097:
  Delete: VC++Files/mysqlserver/mysqlserver.vcproj
BitKeeper/deleted/.del-mysys.vcproj~6be390f26fc5539a:
  Delete: VC++Files/mysys/mysys.vcproj
BitKeeper/deleted/.del-perror.vcproj~622c06abaff48379:
  Delete: VC++Files/perror/perror.vcproj
BitKeeper/deleted/.del-regex.vcproj~9dfe1e8c7395a8e5:
  Delete: VC++Files/regex/regex.vcproj
BitKeeper/deleted/.del-replace.vcproj~921ddc8d8383ffc6:
  Delete: VC++Files/replace/replace.vcproj
BitKeeper/deleted/.del-mysql_client_test.vcproj~624117036ff1d17c:
  Delete: VC++Files/tests/mysql_client_test.vcproj
BitKeeper/deleted/.del-mysqld.vcproj~703886a28862bb2:
  Delete: VC++Files/sql/mysqld.vcproj
BitKeeper/deleted/.del-strings.vcproj~62578a38fd9e976:
  Delete: VC++Files/strings/strings.vcproj
BitKeeper/deleted/.del-test1.vcproj~f47ec733f5da69d5:
  Delete: VC++Files/test1/test1.vcproj
BitKeeper/deleted/.del-thr_test.vcproj~f5b31bfbc5366334:
  Delete: VC++Files/thr_test/thr_test.vcproj
BitKeeper/deleted/.del-dummy.cpp~d1d2a28e28f91f20:
  Delete: VC++Files/mysqlserver/dummy.cpp
BitKeeper/deleted/.del-vio.vcproj~f575b4666be84569:
  Delete: VC++Files/vio/vio.vcproj
BitKeeper/deleted/.del-zlib.vcproj~997ad815f1f4b73:
  Delete: VC++Files/zlib/zlib.vcproj

24770926

Merge mysql.com:/home/timka/mysql/src/5.0-virgin · 39ba8376
unknown authored Sep 30, 2005
```
into  mysql.com:/home/timka/mysql/src/5.0-bug-13597
```
39ba8376

Fix for bug #13629 "view test crashes for debug build" (also includes better · 9b7e4a2a

unknown authored Sep 30, 2005

fix for bug #13451 "view test produces warning about unfreed memory").


sql/sql_view.cc:
  mysql_rename_view():
    Intead of doing full-blown opening of view and then doing extensive cleanup
    of its and main LEXes afterwards, let us just read and parse its .FRM file.

9b7e4a2a

Merge hundin.mysql.fi:/home/marko/mysql-4.1 · ff2f28d9

unknown authored Sep 30, 2005

into  hundin.mysql.fi:/home/marko/mysql-5.0-bk


sql/ha_innodb.cc:
  Ignore 4.1 specific change.

ff2f28d9

Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 · b21b0b2a
unknown authored Sep 30, 2005
```
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
```
b21b0b2a

Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 · 972da434

unknown authored Sep 30, 2005

into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0-icc


include/my_sys.h:
  Auto merged

972da434

Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 · 4dd48359
unknown authored Sep 30, 2005
```
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0-icc
```
4dd48359

InnoDB: After review fix · afed50ae

unknown authored Sep 30, 2005


sql/ha_innodb.cc:
  Avoid bitwise arithmetics, as it might be difficult to read.  The
  added readability costs one register and two instructions on x86.

afed50ae

Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 · 936a6905
unknown authored Sep 30, 2005
```
into mysql.com:/Users/kent/mysql/bk/mysql-5.0


mysql-test/t/mysqldump.test:
  Auto merged
```
936a6905

Many files: · b446550e

unknown authored Sep 30, 2005

  New VC7 project files
des_key_file.cc:
  Visual C++ wants '"' for local include
mysql.cc:
  Cast my_cgets() argument for VC6 and VC7
dummy.cpp:
  Added to convince VS .Net generate a lib for mysqlserver


VC++Files/mysqlserver/dummy.cpp:
  Added to convince VS .Net generate a lib for mysqlserver
VC++Files/bdb/bdb.vcproj:
  New VC7 project files
VC++Files/client/mysql.vcproj:
  New VC7 project files
VC++Files/client/mysqladmin.vcproj:
  New VC7 project files
VC++Files/client/mysqlclient.vcproj:
  New VC7 project files
VC++Files/client/mysqldump.vcproj:
  New VC7 project files
VC++Files/client/mysqlimport.vcproj:
  New VC7 project files
VC++Files/client/mysqlshow.vcproj:
  New VC7 project files
VC++Files/client/mysqltest.vcproj:
  New VC7 project files
VC++Files/comp_err/comp_err.vcproj:
  New VC7 project files
VC++Files/dbug/dbug.vcproj:
  New VC7 project files
VC++Files/heap/heap.vcproj:
  New VC7 project files
VC++Files/innobase/innobase.vcproj:
  New VC7 project files
VC++Files/libmysql/libmysql.vcproj:
  New VC7 project files
VC++Files/libmysqld/examples/test_libmysqld.vcproj:
  New VC7 project files
VC++Files/libmysqld/libmysqld.vcproj:
  New VC7 project files
VC++Files/libmysqltest/myTest.vcproj:
  New VC7 project files
VC++Files/my_print_defaults/my_print_defaults.vcproj:
  New VC7 project files
VC++Files/myisam/myisam.vcproj:
  New VC7 project files
VC++Files/myisam_ftdump/myisam_ftdump.vcproj:
  New VC7 project files
VC++Files/myisamchk/myisamchk.vcproj:
  New VC7 project files
VC++Files/myisamlog/myisamlog.vcproj:
  New VC7 project files
VC++Files/myisammrg/myisammrg.vcproj:
  New VC7 project files
VC++Files/myisampack/myisampack.vcproj:
  New VC7 project files
VC++Files/mysql-test/mysql_test_run_new.vcproj:
  New VC7 project files
VC++Files/mysql.sln:
  New VC7 project files
VC++Files/mysqlbinlog/mysqlbinlog.vcproj:
  New VC7 project files
VC++Files/mysqlcheck/mysqlcheck.vcproj:
  New VC7 project files
VC++Files/mysqldemb/mysqldemb.vcproj:
  New VC7 project files
VC++Files/mysqlserver/mysqlserver.vcproj:
  New VC7 project files
VC++Files/mysys/mysys.vcproj:
  New VC7 project files
VC++Files/perror/perror.vcproj:
  New VC7 project files
VC++Files/regex/regex.vcproj:
  New VC7 project files
VC++Files/replace/replace.vcproj:
  New VC7 project files
VC++Files/sql/mysqld.vcproj:
  New VC7 project files
VC++Files/strings/strings.vcproj:
  New VC7 project files
VC++Files/test1/test1.vcproj:
  New VC7 project files
VC++Files/tests/mysql_client_test.vcproj:
  New VC7 project files
VC++Files/thr_test/thr_test.vcproj:
  New VC7 project files
VC++Files/vio/vio.vcproj:
  New VC7 project files
VC++Files/zlib/zlib.vcproj:
  New VC7 project files
client/mysql.cc:
  Cast my_cgets() argument for VC6 and VC7
sql/des_key_file.cc:
  Visual C++ wants '"' for local include
scripts/make_win_src_distribution.sh:
  New VC7 project files

b446550e

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 · 1d31ee29
unknown authored Sep 30, 2005
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push
```
1d31ee29

ndb - · 937de41a

unknown authored Sep 30, 2005

  Fix compile error with gcc296


ndb/src/common/util/SimpleProperties.cpp:
  Fix compile error with gcc296

937de41a

Raise the version. · d04eb651
unknown authored Sep 30, 2005

d04eb651
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 · 5f5fc659
unknown authored Sep 30, 2005
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push
```
5f5fc659
Fix for Bug#12629, "mysqld_multi produces syntax error". · d1538465
unknown authored Sep 30, 2005
```
Quote here is unneccessary as it should all be handled in
quote_opt_arg().
```
d1538465

InnoDB: On UPDATE, trim UCS2 columns correctly. (Bug #12178) · a14a34be

unknown authored Sep 30, 2005


sql/ha_innodb.cc:
  innobase_convert_and_store_changed_col(), calc_row_difference():
   Replace parameter "is_unsigned" with "prtype".
  innobase_convert_and_store_changed_col():
   When trimming spaces, note that UCS2 spaces are 0x0020, not 0x20.

a14a34be

Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 · 3bb53a7c

unknown authored Sep 30, 2005

into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0-icc


myisam/mi_open.c:
  Auto merged
myisam/myisamchk.c:
  Auto merged
myisam/myisamdef.h:
  Auto merged
myisam/myisampack.c:
  Auto merged
sql/sql_parse.cc:
  Auto merged

3bb53a7c

Merge mysql.com:/M50/noserver-5.0 into mysql.com:/M50/mysql-5.0 · 06e08e04
unknown authored Sep 30, 2005
```
mysys/mf_keycache.c:
  Auto merged
```
06e08e04

Change "mf_keycache.c" so that it can be compiled without thread support (bug#11680): · cc430c68

unknown authored Sep 30, 2005

"configure --without-server" (without giving "--enable-thread-safe-client").

mysys/mf_keycache.c:
This module is needed both in the server (multi-threaded) and in some myisam tools (single-threaded).
For the latter use, compilation failed in a "configure --without-server" as thread support was not
defined then (unless "--enable-thread-safe-client" was also given, but this should not be required).
The solution is to guard all threading operations in "#ifdef THREAD", and in the "#else" case adding
assertions where appropriate. This fixes bug#11680.
Also minor cleanup: Delete an unused variable, change "return" -> "DBUG_RETURN" in one place.

cc430c68

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 · 710a2e29

unknown authored Sep 30, 2005

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push


ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvrConfig.cpp:
  Auto merged

710a2e29

Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0 · d3febe80

unknown authored Sep 30, 2005

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push


include/my_sys.h:
  Auto merged
mysys/default.c:
  Auto merged

d3febe80

Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1 · 8aebd062
unknown authored Sep 30, 2005
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0


ndb/tools/ndb_config.cpp:
  merge
```
8aebd062

ndb_config · 7337ba76

unknown authored Sep 30, 2005

  Check returnvalue on load/fetch configuration


ndb/tools/ndb_config.cpp:
  Check returnvalue on load/fetch configuration

7337ba76

Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 · 0a467b5f
unknown authored Sep 30, 2005
```
into mysql.com:/home/psergey/mysql-5.0-sept30-test
```
0a467b5f
BUG#13081: Disable ROR-index_merge for NDB tables (by adding a · b8ad9d14
unknown authored Sep 30, 2005
```
HA_KEY_SCAN_NOT_ROR index flag) as NDB index scans are not guaranteed to be ROR 
scans. 
```
b8ad9d14

ndb · dbc72145

unknown authored Sep 30, 2005

  Add support/test for using my.cnf [cluster_config]


mysql-test/r/ndb_config.result:
  Add support for ndb_config to read my.cnf
mysql-test/t/ndb_config.test:
  Add support for ndb_config to read my.cnf
ndb/src/mgmsrv/InitConfigFileParser.cpp:
  merge
ndb/tools/ndb_config.cpp:
  Add support for ndb_config to read my.cnf
mysql-test/std_data/ndb_config_mycnf1.cnf:
  New BitKeeper file ``mysql-test/std_data/ndb_config_mycnf1.cnf''

dbc72145

Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 60ee9326
unknown authored Sep 30, 2005
```
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
```
60ee9326
duplicate error message removed · 31f7a0e8
unknown authored Sep 30, 2005
```
mysql-test/r/innodb.result:
  after merge fix
```
31f7a0e8

Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1 · 3827a110

unknown authored Sep 30, 2005

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0


mysql-test/r/ndb_config.result:
  Auto merged
mysql-test/t/ndb_config.test:
  Auto merged
ndb/src/mgmsrv/InitConfigFileParser.cpp:
  Auto merged
ndb/src/mgmsrv/InitConfigFileParser.hpp:
  Auto merged
ndb/tools/ndb_config.cpp:
  Auto merged

3827a110

ndb - · 8c570f3f

unknown authored Sep 30, 2005

 add support for reading config.ini from ndb_config
 (as alternative to contacting ndb_mgmd)


mysql-test/r/ndb_config.result:
  Add support for reading config.ini from ndb_config
mysql-test/t/ndb_config.test:
  Add support for reading config.ini from ndb_config
ndb/src/mgmsrv/InitConfigFileParser.cpp:
  Handle prinouts better
ndb/src/mgmsrv/InitConfigFileParser.hpp:
  Handle prinouts better
ndb/tools/ndb_config.cpp:
  Add support for reading config.ini from ndb_config

8c570f3f