Commits · f2b41e688669a93866d82ec51b769124b31459b2 · Kirill Smelkov / mariadb

02 May, 2005 14 commits

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · f2b41e68

unknown authored May 03, 2005

into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-clean


configure.in:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
scripts/mysql_create_system_tables.sh:
  Auto merged
scripts/mysql_fix_privilege_tables.sql:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

f2b41e68

Update test results · d00d1dd1

unknown authored May 02, 2005


mysql-test/r/query_cache.result:
  Update results
mysql-test/r/user_limits.result:
  Update results

d00d1dd1

Resolve merge of fix for #8166. · d4b39a51

unknown authored May 02, 2005


mysql-test/r/system_mysql_db.result:
  Update results
scripts/mysql_create_system_tables.sh:
  Resolve merge of bug fix
scripts/mysql_fix_privilege_tables.sql:
  Resolve merge of bug fix

d4b39a51

Merge mysql.com:/home/jimw/my/mysql-5.0-7293 · 2d998575
unknown authored May 02, 2005
```
into mysql.com:/home/jimw/my/mysql-5.0-clean
```
2d998575

Merge mysql.com:/home/jimw/my/mysql-5.0-5354 · bd24e892

unknown authored May 02, 2005

into mysql.com:/home/jimw/my/mysql-5.0-clean


extra/my_print_defaults.c:
  Auto merged
include/my_sys.h:
  Auto merged
mysys/default.c:
  Auto merged

bd24e892

Clean up merge from 4.1 · 41e7a970

unknown authored May 02, 2005


configure.in:
  Auto merged
extra/my_print_defaults.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/lowercase_table.result:
  Auto merged
mysql-test/r/query_cache.result:
  Mege results
mysql-test/t/lowercase_table.test:
  Merge tests
mysql-test/t/query_cache.test:
  Merge tests
mysys/default.c:
  Merge from 4.1
sql/sql_cache.cc:
  Merge
sql/sql_parse.cc:
  Merge from 4.1
sql/sql_table.cc:
  Merge
tests/mysql_client_test.c:
  Merge

41e7a970

Merge bk-internal:/home/bk/mysql-5.0 · d41aa297
unknown authored May 02, 2005
```
into serg.mylan:/usr/home/serg/Abk/mysql-5.0


sql/ha_blackhole.cc:
  Auto merged
```
d41aa297
Merge mysql.com:/home/jimw/my/mysql-4.1-9947 · 9f5a4955
unknown authored May 02, 2005
```
into mysql.com:/home/jimw/my/mysql-4.1-clean
```
9f5a4955
Merge mysql.com:/home/jimw/my/mysql-4.1-9761 · 5df9135b
unknown authored May 02, 2005
```
into mysql.com:/home/jimw/my/mysql-4.1-clean
```
5df9135b
Merge mysql.com:/home/jimw/my/mysql-4.1-9136 · 875ed1e4
unknown authored May 02, 2005
```
into mysql.com:/home/jimw/my/mysql-4.1-clean


mysys/default.c:
  Auto merged
```
875ed1e4
Merge bk-internal:/home/bk/mysql-4.1 · 465ba81a
unknown authored May 02, 2005
```
into mysql.com:/home/jimw/my/mysql-4.1-clean


configure.in:
  Auto merged
```
465ba81a

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb · 463c82e2

unknown authored May 02, 2005

into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-clean


BitKeeper/etc/logging_ok:
  auto-union
mysql-test/mysql-test-run.sh:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
storage/ndb/include/debugger/SignalLoggerManager.hpp:
  Auto merged
storage/ndb/include/kernel/ndb_limits.h:
  Auto merged
storage/ndb/include/kernel/signaldata/AccScan.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/NextScan.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/ScanFrag.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/ScanTab.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/TcCommit.hpp:
  Auto merged
storage/ndb/include/ndbapi/NdbIndexScanOperation.hpp:
  Auto merged
storage/ndb/include/ndbapi/NdbScanOperation.hpp:
  Auto merged
storage/ndb/include/ndbapi/NdbTransaction.hpp:
  Auto merged
storage/ndb/src/common/debugger/SignalLoggerManager.cpp:
  Auto merged
storage/ndb/src/common/debugger/signaldata/ScanTab.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbacc/DbaccInit.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/SchemaFile.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/Makefile.am:
  Auto merged
storage/ndb/src/kernel/vm/Makefile.am:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
storage/ndb/test/include/HugoTransactions.hpp:
  Auto merged
storage/ndb/test/ndbapi/testDict.cpp:
  Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  Auto merged
