Commits · b63b06dcbb4661168f7d419b8caba480049a669a · Kirill Smelkov / mariadb

17 Oct, 2005 11 commits

Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-5.0 · b63b06dc

unknown authored Oct 17, 2005

into  selena.:H:/MYSQL/src/#13377-mysql-5.0


mysql-test/include/check_var_limit.inc:
  Auto merged
mysql-test/include/have_big5.inc:
  Auto merged
mysql-test/include/have_compress.inc:
  Auto merged
mysql-test/include/have_crypt.inc:
  Auto merged
mysql-test/include/have_outfile.inc:
  Auto merged
mysql-test/include/have_query_cache.inc:
  Auto merged
mysql-test/include/have_tis620.inc:
  Auto merged
mysql-test/include/have_ucs2.inc:
  Auto merged
mysql-test/include/have_ujis.inc:
  Auto merged
mysql-test/include/not_embedded.inc:
  Auto merged
mysql-test/include/system_db_struct.inc:
  Auto merged
mysql-test/include/test_outfile.inc:
  Auto merged
mysql-test/r/greedy_optimizer.result:
  Auto merged
mysql-test/r/index_merge.result:
  Auto merged
mysql-test/r/index_merge_bdb.result:
  Auto merged
mysql-test/r/index_merge_innodb.result:
  Auto merged
mysql-test/r/index_merge_innodb2.result:
  Auto merged
mysql-test/r/index_merge_ror.result:
  Auto merged
mysql-test/r/index_merge_ror_cpk.result:
  Auto merged
mysql-test/r/join_nested.result:
  Auto merged
mysql-test/r/rowid_order_bdb.result:
  Auto merged
mysql-test/r/rowid_order_innodb.result:
  Auto merged
mysql-test/r/rpl_session_var.result:
  Auto merged
mysql-test/r/sp-error.result:
  Auto merged
mysql-test/r/sp-security.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/r/sum_distinct.result:
  Auto merged
mysql-test/std_data/des_key_file:
  Auto merged
mysql-test/std_data/init_file.dat:
  Auto merged
mysql-test/std_data/loaddata1.dat:
  Auto merged
mysql-test/std_data/loaddata2.dat:
  Auto merged
mysql-test/std_data/loaddata3.dat:
  Auto merged
mysql-test/std_data/loaddata4.dat:
  Auto merged
mysql-test/std_data/rpl_loaddata.dat:
  Auto merged
mysql-test/std_data/rpl_loaddata2.dat:
  Auto merged
mysql-test/std_data/warnings_loaddata.dat:
  Auto merged
mysql-test/t/greedy_optimizer.test:
  Auto merged
mysql-test/t/index_merge.test:
  Auto merged
mysql-test/t/index_merge_bdb.test:
  Auto merged
mysql-test/t/index_merge_innodb.test:
  Auto merged
mysql-test/t/index_merge_innodb2.test:
  Auto merged
mysql-test/t/index_merge_ror.test:
  Auto merged
mysql-test/t/index_merge_ror_cpk.test:
  Auto merged
mysql-test/t/join_nested.test:
  Auto merged
mysql-test/t/rowid_order_bdb.test:
  Auto merged
mysql-test/t/rowid_order_innodb.test:
  Auto merged
mysql-test/t/rpl_session_var.test:
  Auto merged
mysql-test/t/sp-error.test:
  Auto merged
mysql-test/t/sp-security.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysql-test/t/sum_distinct.test:
  Auto merged
sql/log.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_class.h:
  Auto merged

b63b06dc

Small update for #13377 patch · b1338c21
unknown authored Oct 17, 2005
```
sql/log.cc:
  Small update to apply patch to *nix builds as well
```
b1338c21

Turn off EOLN_NATIVE for test files · 8c2edb46

unknown authored Oct 17, 2005


mysql-test/include/check_var_limit.inc:
  Turn off EOLN_NATIVE flag
mysql-test/include/have_big5.inc:
  Turn off EOLN_NATIVE flag
mysql-test/include/have_compress.inc:
  Turn off EOLN_NATIVE flag
mysql-test/include/have_crypt.inc:
  Turn off EOLN_NATIVE flag
mysql-test/include/have_outfile.inc:
  Turn off EOLN_NATIVE flag
