Commit graph

17996 commits

Author SHA1 Message Date
unknown
0914b0125b Don't allow the server to start up when an invalid user is
specified via --user or in configuration. (Bug )


sql/mysqld.cc:
  Actually die if we an invalid user is specified.
2005-04-13 15:43:29 -07:00
unknown
a40ecb4818 ha_innodb.cc:
Fix part of bug : if MySQL calls ::store_lock with TL_IGNORE, do not change prebuilt->select_lock_type; this fix may heal the assertion failures reported in UPDATE and multi-table UPDATE; it is not clear if this fixes the problems in OPTIMIZE TABLE


sql/ha_innodb.cc:
  Fix part of bug : if MySQL calls ::store_lock with TL_IGNORE, do not change prebuilt->select_lock_type; this fix may heal the assertion failures reported in UPDATE and multi-table UPDATE; it is not clear if this fixes the problems in OPTIMIZE TABLE
2005-04-13 20:21:28 +03:00
unknown
338df0b77c Fix ctype_ucs_binlog test when ucs2 not available
mysql-test/t/ctype_ucs_binlog.test:
  Require ucs support
2005-04-13 09:02:12 -07:00
unknown
02e1937910 Merge bk-internal:/home/bk/mysql-4.1
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-04-13 08:46:29 -07:00
unknown
3fbb9c39a7 fil0fil.c:
At the shutdown, write the latest lsn only to the first pages of the ibdata files of the system tablespace, NOT to the .ibd files; writing to tens of thousands .ibd files can take minutes


innobase/fil/fil0fil.c:
  At the shutdown, write the latest lsn only to the first pages of the ibdata files of the system tablespace, NOT to the .ibd files; writing to tens of thousands .ibd files can take minutes
2005-04-13 17:22:04 +03:00
unknown
ad5ec8a46c Merge heikki@bk-internal.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/heikki/mysql-4.1
2005-04-13 16:19:49 +03:00
unknown
880d0295d6 row0sel.c:
Do not test the value of err if the lock operation was skipped because innodb_logs_unsafe_for_binlog was TRUE; though this did not cause any bugs visible to the user, because err is inited to DB_SUCCESS at the start of the function row_search_for_mysql()


innobase/row/row0sel.c:
  Do not test the value of err if the lock operation was skipped because innodb_logs_unsafe_for_binlog was TRUE; though this did not cause any bugs visible to the user, because err is inited to DB_SUCCESS at the start of the function row_search_for_mysql()
2005-04-13 15:49:28 +03:00
unknown
f53284f193 Merge
sql/mysqld.cc:
  Auto merged
2005-04-13 14:08:54 +02:00
unknown
9faf085b9f Fix for bug#9813: Test 'ndb_basic': Autoincrement fails in 64 bit 2005-04-13 12:42:23 +02:00
unknown
4a5edc965f Remove references to result.es files
mysql-test/Makefile.am:
  Remove reference to result.es
scripts/make_binary_distribution.sh:
  Remove references to result.es
2005-04-12 18:04:32 -07:00
unknown
dec90f5b36 InnoDB: Ignore character set mismatch in ALTER TABLE and RENAME TABLE
if foreign_key_checks=0. (Bug )


innobase/dict/dict0dict.c:
  dict_foreign_add_to_cache(): Add flag check_types.
  If the flag is FALSE, ignore character set mismatch.
innobase/dict/dict0load.c:
  dict_load_foreign(), dict_load_foreigns(): Add flag check_types.
  If the flag is FALSE, differences in character sets will be ignored.
innobase/include/dict0dict.h:
  dict_foreign_add_to_cache(): Add flag check_types.
  If the flag is FALSE, differences in character sets will be ignored.
innobase/include/dict0load.h:
  dict_load_foreigns(): Add flag check_types.
  If the flag is FALSE, differences in character sets will be ignored.
innobase/row/row0mysql.c:
  row_table_add_foreign_constraints(), row_rename_table_for_mysql():
  Pass trx->check_foreigns to dict_load_foreigns()
sql/ha_innodb.cc:
  ha_innobase::rename_table(): Clear trx->check_foreign if necessary.
2005-04-12 16:12:34 +03:00
unknown
3fcbdd761c Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2005-04-12 13:56:58 +02:00
unknown
efd06e1910 bug#9757 - ndb - post review
use DBUG_RETURN


ndb/src/mgmsrv/MgmtSrvr.cpp:
  bug#9757 - ndb
    use DBUG_RETURN