storage/ndb/test/ndbapi/testOIBasic.cpp:
  Auto merged
storage/ndb/test/ndbapi/testScan.cpp:
  Auto merged
storage/ndb/test/ndbapi/testScanPerf.cpp:
  Auto merged
storage/ndb/test/run-test/daily-devel-tests.txt:
  Auto merged
storage/ndb/test/src/HugoOperations.cpp:
  Auto merged
storage/ndb/test/src/HugoTransactions.cpp:
  Auto merged

463c82e2

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 5326bdc6

unknown authored May 02, 2005

into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-clean


BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/ha_myisammrg.cc:
  Auto merged
sql/lock.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
storage/heap/hp_hash.c:
  Auto merged
storage/innobase/dict/dict0dict.c:
  Auto merged
storage/innobase/fil/fil0fil.c:
  Auto merged
storage/innobase/include/dict0dict.h:
  Auto merged
storage/myisam/Makefile.am:
  Auto merged
storage/myisam/mi_key.c:
  Auto merged
storage/myisam/myisampack.c:
  Auto merged
storage/myisammrg/myrg_open.c:
  Auto merged
storage/ndb/include/ndbapi/NdbDictionary.hpp:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndberror.c:
  Auto merged

5326bdc6

Fix typo in ha_backhole.cc · a406c034
unknown authored May 02, 2005
```
sql/ha_blackhole.cc:
  Fix typo
```
a406c034

01 May, 2005 3 commits

Merge bk-internal:/home/bk/mysql-5.0 · 9b512475

unknown authored May 01, 2005

into serg.mylan:/usr/home/serg/Abk/mysql-5.0


Makefile.am:
  Auto merged
client/mysqladmin.cc:
  Auto merged
configure.in:
  Auto merged
include/my_global.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

9b512475

Merge mysql.com:/home/psergey/mysql-4.1-bug9228 · 21eed96b
unknown authored May 01, 2005
```
into mysql.com:/home/psergey/mysql-5.0-bug10274-merge


sql/protocol.cc:
  Auto merged
```
21eed96b
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 · 7ecca388
unknown authored May 01, 2005
```
into mysql.com:/home/psergey/mysql-4.1-bug9228
```
7ecca388

30 Apr, 2005 8 commits

yassl changeset 2: · d3d56609

unknown authored Apr 30, 2005

  remove FIX_GCC_LINKING_PROBLEM and -DDEFINE_CXA_PURE_VIRTUAL
  replace echo in configure.in with AC_MSG_WARN/AC_MSG_ERROR
  don't set -DUSE_MYSYS_NEW for gcc 2.95
  set $USE_MYSYS_NEW even if CXX is g++
  yassl bugfixes
  instantiate all yassl templates explicitly


client/Makefile.am:
  mysqlbinlog as a c++ program may need my_new.cc (if CXX=gcc)
  no FIX_GCC_LINKING_PROBLEM anymore - it's in my_new.cc
client/mysqladmin.cc:
  no FIX_GCC_LINKING_PROBLEM anymore - it's in my_new.cc
client/mysqlbinlog.cc:
  no FIX_GCC_LINKING_PROBLEM anymore - it's in my_new.cc
configure.in:
  echo should be AC_MSG_WARN or AC_MSG_ERROR
  don't set -DUSE_MYSYS_NEW for gcc 2.95 (to restore old behaviour)
  set $USE_MYSYS_NEW even if CXX is g++ (for yassl, as it can be linked with C programs)
  remove -DDEFINE_CXA_PURE_VIRTUAL - -DUSE_MYSYS_NEW is enough
extra/yassl/mySTL/list.hpp:
  bugfixes
extra/yassl/src/Makefile.am:
  no need to mess with CXXFLAGS anymore. Instantiate all templates explicitly
extra/yassl/src/crypto_wrapper.cpp:
  instantiate templates explicitly
extra/yassl/src/yassl_imp.cpp:
  instantiate templates explicitly
extra/yassl/src/yassl_int.cpp:
  instantiate templates explicitly
extra/yassl/taocrypt/include/runtime.hpp:
  use -DUSE_MYSYS_NEW not -DDEFINE_CXA_PURE_VIRTUAL
  assert in __cxa_pure_virtual
  remove dummy (and thus dangerous) __cxa_guard_acquire/__cxa_guard_release
extra/yassl/taocrypt/src/Makefile.am:
  no need to mess with CXXFLAGS anymore. Instantiate all templates explicitly
extra/yassl/taocrypt/src/integer.cpp:
  instantiate templates explicitly
