Commits · 7e0e3cb7b96fde137ac8d3eecfb1e1c2a608629b · Kirill Smelkov / mariadb

01 Oct, 2005 2 commits

unknown authored Oct 01, 2005

  Removed "examples/" from path to "ha_archive.cc"


VC++Files/sql/mysqld.vcproj:
  Removed "examples/" from path to "ha_archive.cc"

7e0e3cb7

init_db.sql: · c96cf154

unknown authored Oct 01, 2005

  mysql.user.password doesn't need utf8


mysql-test/lib/init_db.sql:
  mysql.user.password doesn't need utf8

c96cf154

30 Sep, 2005 25 commits

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 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

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

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

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 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 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
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

Tell the user that this ROLLBACK is added by mysqlbinlog (so that he does not... · 1e148ca4

unknown authored Sep 30, 2005

Tell the user that this ROLLBACK is added by mysqlbinlog (so that he does not wonder if it's present in binlog). This was brought up by Salle - thanks Salle.


client/mysqlbinlog.cc:
  tell the user that this ROLLBACK is added by mysqlbinlog (so that he does not wonder if it's present in binlog)
mysql-test/r/ctype_ucs_binlog.result:
  update
mysql-test/r/mysqlbinlog.result:
  update
mysql-test/r/mysqlbinlog2.result:
  update
mysql-test/r/rpl_charset.result:
  update
mysql-test/r/rpl_timezone.result:
  update
mysql-test/r/user_var-binlog.result:
  update

1e148ca4

Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · caa441d0
unknown authored Sep 30, 2005
```
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1
```
caa441d0
Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 203bb8bc
unknown authored Sep 30, 2005
```
into serg.mylan:/usr/home/serg/Abk/mysql-5.0


mysql-test/r/mysqldump.result:
  Auto merged
```
203bb8bc
Comment adjusted (see fix for #13545) · 33313992
unknown authored Sep 30, 2005

33313992
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 3c5ae70e
unknown authored Sep 30, 2005
```
into  mysql.com:/usr/home/ram/work/mysql-5.0
```
3c5ae70e
Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-5.0 · 3a806cd6
unknown authored Sep 30, 2005
```
into  mysql.com:/home/stewart/Documents/MySQL/5.0/main
```
3a806cd6

more post-merge fixes for SingleUser log events · 62233c20

unknown authored Sep 30, 2005


ndb/include/mgmapi/ndb_logevent.h:
  more post-merge fixes
ndb/src/mgmapi/ndb_logevent.cpp:
  more post-merge fixes

62233c20

Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-4.1 · b96e4b68
unknown authored Sep 30, 2005
```
into  mysql.com:/home/stewart/Documents/MySQL/4.1/main
```
b96e4b68
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 · ec5df5f2
unknown authored Sep 30, 2005
```
into mysql.com:/home/psergey/mysql-5.0-bug13455
```
ec5df5f2
Adjust test results changed because of fix for BUG#13455 · 0c8d29e0
unknown authored Sep 30, 2005

0c8d29e0

29 Sep, 2005 13 commits

Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.0 · 0f610081
unknown authored Sep 30, 2005
```
into  xiphis.org:/usr/home/antony/work2/p2-bug10586.5
```
0f610081
Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.0 · 1b6ddb7f
unknown authored Sep 29, 2005
```
into  xiphis.org:/usr/home/antony/work2/p2-bug10586.5
```
1b6ddb7f

mtr_report.pl: · 3dd066e8

unknown authored Sep 30, 2005

  Text formatting, adjust table header
mysql-test-run.pl:
  Remove requirement for source tree to run embedded server test
mysqldump.test:
  Removed ending ';' from --exec line


mysql-test/t/mysqldump.test:
  Removed ending ';' from --exec line
mysql-test/mysql-test-run.pl:
  Remove requirement for source tree to run embedded server test
mysql-test/lib/mtr_report.pl:
  Text formatting, adjust table header

3dd066e8

Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 · 0669d1e0
unknown authored Sep 30, 2005
```
into mysql.com:/home/psergey/mysql-5.0-bug13455


mysql-test/r/innodb.result:
  Auto merged
```
0669d1e0

Fix for BUG#13455: Make "ref" optimizer able to make this inference: · 8bdb41ab

unknown authored Sep 30, 2005

"t.key BETWEEN c1 AND c2" and c1 = c2 -> can access table t using "t.key = c1".


mysql-test/r/heap.result:
  BUG#13455: updated test results
mysql-test/r/innodb.result:
  BUG#13455: updated test results
mysql-test/r/myisam.result:
  BUG#13455: updated test results
mysql-test/r/range.result:
  Testcase for BUG#13455
mysql-test/t/range.test:
  Testcase for BUG#13455

8bdb41ab

Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 · 11d9e4b6
unknown authored Sep 29, 2005
```
into  krsna.patg.net:/home/patg/mysql-build/mysql-5.0
```
11d9e4b6

New flags for new max-no-ndb build script to get a build that has · 2f9e42f7

unknown authored Sep 29, 2005

everything except NDB


BUILD/SETUP.sh:
  Added base_max_no_ndb_configs so I can get a max-type build sans NDB for faster builds.
BUILD/compile-pentium-debug-max-no-ndb:
  new script to compile a max-type build sans NDB
BUILD/compile-ppc-debug-max-no-ndb:
  new script to build a max-type build sans NDB

2f9e42f7

portability.h: · 4ed46633

unknown authored Sep 29, 2005

  Corrected OpenServer ifdef test
Makefile.am:
  Added test-pl and test-force-pl targets


Makefile.am:
  Added test-pl and test-force-pl targets
server-tools/instance-manager/portability.h:
  Corrected OpenServer ifdef test

4ed46633

Merge mysql.com:/usr/local/bk/mysql-5.0 · b262e643
unknown authored Sep 29, 2005
```
into  mysql.com:/usr/home/pem/mysql-5.0
```
b262e643

fix for bug #13545: Server crash caused by select query. · 7acbea3f

unknown authored Sep 29, 2005


sql/sql_base.cc:
  fix for bug #13545: Server crash caused by select query.
  - compare table qualifier only with tables which are not nested joins.
  - perform recursion accordingly.
  - DBUG_ASSERT(table_list->table); added before the find_field_in_table() call.

7acbea3f

Merge grichter@bk-internal.mysql.com:/home/bk/mysql-5.0 · 34a56557
unknown authored Sep 29, 2005
```
into lmy002.wdf.sap.corp:/home/georg/work/mysql/bugs/mysql-5.0
```
34a56557
Merge mysql.com:/usr/local/bk/mysql-5.0 · 71c8588a
unknown authored Sep 29, 2005
```
into  mysql.com:/usr/home/pem/mysql-5.0
```
71c8588a
Merge mysql.com:/home/mydev/mysql-5.0 · 35598ff5
unknown authored Sep 29, 2005
```
into  mysql.com:/home/mydev/mysql-5.0-5000
```
35598ff5