Commits · 1e7531ea5c056ca305ac52f89f35e08aa5972936 · Kirill Smelkov / mariadb

19 Oct, 2005 4 commits

Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 · 1e7531ea
unknown authored Oct 19, 2005
```
into mysql.com:/home/psergey/mysql-5.0-bug12915-merge
```
1e7531ea
Post-merge fixes · c5f9e201
unknown authored Oct 19, 2005

c5f9e201
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 · 0c1085ee
unknown authored Oct 18, 2005
```
into  krsna.patg.net:/home/patg/mysql-build/mysql-5.0.test2
```
0c1085ee

Changeset: · 75184ffa

unknown authored Oct 18, 2005

  Changed option text in mysqldump.c
mysqldump.c:
  Changed text to read "+00:00" as opposed to "UTC" (per what the code does)


client/mysqldump.c:
  Changed text to read "+00:00" as opposed to "UTC" (per what the code does)

75184ffa

18 Oct, 2005 21 commits

Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 · 6c009e7c
unknown authored Oct 18, 2005
```
into  krsna.patg.net:/home/patg/mysql-build/mysql-5.0.test1
```
6c009e7c
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 · 03f289db
unknown authored Oct 18, 2005
```
into  krsna.patg.net:/home/patg/mysql-build/mysql-5.0.test1
```
03f289db

Re-application of earlier patch for create_where_from_key and and delete_all_rows · 1f732c11

unknown authored Oct 18, 2005

sql/ha_federated.cc:
Re-application of patch from earlier, adding debug to create_where_from_key as well
as small bug fix for setting of records and deleted in delete_all_rows to after db call.

1f732c11

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

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

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

8701728f

BUG#121915: Merge 4.1->5.0 · 8698ffc9

unknown authored Oct 19, 2005


mysql-test/r/update.result:
  Auto merged
mysql-test/t/update.test:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/records.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/structs.h:
  Auto merged

8698ffc9

Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 6e0222cb
unknown authored Oct 19, 2005
```
into  sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
```
6e0222cb
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 8363ca4d
unknown authored Oct 19, 2005
```
into  mysql.com:/home/cps/mysql/trees/mysql-5.0-build
```
8363ca4d
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 · 9946ce09
unknown authored Oct 19, 2005
```
into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug4-5.0
```
9946ce09
Merge alstroganov@bk-internal.mysql.com:/home/bk/mysql-5.0 · 4ba16b1f
unknown authored Oct 19, 2005
```
into  regul.home.lan:/mnt/md/bk/mysql-5.0
```
4ba16b1f
After review fixes · 90d26c97
unknown authored Oct 18, 2005

90d26c97

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

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

8b9e392e

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

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

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()

89a5b23d

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

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

e4fed851

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

723b28a2

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

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).

c30d1cfd

Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 · 7d81acb5
unknown authored Oct 18, 2005
```
into mysql.com:/home/psergey/mysql-4.1-bug12915-r2


sql/sql_update.cc:
  Auto merged
```
7d81acb5
BUG#12915: post-review fixes · 8ff8fac5
unknown authored Oct 18, 2005

8ff8fac5

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

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'

12dd0baa

17 Oct, 2005 15 commits

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

0122ca60
Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 49242dda
unknown authored Oct 17, 2005
```
into  mysql.com:/home/emurphy/src/bk-clean/mysql-5.0
```
49242dda
Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 4ba953f5
unknown authored Oct 17, 2005
```
into  mysql.com:/home/emurphy/src/bk-clean/mysql-5.0
```
4ba953f5
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 · 83c1adb4
unknown authored Oct 17, 2005
```
into  krsna.patg.net:/home/patg/mysql-build/mysql-5.0.test1
```
83c1adb4
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 · cf584ced
unknown authored Oct 17, 2005
```
into  krsna.patg.net:/home/patg/mysql-build/mysql-5.0.test1
```
cf584ced
BUG# 13052 Changed text in options to TIMESTAMP · 98b4390f
unknown authored Oct 17, 2005
```
client/mysqldump.c:
  BUG# 13052 Changed text in option to TIMESTAMP
```
98b4390f

Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 5727309d

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

5727309d

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

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).

dd02b98d

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