2005-04-12 13:56:24 +02:00
unknown
583d38f3f7 bug#9757 - ndb
Impl. stupid mgm lock against shutting down 2 nodes simultaniously
  Add some more dump


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Impl. 2 new dump 
  1) to query nf handling state
  2) that impl. sending of arbitrary signal...
     to be used with extreme care
ndb/src/kernel/main.cpp:
  enable critical and warnings in out file
ndb/src/mgmsrv/MgmtSrvr.cpp:
  call handleStopReply on nfCompleteRep instead
ndb/src/mgmsrv/MgmtSrvr.hpp:
  call handleStopReply on nfCompleteRep instead
2005-04-12 13:36:43 +02:00
unknown
c99e332cf1 backport kill.test fix from 5.0 2005-04-11 22:36:07 +02:00
unknown
b3842e107c Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-04-11 20:49:19 +02:00
unknown
65255d3540 don't check record's checksum in REPAIR
myisam/mi_dynrec.c:
  new parameter for _mi_rec_check().
myisam/myisamdef.h:
  new parameter for _mi_rec_check().
2005-04-11 20:04:50 +02:00
unknown
08b89a2b74 In configure.in, don't remove $AVAILABLE_LANGUAGES_ERRORS_RULES at end
because config.status may later need this file (if it does not find it
it won't incorporate dependencies of errmsg.sys in sql/share/Makefile) (thx Serg).
In sql/share/Makefile.am using "all:" leads to double-"all:" in Makefile (thx Konstantin).



sql/share/Makefile.am:
  using "all:" leads to double-"all:" in Makefile (counting the auto-generated);
  all-local is the standard way to add something to all: (thanks Konstantin)
configure.in:
  Don't remove $AVAILABLE_LANGUAGES_ERRORS_RULES at end of configure.in
  because config.status may later need this file (if it does not find it
  it won't incorporate dependencies of errmsg.sys in sql/share/Makefile :( )
2005-04-11 17:37:49 +02:00
unknown
6bf0fcd136 Merge gbichot@bk-internal.mysql.com://home/bk/mysql-4.1
into quadita2.mysql.com:/nfstmp1/guilhem/mysql-4.1-4ita
2005-04-11 16:47:39 +02:00
unknown
30a82dfb7d Fix for BUG#9149 "OPTIMIZE TABLE statement on InnoDB table is logged twice in the binary log"
if we fall back to mysql_alter_table() (for InnoDB), don't do binlogging in mysql_alter_table(), as mysql_admin_table()
is not supposed to do any binlogging (it is done by the caller).


sql/sql_table.cc:
  When optimizing a table, if we fall back to mysql_alter_table()
  (for InnoDB), don't do binlogging in mysql_alter_table(), as mysql_admin_table()
  is not supposed to do any binlogging (it is done by the caller).
2005-04-11 16:46:03 +02:00
unknown
cd0ceaf8c8 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1
into mdk10.(none):/home/reggie/bk/mysql-4.1
2005-04-11 09:19:49 -05:00
unknown
93b4fbea92 Merging fix for bug "Query Cache caches queries with CURRENT_USER()
function" into 4.1 tree.
2005-04-11 10:44:48 +04:00
unknown
d79e696952 Merge mysql.com:/home/dlenev/src/mysql-4.0-bg9796
into mysql.com:/home/dlenev/src/mysql-4.1-merges


sql/item_create.cc:
  Auto merged
mysql-test/r/query_cache.result:
  Auto merged
mysql-test/t/query_cache.test:
  Auto merged
2005-04-11 09:53:54 +04:00
unknown
3e0a626367 Fix for bug "Query Cache caches queries with CURRENT_USER()
function".

We should not cache queries using CURRENT_USER() function as we do it
for some other functions, e.g. USER() function.


mysql-test/r/query_cache.result:
  Let us test that queries with CURRENT_USER() function are not cached.
mysql-test/t/query_cache.test:
  Let us test that queries with CURRENT_USER() function are not cached.
sql/item_create.cc:
  create_func_current_user():
    We should not cache queries which use CURRENT_USER() function.
2005-04-11 00:30:23 +04:00
unknown
ebdf2c0153 ctype_collate.result, ctype_collate.test, union.result, union.test:
fixing tests accordingly
item.cc:
  Allow mixing non-binary collation and binary collation
  even if coercibility is the same. 
  For easier 4.0 -> 4.1 migrating.


sql/item.cc:
  Allow mixing non-binary collation and binary collation
  even if coercibility is the same. 
  For easier 4.0 -> 4.1 migrating.
mysql-test/t/union.test:
  fixing tests accordingly
mysql-test/r/union.result:
  fixing tests accordingly
mysql-test/t/ctype_collate.test:
  fixing tests accordingly
mysql-test/r/ctype_collate.result:
  fixing tests accordingly
2005-04-10 12:40:33 +05:00
unknown
f2824c4d60 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into xiphis.org:/.amd_mnt/bk.anubis/host/work-acurtis/bug6776.1
2005-04-09 07:37:00 +01:00
unknown
fbb21ebfe2 Fix typos in Bug#6776
sql/sql_udf.cc:
  Fix typos
2005-04-09 00:21:51 +01:00
unknown
be400cb092 Merge xiphis.org:/var/db/bk/work-acurtis/bug6776
into xiphis.org:/var/db/bk/work-acurtis/bug6776.1


sql/sql_udf.cc:
  Auto merged
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2005-04-08 21:40:50 +01:00
unknown
81b822082a Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1
into mdk10.(none):/home/reggie/bk/mysql-4.1
2005-04-08 14:17:29 -05:00
unknown
dab65c7131 Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/marko/mysql-4.1
2005-04-08 22:17:28 +03:00
unknown
c88d49bd76 Bug After registering MySQL service and starting with shared mem, cannot stop
Removed the extra set of the shared memory connect event from kill_mysql since it is also being set in kill_server


sql/mysqld.cc:
  removed the code that set the shared memory connect event since this also being done in kill_server
2005-04-08 09:17:19 -05:00
unknown
0c3d72ab58 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1
into mdk10.(none):/home/reggie/bk/mysql-4.1
2005-04-08 09:17:18 -05:00
unknown
e1efe79731 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/M41/mysql-4.1
2005-04-08 16:17:17 +02:00
unknown
7397aeb050 Merge mysql.com:/M41/mysql-4.1 into mysql.com:/M41/clone-4.1.11
configure.in:
  Auto merged
2005-04-08 16:04:37 +02:00
unknown
20b9946d9e Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1


ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Auto merged
2005-04-08 14:16:57 +02:00
unknown
9896cfdf32 bug#9749 - ndb
test case for case 9749, ndb lock upgrade via NDBAPI


ndb/test/ndbapi/testOperations.cpp:
  bug#9749 - test case for case 9749
2005-04-08 14:15:37 +02:00
unknown
b9f486cd02 Add missing parts for the "Cybozu" custom build, to avoid future manual patches.
configure.in:
  Normally, 'configure' does only support "case-insensitive" collations for UTF-8 character sets.
  However, a certain customer requires builds with a "case-sensitive" collation: 'utf8_general_cs'.
  In order to do custom builds without manual patches, this value gets special handling in 'configure'.
  Also, when it is given, the CPP symbol enabling the additional code is set.
mysys/charset-def.c:
  Rename the CPP symbol needed for "UTF8-case-sensitive" collation from customer name to function.
strings/ctype-utf8.c:
  Rename the CPP symbol needed for "UTF8-case-sensitive" collation from customer name to function.
2005-04-08 13:56:48 +02:00
unknown
5474a95aa5 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-04-08 11:39:22 +02:00
unknown
61fed028ba Added more tests for auto_increment 2005-04-08 11:38:40 +02:00
unknown
cbd3334701 Bug After registering MySQL service and starting with shared mem, cannot stop
The shared memory connect event was not being set in kill_server.
This caused the thread that is handling shared memory connections to never
exit.


sql/mysqld.cc:
  Added code to set the shared memory connect event upon server termination
2005-04-08 00:16:02 -05:00
unknown
22f1d637fd Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/mysql-4.1


sql/ha_ndbcluster.cc:
  Auto merged
2005-04-07 20:21:17 +02:00
unknown
ae2f0d9872 Fix for Bug Auto-increment not working with INSERT..SELECT and NDB storage, post review fix 2005-04-07 20:08:01 +02:00
unknown
7259aabc37 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-04-07 17:51:53 +02:00
unknown
606f0a1335 Fix for Bug Auto-increment not working with INSERT..SELECT and NDB storage 2005-04-07 17:44:09 +02:00
unknown
3e801322d7 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/psergey/mysql-4.1-bug8877


sql/sql_select.cc:
  Auto merged
2005-04-07 17:47:37 +04:00
unknown
ebbe70585a Post-review fixes: local variable renamed 2005-04-07 17:44:48 +04:00
unknown
1780abf26f Added missing DBUG_RETURNs 2005-04-07 12:12:03 +02:00
unknown
f7356d7391 InnoDB: Prevent ALTER TABLE ... ENGINE=...
if there are foreign key constraints on the table. (Bug )


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