Commits · bddee0c170454f54c1f87299d88d3aa9e44a3872 · nexedi / MariaDB

05 May, 2004 1 commit

Windows fixes for VC++ compiler compability · bddee0c1

unknown authored May 05, 2004


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

bddee0c1

04 May, 2004 13 commits

Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1 · af847c22
unknown authored May 04, 2004
```
into sinisa.nasamreza.org:/mnt/work/mysql-4.1


sql/sql_union.cc:
  Auto merged
```
af847c22
Fix for a multi table updates when one of the tables is not updated · 5bd7b50c
unknown authored May 04, 2004
```
but used in a nested query.
```
5bd7b50c

After merge fix. · 4df5d6d6

unknown authored May 04, 2004

Now test_bug1664() uses new statement checking macros.


tests/client_test.c:
  Now test_bug1664() uses new statement checking macros.

4df5d6d6

Manual merge of bugfix for Bug #1664. · 5c9f01a7
unknown authored May 04, 2004
```
sql/sql_prepare.cc:
  Auto merged
tests/client_test.c:
  Manual merge.
```
5c9f01a7

Fix for remaining issues described in Bug #1664 · 6ca75754

unknown authored May 04, 2004

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

6ca75754

union.result: · af794dde

unknown authored May 04, 2004

  fixing typo
union.test:
  fixing type


mysql-test/t/union.test:
  fixing type
mysql-test/r/union.result:
  fixing typo

af794dde

Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · a0c07c28
unknown authored May 04, 2004
```
into sanja.is.com.ua:/home/bell/mysql/bk/work-prep-4.1
```
a0c07c28
repetable test replaced with inline function · aaff8391
unknown authored May 04, 2004

aaff8391
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · 23029a0f
unknown authored May 04, 2004
```
into sanja.is.com.ua:/home/bell/mysql/bk/work-sub-4.1
```
23029a0f

union.result, union.test: · a8adc4a8

unknown authored May 04, 2004

  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

a8adc4a8

yangf - yet another ndb gcc/g++ fix · f171556b

unknown authored May 04, 2004

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

f171556b

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 · 4539b639
unknown authored May 04, 2004
```
into mysql.com:/home/jonas/src/mysql-4.1
```
4539b639

Merge NDB patches into 4.1-clone, below is list of changesets · 5f02d41c

unknown authored May 04, 2004

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

5f02d41c

03 May, 2004 9 commits

trying to remove Windows compiler warnings (Miguel, could you please check if it's better now?) · 38b5ea04
unknown authored May 03, 2004
```
innobase/eval/eval0eval.c:
  explicit cast
sql/ha_innodb.cc:
  removed unused variable
```
38b5ea04
Merge bk-internal:/home/bk/mysql-4.1/ · 4841aa28
unknown authored May 03, 2004
```
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
```
4841aa28

Fix for a bug involving UNION's and SET SQL_SELECT_LIMIT · 19c91b79

unknown authored May 03, 2004


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

19c91b79

per special request from Ingo :) · 4ab48908
unknown authored May 03, 2004

4ab48908
Merge mysql.com:/home/mydev/mysql-4.1 · eaeefcea
unknown authored May 03, 2004
```
into mysql.com:/home/mydev/mysql-4.1-wl1700-diff


sql/mysqld.cc:
  Auto merged
```
eaeefcea

WL#1700 - Properly count key_blocks_used and key_blocks_current. · b482283c

unknown authored May 03, 2004

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

b482283c

return table list of fake_select in empty state to prevent using TABLE_LIST... · bcbaefcf

unknown authored May 03, 2004

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

bcbaefcf

- enabled compiling with NDB cluster in compile-pentium-debug-max · 4bde9b83
unknown authored May 03, 2004
```
BUILD/compile-pentium-debug-max:
   - enable compiling with NDB cluster
```
4bde9b83
mysql-test-run: -start-from added, cleanup · 1a34c83c
unknown authored May 03, 2004
```
mysql-test/mysql-test-run.sh:
  -start-from added
  cleanup
```
1a34c83c

02 May, 2004 1 commit

fixed zero result case for group functions in subquery (Bug #3505) · 748db216

unknown authored May 02, 2004

fixed LIMIT 0 for zero rows optimisation


mysql-test/r/subselect.result:
  test case for bugreport
mysql-test/t/subselect.test:
  test case for bugreport
sql/sql_select.cc:
  cleanup sum function on reinit
  take in account LIMIT if zero result optimisation case
  do not forgot sum function in zero result case for subqueries

748db216

01 May, 2004 3 commits
- Merge bk-internal:/home/bk/mysql-4.1/ · 73ff0958
  unknown authored May 01, 2004
```
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
```
  73ff0958
- myisam_data_pointer_size · 66f2d8bf
  unknown authored May 01, 2004
```
include/mysql.h:
  compatibility fix
```
  66f2d8bf
- note that --[skip-]opt include --set-charset · 4173696d
  unknown authored May 01, 2004
```
make --set-charset affect only what's going into *dump* not client-server communication
```
  4173696d
30 Apr, 2004 12 commits

removed duplicated check for thd->killed · 2be0cbb8
unknown authored Apr 30, 2004

2be0cbb8
Fix client_test to use new statement assertion macros · 541cef75
unknown authored Apr 30, 2004

541cef75
Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.1 · 2668cb01
unknown authored Apr 30, 2004
```
into mysql.com:/space/my/mysql-4.1
```
2668cb01

- reverted change to fill_help_tables.sh ("Added checking of maximum · c8f807a6

unknown authored Apr 30, 2004

   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)

c8f807a6

Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 · e8f20133
unknown authored Apr 30, 2004
```
into mysql.com:/dbdata/psergey/mysql-4.1-bug3420


tests/client_test.c:
  Auto merged
```
e8f20133
Merge bk-internal:/home/bk/mysql-4.1/ · dc861599
unknown authored Apr 30, 2004
```
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
```
dc861599
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 · 4f424faf
unknown authored Apr 30, 2004
```
into mysql.com:/dbdata/psergey/mysql-4.1-bug3420


tests/client_test.c:
  Auto merged
```
4f424faf

Only calculate MYSQL_FIELD->max_length if mysql_stmt_attr_set(...,... · 7bf15f4b

unknown authored Apr 30, 2004

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)

7bf15f4b

Merge · 72c7b352

unknown authored Apr 30, 2004


libmysql/libmysql.c:
  Auto merged
tests/client_test.c:
  Auto merged
include/mysql.h:
  SCCS merged

72c7b352

Update 'MYSQL_FIELD->max_length' on mysql_stmt_store_result() (Bug #1647) · 15c2bb61

unknown authored Apr 30, 2004

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

15c2bb61

Merge bk-internal:/home/bk/mysql-4.1/ · 41dfe151
unknown authored Apr 30, 2004
```
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
```
41dfe151
compatibility fix (bug#3606) · b36398fe
unknown authored Apr 30, 2004

b36398fe

29 Apr, 2004 1 commit

Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · be5d750a

unknown authored Apr 30, 2004

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

be5d750a