Commit graph

18768 commits

Author SHA1 Message Date
unknown
b3d0549ed5 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0
2005-01-12 17:05:33 +01:00
unknown
78f59f6093 Merge mysql.com:/home/jwinstead2/mysql-4.1-clean
into mysql.com:/home/jwinstead2/mysql-5.0-clean


libmysql_r/Makefile.am:
  Auto merged
mysql-test/r/analyse.result:
  Auto merged
sql/sql_analyse.cc:
  Auto merged
2005-01-12 17:05:33 +01:00
unknown
1b039e0b3a Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0
into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-5.0
2005-01-12 10:05:33 -06:00
unknown
c153522d35 Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0
into deer.(none):/home/hf/work/mysql-5.0.clean
2005-01-12 20:05:32 +04:00
unknown
c1bc964a8e Merge mysql.com:/home/kostja/work/mysql-4.0-6761
into mysql.com:/home/kostja/work/mysql-4.1-root


sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
2005-01-12 19:00:04 +03:00
unknown
5b0678232f --defaults-extra-file bug fixed
mysys/default.c:
  silly mistake happened during the merge
2005-01-12 19:57:26 +04:00
unknown
6f041af11b ndb - Add test-case file for 16-nodes 2005-01-12 16:20:21 +01:00
unknown
b9dc94a079 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-01-12 15:46:37 +01:00
unknown
8296883ff4 ndb - Fix problem with parallelism < fragcount & committedread
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Pre book fragments to keep count how many ops need to be continued by 
    api
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Pre book fragments to keep count how many ops need to be continued by 
    api
  
  Fixes problem with parallelism < fragcount && committed read
ndb/test/ndbapi/testScan.cpp:
  new testcase for scan parallelism
ndb/test/run-test/daily-basic-tests.txt:
  Run new testcase
ndb/test/src/HugoTransactions.cpp:
  Use parallelism parameter
2005-01-12 15:36:52 +01:00
unknown
b692ca4fd5 A fix for Bug#6761 "mysql_list_fields() does not work": test
case will be added to client_test in 4.1


sql/sql_parse.cc:
  A fix for bug #6761: "mysql_list_fields() does not work": init
  thd->query_length, which is used next line. Remove a stale comment.
2005-01-12 17:04:45 +03:00
unknown
3a13246cb0 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
2005-01-12 16:02:46 +02:00
unknown
1454564f1c Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2005-01-12 14:34:34 +01:00
unknown
d8a2ed781a Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2005-01-12 14:30:04 +01:00
unknown
c65c72f01a InnoDB: Use system-supplied tmpfile() on Netware, as there is no
open interface for setting the "delete-on-close" flag.


innobase/os/os0file.c:
  Use system-supplied tmpfile() on Netware
sql/ha_innodb.cc:
  Remove innobase_mysql_tmpfile() on Netware.
2005-01-12 15:24:49 +02:00
unknown
ec03f8acb2 added management server port as "unique" id for use in shmkey 2005-01-12 14:03:10 +01:00
unknown
124bc850d5 ndb - Fix init of replica/frag count in ndb api
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Fix init of replica/frag count
2005-01-12 13:33:04 +01:00
unknown
bbaa4ea8e7 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-01-12 13:27:15 +01:00
unknown
e8e4861401 Merge mysql.com:/space/my/mysql-4.1
into mysql.com:/space/my/mysql-4.1-merge
2005-01-12 13:08:24 +01:00
unknown
332b0609d9 Merge mysql.com:/space/my/mysql-4.1-merge
into mysql.com:/space/my/mysql-5.0


Build-tools/Do-compile:
  Auto merged
2005-01-12 13:07:48 +01:00
unknown
d862f84643 - Modified Do-compile to run the test suite with ps-protocol and against
the embedded server by default (if included). These additional steps can
  be skipped by providing "--skip-embedded-test" and "--skip-ps-test"


Build-tools/Do-compile:
  - enabled running the test suite with ps-protocol and against the embedded
    server by default (if included). These additional steps can be skipped
    by providing "--skip-embedded-test" and "--skip-ps-test"
2005-01-12 13:06:06 +01:00
unknown
7310387078 Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0


sql/mysqld.cc:
  Auto merged
2005-01-12 12:35:34 +01:00
unknown
452eda8d3e merged. ul. 2005-01-12 12:24:23 +01:00
unknown
0bcfc49b4b added missing Com_update_multi status variable 2005-01-12 12:18:17 +01:00
unknown
e234bbeab0 renamed charset name 'eucjp_ms' to 'eucjpms' 2005-01-12 02:58:15 -08:00
unknown
ce2f345a7d Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-01-12 11:27:30 +01:00
unknown
2123dc6ba3 Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-01-12 11:25:54 +01:00
unknown
40649e92f7 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0


libmysql_r/Makefile.am:
  Auto merged
mysql-test/r/analyse.result:
  Auto merged
sql/sql_analyse.cc:
  Auto merged
2005-01-12 11:24:46 +01:00
unknown
ed6c9afd6d Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2005-01-12 11:20:05 +01:00
unknown
7e36a0b7cb ndb - fix 64-bit problem in autotest
ndb/test/src/CpcClient.cpp:
  Fix 64-bit problem
2005-01-12 11:17:03 +01:00
unknown
edbef416f4 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0


sql/opt_range.cc:
  Auto merged
