Commit graph

19797 commits

Author SHA1 Message Date
unknown
faca00b5d5 Merge mysql.com:/home/jimw/my/mysql-4.0-5569
into mysql.com:/home/jimw/my/mysql-4.0-clean


sql/sql_parse.cc:
  Auto merged
2005-02-01 15:38:27 -08:00
unknown
6162c4a6eb Fix value of YEAR field when set from a non-numeric string. (Bug #6067)
mysql-test/t/type_date.test:
  Add new regression test
mysql-test/r/type_date.result:
  Add result
sql/field.cc:
  Set YEAR to 0 when set to a non-numeric string, not 2000,
  and issue a warning.
2005-02-01 15:08:31 -08:00
unknown
27d743576f Merge hundin.mysql.fi:/home/heikki/mysql-4.0
into hundin.mysql.fi:/home/heikki/mysql-4.1


innobase/include/rem0rec.ic:
  SCCS merged
sql/sql_select.cc:
  SCCS merged
2005-02-02 00:41:25 +02:00
unknown
3c04bddb04 rem0rec.ic:
Fix a debug assertion in rem0rec.ic on AMD64; 4.1 was already fixed


innobase/include/rem0rec.ic:
  Fix a debug assertion in rem0rec.ic on AMD64; 4.1 was already fixed
2005-02-02 00:31:06 +02:00
unknown
a1b7bbd74c Merge heikki@bk-internal.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/heikki/mysql-4.1


sql/sql_class.h:
  Auto merged
2005-02-02 00:22:19 +02:00
unknown
9d8af792cc Merge marko@bk-internal.mysql.com:/home/bk/mysql-5.0
into hundin.mysql.fi:/home/marko/mysql-5.0
2005-02-01 23:57:05 +02:00
unknown
7d2dcab3a2 InnoDB: Fix debug compile error on Tru64 (Bug #8244)
innobase/include/rem0rec.ic:
  Eliminate int16_t from an assertion, as it is not defined in the
  same system headers on all platforms.  (Bug #8244)
2005-02-01 23:55:41 +02:00
unknown
eca1f04aa4 Make sure mysql_client_test and embedded test clients get added to
binary distribution on all platforms.


scripts/make_binary_distribution.sh:
  Add mysql_client_test and embedded versions to basic list of binaries
  and only list libtool-produced '.libs/' versions as non-netware binaries
2005-02-01 11:59:44 -08:00
unknown
69c2eb98ee Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/wl1967


sql/ha_innodb.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
2005-02-01 19:57:42 +00:00
unknown
0e50e32480 WL#1967
Support for COMMIT/ROLLBACK optional arguments


innobase/include/trx0roll.h:
  WL#1967
    trx_release_savepoint_for_mysql()
innobase/trx/trx0roll.c:
  WL#1967
    trx_release_savepoint_for_mysql()
mysql-test/r/innodb.result:
  WL#1967
    Test for savepoint release
mysql-test/t/innodb.test:
  WL#1967
    Test for savepoint release
sql/ha_innodb.cc:
  WL#1967
    innobase_release_savepoint_name()
sql/ha_innodb.h:
  WL#1967
    innobase_release_savepoint_name()
sql/handler.cc:
  WL#1967
    ha_release_savepoint_name()
sql/handler.h:
  WL#1967
    ha_release_savepoint_name()
sql/lex.h:
  WL#1967
    New tokens: CHAIN, RELEASE
sql/mysqld.cc:
  WL#1967
    new option: completion-type
sql/set_var.cc:
  WL#1967
    new option: completion-type
sql/sql_class.h:
  WL#1967
    new option: completion-type
sql/sql_lex.h:
  WL#1967
    Support RELEASE SAVEPOINT
    additional flags to support COMMIT/ROLLBACK options
sql/sql_parse.cc:
  WL#1967
    Transaction operations in mysql_endtrans(), begin_trans()
sql/sql_yacc.yy:
  WL#1967
    Support COMMIT/ROLLBACK optional args
2005-02-01 19:48:05 +00:00
unknown
cf660b001e cleanup and streamlining of thread create/exit in ndb 2005-02-01 19:01:37 +01:00
unknown
10ede1a513 Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-02-01 18:02:36 +01:00
unknown
6b7f067e8b merge 2005-02-01 17:16:05 +01:00
unknown
64412075e8 Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb


sql/mysqld.cc:
  Auto merged
2005-02-01 17:11:09 +01:00
unknown
6a2b914190 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0
2005-02-01 17:09:36 +01:00
unknown
9d548d7f22 ndb - Put all output from ndb tools during mysql-test-run into log file
mysql-test/mysql-test-run.sh:
  Put all output from ndb_tool into log file
mysql-test/t/ndb_autodiscover.test:
  Put all output from ndb_tool into log file
mysql-test/t/ndb_restore.test:
  Put all output from ndb_tool into log file
2005-02-01 17:08:39 +01:00
unknown
3a890c8a87 ndb -
1) New testcase
   Check every combination of ins/upd/del of length 5
   Check reading savepoint's
2) Fix 1 liner in acc wrt committing read


ndb/include/ndbapi/NdbConnection.hpp:
  Make testcase friend
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Fix so that committing a READ can _not_ result in setting elementIsDisappeared
ndb/test/include/NDBT_Test.hpp:
  Make copy of testcase name
ndb/test/ndbapi/testOperations.cpp:
  New testcase
    Check every combination of ins/upd/del of length 5
    Check reading savepoint's
ndb/test/src/HugoOperations.cpp:
  Close transaction in destructor
ndb/test/src/NDBT_Test.cpp:
  Make copy of testcase name
2005-02-01 16:49:23 +01:00
unknown
514b2364b4 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1
into bob.(none):/home/reggie/bk/mysql41
2005-02-01 08:46:56 -06:00
unknown
38e395aa32 WL#2269 Enable query cache for NDB
- Added a thread that fetches commit_count for open tables. This
will mean that NDB will not have to be contacted for every use of a cached query. 


sql/ha_ndbcluster.cc:
  Added a thread that periodically will fetch commit_count 
  for open tables and store that value in share. 
  The commit count value is then used when query cache 
  asks if a cached query can be used. 
  The thread activation interval is regulated by the 
  config variable ndb_cache_check_time, it's default value is 0
  which means that NDB is contacted every time a cached query is reused.
sql/ha_ndbcluster.h:
  Added commit_count to share
  Added ndb_cache_check_time
sql/mysqld.cc:
  Added config variable ndb_cache_check_time
sql/set_var.cc:
  Added config variable ndb_cache_check_time
2005-02-01 15:43:08 +01:00
unknown
c53184ebb7 Proper fix for comparision with ' '
(Bug #7788 "Table is full" occurs during a multitable update")


client/mysqldump.c:
  Style fixes
innobase/include/univ.i:
  UNIV_DEBUG should not depend on configure --debug but on --debug=full
mysql-test/r/compare.result:
  Added test to find bug in previous bugfix
mysql-test/t/compare.test:
  Added test to find bug in previous bugfix
mysys/my_handler.c:
  Proper fix for comparision with ' '
strings/ctype-big5.c:
  Proper fix for comparision with ' '
strings/ctype-bin.c:
  Proper fix for comparision with ' '
strings/ctype-gbk.c:
  Proper fix for comparision with ' '
strings/ctype-latin1.c:
  Proper fix for comparision with ' '
strings/ctype-mb.c:
  Proper fix for comparision with ' '
strings/ctype-simple.c:
  Proper fix for comparision with ' '
strings/ctype-sjis.c:
  Proper fix for comparision with ' '
strings/ctype-tis620.c:
  Proper fix for comparision with ' '
strings/ctype-ucs2.c:
  Proper fix for comparision with ' '
strings/ctype-utf8.c:
  Proper fix for comparision with ' '
2005-02-01 16:27:08 +02:00
unknown
fe7b863412 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.0
into bob.(none):/home/reggie/bk/mysql5.0
2005-02-01 08:19:57 -06:00
unknown
8a90aced5e Merge bob.(none):/home/reggie/bk/mysql41
into bob.(none):/home/reggie/bk/mysql5.0


extra/perror.c:
  Auto merged
2005-02-01 08:16:45 -06:00
unknown
9ffdfea1cc Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/my/mysql-4.0
2005-02-01 15:38:48 +02:00
unknown
7da72c932e Remove #if 0 as this only confuses the code withing adding anything 2005-02-01 15:36:48 +02:00
unknown
e1f418e140 merging 2005-02-01 17:20:32 +04:00
unknown
e729760daf after merge fix up:
we should use REPLACE for $hostaname queries to avoid problems when $hostname=localhost.
2005-02-01 17:13:44 +04:00
unknown
0451add301 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/space/my/mysql-4.0
2005-02-01 13:30:16 +01:00
unknown
d59bc7f47a Merge mysql.com:/space/my/mysql-4.0 into mysql.com:/space/my/mysql-4.1
Build-tools/Bootstrap:
  Auto merged
2005-02-01 13:19:21 +01:00
unknown
b3c74fb124 Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
2005-02-01 13:55:40 +02:00
unknown
f7606a335e Skip cp932 and eucjpms tests when the character sets are not compiled. 2005-02-01 14:37:51 +04:00
unknown
2bb14c6fe7 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0


sql/sql_parse.cc:
  Auto merged
2005-02-01 12:20:03 +03:00
unknown
9fe76ad98b Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1


sql/item.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
2005-02-01 11:05:29 +02:00
unknown
e5d8e72a78 After merge fixes
innobase/mem/mem0pool.c:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
configure.in:
  Ignore changes that were backported to 4.0
scripts/mysql_install_db.sh:
  Ignore Ramil's changes for now
2005-02-01 10:24:09 +02:00
unknown
b95c2d3578 character_sets.m4:
--with-uca configure.in argument.
  The rest of the changes are pending from 4.1 tree


config/ac-macros/character_sets.m4:
  --with-uca configure.in argument.
  The rest of the changes are pending from 4.1 tree
2005-02-01 11:50:43 +04:00
unknown
199375cbc9 Bug #7390 perror.exe doesn't work
perror.c:
  Copy output of strerr to temp buffer to prevent system overwrite on Windows


extra/perror.c:
  Copy output of strerr to temp buffer to prevent system overwrite on Windows
2005-01-31 23:02:32 -06:00
unknown
8f795d9e6e Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.0
into bob.(none):/home/reggie/bk/mysql5.0


BitKeeper/etc/logging_ok:
  auto-union
innobase/include/srv0srv.h:
  Auto merged
innobase/srv/srv0srv.c:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
2005-01-31 22:26:12 -06:00
unknown
e71e8b933c Merge bob.(none):/home/reggie/bk/mysql41
into bob.(none):/home/reggie/bk/mysql5.0


BitKeeper/etc/logging_ok:
  auto-union
innobase/include/srv0srv.h:
  Auto merged
innobase/srv/srv0srv.c:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
2005-01-31 22:24:04 -06:00
unknown
77cdf79fb4 Add 'debug' to mysqladmin --help output. (Bug #8207)
client/mysqladmin.cc:
  Add documentation for 'debug' command
2005-01-31 19:35:12 -08:00
unknown
6e0691f54f Update client_xml test to avoid timestamp-sensitive part of test.
mysql-test/t/client_xml.test:
  Exclude create in mysqldump test, it includes timestamp
mysql-test/r/client_xml.result:
  Update result file
2005-01-31 18:48:42 -08:00
unknown
41763b20e2 Merge mysql.com:/home/jimw/my/mysql-4.1-7811
into mysql.com:/home/jimw/my/mysql-5.0-clean


client/mysql.cc:
  Auto merged
2005-01-31 17:51:45 -08:00
unknown
99620cecd8 Merge bk-internal:/home/bk/mysql-4.1
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-01-31 17:32:22 -08:00
unknown
ac5e79b9a1 Update test results after bug-fix merge.
mysql-test/r/mysqldump.result:
  Fix results
2005-01-31 17:31:42 -08:00
unknown
098fc22417 Merge mysql.com:/home/stewart/Documents/MySQL/5.0/ndb
into mysql.com:/home/stewart/Documents/MySQL/5.0/ndb-dynamic-ports-impl5


ndb/src/common/mgmcommon/IPCConfig.cpp:
  Auto merged
ndb/src/common/transporter/TransporterRegistry.cpp:
  Auto merged
ndb/src/cw/cpcd/main.cpp:
  Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
ndb/src/mgmsrv/main.cpp:
  Auto merged
2005-02-01 11:45:05 +11:00
unknown
8b08a2e87f Merge
BitKeeper/etc/logging_ok:
  auto-union
client/mysqldump.c:
  Auto merged
innobase/include/srv0srv.h:
  Auto merged
innobase/srv/srv0srv.c:
  Auto merged
mysql-test/r/mysqldump.result:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
strings/ctype-simple.c:
  SCCS merged
2005-01-31 16:27:17 -08:00
unknown
af5e2a1034 Merge mysql.com:/home/jimw/my/mysql-4.1-6511
into mysql.com:/home/jimw/my/mysql-4.1-clean


sql/mysql_priv.h:
  Auto merged
sql/sql_cache.cc:
  Auto merged
2005-01-31 15:30:34 -08:00
unknown
ec12a1f341 Merge mysql.com:/home/jimw/my/mysql-4.1-8134
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-01-31 15:29:55 -08:00
unknown
20745ec65f Merge mysql.com:/home/jimw/my/mysql-4.1-8148
into mysql.com:/home/jimw/my/mysql-4.1-clean


client/mysqldump.c:
  Auto merged
2005-01-31 15:28:33 -08:00
unknown
4b88e07159 Bug #6607 Create table... LIKE... with Windows Symlinks
sql_table.cc:
  use fn_format to resolve symlinks in mysql_create_like_table


sql/sql_table.cc:
  use fn_format to resolve symlinks in mysql_create_like_table
2005-01-31 17:24:18 -06:00
unknown
dd385f2493 Bug#7011
Fix for merge from 4.1
2005-01-31 20:49:37 +00:00
unknown
5df7e7bd71 Merge heikki@bk-internal.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/heikki/mysql-4.1


sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
2005-01-31 22:30:40 +02:00