Commit graph

11985 commits

Author SHA1 Message Date
unknown
4b6eb9b06a Fix ndberror after jonas comments 2004-05-05 12:42:00 +02:00
unknown
9f76f43cb9 Restructure of ndb error
ndb/src/kernel/blocks/backup/restore/Makefile:
  better make
2004-05-05 11:29:56 +02:00
unknown
93448ea564 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mc05.(none):/space2/tomas/mysql-4.1


ndb/src/ndbapi/Ndberror.cpp:
  Auto merged
2004-05-04 15:00:19 +02: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
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
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
4bde9b834a - enabled compiling with NDB cluster in compile-pentium-debug-max
BUILD/compile-pentium-debug-max:
   - enable compiling with NDB cluster
2004-05-03 12:56:51 +02:00
unknown
1a34c83cb3 mysql-test-run: -start-from added, cleanup
mysql-test/mysql-test-run.sh:
  -start-from added
  cleanup
2004-05-03 12:10:06 +02:00
unknown
d5d6c4fc1f Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mc05.(none):/space2/tomas/mysql-4.1
2004-05-03 06:33:35 +02:00
unknown
73ff0958c0 Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-05-01 15:43:05 +02:00
unknown
66f2d8bffa myisam_data_pointer_size
include/mysql.h:
  compatibility fix
