Commits · fff4897f846294589e06b13df1e9e9d29c927527 · nexedi / MariaDB

17 Oct, 2005 18 commits

Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 · fff4897f
unknown authored Oct 17, 2005
```
into  krsna.patg.net:/home/patg/mysql-build/mysql-5.0.test1
```
fff4897f
BUG# 13052 Changed text in options to TIMESTAMP · 138f1a25
unknown authored Oct 17, 2005
```
client/mysqldump.c:
  BUG# 13052 Changed text in option to TIMESTAMP
```
138f1a25
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 · 162076e4
unknown authored Oct 17, 2005
```
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
```
162076e4
Bug #13377. Small update, code formatting. · df494c54
unknown authored Oct 17, 2005

df494c54

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

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

ac4756d4

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

Turn off EOLN_NATIVE for test files · d551a766

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

d551a766

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

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

efe9b1ec

Additional fix for BUG#7049, after review. · 7bcbbde3

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.

7bcbbde3

Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-release · 92af600b
unknown authored Oct 17, 2005
```
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
```
92af600b
Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0 · ade882cd
unknown authored Oct 17, 2005
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push
```
ade882cd
Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1 · eb4fa5db
unknown authored Oct 17, 2005
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
```
eb4fa5db

ndb - hugo · 339897ec

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

339897ec

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

ndb - ndbapi testprogram bugfix · fe08ae37

unknown authored Oct 17, 2005

  testBackup, fix assertion


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

fe08ae37

Merge mysqldev@production.mysql.com:my/mysql-5.0-release · 2de36cb3
unknown authored Oct 17, 2005
```
into  mysql.com:/home/cps/mysql/trees/mysql-5.0
```
2de36cb3

Fix im tests on powermacg5: temporarily fix for problem with Darwin kernels. For more details see · e09e43d2

unknown authored Oct 17, 2005

bug 2030. Will push a proper fix later


server-tools/instance-manager/manager.cc:
  Fix im tests on powermacg5: temporarily fix for problem with Darwin kernels.

e09e43d2

16 Oct, 2005 6 commits

mysql-test-run.pl: · c1e49b54

unknown authored Oct 16, 2005

  Added --skip-im option handling
  Don't terminate script if IM fails to create PID file
mtr_cases.pl:
  Added --skip-im option handling
mtr_process.pl:
  Kill left over 'mysqld' processes started by IM


mysql-test/lib/mtr_process.pl:
  Kill left over 'mysqld' processes started by IM
mysql-test/lib/mtr_cases.pl:
  Added --skip-im option handling
mysql-test/mysql-test-run.pl:
  Added --skip-im option handling
  Don't terminate script if IM fails to create PID file

c1e49b54

sp-security.result, sp.result, sp-security.test, sp.test: · 6eddd561

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

6eddd561

Merge mysqldev@production.mysql.com:my/mysql-5.0-release · f7c79336
unknown authored Oct 16, 2005
```
into  mysql.com:/home/cps/mysql/trees/mysql-5.0
```
f7c79336
portability fix: sh does not support "==". This resulted in IM tests failing on range of platforms. · 40e9c83d
unknown authored Oct 16, 2005

40e9c83d

mysql-test-run.pl: · 924aa6a9

unknown authored Oct 16, 2005

  Put socket files into $opt_tmpdir, to avoid problems
  with platforms that can't handle long socket paths.


mysql-test/mysql-test-run.pl:
  Put socket files into $opt_tmpdir, to avoid problems
  with platforms that can't handle long socket paths.

924aa6a9

thread_registry.h, thread_registry.cc: · b26f6799

unknown authored Oct 16, 2005

  Add explicit Thread_info::Thread_info() and move both
  initializers out of class definition, to solve link
  problem on QNX
Makefile.am:
  Preserve executable mode on scripts
make_binary_distribution.sh:
  Copy *.imtest files


scripts/make_binary_distribution.sh:
  Copy *.imtest files
mysql-test/Makefile.am:
  Preserve executable mode on scripts
server-tools/instance-manager/thread_registry.cc:
  Add explicit Thread_info::Thread_info() and move both
  initializers out of class definition, to solve link
  problem on QNX
