mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 12:32:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
mariadb/sql
History
Ramil Kalimullin d3e317d16b Fix for bug#39182: Binary log producing incompatible character set query 
from stored procedure. 

Problem: we replace all references to local variables in stored procedures     
with NAME_CONST(name, value) logging to the binary log. However, if the
value's collation differs we might get an 'illegal mix of collation'           
error as we don't pass the collation to the function.

Fix: pass the value's collation to NAME_CONST().

Note: actually we should pass to NAME_CONST() the value's derivation as well.
It's impossible without the parser modifying. Now we always set the 
derivation to DERIVATION_IMPLICIT, the same as local variables have.


mysql-test/r/binlog.result:
  Fix for bug#39182: Binary log producing incompatible character set query
  from stored procedure.
    - test result.
mysql-test/r/ctype_cp932_binlog.result:
  Fix for bug#39182: Binary log producing incompatible character set query
  from stored procedure.
    - results adjusted.
mysql-test/r/rpl_sp.result:
  Fix for bug#39182: Binary log producing incompatible character set query
  from stored procedure.
    - results adjusted.
mysql-test/t/binlog.test:
  Fix for bug#39182: Binary log producing incompatible character set query
  from stored procedure.
    - test case.
sql/item.cc:
  Fix for bug#39182: Binary log producing incompatible character set query
  from stored procedure.
    - allow NAME_CONST() to get _charset'foo' COLLATE 'bar' strings
  (see Item_func_set_collation).
sql/sp_head.cc:
  Fix for bug#39182: Binary log producing incompatible character set query
  from stored procedure. 
    - pass the value's collation to NAME_CONST().