extra/yassl/taocrypt/src/rsa.cpp:
  instantiate templates explicitly
include/my_global.h:
  no FIX_GCC_LINKING_PROBLEM anymore - it's in my_new.cc
mysys/my_new.cc:
  no FIX_GCC_LINKING_PROBLEM anymore - it's in my_new.cc
server-tools/instance-manager/command.cc:
  no FIX_GCC_LINKING_PROBLEM anymore - it's in my_new.cc
sql/ha_blackhole.cc:
  typo fixed
sql/ha_innodb.cc:
  warning fixed
sql/item_func.cc:
  use LL()
sql/mysqld.cc:
  no FIX_GCC_LINKING_PROBLEM anymore - it's in my_new.cc

d3d56609

After merge fixes · d1d474c8

unknown authored Apr 30, 2005


Makefile.am:
  Added target test-force
mysql-test/r/cast.result:
  Updated results after merge

d1d474c8

Merge with 4.1 · a6acc446

unknown authored Apr 30, 2005


BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
include/config-win.h:
  Auto merged
include/my_global.h:
  Auto merged
mysql-test/r/drop.result:
  Auto merged
mysys/default.c:
  Auto merged
mysys/mf_keycache.c:
  Auto merged
sql/field.h:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
BitKeeper/deleted/.del-errmsg.txt~f96b7055cac394e:
  Auto merged
mysql-test/r/cast.result:
  Merge
mysql-test/t/cast.test:
  Merge
sql/sql_insert.cc:
  Merge
sql/sql_select.cc:
  Merge

a6acc446

Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · e64d221e
unknown authored Apr 30, 2005
```
into mysql.com:/home/my/mysql-5.0


tests/mysql_client_test.c:
  Auto merged
```
e64d221e

A fix and a test case for Bug#9520 "SELECT DISTINCT crashes server · 963e94ce

unknown authored Apr 30, 2005

with cursor". The patch refactors do_select/sub_select
functions, which implement the nested loop algorithm, and reuses them to
fetch rows for cursors as well.
Pushing with view.test failing (--ps-protocol).


sql/sql_prepare.cc:
   Cursor::fetch() now returns void
sql/sql_select.cc:
  A fix for Bug#9520 "SELECT DISTINCT crashes server with cursor":
  * rename sub_select returns codes to be able to track down what's going
    on in which case.
  * move record processing and outer join record processing to a separate
    function, out of sub_select read-record loop.
  * use generalized sub_select() nested loop function for
  cursors instead of own loop implementation used in Cursor::fetch() before
sql/sql_select.h:
  Replace all return values of sub_select family with enum.
  Add JOIN::resume_nested_loop flag to indicate we are restarting the nested loop
  for execution of next chunk of cursor's rows.
tests/mysql_client_test.c:
  A test case for Bug#9520 "SELECT DISTINCT crashes server with cursor"

963e94ce

Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 66bea0de

unknown authored Apr 30, 2005

into mysql.com:/home/my/mysql-5.0


sql/handler.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged

66bea0de

Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 3b604387
unknown authored Apr 30, 2005
```
into mysql.com:/home/my/mysql-4.1


sql/sql_select.cc:
  Auto merged
```
3b604387