2005-01-12 11:45:04 +02:00
unknown
2ee0dc0936 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb


ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
2005-01-12 09:22:10 +01:00
unknown
5861c6dc17 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/dbdata/psergey/mysql-5.0-bug5401-2


innobase/include/row0mysql.h:
  Auto merged
innobase/row/row0sel.c:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
2005-01-12 09:05:11 +03:00
unknown
dd3cfa8d88 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/psergey/mysql-5.0-look-valgrind
2005-01-12 09:05:10 +03:00
unknown
c8807157ff BUG#5401: post-review fixes 2005-01-12 08:39:15 +03:00
unknown
2b73271ceb Fix for use of unitialized variable errors: Manually delete
{min,max}_functions_it as it is not allocated on the pool.
2005-01-12 08:15:46 +03:00
unknown
d67a56cb21 uncommented the drop table statement
mysql-test/t/ctype_eucjp_ms.test:
  uncommnented the drop table statement
2005-01-11 20:26:43 -08:00
unknown
37a15ec061 added new character set - cp932, eucjp_ms
config/ac-macros/character_sets.m4:
  added cp932, eucjp_ms character set
include/m_ctype.h:
  added cp932, eucjp_ms character set
libmysql/Makefile.shared:
  added cp932, eucjp_ms character set
mysys/charset-def.c:
  added cp932, eucjp_ms character set
sql/share/charsets/Index.xml:
  added cp932, eucjp_ms character set
strings/Makefile.am:
  added cp932, eucjp_ms character set
2005-01-11 17:45:36 -08:00
unknown
547b78c504 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0


sql/field.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
2005-01-12 03:40:02 +02:00
unknown
24a0275722 Fixed memory reference errors found by valgrind
sql/ha_federated.cc:
  Change mode to -rw-rw-r--
myisam/mi_create.c:
  Ensure that all referenced memory is reset
mysql-test/r/type_timestamp.result:
  More tests
mysql-test/t/func_compress.test:
  Added comment
mysql-test/t/type_timestamp.test:
  More tests
sql/field.h:
  Count number of varchars in table
sql/item_cmpfunc.cc:
  Safety fix (to avoid warning from valgrind)
sql/opt_range.cc:
  Simple optimzation
sql/sql_acl.cc:
  Safety fix (to avoid warning from valgrind)
sql/sql_parse.cc:
  Safety fix for prepared statements
sql/sql_show.cc:
  Move variable declarations first in function
  Remove hidden variable (it)
  Remove accessing freed memory (table_list->table_name)
sql/sql_update.cc:
  Compare records with varchars correctly
sql/table.cc:
  Safety fix when running with purify/valgrind
  Fix wrong memory reference in case of errors
sql/table.h:
  Added counting of varchar fields
strings/ctype-mb.c:
  Fill max_str properly
2005-01-12 03:38:53 +02:00
unknown
61eec3db43 Merge mysql.com:/home/stewart/Documents/MySQL/5.0/ndb
into mysql.com:/home/stewart/Documents/MySQL/5.0/ndb-dynamic-ports-impl3


ndb/src/common/transporter/TransporterRegistry.cpp:
  Auto merged
ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/src/mgmsrv/main.cpp:
  Auto merged
2005-01-12 11:25:49 +11:00
unknown
a964b18269 change to using public enum for log events
ndb/include/Makefile.am:
  added ndb_logevent to source dist
2005-01-11 23:25:45 +01:00
unknown
d5a3f4a6e3 ndbcluster.sh:
increased timeouts to see if more tests get started automatically


mysql-test/ndb/ndbcluster.sh:
  increased timeouts to see if more tests get started automatically
2005-01-11 23:09:10 +01:00
unknown
0f44ad64d0 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2005-01-11 23:02:14 +01:00
unknown
90d6c0629f Merge jwinstead@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jwinstead2/mysql-4.1-clean
2005-01-11 21:55:39 +01:00
unknown
6eb792304c Merge mysql.com:/home/jwinstead2/mysql-4.1-6418
into mysql.com:/home/jwinstead2/mysql-4.1-clean
2005-01-11 21:53:39 +01:00
unknown
f214faa8ad Replace ZLIB_LIBS in mysql_config. (Bug #6418)
scripts/Makefile.am:
  Replace ZLIB_LIBS
2005-01-11 21:50:30 +01:00
unknown
21d4d7ec49 Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0
into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-5.0
2005-01-11 13:28:58 -06:00
unknown
8c71efbcd4 strict.result, strict.test:
Clean-up for the previous change: VARCHAR and trailing spaces.


mysql-test/t/strict.test:
  Clean-up for the previous change: VARCHAR and trailing spaces.
mysql-test/r/strict.result:
  Clean-up for the previous change: VARCHAR and trailing spaces.
2005-01-11 23:28:57 +04:00
unknown
c7fbf424c7 Merging fixed 2005-01-11 23:28:56 +04:00
unknown
cd3b9f5790 ndb compile warnings
ndb/test/include/NDBT_Test.hpp:
  compile warnings
ndb/test/ndbapi/bank/BankLoad.cpp:
  compile warnings
ndb/test/ndbapi/testOIBasic.cpp:
  compile warnings
ndb/test/src/HugoCalculator.cpp:
  compile warnings
ndb/test/src/NDBT_Test.cpp:
  compile warnings
ndb/test/src/NdbBackup.cpp:
  compile warnings
ndb/test/src/NdbRestarts.cpp:
  compile warnings
2005-01-11 19:45:57 +01:00