summaryrefslogtreecommitdiff
path: root/sql
Commit message (Collapse)AuthorAgeFilesLines
* Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-04-191-15/+24
|\ | | | | | | | | | | | | into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
| * Fix for Bug #9691 UPDATE fails on attempt to update primary keyunknown2005-04-191-15/+24
| |
* | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-04-181-69/+104
|\ \ | |/ |/| | | | | | | | | into mysql.com:/home/dlenev/src/mysql-4.1-bg8086
| * Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-04-181-69/+104
| |\ | | | | | | | | | | | | | | | | | | into mysql.com:/home/dlenev/src/mysql-4.1-bg8086
| | * Fix for bug #8068 "TIMEDIFF with first negative argument gives wrong unknown2005-03-281-69/+104
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | result" (and similar bug in ADDTIME/SUBTIME). Both Item_func_add_time/Item_func_timediff::val_str() now use calc_time_diff() function which was backported from 5.0 (and which was was fixed to properly handle microseconds part of its second argument). Also now we correctly set sign of result in case when first argument is negative and second is positive. mysql-test/r/func_sapdb.result: Added test for bug #8068 "TIMEDIFF with first negative argument gives wrong result". mysql-test/t/func_sapdb.test: Added test for bug #8068 "TIMEDIFF with first negative argument gives wrong result". sql/item_timefunc.cc: - Backported calc_time_diff() function from 5.0 tree. Changed it to accept time value as its second argument when its first argument is datetime value. Fixed wrong handling of microsecond part of second argument. - Item_func_add_time::val_str()/Item_func_timediff::val_str() Removed similar pieces of code calculating difference between two datetime values (or their sum) in microseconds. Now we use calc_time_diff() function instead. Also now we correctly set sign of result in case when first argument is negative and second is positive.
* | | Fixed a bug: deadlock without any locking, simple select and update (Bug #7975).unknown2005-04-181-4/+15
|/ / | | | | | | | | | | | | | | | | | | | | | | Backported from 5.0.3. innobase/row/row0ins.c: If the SQL-query will update or replace duplicate records we take X-lock for duplicate records. sql/ha_innodb.cc: INSERT ON DUPLICATE KEY UPDATE will also update duplicate records and we should take X-lock in this case for duplicate records.
* | Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-04-171-2/+2
|\ \ | | | | | | | | | | | | | | | | | | into mysql.com:/home/psergey/mysql-4.1-bug9439
| * | Fix for BUG#9439:unknown2005-04-161-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed type of "Sub_part" column in SHOW KEYS from TINYINT to SMALLINT (as MAX_KEY_LENGTH=1024) (this is the final cset with proper tests) mysql-test/r/show_check.result: Testcase for BUG#9439 mysql-test/t/show_check.test: Testcase for BUG#9439 sql/sql_show.cc: Fix for BUG#9439: Changed type of "Sub_part" column in SHOW KEYS from TINYINT to SMALLINT (as MAX_KEY_LENGTH=1024)
* | | Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-04-171-0/+1
|\ \ \ | |/ / |/| | | | | | | | | | | | | | into mysql.com:/home/psergey/mysql-4.1-look-range
| * | Fix for BUG#9348: when computing union of two intervals set lower bound to unknown2005-04-171-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | minimum of lower bounds of two joined intervals. mysql-test/r/range.result: Testcase for BUG#9348 mysql-test/t/range.test: Testcase for BUG#9348
* | | Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/unknown2005-04-163-18/+21
|\ \ \ | |/ / | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.1
| * | Fixed core dump with long timezone namesunknown2005-04-163-18/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't abort on bootstrap if a wrong --default-storage-engine is specified sql/handler.cc: Combined code sql/mysqld.cc: Fixed core dump with long timezone names Don't abort on bootstrap if a wrong --default-storage-engine is specified Don't print strange messages if one sends 'kill' to a mysqld --bootstrap sql/set_var.cc: Indentaion change
* | | Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/unknown2005-04-164-5/+51
|\ \ \ | |/ / | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.1
| * | Merge mysql.com:/home/jimw/my/mysql-4.1-9833unknown2005-04-151-0/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-4.1-clean sql/mysqld.cc: Auto merged
| | * | Don't allow the server to start up when an invalid user isunknown2005-04-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | specified via --user or in configuration. (Bug #9833) sql/mysqld.cc: Actually die if we an invalid user is specified.
| * | | Merge mysql.com:/home/jimw/my/mysql-4.1-9815unknown2005-04-153-0/+27
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-4.1-clean
| | * | | Check that the default storage engine is really available, andunknown2005-04-133-0/+27
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | refuse to start up if it is not. (Bug #9815) sql/handler.cc: Add ha_storage_engine_is_enabled function. sql/handler.h: Declare ha_storage_engine_is_enabled() sql/mysqld.cc: Abort startup if the specified default storage engine is not available.
| * | | Bug #9839 Column with AUTOINC contains -1 Value on node stop, post review fixunknown2005-04-151-5/+18
| | | |
| * | | Bug #9839 Column with AUTOINC contains -1 Value on node stopunknown2005-04-151-0/+5
| |/ /
* | | mergedunknown2005-04-161-1/+0
|\ \ \ | | | | | | | | | | | | | | | | sql/sql_lex.cc: ul
| * | | BUG#9922 - INSERT SELECT with UNIONs allows concurrent INSERTsunknown2005-04-152-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | don't set lex->lock_option=TL_READ in the parser for SELECT
| * | | Merge bk-internal:/home/bk/mysql-4.0/unknown2005-04-141-2/+6
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.0
* | \ \ \ mergedunknown2005-04-141-0/+3
|\ \ \ \ \ | | |/ / / | |/| / / | |_|/ / |/| | | | | | | | | | | mysql-test/r/innodb.result: Auto merged mysql-test/t/innodb.test: Auto merged
| * | | TRUNCATE is always a transaction on itself. pretent we're in auto-commit modeunknown2005-04-141-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | bug#8151
* | | | ha_innodb.cc:unknown2005-04-131-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix part of bug #9670: 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 #9670: 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
* | | | Mergeunknown2005-04-132-13/+15
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | sql/mysqld.cc: Auto merged
| * | | | Fix for bug#9813: Test 'ndb_basic': Autoincrement fails in 64 bitunknown2005-04-132-13/+23
| | | | |
* | | | | InnoDB: Ignore character set mismatch in ALTER TABLE and RENAME TABLEunknown2005-04-121-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | if foreign_key_checks=0. (Bug #9802) 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.
* | | | | In configure.in, don't remove $AVAILABLE_LANGUAGES_ERRORS_RULES at endunknown2005-04-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 :( )
* | | | | Merge gbichot@bk-internal.mysql.com://home/bk/mysql-4.1unknown2005-04-111-0/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into quadita2.mysql.com:/nfstmp1/guilhem/mysql-4.1-4ita
| * | | | | Fix for BUG#9149 "OPTIMIZE TABLE statement on InnoDB table is logged twice ↵unknown2005-04-111-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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).
* | | | | | Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-04-113-3/+16
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mdk10.(none):/home/reggie/bk/mysql-4.1
| * | | | | Merging fix for bug #9796 "Query Cache caches queries with CURRENT_USER()unknown2005-04-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | function" into 4.1 tree.
| * | | | | Merge mysql.com:/home/dlenev/src/mysql-4.0-bg9796unknown2005-04-111-0/+1
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | Fix for bug #9796 "Query Cache caches queries with CURRENT_USER()unknown2005-04-111-0/+1
| | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * | | Merge bk-internal.mysql.com:/home/bk/mysql-4.0unknown2005-04-035-8/+10
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/dlenev/src/mysql-4.0-bg8894
| | * | | | Fix for bug #8894 "TIMESTAMP values scrambled/misaligned when using --new".unknown2005-03-282-32/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed Field_timestamp::val_int() so now it works correctly in --new mode (or for TIMESTAMP(19) columns). Also removed unused Field_timestamp::fill_and_store() method. mysql-test/r/type_timestamp.result: Added test for bug #8894 "TIMESTAMP values scrambled/misaligned when using --new". mysql-test/t/type_timestamp.test: Added test for bug #8894 "TIMESTAMP values scrambled/misaligned when using --new". sql/field.cc: Field_timestamp::fill_and_store() Removed unused method. Field_timestamp::val_int() Even in --new mode integer representation of TIMESTAMP value should not exceed 14 digits. sql/field.h: Removed unused Field_timestamp::fill_and_store() method.
| * | | | | ctype_collate.result, ctype_collate.test, union.result, union.test:unknown2005-04-101-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-04-091-2/+5
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into xiphis.org:/.amd_mnt/bk.anubis/host/work-acurtis/bug6776.1
| | * | | | | Fix typos in Bug#6776unknown2005-04-091-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sql/sql_udf.cc: Fix typos
| | * | | | | Merge xiphis.org:/var/db/bk/work-acurtis/bug6776unknown2005-04-081-2/+5
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | * | | | | Bug#6776unknown2005-03-071-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Failure to delete rows from mysql.func table caused by missing charset conversion for index read by pk. sql/sql_udf.cc: Bug#6776 Have to use Field store() methods for charset conversion
* | | | | | | | Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-04-084-0/+33
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mdk10.(none):/home/reggie/bk/mysql-4.1
| * | | | | | | Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-04-084-0/+33
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into hundin.mysql.fi:/home/marko/mysql-4.1
| | * | | | | | InnoDB: Prevent ALTER TABLE ... ENGINE=...unknown2005-04-074-0/+33
| | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | Bug #9665 After registering MySQL service and starting with shared mem, ↵unknown2005-04-081-9/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | Bug #9665 After registering MySQL service and starting with shared mem, ↵unknown2005-04-081-0/+12
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-04-075-44/+213
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-4.1 sql/ha_ndbcluster.cc: Auto merged
| * | | | | | Fix for Bug #9675 Auto-increment not working with INSERT..SELECT and NDB ↵unknown2005-04-071-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | storage, post review fix
| * | | | | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-04-071-1/+6
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
View Lorry Controller Status