mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 20:42:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
mariadb/sql
History
unknown c64c108eda Bug#15949 union + illegal mix of collations (IMPLICIT + COERCIBLE) 
union.result, union.test:
  Adding test case.
item.cc:
  Allow safe character set conversion in UNION
  - string constant to column's charset
  - to unicode
  Thus, UNION now works the same with CONCAT (and other string functions)
  in respect of aggregating arguments with different character sets.


sql/item.cc:
  Allow character set conversion in UNION
  - string to column's charset
  - to unicode
  Bug#15949 union + illegal mix of collations (IMPLICIT + COERCIBLE)
mysql-test/t/union.test:
  Adding test case.
mysql-test/r/union.result:
  Adding test case.
2006-03-01 17:58:01 +04:00
..
examples Fix Bug#14672 Bug in deletion 2005-11-06 02:11:12 +03:00
share Bug#13421 problem with sorting turkish 2005-12-07 18:48:46 +04: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 Bug#15581: COALESCE function truncates mutli-byte TINYTEXT values 2005-12-19 15:52:10 +04:00
field.h BUG#14139: When handling "CREATE TABLE(field_X type_spec,...) SELECT smth AS field_X, ...." 2005-10-26 00:56:17 +04: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
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 Added comments to specify why no much mutex is needed. 2006-01-27 12:44:33 -05:00
ha_heap.h Bug #12796: Record lost in HEAP table 2005-11-08 00:26:37 -05:00
ha_innodb.cc Changes from innodb-4.1-ss14 snapshot 2006-01-15 14:50:47 +03:00
ha_innodb.h
ha_isam.cc a compiler must see '#pragma implementation' *before* 2005-06-05 19:38:52 +02:00
ha_isam.h
ha_isammrg.cc a compiler must see '#pragma implementation' *before* 2005-06-05 19:38:52 +02:00
ha_isammrg.h
ha_myisam.cc BUG#9622, stage 2, work together with fix for BUG#12232: 2005-10-21 06:29:17 +04:00
ha_myisam.h
ha_myisammrg.cc a compiler must see '#pragma implementation' *before* 2005-06-05 19:38:52 +02:00
ha_myisammrg.h
ha_ndbcluster.cc Bug #17249 ndb, delete statement with join where clause fails when table do not have pk 2006-02-10 17:40:22 +01:00
ha_ndbcluster.h Bug #17249 ndb, delete statement with join where clause fails when table do not have pk 2006-02-10 17:40:22 +01:00
handler.cc Bug #14514 Creating table with packed key fails silently 2005-11-21 12:27:58 +01: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
hostname.cc Backport of JimW's localhost patch to 4.1 tree. 2005-09-02 17:07:05 -07:00
init.cc
item.cc Bug#15949 union + illegal mix of collations (IMPLICIT + COERCIBLE) 2006-03-01 17:58:01 +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 A fix and a test case for Bug#12734 " prepared statement may 2006-01-14 04:55:07 +03:00
item_cmpfunc.h A fix and a test case for Bug#12734 " prepared statement may 2006-01-14 04:55:07 +03:00
item_create.cc
item_create.h
item_func.cc Merge hf@192.168.21.12:work/mysql-4.1.9855 2006-01-21 17:53:29 +04:00
item_func.h Merge april.(none):/home/svoj/devel/mysql/BUG16893/mysql-4.1 2006-02-07 13:49:55 +04:00
item_geofunc.cc Fix for bug #12839 (Endian support is absurd) 2005-09-21 14:35:01 +05:00
item_geofunc.h
item_row.cc
item_row.h
item_strfunc.cc A fix for Bug#13944 "libmysqlclient exporting sha1_result function": 2006-01-11 17:31:52 +03:00
item_strfunc.h BUG#9535 Warning for "create table t as select uuid();" 2005-12-07 15:45:31 +01: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 date_formats.test: 2006-01-16 15:46:37 +01:00
item_timefunc.h Declaring some class members public for BUG#12377: 2005-11-10 15:12:22 +01:00
item_uniq.cc a compiler must see '#pragma implementation' *before* 2005-06-05 19:38:52 +02:00
item_uniq.h
key.cc
lex.h
lex_symbol.h
lock.cc A fix for Bug#7209 "Client error with "Access Denied" on updates 2006-01-04 17:35:30 +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 BUG#16217 fix partly backported from 5.0. It is different in mysqlbinlog part. 2006-02-10 15:12:27 +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, configure.in: 2005-09-24 15:51:45 +02:00
matherr.c
mf_iocache.cc
my_lock.c
mysql_priv.h BUG#5390 - problems with merge tables 2005-12-07 19:52:26 +01:00
mysqld.cc Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.0 2006-01-12 17:47:58 +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 A fix for Bug#13944 "libmysqlclient exporting sha1_result function": 2006-01-11 17:31:52 +03:00
procedure.cc a compiler must see '#pragma implementation' *before* 2005-06-05 19:38:52 +02:00
procedure.h
protocol.cc A fix and a test case for Bug#15613 "libmysqlclient API function 2006-01-18 22:50:31 +03:00
protocol.h
protocol_cursor.cc a compiler must see '#pragma implementation' *before* 2005-06-05 19:38:52 +02:00
records.cc Added more tests for new UPDATE ... ORDER BY ... LIMIT optimization 2005-10-25 02:27:40 +03: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
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 Review of new pushed code 2005-11-01 13:00:02 +02:00
spatial.h Fix for bug #14320 (MBROverlaps does wrong test) 2005-12-10 18:20:00 +04:00
sql_acl.cc Merge msvensson@10.100.68.5:/home/msvensson/mysql/bug15598/my41-bug15598 2006-01-09 10:57:28 +01: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
sql_base.cc BUG#16893: Crash in test 'fulltext_order_by' 2006-02-03 14:09:33 +04:00
sql_bitmap.h
sql_cache.cc A fix for Bug#7209 "Client error with "Access Denied" on updates 2006-01-04 17:35:30 +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 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 2006-01-18 13:49:37 +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
sql_db.cc Bug #15302 LOAD DATA FROM MASTER -> Packets out of order (Found: 2, expected 1) 2006-01-31 12:47:22 +01:00
sql_delete.cc Fix calls to free_underlaid_joins() in INSERT, DELETE, and UPDATE 2005-12-08 12:33:33 -08:00
sql_derived.cc
sql_do.cc
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 Re-run fix-fields on condition if table was reopened in HANDLERREAD 2006-01-10 19:13:12 +02:00
sql_help.cc
sql_insert.cc Fix calls to free_underlaid_joins() in INSERT, DELETE, and UPDATE 2005-12-08 12:33:33 -08: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
sql_load.cc Bug #17154 load data infile of char values into a table of char(PK) hangs 2006-02-07 00:03:39 +01: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
sql_olap.cc a compiler must see '#pragma implementation' *before* 2005-06-05 19:38:52 +02:00
sql_parse.cc BUG#15699 importing the fix from 5.0 2006-01-26 12:49:55 +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
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
sql_select.cc Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 2006-01-18 13:49:37 +02:00
sql_select.h Excluded posibility of tmp_table_param.copy_field double deletion (BUG#14851). 2006-01-18 13:48:57 +02:00
sql_show.cc Avoid possible race condition in accessing slave statistics 2005-11-01 11:48:55 -08: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
sql_table.cc Merge 2006-01-16 16:21:41 +01: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
sql_union.cc Review of new pushed code 2005-08-09 00:13:49 +03:00
sql_update.cc BUG#15935: post-review fixes: added comment 2006-01-26 00:09:04 +03:00
sql_yacc.yy Bug#13233 2005-10-21 14:41:56 +05:00
stacktrace.c
stacktrace.h
strfunc.cc
structs.h Added more tests for new UPDATE ... ORDER BY ... LIMIT optimization 2005-10-25 02:27:40 +03:00
table.cc A fix and a test case for Bug#14410 "Crash in Enum or Set type in 2005-11-25 13:25:31 +03:00
table.h after pull cleanup 2005-08-22 13:20:02 +04:00
thr_malloc.cc
time.cc
tzfile.h
tztime.cc Minor Netware specific changes. 2005-12-13 18:30:10 +02:00
tztime.h
udf_example.cc
uniques.cc
unireg.cc Review of new code: 2005-07-27 13:05:30 +03:00
unireg.h
watchdog_mysqld