mysql-test/include/have_query_cache.inc:
  Turn off EOLN_NATIVE flag
mysql-test/include/have_tis620.inc:
  Turn off EOLN_NATIVE flag
mysql-test/include/have_ucs2.inc:
  Turn off EOLN_NATIVE flag
mysql-test/include/have_ujis.inc:
  Turn off EOLN_NATIVE flag
mysql-test/include/not_embedded.inc:
  Turn off EOLN_NATIVE flag
mysql-test/include/system_db_struct.inc:
  Turn off EOLN_NATIVE flag
mysql-test/include/test_outfile.inc:
  Turn off EOLN_NATIVE flag
mysql-test/r/greedy_optimizer.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/index_merge.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/index_merge_bdb.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/index_merge_innodb.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/index_merge_innodb2.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/index_merge_ror.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/index_merge_ror_cpk.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/join_nested.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/rowid_order_bdb.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/rowid_order_innodb.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/rpl_session_var.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/sp-error.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/sp-security.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/sp.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/sum_distinct.result:
  Turn off EOLN_NATIVE flag
mysql-test/std_data/des_key_file:
  Turn off EOLN_NATIVE flag
mysql-test/std_data/init_file.dat:
  Turn off EOLN_NATIVE flag
mysql-test/std_data/loaddata1.dat:
  Turn off EOLN_NATIVE flag
mysql-test/std_data/loaddata2.dat:
  Turn off EOLN_NATIVE flag
mysql-test/std_data/loaddata3.dat:
  Turn off EOLN_NATIVE flag
mysql-test/std_data/loaddata4.dat:
  Turn off EOLN_NATIVE flag
mysql-test/std_data/rpl_loaddata.dat:
  Turn off EOLN_NATIVE flag
mysql-test/std_data/rpl_loaddata2.dat:
  Turn off EOLN_NATIVE flag
mysql-test/std_data/warnings_loaddata.dat:
  Turn off EOLN_NATIVE flag
mysql-test/t/greedy_optimizer.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/index_merge.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/index_merge_bdb.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/index_merge_innodb.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/index_merge_innodb2.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/index_merge_ror.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/index_merge_ror_cpk.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/join_nested.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rowid_order_bdb.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rowid_order_innodb.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_session_var.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/sp-error.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/sp-security.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/sp.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/sum_distinct.test:
  Turn off EOLN_NATIVE flag

8c2edb46

Merge mysql.com:/usr/local/bk/mysql-5.0 · ad45b9a1

unknown authored Oct 17, 2005

into  mysql.com:/home/pem/work/bug7049/mysql-5.0


mysql-test/r/sp.result:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged

ad45b9a1

Additional fix for BUG#7049, after review. · c8a2ff6f

unknown authored Oct 17, 2005

Make sure "select" aborts when finding a SP condition handler beyond the current scope.


mysql-test/r/sp.result:
  Updated test results after fixing error handling in select.
sql/mysqld.cc:
  Make sure "select" aborts when finding a SP condition handler beyond the current scope.
sql/protocol.cc:
  Make sure "select" aborts when finding a SP condition handler beyond the current scope.
sql/sp_rcontext.h:
  Added method for checking if the handler was found in the current context.
sql/sql_error.cc:
  Make sure "select" aborts when finding a SP condition handler beyond the current scope.

c8a2ff6f

Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0 · 06f10b7f
unknown authored Oct 17, 2005
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push
```
06f10b7f
Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1 · d3d218c2
unknown authored Oct 17, 2005
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
```
d3d218c2

ndb - hugo · 1f844d35

unknown authored Oct 17, 2005

  Disable tests of lock upgrade paths that are currently unsupported


ndb/test/ndbapi/testOperations.cpp:
  Disable lock upgrade paths that currently unsupported

1f844d35