Setting a variable to CAST(NULL as X) set the result type of the variable to X. (Bug #6598) · ac82a2d5

unknown authored Apr 30, 2005


mysql-test/r/bigint.result:
  Test to show show that the parser threats big longlong values as unsigned
mysql-test/r/user_var.result:
  Test of CAST(NULL as SIGNED/UNSIGNED)
mysql-test/t/bigint.test:
  Test to show show that the parser threats big longlong values as unsigned
mysql-test/t/user_var.test:
  Test of CAST(NULL as SIGNED/UNSIGNED)
sql/item_func.cc:
  Setting a variable to CAST(NULL as X) set the result type of the variable to X. (Bug #6598)
  Setting a variable to NULL doesn't change the old result type.
sql/item_func.h:
  Detect setting a variable to NULL
sql/unireg.cc:
  Safety fix

ac82a2d5

29 Apr, 2005 15 commits

Fix for BUG#10274: In Protocol_simple::store_long don't make any assumptions about · 93196131
unknown authored Apr 30, 2005
```
relative sizes of int/long/longlong.
 
```
93196131
Merge mysql.com:/home/jimw/my/mysql-5.0-build · e9cc39c4
unknown authored Apr 29, 2005
```
into mysql.com:/home/jimw/my/mysql-5.0-clean
```
e9cc39c4
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1 · f8e45de3
unknown authored Apr 29, 2005
```
into moonbone.local:/usr/src/mysql-4.1
```
f8e45de3
Merge bk-internal:/home/bk/mysql-5.0 · 927d747a
unknown authored Apr 29, 2005
```
into serg.mylan:/usr/home/serg/Abk/mysql-5.0


configure.in:
  Auto merged
```
927d747a

Fix bug #9703 "Error 1032 with GROUP BY query and large tables" · 27fa1254

unknown authored Apr 29, 2005

Reset old error if tmp table was successfully created.

Test data is large and can be found in bug report along with test query.


sql/sql_select.cc:
  Fix bug #9703
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

27fa1254

Merge mysql.com:/home/jimw/my/mysql-4.1-9634 · 1c629417
unknown authored Apr 29, 2005
```
into mysql.com:/home/jimw/my/mysql-4.1-clean
```
1c629417

Manually resolve merge · 65d0de3b

unknown authored Apr 29, 2005


mysql-test/r/query_cache.result:
  Resolve merge
mysql-test/t/query_cache.test:
  Resolve merge

65d0de3b

Merge mysql.com:/home/jimw/my/mysql-4.0-clean · 931389d5
unknown authored Apr 29, 2005
```
into mysql.com:/home/jimw/my/mysql-4.1-clean


configure.in:
  Auto merged
```
931389d5
Merge mysql.com:/home/jimw/my/mysql-4.0-9690 · ede028b0
unknown authored Apr 29, 2005
```
into mysql.com:/home/jimw/my/mysql-4.0-clean


configure.in:
  Auto merged
```
ede028b0
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0 · 90110b84
unknown authored Apr 29, 2005
```
into deer.(none):/home/hf/work/mysql-5.0.spaerrs
```
90110b84

Fix for #6553 and #8776 (no errors on bad spatial data) · 1df25ccd

unknown authored Apr 29, 2005


mysql-test/r/gis-rtree.result:
  test result fixed
mysql-test/r/gis.result:
  test result fixed
mysql-test/t/gis-rtree.test:
  test case fixed
mysql-test/t/gis.test:
  test case added
sql/field.cc:
  error messages launched now when we try to put bad spatial
  data in the GEOMETRY field
sql/field.h:
  interface fixed
sql/item_geofunc.cc:
  bad_data sign now instead of NULL now returned from
  Item_geometry_from_text::val_str
sql/share/errmsg.txt:
  error message added
sql/spatial.cc:
  bad_geometry data instance
sql/spatial.h:
  bad_geometry_data declaration
sql/sql_base.cc:
  messages now created in store_* function

1df25ccd

CAST(string_argument AS UNSIGNED) didn't work for big integers above the signed range. (Bug #7036) · 97b08214

unknown authored Apr 29, 2005

Produce warnings of wrong cast of strings to signed/unsigned.
Don't block not resolved IP's if DNS server is down (Bug #8467)
Fix compiler problems with MinGW (Bug #8872)


configure.in:
  Fix compiler problems with MinGW (Bug #8872)
include/config-win.h:
  Fix compiler problems with MinGW (Bug #8872)
include/my_global.h:
  Fix compiler problems with MinGW (Bug #8872)
mysql-test/r/cast.result:
  Test for cast to signed/unsigned outside of range (Bug #7036)
mysql-test/t/cast.test:
  Test for cast to signed/unsigned outside of range (Bug #7036)
mysys/default.c:
  Cleanup (combine identical code). 
  Done mainly by Jani
sql/field.h:
  Added cast_to_int_type() to ensure that enums are casted as numbers
sql/hostname.cc:
  Don't block not resolved IP's if DNS server is down (Bug #8467)
sql/item.h:
  Added cast_to_int_type() to ensure that enums are casted as numbers
sql/item_func.cc:
  CAST(string_argument AS UNSIGNED) didn't work for big integers above the
  signed range. (Bug #7036)
  Produce warnings of wrong cast of strings to signed/unsigned
sql/item_func.h:
  CAST(string_argument AS UNSIGNED) didn't work for big integers above the
  signed range. (Bug #7036)

97b08214

Merge · e31358ae
unknown authored Apr 29, 2005
```
configure.in:
  SCCS merged
```
e31358ae
Merge mysql.com:/home/mydev/mysql-5.0 · c6dedf4e
unknown authored Apr 29, 2005
```
into mysql.com:/home/mydev/mysql-5.0-5000
```
c6dedf4e
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 · 17e6c8f2
unknown authored Apr 29, 2005
```
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
```
17e6c8f2