Commits · a122e90d8b4addc066ca98cb46ebfe0066d6dfbd · nexedi / MariaDB

18 Oct, 2005 15 commits

Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0 · a122e90d
unknown authored Oct 18, 2005
```
into  zim.(none):/home/brian/mysql/mysql-5.0
```
a122e90d

Per a user request there is now support for "CHECK TABLE" where the table is an archive file. · 076061cd

unknown authored Oct 18, 2005


mysql-test/r/archive.result:
  Result file for adding check table support
mysql-test/t/archive.test:
  Simple test for check table. The additional select is added just to make sure the file is not destroyed.
sql/ha_archive.cc:
  Updates for adding CHECK table support. is_crashed() now returns the state of the file.
sql/ha_archive.h:
  Updates for adding CHECK table support

076061cd

Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 2d88ad20
unknown authored Oct 19, 2005
```
into  sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
```
2d88ad20
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 · 548f7235
unknown authored Oct 19, 2005
```
into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug4-5.0
```
548f7235
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0 · f36dfd8a
unknown authored Oct 19, 2005
```
into  mysql.com:/home/cps/mysql/trees/mysql-5.0-build
```
f36dfd8a
Merge alstroganov@bk-internal.mysql.com:/home/bk/mysql-5.0 · 87636440
unknown authored Oct 19, 2005
```
into  regul.home.lan:/mnt/md/bk/mysql-5.0
```
87636440
After review fixes · ad257f1c
unknown authored Oct 18, 2005

ad257f1c

fix compilation failure on serg's box: we shouldn't · f21cd2ca

unknown authored Oct 19, 2005

use USE_PRAGMA_INTERFACE before include of my_global.h,
where it is defined


server-tools/instance-manager/command.h:
  don't use USE_PRAGMA_INTERFACE before my_global.h, where it is defined
server-tools/instance-manager/listener.h:
  don't use USE_PRAGMA_INTERFACE before my_global.h, where it is defined
server-tools/instance-manager/mysql_connection.h:
  don't use USE_PRAGMA_INTERFACE before my_global.h, where it is defined
server-tools/instance-manager/options.h:
  don't use USE_PRAGMA_INTERFACE before my_global.h, where it is defined
server-tools/instance-manager/thread_registry.cc:
  fix register
server-tools/instance-manager/thread_registry.h:
  don't use USE_PRAGMA_INTERFACE before my_global.h, where it is defined
server-tools/instance-manager/user_map.h:
  don't use USE_PRAGMA_INTERFACE before my_global.h, where it is defined

f21cd2ca

Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 · 52ae6f23
unknown authored Oct 18, 2005
```
into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug4-5.0
```
52ae6f23

check of ACL initialization in is_acl_user() (BUG#13504) · df9a964a

unknown authored Oct 18, 2005


mysql-test/r/skip_grants.result:
  creation view with DEFINER clause if --skip-grant-tables
mysql-test/t/skip_grants.test:
  creation view with DEFINER clause if --skip-grant-tables
sql/sql_acl.cc:
  check of ACL initialization in is_acl_user()

df9a964a

Added initial support of stress testing. Now it is possible to start stress... · e2f393aa

unknown authored Oct 18, 2005

Added initial support of stress testing. Now it is possible to start stress test from mysql-test-run script.
For details see README.stress

e2f393aa

Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 242c5e9b
unknown authored Oct 18, 2005
```
into  mysql.com:/home/emurphy/src/bk-clean/mysql-5.0
```
242c5e9b
Fixed stack overflow problem and abnormal end on Netware. · db398372
unknown authored Oct 18, 2005

db398372

Fix for bug #14064: information_schema test fails on opnsrv6c. · 8dd6ac8e

unknown authored Oct 18, 2005


sql/sql_show.cc:
  1. Use Field_longlong::store(longlong nr, bool unsigned_val) for ulonglong values
     instead of Field_longlong::store(double nr).
  2. CHARACTER_OCTET_LENGTH and CHARACTER_MAXIMUM_LENGTH fields filing order fixed (8 <-> 9).

8dd6ac8e

Fix for bug#13783 mysqlcheck tries to optimize and analyze information_schema · c5650615

unknown authored Oct 18, 2005

  'information_schema' is excluded from list of databases for mysqlcheck command


mysql-test/mysql-test-run.pl:
  dded support for 'mysqlcheck'
mysql-test/mysql-test-run.sh:
  dded support for 'mysqlcheck'

c5650615

17 Oct, 2005 25 commits

Hastily fix VC++6 project files to include a new file. · 1fa2f356
unknown authored Oct 18, 2005

1fa2f356
Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 21d0fe01
unknown authored Oct 17, 2005
```
into  mysql.com:/home/emurphy/src/bk-clean/mysql-5.0
```
21d0fe01
Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 057c0f08
unknown authored Oct 17, 2005
```
into  mysql.com:/home/emurphy/src/bk-clean/mysql-5.0
```
057c0f08
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 · 008e4abf
unknown authored Oct 17, 2005
```
into  krsna.patg.net:/home/patg/mysql-build/mysql-5.0.test1
```
008e4abf
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 bk-internal.mysql.com:/home/bk/mysql-5.0 · 17ff2406

unknown authored Oct 17, 2005

into  mysql.com:/home/dlenev/src/mysql-5.0-bg12739


sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged

17ff2406

Fix for bug #12739 "Deadlock in multithreaded environment during creating/ · 1a00e60b

unknown authored Oct 17, 2005

droping trigger on InnoDB table".

Deadlock occured in cases when we were trying to create two triggers for
the same InnoDB table concurrently and both threads were able to reach
close_cached_table() simultaneously. Bugfix implements new approach to
table locking and table cache invalidation during creation/dropping
of trigger.

No testcase is supplied since bug was repeatable only under high concurrency.


sql/mysql_priv.h:
  reopen_name_locked_table():
    Changed function signature to make it more robust against erroneous usage.
sql/sql_base.cc:
  reopen_name_locked_table():
    Changed function signature to make it more robust against erroneous usage.
    Obtaining LOCK_open lock is now resposibility of caller.
    When searching for the table to open we should not prefer connection's current
    database over database which was explicitly specified in TABLE_LIST::db member
    (even if database is not explicitly specified for table in original query
    TABLE_LIST::db will be set properly at parsing stage).
    Fixed behavior of function in cases when error occurs during opening of table.
sql/sql_table.cc:
  prepare_for_restore()/prepare_for_repair():
    We should not prefer connection's current database over database which was
    specified in TABLE_LIST::db member (even if database is not explicitly
    specified for table in original query TABLE_LIST::db will be set properly
    at parsing stage). Fixed behavior in unlikely case when we are unable
    to open table which we are restoring/reparing at the end of preparation
    stage.
sql/sql_trigger.cc:
  mysql_create_or_drop_trigger():
    Now instead of opening and locking table, creating trigger, and then trying
    to invalidate all instances of this table in table cache, we obtain name
    lock on table first (thus ensuring that no other thread has this table
    open), open it, create trigger and then close table therefore releasing lock.
    New approach is more in line with other places where change .frm files
    (i.e. change table meta-data).
    With this change we also get rid of deadlock which occured in cases when we
    were trying to create two triggers for the same InnoDB table concurrently
    and both threads were able to reach close_cached_table() simultaneously.
    (Alternative was to forbid to InnoDB downgrade locks for CREATE/DROP
     TRIGGER statements in one way or another but I think that proposed
     solution is better long term).

1a00e60b

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

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

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.

c5615673

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