mariadb/sql
unknown 7d81acb5e9 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/psergey/mysql-4.1-bug12915-r2


sql/sql_update.cc:
  Auto merged
2005-10-18 14:08:50 +04:00
..
examples Merge mysqldev@production.mysql.com:jimw/mysql-4.1-sco 2005-09-12 10:19:56 -07:00
share Bug#11216: 'show character set' describes latin1 incorrectly 2005-07-21 16:05:19 +05:00
.cvsignore
add_errmsg
client_settings.h
custom_conf.h
derror.cc
des_key_file.cc Many files: 2005-09-30 14:03:55 +02:00
discover.cc
field.cc Fixed compiler warnings 2005-07-28 21:25:05 +03:00
field.h group_by.result: 2005-06-20 10:49:04 -07:00
field_conv.cc a fix (bug #7589: Decimal types are ignored when updating data from another column). 2005-09-21 14:32:19 +05:00
filesort.cc Review fixes since last pull 2005-09-12 18:48:17 +03:00
frm_crypt.cc
gen_lex_hash.cc
gstream.cc
gstream.h
ha_berkeley.cc a compiler must see '#pragma implementation' *before* 2005-06-05 19:38:52 +02:00
ha_berkeley.h BUG#10241 cygwin port: invalid pragma interface directives 2005-05-04 15:05:56 +02:00
ha_blackhole.cc ha_blackhole.cc: 2005-08-30 02:46:03 +02:00
ha_blackhole.h ha_blackhole changes, same patch as http://lists.mysql.com/internals/27878, per brian 2005-08-26 02:09:56 +02:00
ha_heap.cc Bug#10178 - failure to find a row in heap table by concurrent UPDATEs 2005-06-24 17:47:09 +02:00
ha_heap.h Bug#10178 - failure to find a row in heap table by concurrent UPDATEs 2005-06-24 17:47:09 +02:00
ha_innodb.cc Merge hundin.mysql.fi:/home/marko/mysql-4.0 2005-10-03 17:54:39 +03:00
ha_innodb.h BUG#10241 cygwin port: invalid pragma interface directives 2005-05-04 15:05:56 +02:00
ha_isam.cc a compiler must see '#pragma implementation' *before* 2005-06-05 19:38:52 +02:00
ha_isam.h BUG#10241 cygwin port: invalid pragma interface directives 2005-05-04 15:05:56 +02:00
ha_isammrg.cc a compiler must see '#pragma implementation' *before* 2005-06-05 19:38:52 +02:00
ha_isammrg.h BUG#10241 cygwin port: invalid pragma interface directives 2005-05-04 15:05:56 +02:00
ha_myisam.cc BUG#12232: Addressing docs team feedback: s/inequal/unequal/ 2005-09-24 01:39:50 +04:00
ha_myisam.h BUG#10241 cygwin port: invalid pragma interface directives 2005-05-04 15:05:56 +02:00
ha_myisammrg.cc a compiler must see '#pragma implementation' *before* 2005-06-05 19:38:52 +02:00
ha_myisammrg.h Bug#10400 - Improperly-defined MERGE table crashes with INSERT ... ON DUPLICATE KEY UPDATE 2005-05-18 19:40:39 +02:00
ha_ndbcluster.cc Fix for Bug #13961 Triggers on tables with auto_increment insert bogus values into table (clean version) 2005-10-14 11:23:02 +02:00
ha_ndbcluster.h ndb - imlp. show engine ndb status; 2005-09-19 15:35:07 +02:00
handler.cc Bug #12055 NDB temp tables created by ALTER TABLE are usable 2005-07-20 18:40:55 +02:00
handler.h BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index 2005-09-21 02:18:29 +04:00
hash_filo.cc a compiler must see '#pragma implementation' *before* 2005-06-05 19:38:52 +02:00
hash_filo.h forgotten s/__GNUC__/USE_PRAGMA_INTERFACE/ causes compilation faliures 2005-05-27 14:15:08 +02:00
hostname.cc Backport of JimW's localhost patch to 4.1 tree. 2005-09-02 17:07:05 -07:00
init.cc
item.cc Manual merged 2005-10-13 01:14:58 +04:00
item.h Merge mysql.com:/home/jimw/my/mysql-4.1-13344 2005-10-12 13:27:49 -07:00
item_buff.cc group_by.result, group_by.test: 2005-06-21 04:24:21 -07:00
item_cmpfunc.cc item_cmpfunc.cc: 2005-10-06 15:26:59 +05:00
item_cmpfunc.h Many files: 2005-09-29 02:08:24 +02:00
item_create.cc Merging fix for bug #9796 "Query Cache caches queries with CURRENT_USER() 2005-04-11 10:44:48 +04:00
item_create.h Making 4.1 tree compile with -ansi -pedantic 2004-12-16 16:16:28 +03:00
item_func.cc ctype_utf8.result, ctype_utf8.test: 2005-10-07 09:52:15 +05:00
item_func.h func_gconcat.result, func_gconcat.test: 2005-07-26 12:52:02 +05:00
item_geofunc.cc a compiler must see '#pragma implementation' *before* 2005-06-05 19:38:52 +02:00
item_geofunc.h BUG#10241 cygwin port: invalid pragma interface directives 2005-05-04 15:05:56 +02:00
item_row.cc Better bugfix for "HAVING when refering to RAND()" (Bug #8216) 2005-02-08 14:41:09 +02:00
item_row.h Deployment of centralized Item change registry, step 2: Item_ref 2004-10-08 19:13:09 +04:00
item_strfunc.cc Handle errors returned by system crypt() in ENCRYPT(). (Bug #13619) 2005-10-06 16:15:53 -07:00
item_strfunc.h func_str.test: 2005-06-29 02:40:25 -07:00
item_subselect.cc fixed convertion and handling IN subqueries with rows (BUG#11867) 2005-08-13 07:45:14 +03:00
item_subselect.h - a fix for Bug#11458 "Prepared statement with subselects return random 2005-07-13 17:38:55 +04:00
item_sum.cc Fix for BUG#12882 - min/max inconsistent on empty table. 2005-09-21 09:49:19 +03:00
item_sum.h func_gconcat.result, func_gconcat.test: 2005-09-06 22:20:11 -07:00
item_timefunc.cc Simple fixes during review of new code 2005-07-19 19:25:05 +03:00
item_timefunc.h Fix bug#12266 GROUP BY DATE(LEFT(column,8)) returns result strings with reduced 2005-08-04 18:05:33 +04:00
item_uniq.cc a compiler must see '#pragma implementation' *before* 2005-06-05 19:38:52 +02:00
item_uniq.h Add ifdefs to control when "#pragma implementation" should be used 2005-05-26 12:09:14 +02:00
key.cc Merge 2005-03-17 10:59:25 +04:00
lex.h WL#1596 "make mysqldump --master-data --single-transaction able to do online dump of InnoDB AND report reliable 2004-11-10 17:56:45 +01:00
lex_symbol.h
lock.cc Merge mysql.com:/home/my/mysql-4.0 2005-07-27 13:24:59 +03:00
log.cc Fix for BUG#13023: "SQL Thread is up but doesn't move forward". Details in slave.cc; 2005-10-12 13:29:55 +02:00
log_event.cc Fix for BUG#13023: "SQL Thread is up but doesn't move forward". Details in slave.cc; 2005-10-12 13:29:55 +02:00
log_event.h Fix for BUG#13023: "SQL Thread is up but doesn't move forward". Details in slave.cc; 2005-10-12 13:29:55 +02:00
Makefile.am Makefile.am: 2005-07-05 23:24:48 +02:00
matherr.c
mf_iocache.cc
my_lock.c
mysql_priv.h BUG#12915: Added single-table UPDATE/DELTE ... ORDER BY ... LIMIT 2005-09-30 15:21:37 +04:00
mysqld.cc fix for Valgrind errors: query_id needs to be inited early (already fixed in 5.0 by Konstantin) and so does client_capabilities (not fixed in 5.0); 2005-10-14 15:34:52 +02:00
mysqld_suffix.h
net_serv.cc Merge selena.:H:/MYSQL/src/#05588-mysql-4.0 2005-09-07 14:59:41 +04:00
nt_servc.cc
nt_servc.h
opt_range.cc BUG#12915: post-review fixes 2005-10-18 14:04:14 +04:00
opt_range.h BUG#12915: Added single-table UPDATE/DELTE ... ORDER BY ... LIMIT 2005-09-30 15:21:37 +04:00
opt_sum.cc Fixed error found during review of new pushed code 2005-09-25 21:22:23 +03:00
password.c sql/password.c: check for buffer overflow in check_scramble_323 (BUG#7187) 2004-12-11 10:17:25 +01:00
procedure.cc a compiler must see '#pragma implementation' *before* 2005-06-05 19:38:52 +02:00
procedure.h BUG#10241 cygwin port: invalid pragma interface directives 2005-05-04 15:05:56 +02:00
protocol.cc a compiler must see '#pragma implementation' *before* 2005-06-05 19:38:52 +02:00
protocol.h BUG#10241 cygwin port: invalid pragma interface directives 2005-05-04 15:05:56 +02:00
protocol_cursor.cc a compiler must see '#pragma implementation' *before* 2005-06-05 19:38:52 +02:00
records.cc BUG#12915: post-review fixes 2005-10-18 14:04:14 +04:00
repl_failsafe.cc fix for Valgrind errors: query_id needs to be inited early (already fixed in 5.0 by Konstantin) and so does client_capabilities (not fixed in 5.0); 2005-10-14 15:34:52 +02:00
repl_failsafe.h Merge with 4.0 for 4.1 release 2004-10-06 19:14:33 +03:00
set_var.cc BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index 2005-09-21 02:18:29 +04:00
set_var.h A fix and a test case for Bug#9359 "Prepared statements take snapshot 2005-07-16 03:29:13 +04:00
slave.cc fix for Valgrind errors: query_id needs to be inited early (already fixed in 5.0 by Konstantin) and so does client_capabilities (not fixed in 5.0); 2005-10-14 15:34:52 +02:00
slave.h Fix for BUG#13023: "SQL Thread is up but doesn't move forward". Details in slave.cc; 2005-10-12 13:29:55 +02:00
spatial.cc hf's fix for bug #10626 ( gis.test fails) 2005-05-19 22:53:35 +05:00
spatial.h Fix compiler warnings (detected by Intel's C++ compiler) 2004-10-22 18:44:51 +03:00
sql_acl.cc Merge bk-internal.mysql.com:/home/bk/mysql-4.1 2005-09-01 17:01:25 +04:00
sql_acl.h Fix for bug #12423 "Deadlock when doing FLUSH PRIVILEGES and GRANT in 2005-09-01 16:52:59 +04:00
sql_analyse.cc Merged code. Removed unneccessary repeating. 2005-09-13 18:11:51 +03:00
sql_analyse.h Add ifdefs to control when "#pragma implementation" should be used 2005-05-26 12:09:14 +02:00
sql_base.cc Merge mysql.com:/home/mydev/mysql-4.0-4000 2005-09-13 20:47:00 +02:00
sql_bitmap.h terminal.c, sql_bitmap.h, my_sys.h, configure.in, config.h: 2005-05-05 09:15:14 +02:00
sql_cache.cc Merge sanja.is.com.ua:/home/bell/mysql/bk/work-4.0 2005-09-06 12:18:23 +03:00
sql_cache.h Merge sanja.is.com.ua:/home/bell/mysql/bk/work-4.0 2005-09-06 12:18:23 +03:00
sql_class.cc fix for Valgrind errors: query_id needs to be inited early (already fixed in 5.0 by Konstantin) and so does client_capabilities (not fixed in 5.0); 2005-10-14 15:34:52 +02:00
sql_class.h BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index 2005-09-21 02:18:29 +04:00
sql_client.cc
sql_crypt.cc a compiler must see '#pragma implementation' *before* 2005-06-05 19:38:52 +02:00
sql_crypt.h Add ifdefs to control when "#pragma implementation" should be used 2005-05-26 12:09:14 +02:00
sql_db.cc Fix for bug #6008: MySQL does not create warnings when creating database and using IF NOT EXISTS 2005-09-12 17:09:19 +05:00
sql_delete.cc BUG#12915: Added single-table UPDATE/DELTE ... ORDER BY ... LIMIT 2005-09-30 15:21:37 +04:00
sql_derived.cc fixed union types merging and table related metadata (BUG#8824) 2005-03-23 08:36:48 +02:00
sql_do.cc Fix for bug #6765 "Implicit access to time zone description 2004-12-09 13:31:46 +03:00
sql_error.cc abort storing query to query cache if warnings appeared (BUG#9414) 2005-06-28 00:52:21 +03:00
sql_handler.cc bug#5373: handler READ NEXT w/o HANDLER READ [FIRST] 2005-06-07 22:43:25 +02:00
sql_help.cc * Added comments and one assert 2004-12-14 03:36:19 +03:00
sql_insert.cc Bug#10109 2005-08-07 03:16:15 +01:00
sql_lex.cc select.test, sql_select.cc, sql_lex.cc, item.cc: 2005-10-13 00:58:59 +04:00
sql_lex.h Manual merge, fix for bug #7672 2005-10-12 03:32:14 +04:00
sql_list.cc a compiler must see '#pragma implementation' *before* 2005-06-05 19:38:52 +02:00
sql_list.h merged 2005-05-18 22:14:08 +02:00
sql_load.cc Fixed error found during review of new pushed code 2005-09-25 21:22:23 +03:00
sql_manager.cc
sql_manager.h
sql_map.cc a compiler must see '#pragma implementation' *before* 2005-06-05 19:38:52 +02:00
sql_map.h Add ifdefs to control when "#pragma implementation" should be used 2005-05-26 12:09:14 +02:00
sql_olap.cc a compiler must see '#pragma implementation' *before* 2005-06-05 19:38:52 +02:00
sql_parse.cc Added missing HAVE_REPLICATION define 2005-10-10 19:23:13 +02:00
sql_prepare.cc Fixed error found during review of new pushed code 2005-09-25 21:22:23 +03:00
sql_rename.cc Bug#6391 (binlog-do-db rules ignored) 2004-12-03 12:13:51 +01:00
sql_repl.cc Fix for BUG#12003 "assertion failure in testsuite (double lock of 2005-07-18 14:46:53 +02:00
sql_repl.h Remove DUP_IGNORE from enum_duplicates and instead use a separate ignore flag 2004-12-31 12:04:35 +02:00
sql_select.cc merging 2005-10-13 19:31:09 +05:00
sql_select.h func_str.result, func_str.test: 2005-06-23 06:15:50 -07:00
sql_show.cc Fix bug#13535 Incorrect result from SELECT statement after SHOW TABLE STATUS 2005-10-03 23:22:46 +04:00
sql_sort.h
sql_state.c
sql_string.cc a compiler must see '#pragma implementation' *before* 2005-06-05 19:38:52 +02:00
sql_string.h BUG#10241 cygwin port: invalid pragma interface directives 2005-05-04 15:05:56 +02:00
sql_table.cc Fix for bug #6008: MySQL does not create warnings when creating database and using IF NOT EXISTS 2005-09-12 17:09:19 +05:00
sql_test.cc Bug#12920 - key_read_requests counter appears to re-set 2005-09-14 13:18:16 +02:00
sql_udf.cc - backport of a compile fix from 4.1 (ChangeSet@1.2260.23.2 2005/05/19 from reggie) 2005-06-30 17:33:23 +02:00
sql_udf.h Merge bk-internal.mysql.com:/home/bk/mysql-4.1 2005-05-09 12:16:59 +02:00
sql_union.cc Review of new pushed code 2005-08-09 00:13:49 +03:00
sql_update.cc Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 2005-10-18 14:08:50 +04:00
sql_yacc.yy sql_yacc.yy: 2005-10-12 09:47:59 +02:00
stacktrace.c Step 2 of the switch to support configuration with NPTL: 2005-04-20 20:38:57 +02:00
stacktrace.h Step 2 of the switch to support configuration with NPTL: 2005-04-20 20:38:57 +02:00
strfunc.cc - Housekeeping: removed a few unreferenced variables, noticed while doing 2005-01-11 15:38:03 +01:00
structs.h BUG#12915: Added single-table UPDATE/DELTE ... ORDER BY ... LIMIT 2005-09-30 15:21:37 +04:00
table.cc Review of new code: 2005-07-27 13:05:30 +03:00
table.h after pull cleanup 2005-08-22 13:20:02 +04:00
thr_malloc.cc Simpler arena swapping code 2004-11-08 01:13:54 +02:00
time.cc Fix for bug #7297 "Two digit year should be interpreted correctly 2004-12-16 16:31:50 +03:00
tzfile.h
tztime.cc a compiler must see '#pragma implementation' *before* 2005-06-05 19:38:52 +02:00
tztime.h BUG#10241 cygwin port: invalid pragma interface directives 2005-05-04 15:05:56 +02:00
udf_example.cc Ensure that we free memory used with --order-by-primary (in mysqldump) 2004-12-09 12:47:20 +02:00
uniques.cc
unireg.cc Review of new code: 2005-07-27 13:05:30 +03:00
unireg.h Fixed bug in HAVING when refering to RAND() through alias 2005-02-07 18:13:57 +02:00
watchdog_mysqld