Commit graph

18205 commits

Author SHA1 Message Date
unknown
f7356d7391 InnoDB: Prevent ALTER TABLE ... ENGINE=...
if there are foreign key constraints on the table. (Bug #5574)


sql/ha_innodb.cc:
  Add method can_switch_engines()
sql/ha_innodb.h:
  Add method can_switch_engines()
sql/handler.h:
  Add method can_switch_engines()
sql/sql_table.cc:
  Check handler::can_switch_engines() before switching storage engines
2005-04-07 12:16:41 +03:00
unknown
0d17aea729 Merge mysql.com:/home/jimw/my/mysql-4.0-clean
into mysql.com:/home/jimw/my/mysql-4.1-clean


client/mysqlcheck.c:
  Auto merged
mysys/my_rename.c:
  Auto merged
2005-04-06 11:02:20 -07:00
unknown
c6bb22936a Merge mysql.com:/home/jimw/my/mysql-4.0-9492
into mysql.com:/home/jimw/my/mysql-4.0-clean
2005-04-06 10:53:09 -07:00
unknown
57fa327069 Small fixes done while reviewing pushed code
mysql-test/r/innodb-replace.result:
  Added proper cleanup for test
mysql-test/t/innodb-replace.test:
  Added proper cleanup for test
sql/share/english/errmsg.txt:
  Don't extend the possible length of error message too much for common errors are MySQL 4.0 clients has a limit of 200 characters
2005-04-06 16:52:41 +03:00
unknown
c8c6c91811 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1


sql/mysqld.cc:
  Auto merged
2005-04-06 15:53:32 +03:00
unknown
e23d1768a0 Fixed that create_time is set properly for cached threads 2005-04-06 15:52:32 +03:00
unknown
cde615c9cb InnoDB: Avoid test suite failures caused by a locking conflict
between two server instances at server shutdown/startup.
This conflict on advisory locks appears to be the result of a bug
in the operating system; these locks should be released when the
files are closed, but somehow that does not always happen
immediately in Linux.  (Bug #9381)


innobase/include/os0file.h:
  Add OS_FILE_OPEN_RETRY for os_file_create()ing ibdata1
innobase/os/os0file.c:
  os_file_lock(): Do not close the file on failure, but let the
  callers do that.
  os_file_create(): If create_mode==OS_FILE_OPEN_RETRY and
  os_file_lock() fails, keep retrying for 100 seconds.
innobase/srv/srv0start.c:
  open_or_create_data_files(): Open the first data file with
  OS_FILE_OPEN_RETRY, to resolve a conflict with a shutting-down
  instance of the MySQL server.
2005-04-06 15:09:15 +03:00
unknown
d5b7547597 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
2005-04-06 13:45:14 +02:00
unknown
1216986050 Makefile.am:
Include the Perl version of mysql-test-run
rpl_rewrite_db.test, rpl_rewrite_db.result:
  Added missing database cleanup
mysql-test-run.pl:
  Embedded result files no longer needed


mysql-test/mysql-test-run.pl:
  Embedded result files no longer needed
mysql-test/r/rpl_rewrite_db.result:
  Added missing database cleanup
mysql-test/t/rpl_rewrite_db.test:
  Added missing database cleanup
mysql-test/Makefile.am:
  Include the Perl version of mysql-test-run
2005-04-06 12:20:55 +02:00
unknown
9c642e5b31 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/gluh/MySQL/Bugs/mysql-4.1.9286
2005-04-06 15:19:02 +05:00
unknown
3683fc3453 Minor clean-ups for the previous commit.
sql/field.cc:
  Use a separate variable. Otherwise "error" value gets lost
  after well_formed_length call.
strings/ctype-mb.c:
  Don't return an error if we reached end of line.
2005-04-06 15:12:44 +05:00
unknown
ddd9fd8964 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/gluh/MySQL/Bugs/mysql-4.1.9286


sql/sql_yacc.yy:
  Auto merged
2005-04-06 14:14:13 +05:00
unknown
31d15c3f76 Fix for bug #9286: SESSION/GLOBAL should be disallowed for user variables
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2005-04-06 14:13:06 +05:00
unknown
548547669a Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-04-06 10:56:51 +02:00
unknown
97b26d3b93 row0sel.c, btr0pcur.c, btr0pcur.ic, btr0pcur.h:
Add diagnostic code to track assertion failure in ut_a(cursor->old_stored == BTR_PCUR_OLD_STORED); the failure happened in OPTIMIZE TABLE, and in 4.0.24 in some other context


innobase/include/btr0pcur.h:
  Add diagnostic code to track assertion failure in ut_a(cursor->old_stored == BTR_PCUR_OLD_STORED); the failure happened in OPTIMIZE TABLE, and in 4.0.24 in some other context
innobase/include/btr0pcur.ic:
  Add diagnostic code to track assertion failure in ut_a(cursor->old_stored == BTR_PCUR_OLD_STORED); the failure happened in OPTIMIZE TABLE, and in 4.0.24 in some other context
innobase/btr/btr0pcur.c:
  Add diagnostic code to track assertion failure in ut_a(cursor->old_stored == BTR_PCUR_OLD_STORED); the failure happened in OPTIMIZE TABLE, and in 4.0.24 in some other context
innobase/row/row0sel.c:
  Add diagnostic code to track assertion failure in ut_a(cursor->old_stored == BTR_PCUR_OLD_STORED); the failure happened in OPTIMIZE TABLE, and in 4.0.24 in some other context
2005-04-06 10:27:40 +03:00
unknown
5687fe36bf Adding a new parameter for well_formed_length to
return error. We'll use it for better warnign reporting.
2005-04-06 11:53:15 +05:00
unknown
81125bc8ce Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-04-05 20:04:31 +02:00
unknown
28a1851629 Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2005-04-05 19:45:04 +02:00
unknown
a62081a931 merged 2005-04-05 19:44:39 +02:00
unknown
90908f0287 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-04-05 18:35:51 +02:00
unknown
f50dc99d24 add changeset key to the bk commit mail 2005-04-05 15:16:15 +02:00
unknown
bb4cc70d53 ndb - csc#4847 release scan op early to save memory
ndb/include/ndbapi/NdbConnection.hpp:
  release scan op of hupped trans at scan close to save memory
ndb/include/ndbapi/NdbScanOperation.hpp:
  release scan op of hupped trans at scan close to save memory
ndb/src/ndbapi/NdbConnection.cpp:
  release scan op of hupped trans at scan close to save memory
ndb/src/ndbapi/NdbResultSet.cpp:
  release scan op of hupped trans at scan close to save memory
ndb/src/ndbapi/NdbScanOperation.cpp:
  release scan op of hupped trans at scan close to save memory
ndb/tools/desc.cpp:
  release scan op of hupped trans at scan close to save memory
2005-04-05 13:14:03 +02:00
unknown
9cc67b9eaa Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/bug6762
2005-04-05 13:11:21 +02:00
unknown
a503a112cd Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-04-05 13:08:00 +02:00
unknown
e0216a7e31 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/bug6762
2005-04-05 13:07:46 +02:00
unknown
bc18ca4a66 Fix swedish error message
sql/share/swedish/errmsg.txt:
  Fix length of swedish error message for "unknown table"
2005-04-05 13:01:16 +02:00
unknown
632f8c197e A fix for Netware. 2005-04-05 13:15:04 +03:00
unknown
9c6d24e6e4 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/M41/mysql-4.1
2005-04-05 11:25:42 +02:00
unknown
fccf177b15 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/bug6762
2005-04-05 11:23:17 +02:00
unknown
fee508a430 dict0dict.c:
Add a note that ENUM in new tables cannot reference ENUM in old tables, in FOREIGN KEY constraints


innobase/dict/dict0dict.c:
  Add a note that ENUM in new tables cannot reference ENUM in old tables, in FOREIGN KEY constraints
2005-04-05 11:35:03 +03:00
unknown
7cb0a8e794 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/M41/mysql-4.1


sql/mysqld.cc:
  Auto merged
2005-04-05 09:06:57 +02:00
unknown
682baee231 Merge new tests
mysql-test/r/join_outer.result:
  Update results
mysql-test/t/join_outer.test:
  Merge
2005-04-04 18:29:18 -07:00
unknown
52781a484c Merge mysql.com:/home/jimw/my/mysql-4.1-9472b
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-04-04 18:27:27 -07:00
unknown
fe02ce98af Merge mysql.com:/home/jimw/my/mysql-4.1-8866
into mysql.com:/home/jimw/my/mysql-4.1-clean


client/mysqltest.c:
  Auto merged
sql-common/client.c:
  Auto merged
2005-04-04 18:26:39 -07:00
unknown
6d2e510a30 Removed extra comment 2005-04-05 03:34:39 +04:00
unknown
31f2f9bcf8 Fix for BUG#8877: Implementation of
"Early NULL-values filtering for ref access" (attempt2+post-review fixes)
1. update_ref_and_keys() accumulates info about null-rejecting
predicates in in KEY_FIELD::null_rejecting, add_key_part saves
these to KEYUSE.
2. create_ref_for_key copies them to TABLE_REF.
3. add_not_null_conds adds "x IS NOT NULL" to join_tab->select_cond of
appropiate JOIN_TAB members.

Includes code cleanups: 
* add_key_field() params: s/COND/Item_func/ (as only Item_funcs are
passed to it)
* add_key_fields() params: JOIN_TAB *stat removed (wasn't used)


sql/sql_select.cc:
  Fix for BUG#8877: Implementation of 
  "Early NULL-values filtering for ref access"
  1. update_ref_and_keys() accumulates info about null-rejecting
  predicates in in KEY_FIELD::null_rejecting, add_key_part saves
  these to KEYUSE.
  2. create_ref_for_key copies them to TABLE_REF.
  3. add_not_null_conds adds "x IS NOT NULL" to join_tab->select_cond
  of appropiate JOIN_TAB members.
  
  Includes code cleanups: 
  * add_key_field() params: s/COND/Item_func/ (as only Item_funcs are
  passed to it)
  * add_key_fields() params: JOIN_TAB *stat removed (wasn't used)
sql/sql_select.h:
  Fix for BUG#8877: Implementation of 
  "Early NULL-values filtering for ref access" (attempt2)
2005-04-05 02:42:23 +04:00
unknown
a1112ca056 Merge bk-internal:/home/bk/mysql-4.1
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-04-04 12:46:43 -07:00
unknown
e31062a23f Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/M41/mysql-4.1


sql/share/english/errmsg.txt:
  Auto merged
2005-04-04 19:00:40 +02:00
unknown
a64487fcd5 ha_innodb.cc:
Correct the fix of Bug #9526 : InnoDB must use its own internal type info for old tables, so that old ENUMs and SETs still are (incorrectly) seen as char strings; we do not dare to allow InnoDB sometimes to see the type as an integer type for those old tables


sql/ha_innodb.cc:
  Correct the fix of Bug #9526 : InnoDB must use its own internal type info for old tables, so that old ENUMs and SETs still are (incorrectly) seen as char strings; we do not dare to allow InnoDB sometimes to see the type as an integer type for those old tables
2005-04-04 19:41:52 +03:00
unknown
9ce74a800e ha_innodb.cc:
Fix bug #9526 in InnoDB: the internal type of an ENUM or SET is an unsigned integer type, not a character string


sql/ha_innodb.cc:
  Fix bug #9526 in InnoDB: the internal type of an ENUM or SET is an unsigned integer type, not a character string
2005-04-04 19:27:28 +03:00
unknown
9176a1f442 Merge bk-internal:/home/bk/mysql-4.1
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-04-04 08:42:30 -07:00
unknown
2f01567ad6 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/bug6762


sql/ha_ndbcluster.cc:
  Auto merged
2005-04-04 17:09:53 +02:00
unknown
07182f5aca ctype_uca.result:
fixing test results accordingly.
ctype-uca.c:
  It appeared that in traditional Spanish collation
  'RR' is not equal to 'R', as Unicode and Mimer state.
  We'll go Oracle and IBM way instead:
  No special rules to 'RR'.


strings/ctype-uca.c:
  It appeared that in traditional Spanish collation
  'RR' is not equal to 'R', as Unicode and Mimer state.
  We'll go Oracle and IBM way instead:
  No special rules to 'RR'.
mysql-test/r/ctype_uca.result:
  fixing test results accordingly.
2005-04-04 17:55:12 +05:00
unknown
f65e9210ee BUG#6762 ALTER TABLE gives weird results and error message
- Better error message when table definition has changed


mysql-test/r/ndb_alter_table.result:
  New error message and code when table definition has changed.
mysql-test/r/ndb_multi.result:
  Safety, drop tables in second server as well
mysql-test/t/ndb_alter_table.test:
  New error message and code when table definition has changed.
mysql-test/t/ndb_multi.test:
  Safety, drop tables in second server as well
sql/ha_ndbcluster.cc:
  When error 284 is returned from NDB a check must be made to see what the error really means.
   - if table does not exists any more, return 709 -> No such table exists
   - if table still exists, table has most likely been altered and table id and version has 
     changed, print  hardcoded  errormessage indicating that transaction should retried
    (this error message should be translated to a langauge dependent error message in 5.0)
    
  Remove mapping from 284 to HA_ERR_NO_SUCH_TABLE
2005-04-04 12:26:05 +02:00
unknown
98e615ba35 Manual merge of fix for bug #8894 "TIMESTAMP values scrambled/misaligned
when using --new" into 4.1 tree.


mysql-test/r/type_timestamp.result:
  Manual merge.
mysql-test/t/type_timestamp.test:
  Manual merge.
sql/field.cc:
  Manual merge.
sql/field.h:
  Manual merge.
2005-04-03 10:05:01 +04:00
unknown
64978db186 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/dlenev/src/mysql-4.0-bg8894
2005-04-03 09:48:09 +04:00
unknown
ecf8732c22 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-04-02 21:45:02 +02:00
unknown
a77a2c8354 results updated 2005-04-02 21:36:50 +02:00
unknown
5f8c654a0a merged
mysql-test/r/drop.result:
  Auto merged
mysql-test/t/drop.test:
  Auto merged
sql/share/english/errmsg.txt:
  Auto merged
sql/share/russian/errmsg.txt:
  Auto merged
sql/share/ukrainian/errmsg.txt:
  Auto merged
2005-04-02 20:28:58 +02:00
unknown
7d865e0b12 bug#3891 - DROP TABLE many-unexistent-tables, was printing an error with %s instead of table names
sql/sql_table.cc: print an error with a function that respects width modifiers (%.64s)


mysql-test/r/drop.result:
  bug#3891 - DROP TABLE many-unexistent-tables, was printing an error with %s instead of table names
mysql-test/t/drop.test:
  bug#3891 - DROP TABLE many-unexistent-tables, was printing an error with %s instead of table names
sql/share/english/errmsg.txt:
  allow longer "table names" as DROP TABLE puts a list here
sql/share/russian/errmsg.txt:
  allow longer "table names" as DROP TABLE puts a list here
sql/share/ukrainian/errmsg.txt:
  allow longer "table names" as DROP TABLE puts a list here
sql/sql_table.cc:
  print an error with a function that respects width modifiers (%.64s)
2005-04-02 20:13:19 +02:00