Fix testDict -n FragmentTypeSingle T1 · f06c72f6
unknown authored Oct 17, 2005
```
Init KeyDescriptor before sending to DIH, 
  make sure that its always inited
```
f06c72f6
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 · 0b7a0b85
unknown authored Oct 17, 2005
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push
```
0b7a0b85

ndb - ndbapi testprogram bugfix · cb04d581

unknown authored Oct 17, 2005

  testBackup, fix assertion


ndb/test/ndbapi/testBackup.cpp:
  Fetch table before verifying

cb04d581

16 Oct, 2005 1 commit

sp-security.result, sp.result, sp-security.test, sp.test: · ccb796a9

unknown authored Oct 16, 2005

  Test for bug#12812 moved from sp.test to sp-security.test


mysql-test/t/sp.test:
  Test for bug#12812 moved from sp.test to sp-security.test
mysql-test/t/sp-security.test:
  Test for bug#12812 moved from sp.test to sp-security.test
mysql-test/r/sp.result:
  Test for bug#12812 moved from sp.test to sp-security.test
mysql-test/r/sp-security.result:
  Test for bug#12812 moved from sp.test to sp-security.test

ccb796a9

15 Oct, 2005 1 commit
- Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0 · 11541107
  unknown authored Oct 15, 2005
```
into deer.(none):/home/hf/work/mysql-5.0.12991


myisam/mi_check.c:
  Auto merged
```
  11541107
14 Oct, 2005 21 commits
- Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 · ee74d3a5
  unknown authored Oct 14, 2005
```
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
```
  ee74d3a5
- Merge mysql.com:/usr/local/home/marty/MySQL/mysql-4.1 · e268eaca
  unknown authored Oct 14, 2005
```
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0


sql/ha_ndbcluster.cc:
  merge
```
  e268eaca
- Fix for Bug #13961 Triggers on tables with auto_increment insert bogus values... · e2cd597d
  unknown authored Oct 14, 2005
```
Fix for Bug #13961  Triggers on tables with auto_increment insert bogus values into table (clean version)
```
  e2cd597d
- mysql.cc: · 9e3df6cc
  unknown authored Oct 14, 2005
```
  After merge fix.


client/mysql.cc:
  After merge fix.
```
  9e3df6cc
- Merge mysql.com:/usr/home/bar/mysql-4.1 · 344a892b
  unknown authored Oct 14, 2005
```
into  mysql.com:/usr/home/bar/mysql-5.0


client/mysql.cc:
  after merge fix.
```
  344a892b
- Merge mysql.com:/usr/home/bar/mysql-4.1.b13487 · 08bf55c7
  unknown authored Oct 14, 2005
```
into  mysql.com:/usr/home/bar/mysql-4.1


client/mysql.cc:
  Auto merged
```
  08bf55c7
- Merge mysql.com:/usr/home/bar/mysql-4.1 · 40157b14
  unknown authored Oct 14, 2005
```
into  mysql.com:/usr/home/bar/mysql-5.0


strings/ctype-latin1.c:
  Auto merged
```
  40157b14
- Merge mysql.com:/usr/home/bar/mysql-4.1.b13145 · 05414133
  unknown authored Oct 14, 2005
```
into  mysql.com:/usr/home/bar/mysql-4.1


mysql-test/r/ctype_latin1.result:
  Auto merged
mysql-test/t/ctype_latin1.test:
  Auto merged
```
  05414133
- Merge abarkov@bk-internal:/home/bk/mysql-5.0 · 7fa49e77
  unknown authored Oct 14, 2005
```
into  mysql.com:/usr/home/bar/mysql-5.0.char1
```
  7fa49e77
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 800061bd
  unknown authored Oct 14, 2005
```
into  mysql.com:/home/my/mysql-5.0
```
  800061bd
- Fixed compile errors on windows · 91afe31f
  unknown authored Oct 14, 2005
```
VC++Files/test1/mysql_thr.c:
  Fixed typo
VC++Files/thr_test/thr_test.c:
  Fixed typo
sql/log_event.cc:
  Removed compiler warning
  Fixed compile error on windows
```
  91afe31f
- Merge mysql.com:/usr/home/bar/mysql-5.0.b12547 · 04d52fab
  unknown authored Oct 14, 2005
```
into  mysql.com:/usr/home/bar/mysql-5.0.char1


strings/ctype-cp932.c:
  Auto merged
```
  04d52fab
- ctype_utf8.result: · 92f80fbb
  unknown authored Oct 14, 2005
```
  after merge fix
  ,


mysql-test/r/ctype_utf8.result:
  after merge fix
  ,
