Commits · 22af54a94a2b6ccb8505297f1da37c5542569dbc · nexedi / MariaDB

17 Oct, 2005 18 commits

Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 22af54a9
unknown authored Oct 17, 2005
```
into  mysql.com:/home/emurphy/src/bk-clean/mysql-5.0
```
22af54a9

BUG#13900 DATETIME data changes after inserting a new row in a InnoDB table · 955798d2

unknown authored Oct 17, 2005

Applying patch from Marko.
All tests pass in pentium-debug-max build on Linux.


innobase/include/rem0rec.h:
  BUG#13900 DATETIME data changes after inserting a new row in a InnoDB table
  Applying patch from Marko.
innobase/include/rem0rec.ic:
  BUG#13900 DATETIME data changes after inserting a new row in a InnoDB table
  Applying patch from Marko.
innobase/row/row0upd.c:
  BUG#13900 DATETIME data changes after inserting a new row in a InnoDB table
  Applying patch from Marko.

955798d2

Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 · dddc50f2
unknown authored Oct 17, 2005
```
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
```
dddc50f2
Bug #13377. Small update, code formatting. · c1a658cd
unknown authored Oct 17, 2005

c1a658cd

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 mysql.com:/Users/kent/mysql/bk/mysql-5.0-release · 40017c6f
unknown authored Oct 17, 2005
```
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
```
40017c6f
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

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

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

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.

cecfe972

16 Oct, 2005 6 commits

mysql-test-run.pl: · cced6ea2

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

cced6ea2

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

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

45c062ba

mysql-test-run.pl: · 4c4c0f87

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.

4c4c0f87

thread_registry.h, thread_registry.cc: · 3e68a46a

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

3e68a46a

15 Oct, 2005 2 commits

mysql.sln: · 682e1af4

unknown authored Oct 15, 2005

  Missing yaSSL added to pro-gpl target


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

682e1af4

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 14 commits

mysql.spec.sh: · 8b6c4068

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

8b6c4068

mysql.spec.sh: · 726170e8

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

726170e8

mysql.spec.sh: · f242afb0

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"

f242afb0

Use Field_longlong::store(longlong nr, bool unsigned_val) for ulonglong values · 171bf938
unknown authored Oct 14, 2005
```
instead of Field_longlong::store(double nr).
```
171bf938
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

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

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

83afcc9c

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

configure.in: · 91018ea6

unknown authored Oct 14, 2005

  - reverted NDB version number, too


configure.in:
  - reverted NDB version number, too

91018ea6

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
- revert version number in configure.in to 5.0.15 · b395e11c
unknown authored Oct 14, 2005
```
configure.in:
  - revert version number to 5.0.15
```
b395e11c
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