Commit graph

12057 commits

Author SHA1 Message Date
unknown
d91477ced6 Fixed wrong key usage which caused wrong result for some "WHERE primary_key=constant" queries where MySQL could use 'only index' (Bug #3666)
The bug was introduced in a patch in the 4.1.2 source tree.


mysql-test/r/key.result:
  New result
mysql-test/t/key.test:
  Added test case for bug in key read
sql/sql_select.cc:
  Fixed wrong key usage which caused wrong result for some "WHERE primary_key=constant" queries where MySQL could use 'only index' (Bug #3666)
2004-05-06 04:40:45 +03:00
unknown
1f32e9a199 fixed test results 2004-05-05 23:29:35 +03:00
unknown
66842d6e57 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-ndb-4.1
2004-05-05 23:19:13 +03:00
unknown
974ce66bdd Replication:
as the I/O thread filters on the server id, we must test replicate_same_server_id in it (on top of in the SQL thread).


mysql-test/r/rpl_server_id2.result:
  result update
sql/slave.cc:
  As the I/O thread filters on the server id, we must test replicate_same_server_id in it (on top of in the SQL thread).
2004-05-05 22:01:41 +02:00
unknown
b52317df71 merge
mysql-test/r/subselect.result:
  Auto merged
sql/sql_union.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2004-05-05 22:30:01 +03:00
unknown
19d3f588f2 After merge fixes 2004-05-05 21:46:16 +03:00
unknown
e5d43578fd Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1


sql/item_strfunc.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
2004-05-05 21:24:45 +03:00
unknown
000f76cfb8 after merge fixes
client/mysqldump.c:
  Fixed problem with multiple tables (--skip-quote didn't work properly for second table)
myisam/myisamchk.c:
  after merge fix
2004-05-05 21:24:21 +03:00
unknown
2c95f97c2b Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-ndb-4.1


mysql-test/r/subselect.result:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
2004-05-05 21:24:13 +03:00
unknown
f6428e8bb9 caching of queries with isammerge tables forbiden using general way
SQL_SELECT_LIMIT as default will be applied only for SELECT statement if there was not explicit LIMIT clause
correct table list passed to class constructor of select_update


mysql-test/r/subselect.result:
  do not show limit if it is not explicit
mysql-test/r/union.result:
  test of LIMIT + ORDER
mysql-test/t/union.test:
  test of LIMIT + ORDER
sql/ha_isammrg.h:
  caching of queries with isammerge tables forbiden
sql/sql_cache.cc:
  removed check on isammerge
sql/sql_lex.cc:
  tag of explicit limit in statement
sql/sql_lex.h:
  tag of explicit limit in statement
sql/sql_parse.cc:
  blanks in empty line removed
  no limit by default (SQL_SELECT_LIMIT as default will be applied only for SELECT statement if there was not explicit LIMIT clause)
sql/sql_union.cc:
  reverted incorrect patch
sql/sql_update.cc:
  reverted incorrect patch
  correct table list passed to class constructor
sql/sql_yacc.yy:
  explicit LIMIT marked
2004-05-05 21:21:41 +03:00
unknown
cd21f7ce40 Merge with 4.0.19
BitKeeper/etc/logging_ok:
  auto-union
VC++Files/client/mysqlclient.dsp:
  Auto merged
VC++Files/mysql.dsw:
  Auto merged
extra/perror.c:
  Auto merged
extra/replace.c:
  Auto merged
innobase/configure.in:
  Auto merged
innobase/include/lock0lock.h:
  Auto merged
innobase/include/row0mysql.h:
  Auto merged
innobase/include/sync0sync.h:
  Auto merged
innobase/lock/lock0lock.c:
  Auto merged
ltmain.sh:
  Auto merged
BitKeeper/deleted/.del-libmysqld.def~8edf7b8780ce943c:
  Auto merged
innobase/os/os0file.c:
  Auto merged
innobase/pars/lexyy.c:
  Auto merged
innobase/row/row0mysql.c:
  Auto merged
innobase/srv/srv0srv.c:
  Auto merged
innobase/srv/srv0start.c:
  Auto merged
innobase/sync/sync0arr.c:
  Auto merged
innobase/sync/sync0sync.c:
  Auto merged
innobase/trx/trx0trx.c:
  Auto merged
mysql-test/r/alias.result:
  Auto merged
mysql-test/t/system_mysql_db_fix-master.opt:
  Auto merged
mysql-test/r/func_time.result:
  Automatic merge
mysql-test/r/innodb.result:
  Automatic merge
mysql-test/t/alias.test:
  Automatic merge
mysql-test/t/create.test:
  Automatic merge
mysql-test/t/func_time.test:
  Automatic merge
sql/ha_innodb.cc:
  Automatic merge
sql/mysql_priv.h:
  Automatic merge
mysql-test/r/rpl_multi_update.result:
  Automatic merge
mysql-test/t/rpl_error_ignored_table.test:
  Automatic merge
mysql-test/t/rpl_multi_update.test:
  Automatic merge
sql/slave.h:
  Automatic merge
sql/sql_base.cc:
  Automatic merge
sql/sql_db.cc:
  Automatic merge
sql/sql_insert.cc:
  Automatic merge
sql/structs.h:
  Automatic merge
sql/table.cc:
  Automatic merge
strings/longlong2str-x86.s:
  Automatic merge
strings/strings-x86.s:
  Automatic merge
support-files/my-medium.cnf.sh:
  Automatic merge
2004-05-05 17:05:24 +03:00
unknown
b30d0883b1 Merge miguel@bk-internal.mysql.com:/home/bk/mysql-4.1
into hegel.local:/home/miguel/bk/mysql-4.1


sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
2004-05-05 10:55:39 -03:00
unknown
cf8463ac7b Fixes for prior commit
mysys/my_getsystime.c:
  Applied Sergei's fixes
sql/sql_prepare.cc:
  Fix prior commit
2004-05-05 10:54:11 -03:00
unknown
7d918f213e Portability fix 2004-05-05 14:40:44 +03:00
unknown
393ed84c9a a fix (Bug #3435: STDDEV|VARIANCE(constant) returns constant if no rows) 2004-05-05 16:06:01 +05:00
unknown
575541b9f7 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1


mysql-test/r/subselect.result:
  Auto merged
sql/item.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
tests/client_test.c:
  Auto merged
2004-05-05 12:40:59 +03:00
unknown
e75a26ba3f Delete Items created during Prepared Stat (memory leak bug) (Bug #3451)
sql/sql_parse.cc:
  Delete Items created during Prepared Stat (memory leak bug)
sql/sql_prepare.cc:
  Delete Items created during Prepared Stat (memory leak bug)
2004-05-05 12:40:33 +03:00
unknown
68d07cbcc4 Fixed crashing bug with alter table when table was in use (Bug #3643)
We didn't use 'only index' for tables of type 'const'. (Bug #3497)


mysql-test/r/func_str.result:
  New testfin
mysql-test/r/key.result:
  New test
mysql-test/r/key_primary.result:
  Update after "We didn't use 'only index' for tables of type 'const'" fix.
mysql-test/r/null_key.result:
  Update after "We didn't use 'only index' for tables of type 'const'" fix.
mysql-test/r/subselect.result:
  Update after "We didn't use 'only index' for tables of type 'const'" fix.
mysql-test/t/func_str.test:
  Updated bug texts
  Added test for conversion of long string value to integer (Bug #3472)
mysql-test/t/key.test:
  Test of key read with primary key (Bug #3497)
sql/item.cc:
  Added assert
sql/sql_base.cc:
  Fixed crashing bug with alter table when table was in use (Bug #3643)
sql/sql_load.cc:
  Indentation fixes
sql/sql_select.cc:
  We didn't use 'only index' for tables of type 'const'. (Bug #3497)
2004-05-05 12:31:17 +03:00
unknown
b33f8fa778 InnoDB: Truncate "<datadir>/innodb.status.<pid>" to its actual size
(Bug #3596)


innobase/srv/srv0srv.c:
  Truncate "<datadir>/innodb.status.<pid>" to its actual size (Bug #3596)
sql/ha_innodb.cc:
  Truncate "<datadir>/innodb.status.<pid>" to its actual size (Bug #3596)
2004-05-05 11:50:58 +03:00
unknown
f44fb5fd89 InnoDB: os0file.c: Lock files exclusively (Bug #3608)
innobase/os/os0file.c:
  Lock files unless #defined __WIN__ or UNIV_HOTBACKUP (Bug #3608)
2004-05-05 11:40:17 +03:00
unknown
ea646dce60 avoid using ndb tables in query cache
sql/ha_ndbcluster.h:
  fixed layout
  prohibit using query cache with ndb tables
sql/handler.h:
  new caching type
sql/sql_cache.cc:
  support of new caching type (caching prohibited)
2004-05-05 11:22:10 +03:00
unknown
aee9a54886 Merge marko@build.mysql.com:/home/bk/mysql-4.0
into hundin.mysql.fi:/home/marko/l/mysql-4.0
2004-05-05 10:15:43 +03:00
unknown
bddee0c170 Windows fixes for VC++ compiler compability
myisam/myisam_ftdump.c:
  VC++ compiler compability fix
mysys/my_getsystime.c:
  Applied Sergei's code for Windows (still subject to changes by him)
sql/handler.cc:
  VC++ compiler compability fix
sql/item_geofunc.cc:
  Removed non-used variable
sql/item_strfunc.cc:
  VC++ compiler compability fix
sql/opt_range.cc:
  VC++ compiler compability fix
sql/sql_insert.cc:
  VC++ compiler compability fix
sql/sql_lex.cc:
  VC++ compiler compability fix
sql/sql_parse.cc:
  VC++ compiler compability fix
sql/sql_prepare.cc:
  VC++ compiler compability fix
sql/sql_union.cc:
  Removed non-used variable and VC++ compiler compability fix
2004-05-05 02:59:17 -03:00
unknown
e35921a112 Fixes to Windows project files for 4.0.19
VC++Files/client/mysqlclient.dsp:
  Add strxnmov to project files
VC++Files/mysql.dsw:
  Add dependency to prevent compile error
2004-05-04 21:47:39 -01:00
unknown
af847c22af Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1


sql/sql_union.cc:
  Auto merged
2004-05-04 23:05:37 +03:00
unknown
5bd7b50cf1 Fix for a multi table updates when one of the tables is not updated
but used in a nested query.
2004-05-04 23:04:05 +03:00
unknown
4df5d6d696 After merge fix.
Now test_bug1664() uses new statement checking macros.


tests/client_test.c:
  Now test_bug1664() uses new statement checking macros.
2004-05-04 20:02:55 +04:00
unknown
5c9f01a79b Manual merge of bugfix for Bug #1664.
sql/sql_prepare.cc:
  Auto merged
tests/client_test.c:
  Manual merge.
2004-05-04 19:13:18 +04:00
unknown
6ca757544b Fix for remaining issues described in Bug #1664
"mysql_send_long_data() API call is completely broken".

Now we are resetting some members (long_data_supplied/null_value...) of Item_param to its 
initial state after each execution of prepared statement. We also manipulating 
Item_param::maybe_null/null_value only via Item_param::set_* setters which makes code a bit 
more robust.


sql/item.cc:
  Now we are assuming that Item_param may be NULL until we know this fact exactly.
  Added non-empty implementation of Item_param::reset() method which should be used
  for restoring Item_param state after each statment execution. (We need to clear 
  long_data_supplied flag, we also clear some other Item_param members here since it
  makes code simpler.)
sql/item.h:
  Now Item_param::reset() method really does something.
sql/sql_prepare.cc:
  Now we are calling Item_param::reset() for each parameter after execution for resetting Item_param
  to initial state. So we no longer don't need Prepared_statement::long_data_flag. We also 
  set Item_param::null_value/maybe_null value in Item_param::set_* and reset() methods 
  instead of doing it explicitly in insert_params_* functions (this by the way lowers 
  probability that we will forget to update one of such functions).
tests/client_test.c:
  Added test for Bug#1664 "mysql_send_long_data() API call is broken".
2004-05-04 19:08:19 +04:00
unknown
40dba5a82f useless fixes for --report-password and --show-slave-auth-info (almost undocumented options),
just for beauty of truth.


sql/mysqld.cc:
  correcting sentence (even if option is not really usable,
  as it depends on report-user and report-password which are undocumented
  (and will stay like this)).
sql/slave.cc:
  report password when you must report password.
2004-05-04 16:35:31 +02:00
unknown
a1ec6140d2 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
2004-05-04 15:49:22 +02:00
unknown
ed3f472a12 Fix for Bug#3357 "If the statement is long, the error message is trunc and important info is lost";
in hard-coded replication messages, always put small-length info (error codes, explanation of the error) at the beginning,
so that it is not cut by truncation if the query is very long (which happens if the query goes first).


sql/log_event.cc:
  in hard-coded replication messages, always put small-length info (error codes, explanation of the error) at the beginning,
  so that it is not cut by truncation if the query is very long (which happens if the query goes first).
2004-05-04 15:48:40 +02:00
unknown
af794dde93 union.result:
fixing typo
union.test:
  fixing type


mysql-test/t/union.test:
  fixing type
mysql-test/r/union.result:
  fixing typo
2004-05-04 16:48:34 +03:00
unknown
a0c07c28ec Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-prep-4.1
2004-05-04 16:42:39 +03:00
unknown
aaff8391f5 repetable test replaced with inline function 2004-05-04 16:37:04 +03:00
unknown
7e41bc959c don't rely on readdir() returning . and .. first 2004-05-04 14:36:23 +02:00
unknown
23029a0f56 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-sub-4.1
2004-05-04 15:35:11 +03:00
unknown
030587a7a6 Fix to handle unsigned data in prepared statements (Bug #3447)
Fixed security problem that password was temporarly reset when someone changed GRANT for a user. (Bug #3404)
Fixed problem with PROCEDURE analyse() and impossible WHERE (Bug #2238)
Don't auto-repair tables in mysqlcheck if table type doesn't support 'check' command.


Docs/mysqld_error.txt:
  Updated error values
client/mysqlcheck.c:
  Don't cause auto-repair on 'note' (Tables that doesn't support 'check')
libmysql/libmysql.c:
  Fix to handle unsigned data in prepared statements (Bug #3447)
mysql-test/r/analyse.result:
  Test of analyze + impossible where (Bug #2238)
mysql-test/r/bdb.result:
  Update results
mysql-test/r/ctype_ujis.result:
  Update results
mysql-test/r/isam.result:
  Update results
mysql-test/r/repair.result:
  Update results
mysql-test/t/analyse.test:
  Test of analyze + impossible where (Bug #2238)
mysql-test/t/ctype_ujis.test:
  Added test for LIKE (Bug #3438)
sql/sql_acl.cc:
  Fixed security problem that password was temporarly reset when someone changed GRANT for a user. (Bug #3404)
sql/sql_select.cc:
  Fixed problem with PROCEDURE analyse() and impossible WHERE (Bug #2238)
sql/sql_table.cc:
  Changed 'error' to 'note' when table doesn't support admin command.
sql/sql_update.cc:
  Indentaion cleanup
tests/client_test.c:
  Added test for handling unsigned/signed strings with prepared statements
2004-05-04 15:02:38 +03:00
unknown
a8adc4a897 union.result, union.test:
a small fix for the test case


mysql-test/t/union.test:
  a small fix for the test case
mysql-test/r/union.result:
  a small fix for the test case
2004-05-04 14:11:23 +03:00
unknown
f171556b54 yangf - yet another ndb gcc/g++ fix
Hopefully last one



ndb/config/Defs.LINUX.x86.GCC.mk:
  Only use __cxa_pure_virtual for binaries / so's
ndb/src/common/util/new.cpp:
  Remove __cxa_pure_virtual from here
2004-05-04 12:40:33 +02:00
unknown
4539b63989 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2004-05-04 11:49:21 +02:00
unknown
5f02d41c0d Merge NDB patches into 4.1-clone, below is list of changesets
# --------------------------------------------
# 04/04/13      joreland@mysql.com      1.1858.1.1
# Removal of NDBT_Table
# --------------------------------------------
# 04/04/13      joreland@mysql.com      1.1858.1.2
# Removal of NDBT_Table
# --------------------------------------------
# 04/04/13      joreland@mysql.com      1.1858.1.3
# Fix for crashing AT
# --------------------------------------------
# 04/04/13      joreland@mysql.com      1.1858.1.4
# Bug fixes in testIndex
# --------------------------------------------
# 04/04/13      joreland@mysql.com      1.1866.1.5
# Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
# into mysql.com:/home/jonas/src/tmp
# --------------------------------------------
# 04/04/14      joreland@mysql.com      1.1858.1.5
# Fix for takeover when accessing indexes.
# --------------------------------------------
# 04/04/14      joreland@mysql.com      1.1866.1.6
# Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
# into mysql.com:/home/jonas/src/tmp
# --------------------------------------------
# 04/04/14      joreland@mysql.com      1.1858.2.1
# Fixed error handling of fire_trigger_ord + lqhkeyref w.r.t indexes
# --------------------------------------------
# 04/04/14      joreland@mysql.com      1.1858.2.2
# Simple retry mechanism in UTIL
# Helps testIndex -n BuildDuring _a lot_
# --------------------------------------------
# 04/04/14      joreland@mysql.com      1.1858.2.3
# Misc fixes to test prg.
# --------------------------------------------
# 04/04/14      joreland@mysql.com      1.1858.2.4
# Allow more retires on application errors
# --------------------------------------------
# 04/04/14      joreland@mysql.com      1.1858.2.5
# Pass no of rows fetched in SUB_SYNC_CONTINUE_REQ
# --------------------------------------------
# 04/04/14      joreland@mysql.com      1.1869
# wl1714
# Improve parallellism
# --------------------------------------------
# 04/04/14      joreland@mysql.com      1.1870
# Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
# into mysql.com:/home/jonas/src/wl1714
# --------------------------------------------
# 04/04/14      joreland@mysql.com      1.1866.1.7
# Merge
# --------------------------------------------
# 04/04/14      joreland@mysql.com      1.1871
# Merge mysql.com:/home/jonas/src/wl1714
# into mysql.com:/home/jonas/src/mysql-4.1-ndb
# --------------------------------------------
# 04/04/14      joreland@mysql.com      1.1872
# Fix for testScan -n ScanReadError5030
# --------------------------------------------
# 04/04/14      joreland@mysql.com      1.1873
# fix testDict -n FragmentType*
# --------------------------------------------
# 04/04/14      johan@stingray.(none)   1.1866.2.1
# small fixes
# --------------------------------------------
# 04/04/14      johan@stingray.(none)   1.1874
# Merge jandersson@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
# into stingray.(none):/space/bk/rep/mysql-4.1-ndb
# --------------------------------------------
# 04/04/14      johan@stingray.(none)   1.1875
# handle rep node as an api node
# --------------------------------------------
# 04/04/14      pekka@mysql.com 1.1873.1.1
# Fix for NDBT_Table removal
# --------------------------------------------
# 04/04/15      joreland@mysql.com      1.1873.1.2
# Uninitialized var.
# --------------------------------------------
# 04/04/15      johan@stingray.(none)   1.1876
# Merge jandersson@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
# into stingray.(none):/space/bk/rep/mysql-4.1-ndb
# --------------------------------------------
# 04/04/15      joreland@mysql.com      1.1873.1.3
# Write pid before changing user
# (as runas user probably doesn't have permissions on pid-dir)
# --------------------------------------------
# --------------------------------------------
# 04/04/15      ndb@mc03.ndb.mysql.com  1.1862.1.3
# Fix printout of varchars
# --------------------------------------------
# 04/04/15      ndb@mc03.ndb.mysql.com  1.1877
# Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
# into mc03.ndb.mysql.com:/space/ndb/tmp
# --------------------------------------------
# 04/04/15      ndb@mc03.ndb.mysql.com  1.1862.1.4
# Hmm.. don't print attr as many times as length of array
# --------------------------------------------
# 04/04/15      ndb@mc03.ndb.mysql.com  1.1878
# Merge mc03.ndb.mysql.com:/space/ndb/mysql-4.1-ndb
# into mc03.ndb.mysql.com:/space/ndb/tmp
# --------------------------------------------
# 04/04/15      joreland@mysql.com      1.1876.1.1
# Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
# into mysql.com:/home/jonas/src/mysql-4.1-ndb
# --------------------------------------------
# 04/04/15      joreland@mysql.com      1.1877.1.1
# Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
# into mysql.com:/home/jonas/src/mysql-4.1-ndb
# --------------------------------------------
# 04/04/15      ndb@mc03.ndb.mysql.com  1.1879
# Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
# into mc03.ndb.mysql.com:/space/ndb/tmp
# --------------------------------------------
# 04/04/17      joreland@mysql.com      1.1880
# LCP bug when restarting ops take's longer than DIH sending a new lcp ord
# Solution:
# Send LCP_FRAG_REP after restarting all ops
# --------------------------------------------
# 04/04/18      joreland@mysql.com      1.1881
# Missspelled ERROR_INSERT
# --------------------------------------------
# 04/04/18      joreland@mysql.com      1.1882
# Added possibility to log only distributed signals
# --------------------------------------------
# 04/04/22      joreland@mysql.com      1.1883
# Removed dependancy to libstdc++
# * pure virtual functions "__cxa_pure_virtual" is defined in libstd++ ->
#   remove all pure virtual functions
# --------------------------------------------
# 04/04/23      joreland@mysql.com      1.1884
# Various minor bug fixes for problems found while compiling
# with icc
# --------------------------------------------
# --------------------------------------------
# 04/04/25      joreland@mysql.com      1.1885
# Removed debug code (joreland:1.1875)
# --------------------------------------------
# 04/04/26      ejonore@mc03.ndb.mysql.com      1.1862.1.5
# Lock pages in memory _after_ daemon-mode (exec/fork)
# --------------------------------------------
# 04/04/27      ejonore@mc03.ndb.mysql.com      1.1862.1.6
# 1) Trap abort()
# 2) StopStart/StopAborted events
# 3) warning if memlock fails
# 4) use g_logger more often (instead of ndbout)
# 
# --------------------------------------------
# 04/04/27      joreland@mysql.com      1.1886
# bug fix for a bug in wl1714 + software upgrade
# --------------------------------------------
# 04/04/27      joreland@mysql.com      1.1887
# Cset exclude: joreland@mysql.com|ChangeSet|20040422160720|05374
# --------------------------------------------
# 04/04/27      joreland@mysql.com      1.1888
# removed libstc++ second try...
# --------------------------------------------
# 04/04/28      ejonore@mc03.ndb.mysql.com      1.1862.1.7
# 1) Don't lock FUTURE pages but only current
# 2) Do this when SIZEALT has completed
# --------------------------------------------
# 04/04/30      joreland@mysql.com      1.1889
# Merge jonas@orca:/home/ndb/releases/mysql-4.1-ndb-3.4.x
# into mysql.com:/home/jonas/src/mysql-4.1-ndb
# --------------------------------------------
# 04/05/03      ndb@mc03.ndb.mysql.com  1.1862.1.8
# Version update
# --------------------------------------------
# 04/05/03      joreland@mysql.com      1.1862.3.1
# Changed restart behavior.
# Use "angel" process which monitor "real" process
# --------------------------------------------
# 04/05/03      joreland@mysql.com      1.1862.1.9
# Merge jonas@orca:/home/ndb/releases/mysql-4.1-ndb-3.4.x
# into mysql.com:/home/jonas/src/mysql-4.1-ndb-3.4.x
# --------------------------------------------
# 04/05/03      joreland@mysql.com      1.1890
# Merge B2 fixes
# --------------------------------------------
# --------------------------------------------
# 04/05/03      joreland@mysql.com      1.1862.1.10
# Better handling of children terminations
# --------------------------------------------
# 04/05/03      joreland@mysql.com      1.1862.1.11
# Fixes for angel-restarting
# --------------------------------------------
# 04/05/03      joreland@mysql.com      1.1891
# Merge mysql.com:/home/jonas/src/mysql-4.1-ndb-3.4.x
# into mysql.com:/home/jonas/src/mysql-4.1-ndb
# --------------------------------------------
#


ndb/config/Defs.LINUX.x86.GCC.mk:
  Merge ndb fixes
ndb/examples/ndbapi_async_example/Makefile:
  Merge ndb fixes
ndb/examples/ndbapi_async_example/ndbapi_async.cpp:
  Merge ndb fixes
ndb/examples/ndbapi_scan_example/Makefile:
  Merge ndb fixes
ndb/include/debugger/SignalLoggerManager.hpp:
  Merge ndb fixes
ndb/include/kernel/signaldata/ScanFrag.hpp:
  Merge ndb fixes
ndb/include/ndb_version.h:
  Merge ndb fixes
ndb/include/ndbapi/NdbScanOperation.hpp:
  Merge ndb fixes
ndb/include/util/SocketServer.hpp:
  Merge ndb fixes
ndb/src/common/debugger/SignalLoggerManager.cpp:
  Merge ndb fixes
ndb/src/common/logger/ConsoleLogHandler.cpp:
  Merge ndb fixes
ndb/src/common/portlib/unix/NdbMem.c:
  Merge ndb fixes
ndb/src/common/util/Makefile:
  Merge ndb fixes
ndb/src/common/util/version.c:
  Merge ndb fixes
ndb/src/cw/cpcd/Process.cpp:
  Merge ndb fixes
ndb/src/kernel/blocks/ERROR_codes.txt:
  Merge ndb fixes
ndb/src/kernel/blocks/backup/restore/Restore.cpp:
  Merge ndb fixes
ndb/src/kernel/blocks/backup/restore/Restore.hpp:
  Merge ndb fixes
ndb/src/kernel/blocks/backup/restore/main.cpp:
  Merge ndb fixes
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Merge ndb fixes
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Merge ndb fixes
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Merge ndb fixes
ndb/src/kernel/blocks/dblqh/DblqhInit.cpp:
  Merge ndb fixes
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Merge ndb fixes
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Merge ndb fixes
ndb/src/kernel/blocks/dbtc/DbtcInit.cpp:
  Merge ndb fixes
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Merge ndb fixes
ndb/src/kernel/blocks/dbutil/DbUtil.cpp:
  Merge ndb fixes
ndb/src/kernel/blocks/dbutil/DbUtil.hpp:
  Merge ndb fixes
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Merge ndb fixes
ndb/src/kernel/blocks/ndbfs/Filename.cpp:
  Merge ndb fixes
ndb/src/kernel/blocks/suma/Suma.cpp:
  Merge ndb fixes
ndb/src/kernel/error/Error.hpp:
  Merge ndb fixes
ndb/src/kernel/ndb-main/Main.cpp:
  Merge ndb fixes
ndb/src/kernel/vm/Configuration.cpp:
  Merge ndb fixes
ndb/src/kernel/vm/Configuration.hpp:
  Merge ndb fixes
ndb/src/kernel/vm/DLFifoList.hpp:
  Merge ndb fixes
ndb/src/kernel/vm/Emulator.cpp:
  Merge ndb fixes
ndb/src/kernel/vm/SignalCounter.hpp:
  Merge ndb fixes
ndb/src/kernel/vm/SimulatedBlock.cpp:
  Merge ndb fixes
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Merge ndb fixes
ndb/src/mgmsrv/NodeLogLevel.cpp:
  Merge ndb fixes
ndb/src/ndbapi/ClusterMgr.cpp:
  Merge ndb fixes
ndb/src/ndbapi/Ndberror.cpp:
  Merge ndb fixes
ndb/src/rep/rep_version.hpp:
  Merge ndb fixes
ndb/test/ndbapi/testDict/testDict.cpp:
  Merge ndb fixes
ndb/test/ndbapi/testIndex/testIndex.cpp:
  Merge ndb fixes
ndb/test/ndbapi/testMgm/testMgm.cpp:
  Merge ndb fixes
ndb/test/ndbapi/testScan/testScan.cpp:
  Merge ndb fixes
ndb/test/src/HugoTransactions.cpp:
  Merge ndb fixes
ndb/test/src/NDBT_Tables.cpp:
  Merge ndb fixes
ndb/test/src/NDBT_Test.cpp:
  Merge ndb fixes
ndb/test/src/UtilTransactions.cpp:
  Merge ndb fixes
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2004-05-04 11:19:19 +02:00
unknown
38b5ea0487 trying to remove Windows compiler warnings (Miguel, could you please check if it's better now?)
innobase/eval/eval0eval.c:
  explicit cast
sql/ha_innodb.cc:
  removed unused variable
2004-05-03 23:35:11 +02:00
unknown
f543ca9149 compatibility fix. warning removed 2004-05-03 18:26:50 +02:00
unknown
4841aa284b Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-05-03 18:23:29 +02:00
unknown
19c91b7920 Fix for a bug involving UNION's and SET SQL_SELECT_LIMIT
mysql-test/r/union.result:
  Results for a test case for bug involving UNION's and 
  SET SQL_SELECT_LIMIT
mysql-test/t/union.test:
  Test case for bug involving UNION's and 
  SET SQL_SELECT_LIMIT
sql/sql_union.cc:
  Patch  for a bug involving UNION's and SET SQL_SELECT_LIMIT
2004-05-03 19:15:26 +03:00
unknown
4ab4890866 per special request from Ingo :) 2004-05-03 17:17:50 +02:00
unknown
eaeefceab3 Merge mysql.com:/home/mydev/mysql-4.1
into mysql.com:/home/mydev/mysql-4.1-wl1700-diff


sql/mysqld.cc:
  Auto merged
2004-05-03 16:15:45 +02:00
unknown
b482283cf7 WL#1700 - Properly count key_blocks_used and key_blocks_current.
Introduced a new free blocks list. Free blocks are now re-used before
new blocks are allocated from the pool. There is a new status variable 
which can be queried by "show status like key_blocks_unused".


include/keycache.h:
  WL#1700 - Properly count key_blocks_used and key_blocks_current.
  free_block_list is the new free blocks list. It is implemented like a stack (LIFO).
  blocks_unused holds the number of never used blocks plus the number of blocks in the free list.
  Removed the variable global_blocks_used, as it was always the same as blocks_used.
mysql-test/r/key_cache.result:
  WL#1700 - Properly count key_blocks_used and key_blocks_current.
  Inserted some commands which show how key_blocks_used and key_blocks_unused work.
mysql-test/t/key_cache.test:
  WL#1700 - Properly count key_blocks_used and key_blocks_current.
  Inserted some commands which show how key_blocks_used and key_blocks_unused work.
mysys/mf_keycache.c:
  WL#1700 - Properly count key_blocks_used and key_blocks_current.
  Introduced a new free blocks list. The introductory comment says it all (I hope).
  Removed the variable global_blocks_used, as it was always the same as blocks_used.
sql/mysqld.cc:
  WL#1700 - Properly count key_blocks_used and key_blocks_current.
  The blocks_unused count can be queried by "show status like key_blocks_unused".
  Removed the variable global_blocks_used, as it was always the same as blocks_used.
  Introduced SHOW_KEY_CACHE_CONST_LONG for status variables that
  must not be modified (i.e. flushed to zero).
sql/sql_show.cc:
  WL#1700 - Properly count key_blocks_used and key_blocks_current.
  Introduced SHOW_KEY_CACHE_CONST_LONG for status variables that
  must not be modified (i.e. flushed to zero).
sql/sql_test.cc:
  WL#1700 - Properly count key_blocks_used and key_blocks_current.
  Removed the variable global_blocks_used, as it was always the same as blocks_used.
sql/structs.h:
  WL#1700 - Properly count key_blocks_used and key_blocks_current.
  Introduced SHOW_KEY_CACHE_CONST_LONG for status variables that
  must not be modified (i.e. flushed to zero).
2004-05-03 15:55:21 +02:00
unknown
bcbaefcf97 return table list of fake_select in empty state to prevent using TABLE_LIST allocated on stack in next execution of PS (Bug #3577)
sql/sql_union.cc:
  return table list of fake_select in empty state to prevent using TABLE_LIST allocated on stack in next execution of PS
tests/client_test.c:
  test of UNIONS with PS
2004-05-03 13:58:01 +03:00