2008-10-01 14:48:47 +05:00
..
examples fixed warnings from the fix of 26243 2008-03-29 17:50:46 +02:00
share Bug#29738 Error message not properly translated to Serbian 2008-07-29 15:58:15 +02:00
.cvsignore
add_errmsg
client_settings.h my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
CMakeLists.txt Bug#31745 - crash handler does not work on Windows 2008-02-19 12:37:39 +01:00
custom_conf.h my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
derror.cc my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
des_key_file.cc my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
discover.cc my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
field.cc Partial rollback of fix for bug #30059: End-space truncation is inconsistent 2008-05-06 21:43:46 +05:00
field.h Bug #37799: SELECT with a BIT column in WHERE clause 2008-08-28 02:10:37 +05:00
field_conv.cc field_conv.cc: 2007-07-12 00:55:40 +05:00
filesort.cc BUG#35478: sort_union() returns bad data when sort_buffer_size is hit 2008-07-15 18:13:21 +04:00
frm_crypt.cc my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
gen_lex_hash.cc gen_lex_hash.cc: 2007-01-31 00:06:42 +01:00
gstream.cc Merge mysql.com:/home/hf/work/30286/my41-30286 2007-10-05 16:33:08 +05:00
gstream.h my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
ha_archive.cc BUG#29207 - archive table reported as corrupt by check table (P1) 2007-06-27 13:19:34 +05:00
ha_archive.h Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2007-01-22 14:04:40 +02:00
ha_berkeley.cc fixes for warnings and compile errors for the fix of bug 26243 2008-03-29 16:12:23 +02:00
ha_berkeley.h Fixed compiler warnings (for linux and win32 and win64) 2007-02-22 16:59:57 +02:00
ha_blackhole.cc Bug #35178 INSERT_ID not written to binary log for inserts against BLACKHOLE backed tables 2008-03-19 18:44:50 +02:00
ha_blackhole.h Bug#30294 blackhole engine causes 100% with 2 alter table statements running 2007-11-16 14:46:36 +04:00
ha_federated.cc Fix for bug #34779: crash in checksum table on federated tables 2008-08-15 11:40:05 +05:00
ha_federated.h Bug #32374 crash with filesort when selecting from federated table and view. 2007-11-30 17:08:00 +04:00
ha_heap.cc type conversions fixed to get rid of warnings 2007-10-23 16:32:05 +05:00
ha_heap.h [pb problem]: ha_heap->clone() fails on windows because of mess with 2007-07-17 19:51:50 +04:00
ha_innodb.cc Cherry-pick InnoDB fixes for Bug#34286, Bug#35352, and Bug#36600 from snapshot 2008-07-31 15:47:57 -06:00
ha_innodb.h Bug #20358: InnoDB hang on the adaptive hash index latch in btr0sea.c 2007-10-02 23:47:30 -06:00
ha_myisam.cc Bug#33756 - query cache with concurrent_insert=0 appears broken 2008-03-13 16:39:27 +01:00
ha_myisam.h Bug#28249 Query Cache returns wrong result with concurrent insert / certain lock 2007-07-12 13:29:51 +02:00
ha_myisammrg.cc Merge amd64.(none):/src/mysql-5.0-bugteam 2008-03-28 16:01:05 -04:00
ha_myisammrg.h BUG#26976 - Missing table in merge not noted in related error msg + 2007-06-06 04:42:41 +05:00
ha_ndbcluster.cc fixed warnings and compile errors from the fix for bug 26243 2008-03-29 09:52:16 +02:00
ha_ndbcluster.h ha_ndbcluster.h: 2007-11-05 20:18:22 +01:00
ha_ndbcluster_cond.cc fixed warnings and compile errors from the fix for bug 26243 2008-03-29 09:52:16 +02:00
ha_ndbcluster_cond.h Bug#34749: Server crash when using NAME_CONST() with an aggregate function 2008-02-28 14:23:22 +01:00
handler.cc Bug #36705 key_buffer_size of >= 2G allocates all availabel virtual memory on 64-bit wondo. 2008-05-17 12:53:47 +05:00
handler.h Bug #26461: Intrinsic data type bool (1 byte) redefined to BOOL (4 bytes) 2008-03-21 17:23:17 +02:00
hash_filo.cc my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
hash_filo.h my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
hostname.cc my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
init.cc Bug#26294: library name conflict between MySQL 4.x, 5.0 and Qt 3.3 2008-04-03 11:32:00 -04:00
item.cc Fix for bug#39182: Binary log producing incompatible character set query 2008-10-01 14:48:47 +05:00
item.h Bug#37301 Length and Max_length differ with no obvious reason(2nd version) 2008-08-15 16:13:27 -04:00
item_buff.cc my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
item_cmpfunc.cc Fix for bug#37526: asymertic operator <=> in trigger 2008-09-09 20:05:27 +05:00
item_cmpfunc.h Fix for bug #39021: SELECT REGEXP BINARY NULL never returns 2008-09-05 13:30:01 +05:00
item_create.cc Fix mismerge. 2008-04-10 15:55:37 -04:00
item_create.h Bug #27921 View ignores precision for CAST() 2007-05-10 00:17:21 +05:00
item_func.cc Bug#37662 nested if() inside sum() is parsed in exponential time 2008-07-30 14:07:37 +03:00
item_func.h Bug#34749: Server crash when using NAME_CONST() with an aggregate function 2008-02-28 14:23:22 +01:00
item_geofunc.cc Merge mysql.com:/home/hf/work/31158/my41-31158 2007-11-17 16:48:57 +04:00
item_geofunc.h Bug #31155 gis types in union'd select cause crash. 2007-10-04 12:01:28 +05:00
item_row.cc Many files: 2006-12-23 20:17:15 +01:00
item_row.h Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2007-01-22 14:04:40 +02:00
item_strfunc.cc warning elimination 2008-07-11 04:51:58 +05:00
item_strfunc.h Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0 2007-12-04 20:58:21 -07:00
item_subselect.cc Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-bugteam 2008-03-28 14:31:52 +03:00
item_subselect.h Bug #31884: Assertion + crash in subquery in the SELECT clause. 2007-10-30 14:27:21 +02:00
item_sum.cc Fix for bug #35298: GROUP_CONCAT with DISTINCT can crash the server 2008-05-01 13:49:26 +03:00
item_sum.h Bug#27219: Aggregate functions in ORDER BY. 2008-03-27 19:49:32 +03:00
item_timefunc.cc Bug #33256: CREATE ... SELECT creates obsolete table 2007-12-21 12:44:24 +02:00
item_timefunc.h Bug #33256: CREATE ... SELECT creates obsolete table 2007-12-21 12:44:24 +02:00
item_uniq.cc my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
item_uniq.h my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
key.cc Fixed bug #32556: assert in "using index for group-by" : 2007-11-21 22:56:42 +04:00
lex.h Fix -ansi -pedantic warning (can't cast a pointer to function 2007-03-08 12:04:45 +03:00
lex_symbol.h Fix -ansi -pedantic warning (can't cast a pointer to function 2007-03-08 12:04:45 +03:00
lock.cc fixed warnings from the fix of 26243 2008-03-29 17:50:46 +02:00
log.cc Bug#37027 expire_logs_days and missing binlogs cause a crash ! 2008-07-24 14:28:21 +02:00
log_event.cc Bug #37150 Risk for crash in User_var_log_event::exec_event() 2008-07-07 09:58:27 +02:00
log_event.h Bug #27571 asynchronousity in setting mysql_query::error and 2007-10-29 15:20:59 +02:00
Makefile.am Bug#29414 HPUX build fails - 'noinst_HEADERS' does not exist 2007-06-28 11:13:18 +02:00
matherr.c my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
message.mc
mf_iocache.cc my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
my_decimal.cc Bug#31227: memory overrun with decimal (6,6) and zerofill and group_concat 2007-10-05 09:38:57 +02:00
my_decimal.h Bug#36023: Incorrect handling of zero length caused an assertion to fail. 2008-04-25 00:39:37 +04:00
my_lock.c my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
mysql_priv.h merging fix 2008-08-26 13:32:43 +05:00
mysqld.cc merging fix 2008-08-26 13:32:43 +05:00
mysqld_suffix.h Many files: 2006-12-23 20:17:15 +01:00
net_serv.cc Bug#26243 mysql command line crash after control-c 2008-03-28 14:02:27 -04:00
nt_servc.cc
nt_servc.h
opt_range.cc BUG#36639: subselect.test crashes on 64 bit pentium4 when compiled for valgrind, commit into 5.0 2008-08-25 21:02:54 +04:00
opt_range.h BUG#36639: subselect.test crashes on 64 bit pentium4 when compiled for valgrind, commit into 5.0 2008-08-25 21:02:54 +04:00
opt_sum.cc Bug #30715: Assertion failed: item_field->field->real_maybe_null(), 2007-10-24 11:15:08 +03:00
parse_file.cc Polishing: add comments. 2007-04-06 18:56:39 +04:00
parse_file.h Many files: 2006-12-23 20:17:15 +01:00
password.c Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2007-01-22 14:04:40 +02:00
procedure.cc my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
procedure.h Bug #26461: Intrinsic data type bool (1 byte) redefined to BOOL (4 bytes) 2008-03-21 17:23:17 +02:00
protocol.cc Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 2007-12-01 13:09:16 +01:00
protocol.h Backport of TIME->MYSQL_TIME / Y2K fixset 2007-05-16 10:44:59 +02:00
records.cc BUG#35478: sort_union() returns bad data when sort_buffer_size is hit 2008-07-15 18:13:21 +04:00
repl_failsafe.cc Make gcov happy. 2008-03-18 16:38:12 +04:00
repl_failsafe.h my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
set_var.cc Bug#37428 Potential security issue with UDFs - linux shellcode execution. 2008-08-25 17:11:59 +05:00
set_var.h Merge mysql.com:/home/gluh/MySQL/Merge/5.0 2007-12-13 14:52:49 +04:00
slave.cc Merge amd64.(none):/src/mysql-5.0-bugteam 2008-03-28 16:01:05 -04:00
slave.h BUG#13861 - START SLAVE UNTIL may stop 1 evnt too late if 2008-02-22 19:07:07 +04:00
sp.cc Bug#35577 (CREATE PROCEDURE causes either crash or syntax error depending on 2008-07-14 15:41:30 -06:00
sp.h Many files: 2006-12-23 20:17:15 +01:00
sp_cache.cc Many files: 2006-12-23 20:17:15 +01:00
sp_cache.h Many files: 2006-12-23 20:17:15 +01:00
sp_head.cc Fix for bug#39182: Binary log producing incompatible character set query 2008-10-01 14:48:47 +05:00
sp_head.h Bug#26030 (Parsing fails for stored routine w/multi-statement execution 2008-07-07 10:00:08 -06:00
sp_pcontext.cc Bug#26503 (Illegal SQL exception handler code causes the server to crash) 2007-03-14 12:02:32 -06:00
sp_pcontext.h Bug#26503 (Illegal SQL exception handler code causes the server to crash) 2007-03-14 12:02:32 -06:00
sp_rcontext.cc Bug#33618 (Crash in sp_rcontext) 2008-01-23 13:26:41 -07:00
sp_rcontext.h Bug#33618 (Crash in sp_rcontext) 2008-01-23 13:26:41 -07:00
spatial.cc Bug #29166: 2007-07-05 18:24:48 +03:00
spatial.h Bug #24563: MBROverlaps does not seem to function propertly. 2007-03-23 16:28:07 -06:00
sql_acl.cc Bug#37781 mysql_drop_user calls get_current_user() twice for no reason 2008-07-29 15:37:09 +02:00
sql_acl.h Bug #26461: Intrinsic data type bool (1 byte) redefined to BOOL (4 bytes) 2008-03-21 17:23:17 +02:00
sql_analyse.cc fixed warnings from the fix of 26243 2008-03-29 17:50:46 +02:00
sql_analyse.h Bug #26461: Intrinsic data type bool (1 byte) redefined to BOOL (4 bytes) 2008-03-21 17:23:17 +02:00
sql_array.h Fix for bug #31207: Test "join_nested" shows different strategy on IA64 2007-10-17 20:08:58 +04:00
sql_base.cc Bug #26461: Intrinsic data type bool (1 byte) redefined to BOOL (4 bytes) 2008-03-21 17:23:17 +02:00
sql_bitmap.h Many files: 2006-12-23 20:17:15 +01:00
sql_cache.cc Cherry-pick Bug#33362 from mysql-5.1 2008-07-24 11:14:34 -03:00
sql_cache.h Bug#30087 Set query_cache_size, if the value is too small, get a unclear warning 2008-07-16 16:29:22 -06:00
sql_class.cc Bug#35577 (CREATE PROCEDURE causes either crash or syntax error depending on 2008-07-14 15:41:30 -06:00
sql_class.h Bug#35577 (CREATE PROCEDURE causes either crash or syntax error depending on 2008-07-14 15:41:30 -06:00
sql_client.cc Bug#26664 test suite times out on OS X 64bit 2007-05-24 11:21:27 +02:00
sql_crypt.cc my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
sql_crypt.h my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
sql_cursor.cc Bug#38486 Crash when using cursor protocol 2008-08-11 11:40:54 +02:00
sql_cursor.h my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
sql_db.cc Bug #26461: Intrinsic data type bool (1 byte) redefined to BOOL (4 bytes) 2008-03-21 17:23:17 +02:00
sql_delete.cc BUG#35478: sort_union() returns bad data when sort_buffer_size is hit 2008-07-15 18:13:21 +04:00
sql_derived.cc - renaming TMP_TABLE to NON_TRANSACTIONAL_TMP_TABLE because this is 2007-03-22 15:07:32 +01:00
sql_do.cc my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
sql_error.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime 2007-06-20 12:46:15 +04:00
sql_error.h BUG#26976 - Missing table in merge not noted in related error msg + 2007-06-06 04:42:41 +05:00
sql_handler.cc Bug#31409 RENAME TABLE causes server crash or deadlock when used with HANDLER statements 2007-10-12 10:55:46 -03:00
sql_help.cc BUG#35478: sort_union() returns bad data when sort_buffer_size is hit 2008-07-15 18:13:21 +04:00
sql_insert.cc Fix for bug#38821: Assert table->auto_increment_field_not_null failed 2008-09-03 15:17:19 +05:00
sql_lex.cc Bug#35577 (CREATE PROCEDURE causes either crash or syntax error depending on 2008-07-14 15:41:30 -06:00
sql_lex.h Bug#38296 (low memory crash with many conditions in a query) 2008-08-11 10:10:00 -06:00
sql_list.cc my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
sql_list.h Bug#38296 (low memory crash with many conditions in a query) 2008-08-11 10:10:00 -06:00
sql_load.cc Fix for Bug#35469: server crash with LOAD DATA INFILE to a VIEW. 2008-03-28 18:59:13 +03:00
sql_locale.cc Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl 2007-01-12 12:22:54 +01:00
sql_manager.cc my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
sql_manager.h my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
sql_map.cc type conversions fixed to avoid warnings on Windows 2007-10-23 14:27:11 +05:00
sql_map.h my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
sql_olap.cc my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
sql_parse.cc merging fix 2008-08-26 13:32:43 +05:00
sql_prepare.cc Bug#35577 (CREATE PROCEDURE causes either crash or syntax error depending on 2008-07-14 15:41:30 -06:00
sql_rename.cc my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
sql_repl.cc Fixes to make code compile on Windows. 2008-01-31 07:19:29 +01:00
sql_repl.h BUG#31024: STOP SLAVE does not stop attempted connect()s 2008-03-11 14:42:54 +01:00
sql_select.cc Bug#38195: Incorrect handling of aggregate functions when loose index scan is 2008-08-27 17:03:17 +04:00
sql_select.h Bug #31928: Search fails on '1000-00-00' date after sql_mode change 2007-11-07 18:02:12 +02:00
sql_show.cc Bug#37301 Length and Max_length differ with no obvious reason(2nd version) 2008-08-15 16:13:27 -04:00
sql_sort.h Fixed bug #25798. 2007-07-01 15:33:28 -07:00
sql_state.c Many files: 2006-12-23 20:17:15 +01:00
sql_string.cc Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl 2007-12-19 14:49:04 +01:00
sql_string.h Bug#38296 (low memory crash with many conditions in a query) 2008-08-11 10:10:00 -06:00
sql_table.cc BUG#35478: sort_union() returns bad data when sort_buffer_size is hit 2008-07-15 18:13:21 +04:00
sql_test.cc my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
sql_trigger.cc Bug#35577 (CREATE PROCEDURE causes either crash or syntax error depending on 2008-07-14 15:41:30 -06:00
sql_trigger.h A fix and a test case for Bug#26141 mixing table types in trigger 2007-07-12 22:26:41 +04:00
sql_udf.cc Bug#37428 Potential security issue with UDFs - linux shellcode execution. 2008-08-25 17:11:59 +05:00
sql_udf.h Remove typedef st_table_list TABLE_LIST and always use name 'TABLE_LIST'. 2007-07-06 16:18:49 +04:00
sql_union.cc fixes for warnings and compile errors for the fix of bug 26243 2008-03-29 16:12:23 +02:00
sql_update.cc BUG#35478: sort_union() returns bad data when sort_buffer_size is hit 2008-07-15 18:13:21 +04:00
sql_view.cc Bug#35577 (CREATE PROCEDURE causes either crash or syntax error depending on 2008-07-14 15:41:30 -06:00
sql_view.h Bug#32890 Crash after repeated create and drop of tables and views 2008-02-21 14:58:29 -03:00
sql_yacc.yy Bug#38296 (low memory crash with many conditions in a query) 2008-08-11 10:10:00 -06:00
stacktrace.c Bug#31745 - crash handler does not work on Windows 2008-02-19 12:37:39 +01:00
stacktrace.h Bug#31745 - crash handler does not work on Windows 2008-02-19 12:37:39 +01:00
strfunc.cc Fixed compiler warnings. 2007-03-22 20:32:07 +02:00
structs.h Fix for bug #31137: Assertion failed: primary_key_no == -1 || primary_key_no == 0, 2007-10-26 15:37:38 +05:00
table.cc Bug #30825: Problems when putting a non-spatial index on a GIS column 2007-10-10 16:26:02 +03:00
table.h Bug #28702: VIEWs defined with USE/FORCE KEY ignore that request 2007-09-24 15:34:10 +03:00
thr_malloc.cc Bug#38296 (low memory crash with many conditions in a query) 2008-08-11 10:10:00 -06:00
time.cc Bug #29536: timestamp inconsistent in replication around 1970 2007-08-06 04:57:28 -07:00
tzfile.h Many files: 2006-12-23 20:17:15 +01:00
tztime.cc Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug26294/my50-bug26294 2008-04-03 13:19:55 -04:00
tztime.h Backport of TIME->MYSQL_TIME / Y2K fixset 2007-05-16 10:44:59 +02:00
udf_example.c Bug #30355: Incorrect ordering of UDF results 2007-11-27 17:16:52 +02:00
udf_example.def Bug #29804 UDF parameters don't contain correct string length 2007-10-17 17:54:11 -04:00
uniques.cc Fixed bug #25798. 2007-07-01 15:33:28 -07:00
unireg.cc Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 2007-12-17 09:45:36 +01:00
unireg.h Bug#37428 Potential security issue with UDFs - linux shellcode execution. 2008-08-25 17:11:59 +05:00
watchdog_mysqld