server-tools/instance-manager/thread_registry.h:
  Add explicit Thread_info::Thread_info() and move both
  initializers out of class definition, to solve link
  problem on QNX

b26f6799

15 Oct, 2005 2 commits

mysql.sln: · 5eaf2361

unknown authored Oct 15, 2005

  Missing yaSSL added to pro-gpl target


VC++Files/mysql.sln:
  Missing yaSSL added to pro-gpl target

5eaf2361

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


myisam/mi_check.c:
  Auto merged
```
da203817

14 Oct, 2005 14 commits

mysql.spec.sh: · 3be8e62c

unknown authored Oct 15, 2005

  Give mode arguments the same way in all places
  Moved copy of mysqld.a to "standard" build, but
  disabled it as we don't do embedded yet in 5.0


support-files/mysql.spec.sh:
  Give mode arguments the same way in all places
  Moved copy of mysqld.a to "standard" build, but
  disabled it as we don't do embedded yet in 5.0

3be8e62c

mysql.spec.sh: · 1c28e16b

unknown authored Oct 14, 2005

  For 5.x, always compile with --with-big-tables
  Copy the config.log file to location outside
  the build tree


support-files/mysql.spec.sh:
  For 5.x, always compile with --with-big-tables
  Copy the config.log file to location outside
  the build tree

1c28e16b

mysql.spec.sh: · 5783539e

unknown authored Oct 14, 2005

  Removed unneeded/obsolte configure options
  Added archive engine to standard server
  Removed the embedded server from experimental server
  Changed suffix "-Max" => "-max"
  Changed comment string "Max" => "Experimental"


support-files/mysql.spec.sh:
  Removed unneeded/obsolte configure options
  Added archive engine to standard server
  Removed the embedded server from experimental server
  Changed suffix "-Max" => "-max"
  Changed comment string "Max" => "Experimental"

5783539e

Use Field_longlong::store(longlong nr, bool unsigned_val) for ulonglong values · 91b6b11b
unknown authored Oct 14, 2005
```
instead of Field_longlong::store(double nr).
```
91b6b11b
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 · 7c196f2a
unknown authored Oct 14, 2005
```
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
```
7c196f2a

Change the "Password" column type for the Perl suite running the tests. bug#14023 · a7ef3df7

unknown authored Oct 14, 2005


mysql-test/lib/init_db.sql:
  Data type of the "Password" column has been changed in "mysql_create_system_tables",
  this must be reflected here (until they are united). bug#14023

a7ef3df7

Merge mysql.com:/usr/local/home/marty/MySQL/mysql-4.1 · e837ec90
unknown authored Oct 14, 2005
```
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0


sql/ha_ndbcluster.cc:
  merge
```
e837ec90
Fix for Bug #13961 Triggers on tables with auto_increment insert bogus values... · 2d400132
unknown authored Oct 14, 2005
```
Fix for Bug #13961  Triggers on tables with auto_increment insert bogus values into table (clean version)
```
2d400132

mysql.cc: · edf99511

unknown authored Oct 14, 2005

  After merge fix.


client/mysql.cc:
  After merge fix.

edf99511

Merge mysql.com:/usr/home/bar/mysql-4.1 · 08377383
unknown authored Oct 14, 2005
```
into  mysql.com:/usr/home/bar/mysql-5.0


client/mysql.cc:
  after merge fix.
```
08377383

configure.in: · 989a2c44

unknown authored Oct 14, 2005

  - reverted NDB version number, too


configure.in:
  - reverted NDB version number, too

989a2c44

Merge mysql.com:/usr/home/bar/mysql-4.1.b13487 · 9c6a8154
unknown authored Oct 14, 2005
```
into  mysql.com:/usr/home/bar/mysql-4.1


client/mysql.cc:
  Auto merged
```
9c6a8154
- revert version number in configure.in to 5.0.15 · 73a3531d
unknown authored Oct 14, 2005
```
configure.in:
  - revert version number to 5.0.15
```
73a3531d
Merge mysql.com:/usr/home/bar/mysql-4.1 · 6af710aa
unknown authored Oct 14, 2005
```
into  mysql.com:/usr/home/bar/mysql-5.0


strings/ctype-latin1.c:
  Auto merged
```
6af710aa