```
  92f80fbb
- Merge mysql.com:/usr/home/bar/mysql-4.1.b13751 · df3e57f5
  unknown authored Oct 14, 2005
```
into  mysql.com:/usr/home/bar/mysql-5.0.char1


mysql-test/t/ctype_utf8.test:
  Auto merged
sql/item_func.cc:
  Auto merged
mysql-test/r/ctype_utf8.result:
  after merge fix.
sql/sql_update.cc:
  discarding this change in 5.0.
```
  df3e57f5
- Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · 9cc7d75e
  unknown authored Oct 14, 2005
```
into  mysql.com:/usr/home/bar/mysql-4.1.b13751
```
  9cc7d75e
- Had to revert change, because it breaks compilation for · 7ec96539
  unknown authored Oct 14, 2005
```
Netware. Hartmut informed about this.
```
  7ec96539
- Merge abarkov@bk-internal:/home/bk/mysql-5.0 · d184778e
  unknown authored Oct 14, 2005
```
into  mysql.com:/usr/home/bar/mysql-5.0.char1
```
  d184778e
- Small fixes for Netware. · babdedd5
  unknown authored Oct 14, 2005
```
netware/mysql_test_run.c:
  Fixed typo.
netware/pack_isam.def:
  Added screenname.
scripts/make_binary_distribution.sh:
  Fixed mistake in merge.
```
  babdedd5
- Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · 1e11d278
  unknown authored Oct 14, 2005
```
into  mysql.com:/usr/home/bar/mysql-4.1.b13751
```
  1e11d278
- Merge abarkov@bk-internal:/home/bk/mysql-5.0 · 2aa10d24
  unknown authored Oct 14, 2005
```
into  mysql.com:/usr/home/bar/mysql-5.0.char1
```
  2aa10d24
- Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 · 4083d456
  unknown authored Oct 13, 2005
```
into  krsna.patg.net:/home/patg/mysql-build/mysql-5.0
```
  4083d456
13 Oct, 2005 6 commits

Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-release · 5474a240
unknown authored Oct 14, 2005
```
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
```
5474a240

configure.in: · 178155bb

unknown authored Oct 14, 2005

  New version 5.0.16


configure.in:
  New version 5.0.16

178155bb

Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 · 96e7df0c
unknown authored Oct 13, 2005
```
into  krsna.patg.net:/home/patg/mysql-build/mysql-5.0
```
96e7df0c
configure.in: · 4f204c52
unknown authored Oct 14, 2005
```
  rc => GA


configure.in:
  rc => GA
```
4f204c52
Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · acb50e59
unknown authored Oct 14, 2005
```
into  mysql.com:/home/my/mysql-5.0
```
acb50e59

Move handling of suffix_length from strnxfrm_bin() to filesort to ensure... · b896d334

unknown authored Oct 14, 2005

Move handling of suffix_length from strnxfrm_bin() to filesort to ensure proper sorting of all kind of binary objects
field::sort_key() now adds length last for varbinary/blob
VARBINARY/BLOB is now sorted by filesort so that shorter strings comes before longer ones
Fixed issues in test cases from last merge



mysql-test/r/select.result:
  Change column name in test to get GROUP BY to use the alias
mysql-test/r/type_blob.result:
  Test BLOB and VARCHAR sorting
mysql-test/t/select.test:
  Change column name in test to get GROUP BY to use the alias
  Drop used tables at start of test
  Don't use table names 'a', 'b' or 'c'
mysql-test/t/type_blob.test:
  Test BLOB and VARCHAR sorting
sql/field.cc:
  Store length last in VARBINARY() and BLOB() columns to get shorter strings sorted before longer onces
sql/field.h:
  Added method 'sort_length()' to allow one to have length bytes last for VARBINARY/BLOB to get these to sort properly
sql/filesort.cc:
  Use 'sort_length()' instead of 'pack_length()' to get length of field.
  Store suffix_length last for varbinary (blob) objects.
  The above ensures that BLOB/VARBINARY are correctly sorted (shorter strings before longer ones)
sql/sql_class.h:
  Added sort suffix length (to get varbinary/blob to sort correctly)
sql/sql_select.cc:
  Use sort_length() instead of pack_lengths()
strings/ctype-bin.c:
  Don't let strnxfrm_bin store length last
  Better to do it in MySQL field object to ensure it's done properly for all cases

b896d334