2004-05-01 15:41:59 +02:00
unknown
4173696d65 note that --[skip-]opt include --set-charset
make --set-charset affect only what's going into *dump* not client-server communication
2004-05-01 11:07:42 +02:00
unknown
2be0cbb888 removed duplicated check for thd->killed 2004-04-30 21:11:36 +02:00
unknown
541cef7568 Fix client_test to use new statement assertion macros 2004-04-30 17:21:06 +04:00
unknown
2668cb018e Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
2004-04-30 14:34:44 +02:00
unknown
c8f807a6fe - reverted change to fill_help_tables.sh ("Added checking of maximum
length of line in output (Bug #2874)" from last ChangeSet (should not
   have been applied)


scripts/fill_help_tables.sh:
   - reverted change "Added checking of maximum length of line in output 
     (Bug #2874)" from last ChangeSet (should not have been applied)
2004-04-30 14:31:52 +02:00
unknown
e8f201337d Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/dbdata/psergey/mysql-4.1-bug3420


tests/client_test.c:
  Auto merged
2004-04-30 16:28:04 +04:00
unknown
dc861599cd Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-04-30 14:16:34 +02:00
unknown
4f424faffd Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/dbdata/psergey/mysql-4.1-bug3420


tests/client_test.c:
  Auto merged
2004-04-30 15:32:41 +04:00
unknown
7bf15f4b79 Only calculate MYSQL_FIELD->max_length if mysql_stmt_attr_set(..., STMT_ATTR_UPDATE_MAX_LENGTH) is done.
tests/client_test.c:
  Test mysql_stmt_attr_set(...STMT_ATTR_UPDATE_MAX_LENGTH)
2004-04-30 14:24:06 +03:00
unknown
72c7b3529e Merge
libmysql/libmysql.c:
  Auto merged
tests/client_test.c:
  Auto merged
include/mysql.h:
  SCCS merged
2004-04-30 14:04:51 +03:00
unknown
15c2bb61f5 Update 'MYSQL_FIELD->max_length' on mysql_stmt_store_result() (Bug #1647)
Added checking of cut read lines in bootstrap thread (Bug #2874)


include/mysql.h:
  Added length to MYSQL_ROWS to enable sanity checking of packets
  Update 'MYSQL_FIELD->max_length' on mysql_stmt_store_result()
libmysql/libmysql.c:
  Update 'MYSQL_FIELD->max_length' on mysql_stmt_store_result() (Bug #1647)
scripts/fill_help_tables.sh:
  Added checking of maximum length of line in output (Bug #2874)
scripts/mysql_install_db.sh:
  Added error message if help tables couldn't be done (Bug #2874)
sql/sql_parse.cc:
  Added checking of cut read lines in bootstrap thread (Bug #2874)
tests/client_test.c:
  Added --debug
  Changed some strange define names
  Less output
  Added testing of max_length for prepared statements
2004-04-30 14:02:17 +03:00
unknown
41dfe1514d Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-04-30 10:43:59 +02:00
unknown
b36398fe0d compatibility fix (bug#3606) 2004-04-30 10:42:12 +02:00
unknown
be5d750a24 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/kostja/mysql/mysql-4.1-u2


include/mysql.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
tests/client_test.c:
  Auto merged
2004-04-30 03:00:55 +04:00
unknown
d5237fd09f Fix for Bug#3035 "Prepared statement integer inserts": now unsigned
flag is sent to server with placeholder types.
There were no need to extend the protocol as one additional byte
was reserved for placeholder code, when placeholder code is in range 0-255.
So this byte is now used for flags. Post-review fixes added.


include/config-win.h:
  added floaststore implementation
include/my_global.h:
  added floatstore implementation
include/mysql.h:
  Bug#3035:
  added 'is_unsigned' member
  binary_data wasn't used, removed
  null_field wasn't necessary, removed
include/mysql_com.h:
  Unused defines were removed.
libmysql/libmysql.c:
  Function store_param_type was removed - too much for a function, especially
  with bug in it.
  New implementation is inline and takes into account signedness of 
  placeholder.
  Fixed store functions to not perform double network-host order conversion
  on high-byte-first systems (should also fix Bug#3578 "Prepared statement 
  integer conversions work wrong in 64-bit Power Mac G5 CPUs").
  null_field removed.
sql/sql_prepare.cc:
  Placeholder sign is taken into account when reading data from network.
tests/client_test.c:
  Test for BUG#3035 added: insert and retrieve minimum and maximum of all
  integer types.
2004-04-30 03:00:19 +04:00
unknown
258a3d1678 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/kostja/mysql/mysql-4.1-root
2004-04-30 01:03:19 +04:00
unknown
e73e26f381 Implementation of mysql_stmt_attr_get and mysql_stmt_attr_set
requested by Monty for Bug#1647 (No way to determine what size 
blob/clob is being returned into bound buffer)


include/mysql.h:
  Implementation of mysql_stmt_attr_get and mysql_stmt_attr_set 
  requested by Monty for Bug#1647.
libmysql/libmysql.c:
  Implementation of mysql_stmt_attr_get and mysql_stmt_attr_set 
  requested by Monty for Bug#1647.
libmysql/libmysql.def:
  Windows .defs added for new API calls
2004-04-30 01:02:29 +04:00
unknown
f9038942fa Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mc05.(none):/space/tomas/mysql-4.1-make
2004-04-29 22:00:56 +02:00
unknown
242fe78d2b Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/dbdata/psergey/mysql-4.1-my-ps-bugs


tests/client_test.c:
  Auto merged
2004-04-30 00:00:54 +04:00
unknown
6de9b596b2 SrcDist.sh, Epilogue.mk:
improved distdir


ndb/Epilogue.mk:
  improved distdir
ndb/SrcDist.sh:
  improved distdir
2004-04-29 21:22:03 +02:00
unknown
9d3d017c6c configure.in:
added configure options PACKAGE and VERSION for ndb
GuessConfig.sh:
  added options for PACKAGE and VERSION
Epilogue.mk:
  Added target distdir


ndb/Epilogue.mk:
  Added target distdir
ndb/config/GuessConfig.sh:
  added options for PACKAGE and VERSION
configure.in:
  added configure options PACKAGE and VERSION for ndb
2004-04-29 20:25:00 +02:00
unknown
a8dfb78df0 SrcDist.sh:
new file
2004-04-29 19:48:46 +02:00
unknown
e3a6ef83bb - added option for building/packaging the NDB cluster to Do-compile
Build-tools/Do-compile:
   - added option for building/packaging the NDB cluster
2004-04-29 19:12:27 +02:00
unknown
c5daed7c89 Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-04-29 12:26:39 +02:00
unknown
709a4a9ff2 postreview fixes 2004-04-29 12:25:56 +02:00
unknown
ae629fff86 Allow one to send empty strings with mysql_stmt_send_long_data()
mysql_stmt_reset() now resets param->long_data_used
Abort if --defaults-file=path-name uses a non-existing file (Bug #3413)
Fixed problem with symlink test (bug in 4.1.2)


libmysql/libmysql.c:
  Allow one to send empty strings with mysql_stmt_send_long_data()
  mysql_stmt_reset() now resets param->long_data_used
mysys/default.c:
  Abort if --defaults-file=path-name uses a non-existing file (Bug #3413)
sql/unireg.cc:
  Fixed problem with symlink test:  .frm table was not properly deleted if handler create failed
2004-04-28 20:19:50 +03:00
unknown
1fa5853260 Split Ndberror.cpp so it can be used by perror 2004-04-28 10:49:51 +02:00
unknown
5605374b66 removed ndb odbc from compile and release 2004-04-28 06:44:58 +02:00
unknown
f1ab98d48e Renamed MY_LEX_COLON to MY_LEX_SEMICOLON (at Serg's request) 2004-04-28 01:49:05 +04:00
unknown
2976f954e5 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/dbdata/psergey/mysql-4.1-bug3567
2004-04-27 23:37:14 +04:00
unknown
e35880e0b8 after-merge fix: make concurrent-insert-skip code ft2-aware
mysql-test/t/func_group.test:
  no innodb is not an error
2004-04-27 21:17:10 +02:00
unknown
39ec9e1e23 Fixed results for previous patch
Ensure that mysqldump doesn't give an error about missing Index.xml when it's not needed


client/mysqldump.c:
  Added better default --debug option
mysql-test/r/show_check.result:
  Fixed result after Type->Engine conversion
mysys/charset.c:
  Don't give error if Index.xml doesn't exists
  (If we can't find the character set, the later error will include the used patch to the Index.xml file)
2004-04-27 17:32:40 +03:00
unknown
4f44862bda Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mishka.local:/home/my/mysql-4.1


BitKeeper/etc/logging_ok:
  auto-union
sql/set_var.cc:
  Auto merged
2004-04-27 15:48:48 +03:00
unknown
a3828081cd After merge fixes
Changed 'SHOW FIELD STATUS' to use 'Engine' instead of 'Type'


client/client_priv.h:
  Added option 'create_options' for mysqldump
client/mysqldump.c:
  Changed '--all' to '--create-options' as the old name was meaningless
innobase/buf/buf0buf.c:
  After merge fixes
innobase/buf/buf0lru.c:
  After merge fixes
innobase/buf/buf0rea.c:
  After merge fixes
innobase/dict/dict0load.c:
  After merge fixes
innobase/fil/fil0fil.c:
  After merge fixes
innobase/ibuf/ibuf0ibuf.c:
  After merge fixes
innobase/include/fil0fil.h:
  After merge fixes
innobase/include/row0mysql.h:
  After merge fixes
innobase/include/ut0mem.h:
  After merge fixes
innobase/log/log0recv.c:
  After merge fixes
innobase/row/row0mysql.c:
  After merge fixes
innobase/row/row0sel.c:
  After merge fixes
innobase/srv/srv0start.c:
  After merge fixes
innobase/sync/sync0rw.c:
  After merge fixes
innobase/sync/sync0sync.c:
  After merge fixes
myisam/ft_boolean_search.c:
  After merge fixes
myisam/ft_nlq_search.c:
  After merge fixes
mysql-test/r/mysqldump.result:
  After merge fixes
mysql-test/t/mysqldump.test:
  Make result file smaller
  Some new tests
sql/ha_innodb.cc:
  After merge fixes
sql/set_var.cc:
  Removed compiler warning
sql/slave.cc:
  After merge fixes
sql/slave.h:
  After merge fixes
sql/sql_show.cc:
  Type -> Engine
2004-04-27 15:33:40 +03:00