From d02b8a3bcc2f3f0d088a8f2dfb45a15c79d56833 Mon Sep 17 00:00:00 2001 From: Kristofer Pettersson Date: Tue, 14 Oct 2008 15:41:35 +0200 Subject: [PATCH 001/132] Bug#37416 When SQL_NO_CACHE is used, MySQL still lookup into the query cache The query cache module did not check for the SQL_NO_CACHE keyword before attempting to query the hash lookup table. This had a small performance impact. By introducing a check on the query string before obtaining the hash mutex we can gain some performance if the SQL_NO_CACHE directive is used often. --- sql/sql_cache.cc | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/sql/sql_cache.cc b/sql/sql_cache.cc index b487f092f75..b4fe1e65bbc 100644 --- a/sql/sql_cache.cc +++ b/sql/sql_cache.cc @@ -363,6 +363,43 @@ TYPELIB query_cache_type_typelib= array_elements(query_cache_type_names)-1,"", query_cache_type_names, NULL }; + +/** + Helper function for determine if a SELECT statement has a SQL_NO_CACHE + directive. + + @param sql A pointer to the first white space character after SELECT + + @return + @retval TRUE The character string contains SQL_NO_CACHE + @retval FALSE No directive found. +*/ + +static bool has_no_cache_directive(char *sql) +{ + int i=0; + while (sql[i] == ' ') + ++i; + + if (my_toupper(system_charset_info, sql[i]) == 'S' && + my_toupper(system_charset_info, sql[i+1]) == 'Q' && + my_toupper(system_charset_info, sql[i+2]) == 'L' && + my_toupper(system_charset_info, sql[i+3]) == '_' && + my_toupper(system_charset_info, sql[i+4]) == 'N' && + my_toupper(system_charset_info, sql[i+5]) == 'O' && + my_toupper(system_charset_info, sql[i+6]) == '_' && + my_toupper(system_charset_info, sql[i+7]) == 'C' && + my_toupper(system_charset_info, sql[i+8]) == 'A' && + my_toupper(system_charset_info, sql[i+9]) == 'C' && + my_toupper(system_charset_info, sql[i+10]) == 'H' && + my_toupper(system_charset_info, sql[i+11]) == 'E' && + my_toupper(system_charset_info, sql[i+12]) == ' ') + return TRUE; + + return FALSE; +} + + /***************************************************************************** Query_cache_block_table method(s) *****************************************************************************/ @@ -1085,6 +1122,16 @@ Query_cache::send_result_to_client(THD *thd, char *sql, uint query_length) DBUG_PRINT("qcache", ("The statement is not a SELECT; Not cached")); goto err; } + + if (query_length > 20 && has_no_cache_directive(&sql[i+6])) + { + /* + We do not increase 'refused' statistics here since it will be done + later when the query is parsed. + */ + DBUG_PRINT("qcache", ("The statement has a SQL_NO_CACHE directive")); + goto err; + } } #ifdef __WIN__ From be66e43dabe2681705a9adfe3d385496dc827882 Mon Sep 17 00:00:00 2001 From: Alexey Botchkov Date: Mon, 27 Oct 2008 13:57:59 +0400 Subject: [PATCH 002/132] Bug#39289 libmysqld.a calls exit() upon error Several functions (mostly in mysqld.cc) directly call exit() function in case of errors, which is not a desired behaviour expecially in the embedded-server library. Fixed by making these functions return error sign instead of exiting. per-file comments: include/my_getopt.h Bug#39289 libmysqld.a calls exit() upon error added 'error' retvalue for my_getopt_register_get_addr libmysqld/lib_sql.cc Bug#39289 libmysqld.a calls exit() upon error unireg_clear() function implemented mysys/default.c Bug#39289 libmysqld.a calls exit() upon error error returned instead of exit() call mysys/mf_tempdir.c Bug#39289 libmysqld.a calls exit() upon error free_tmpdir() - fixed so it's not produce crash on uninitialized tmpdir structure mysys/my_getopt.c Bug#39289 libmysqld.a calls exit() upon error error returned instead of exit() call sql/mysql_priv.h Bug#39289 libmysqld.a calls exit() upon error unireg_abort definition fixed for the embedded server sql/mysqld.cc Bug#39289 libmysqld.a calls exit() upon error various functions fixed error returned instead of exit() call --- include/my_getopt.h | 2 +- libmysqld/lib_sql.cc | 9 +++ mysys/default.c | 10 +-- mysys/mf_tempdir.c | 7 +- mysys/my_getopt.c | 33 +++++---- sql/mysql_priv.h | 3 +- sql/mysqld.cc | 163 ++++++++++++++++++++++++++----------------- 7 files changed, 142 insertions(+), 85 deletions(-) diff --git a/include/my_getopt.h b/include/my_getopt.h index 50ebe9190d8..7cbad607aac 100644 --- a/include/my_getopt.h +++ b/include/my_getopt.h @@ -72,7 +72,7 @@ extern void my_cleanup_options(const struct my_option *options); extern void my_print_help(const struct my_option *options); extern void my_print_variables(const struct my_option *options); extern void my_getopt_register_get_addr(uchar ** (*func_addr)(const char *, uint, - const struct my_option *)); + const struct my_option *, int *)); ulonglong getopt_ull_limit_value(ulonglong num, const struct my_option *optp, my_bool *fix); diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc index 6e82812239e..4888ebca533 100644 --- a/libmysqld/lib_sql.cc +++ b/libmysqld/lib_sql.cc @@ -43,6 +43,15 @@ extern char mysql_server_last_error[MYSQL_ERRMSG_SIZE]; static my_bool emb_read_query_result(MYSQL *mysql); +extern "C" void unireg_clear(int exit_code) +{ + DBUG_ENTER("unireg_clear"); + clean_up(!opt_help && (exit_code || !opt_bootstrap)); /* purecov: inspected */ + my_end(opt_endinfo ? MY_CHECK_ERROR | MY_GIVE_INFO : 0); + DBUG_VOID_RETURN; +} + + /* Reads error information from the MYSQL_DATA and puts it into proper MYSQL members diff --git a/mysys/default.c b/mysys/default.c index 6b2b31d43ec..c7e1e513e1e 100644 --- a/mysys/default.c +++ b/mysys/default.c @@ -144,6 +144,7 @@ static char *remove_end_comment(char *ptr); RETURN 0 ok 1 given cinf_file doesn't exist + 2 out of memory The global variable 'my_defaults_group_suffix' is updated with value for --defaults_group_suffix @@ -190,7 +191,7 @@ int my_search_option_files(const char *conf_file, int *argc, char ***argv, if (!(extra_groups= (const char**)alloc_root(ctx->alloc, (2*group->count+1)*sizeof(char*)))) - goto err; + DBUG_RETURN(2); for (i= 0; i < group->count; i++) { @@ -199,7 +200,7 @@ int my_search_option_files(const char *conf_file, int *argc, char ***argv, len= strlen(extra_groups[i]); if (!(ptr= alloc_root(ctx->alloc, len+instance_len+1))) - goto err; + DBUG_RETURN(2); extra_groups[i+group->count]= ptr; @@ -254,12 +255,11 @@ int my_search_option_files(const char *conf_file, int *argc, char ***argv, } } - DBUG_RETURN(error); + DBUG_RETURN(0); err: fprintf(stderr,"Fatal error in defaults handling. Program aborted\n"); - exit(1); - return 0; /* Keep compiler happy */ + DBUG_RETURN(1); } diff --git a/mysys/mf_tempdir.c b/mysys/mf_tempdir.c index b2c18c74347..6ad0f95a342 100644 --- a/mysys/mf_tempdir.c +++ b/mysys/mf_tempdir.c @@ -85,8 +85,11 @@ char *my_tmpdir(MY_TMPDIR *tmpdir) void free_tmpdir(MY_TMPDIR *tmpdir) { uint i; - for (i=0; i<=tmpdir->max; i++) - my_free(tmpdir->list[i], MYF(0)); + if (tmpdir->full_list.elements) + { + for (i=0; i<=tmpdir->max; i++) + my_free(tmpdir->list[i], MYF(0)); + } delete_dynamic(&tmpdir->full_list); pthread_mutex_destroy(&tmpdir->mutex); } diff --git a/mysys/my_getopt.c b/mysys/my_getopt.c index 6a7ee748930..5c7e3ecef34 100644 --- a/mysys/my_getopt.c +++ b/mysys/my_getopt.c @@ -100,10 +100,10 @@ static void default_reporter(enum loglevel level, one. Call function 'get_one_option()' once for each option. */ -static uchar** (*getopt_get_addr)(const char *, uint, const struct my_option *); +static uchar** (*getopt_get_addr)(const char *, uint, const struct my_option *, int *); void my_getopt_register_get_addr(uchar** (*func_addr)(const char *, uint, - const struct my_option *)) + const struct my_option *, int *)) { getopt_get_addr= func_addr; } @@ -362,8 +362,12 @@ int handle_options(int *argc, char ***argv, my_progname, optp->name); return EXIT_NO_ARGUMENT_ALLOWED; } + error= 0; value= optp->var_type & GET_ASK_ADDR ? - (*getopt_get_addr)(key_name, (uint) strlen(key_name), optp) : optp->value; + (*getopt_get_addr)(key_name, (uint) strlen(key_name), optp, &error) : + optp->value; + if (error) + return error; if (optp->arg_type == NO_ARG) { @@ -397,9 +401,10 @@ invalid value '%s'", my_progname, optp->name, optend); continue; } - get_one_option(optp->id, optp, - *((my_bool*) value) ? - (char*) "1" : disabled_my_option); + if (get_one_option(optp->id, optp, + *((my_bool*) value) ? + (char*) "1" : disabled_my_option)) + return EXIT_UNSPECIFIED_ERROR; continue; } argument= optend; @@ -457,7 +462,8 @@ invalid value '%s'", optp->arg_type == NO_ARG) { *((my_bool*) optp->value)= (my_bool) 1; - get_one_option(optp->id, optp, argument); + if (get_one_option(optp->id, optp, argument)) + return EXIT_UNSPECIFIED_ERROR; continue; } else if (optp->arg_type == REQUIRED_ARG || @@ -476,7 +482,8 @@ invalid value '%s'", { if (optp->var_type == GET_BOOL) *((my_bool*) optp->value)= (my_bool) 1; - get_one_option(optp->id, optp, argument); + if (get_one_option(optp->id, optp, argument)) + return EXIT_UNSPECIFIED_ERROR; continue; } /* Check if there are more arguments after this one */ @@ -501,7 +508,8 @@ invalid value '%s'", my_progname, argument, optp->name); return error; } - get_one_option(optp->id, optp, argument); + if (get_one_option(optp->id, optp, argument)) + return EXIT_UNSPECIFIED_ERROR; break; } } @@ -524,7 +532,8 @@ invalid value '%s'", my_progname, argument, optp->name); return error; } - get_one_option(optp->id, optp, argument); + if (get_one_option(optp->id, optp, argument)) + return EXIT_UNSPECIFIED_ERROR; (*argc)--; /* option handled (short or long), decrease argument count */ } @@ -1085,7 +1094,7 @@ static void init_variables(const struct my_option *options, if (options->value) init_one_value(options, options->value, options->def_value); if (options->var_type & GET_ASK_ADDR && - (variable= (*getopt_get_addr)("", 0, options))) + (variable= (*getopt_get_addr)("", 0, options, 0))) init_one_value(options, variable, options->def_value); } DBUG_VOID_RETURN; @@ -1189,7 +1198,7 @@ void my_print_variables(const struct my_option *options) for (optp= options; optp->id; optp++) { uchar* *value= (optp->var_type & GET_ASK_ADDR ? - (*getopt_get_addr)("", 0, optp) : optp->value); + (*getopt_get_addr)("", 0, optp, 0) : optp->value); if (value) { printf("%s ", optp->name); diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index d11f2838e3a..192da33422e 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -2406,7 +2406,8 @@ extern "C" void unireg_abort(int exit_code) __attribute__((noreturn)); void kill_delayed_threads(void); bool check_stack_overrun(THD *thd, long margin, uchar *dummy); #else -#define unireg_abort(exit_code) DBUG_RETURN(exit_code) +extern "C" void unireg_clear(int exit_code); +#define unireg_abort(exit_code) do { unireg_clear(exit_code); DBUG_RETURN(exit_code); } while(0) inline void kill_delayed_threads(void) {} #define check_stack_overrun(A, B, C) 0 #endif diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 76deffec789..601bdcaeaa5 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -733,13 +733,13 @@ uint connection_count= 0; /* Function declarations */ pthread_handler_t signal_hand(void *arg); -static void mysql_init_variables(void); -static void get_options(int *argc,char **argv); +static int mysql_init_variables(void); +static int get_options(int *argc,char **argv); extern "C" my_bool mysqld_get_one_option(int, const struct my_option *, char *); static void set_server_version(void); static int init_thread_environment(); static char *get_relative_path(const char *path); -static void fix_paths(void); +static int fix_paths(void); pthread_handler_t handle_connections_sockets(void *arg); pthread_handler_t kill_server_thread(void *arg); static void bootstrap(FILE *file); @@ -753,7 +753,7 @@ pthread_handler_t handle_connections_shared_memory(void *arg); pthread_handler_t handle_slave(void *arg); static ulong find_bit_type(const char *x, TYPELIB *bit_lib); static ulong find_bit_type_or_exit(const char *x, TYPELIB *bit_lib, - const char *option); + const char *option, int *error); static void clean_up(bool print_message); static int test_if_case_insensitive(const char *dir_name); @@ -1187,7 +1187,8 @@ extern "C" void unireg_abort(int exit_code) my_end(opt_endinfo ? MY_CHECK_ERROR | MY_GIVE_INFO : 0); exit(exit_code); /* purecov: inspected */ } -#endif + +#endif /*EMBEDDED_LIBRARY*/ void clean_up(bool print_message) @@ -3141,12 +3142,12 @@ static int init_common_variables(const char *conf_file_name, int argc, if (!rpl_filter || !binlog_filter) { sql_perror("Could not allocate replication and binlog filters"); - exit(1); + return 1; } - if (init_thread_environment()) + if (init_thread_environment() || + mysql_init_variables()) return 1; - mysql_init_variables(); #ifdef HAVE_TZNAME { @@ -3222,7 +3223,8 @@ static int init_common_variables(const char *conf_file_name, int argc, load_defaults(conf_file_name, groups, &argc, &argv); defaults_argv=argv; defaults_argc=argc; - get_options(&defaults_argc, defaults_argv); + if (get_options(&defaults_argc, defaults_argv)) + return 1; set_server_version(); DBUG_PRINT("info",("%s Ver %s for %s on %s\n",my_progname, @@ -7347,6 +7349,8 @@ SHOW_VAR status_vars[]= { {NullS, NullS, SHOW_LONG} }; +#ifndef EMBEDDED_LIBRARY + static void print_version(void) { set_server_version(); @@ -7358,7 +7362,6 @@ static void print_version(void) server_version,SYSTEM_TYPE,MACHINE_TYPE, MYSQL_COMPILATION_COMMENT); } -#ifndef EMBEDDED_LIBRARY static void usage(void) { if (!(default_charset_info= get_charset_by_csname(default_character_set_name, @@ -7423,8 +7426,9 @@ To see what values a running MySQL server is using, type\n\ as these are initialized by my_getopt. */ -static void mysql_init_variables(void) +static int mysql_init_variables(void) { + int error; /* Things reset to zero */ opt_skip_slave_start= opt_reckless_slave = 0; mysql_home[0]= pidfile_name[0]= log_error_file[0]= 0; @@ -7481,7 +7485,10 @@ static void mysql_init_variables(void) delay_key_write_options= (uint) DELAY_KEY_WRITE_ON; slave_exec_mode_options= 0; slave_exec_mode_options= (uint) - find_bit_type_or_exit(slave_exec_mode_str, &slave_exec_mode_typelib, NULL); + find_bit_type_or_exit(slave_exec_mode_str, &slave_exec_mode_typelib, NULL, + &error); + if (error) + return 1; opt_specialflag= SPECIAL_ENGLISH; unix_sock= ip_sock= INVALID_SOCKET; mysql_home_ptr= mysql_home; @@ -7504,7 +7511,7 @@ static void mysql_init_variables(void) key_caches.empty(); if (!(dflt_key_cache= get_or_create_key_cache(default_key_cache_base.str, default_key_cache_base.length))) - exit(1); + return 1; /* set key_cache_hash.default_value = dflt_key_cache */ multi_keycache_init(); @@ -7647,6 +7654,7 @@ static void mysql_init_variables(void) tmpenv = DEFAULT_MYSQL_HOME; (void) strmake(mysql_home, tmpenv, sizeof(mysql_home)-1); #endif + return 0; } @@ -7655,6 +7663,8 @@ mysqld_get_one_option(int optid, const struct my_option *opt __attribute__((unused)), char *argument) { + int error; + switch(optid) { case '#': #ifndef DBUG_OFF @@ -7700,7 +7710,9 @@ mysqld_get_one_option(int optid, break; case OPT_SLAVE_EXEC_MODE: slave_exec_mode_options= (uint) - find_bit_type_or_exit(argument, &slave_exec_mode_typelib, ""); + find_bit_type_or_exit(argument, &slave_exec_mode_typelib, "", &error); + if (error) + return 1; break; #endif case OPT_SAFEMALLOC_MEM_LIMIT: @@ -7709,9 +7721,11 @@ mysqld_get_one_option(int optid, #endif break; #include +#ifndef EMBEDDED_LIBRARY case 'V': print_version(); exit(0); +#endif /*EMBEDDED_LIBRARY*/ case 'W': if (!argument) global_system_variables.log_warnings++; @@ -7763,18 +7777,16 @@ mysqld_get_one_option(int optid, if (!(p= strstr(argument, "->"))) { - fprintf(stderr, - "Bad syntax in replicate-rewrite-db - missing '->'!\n"); - exit(1); + sql_print_error("Bad syntax in replicate-rewrite-db - missing '->'!\n"); + return 1; } val= p--; while (my_isspace(mysqld_charset, *p) && p > argument) *p-- = 0; if (p == argument) { - fprintf(stderr, - "Bad syntax in replicate-rewrite-db - empty FROM db!\n"); - exit(1); + sql_print_error("Bad syntax in replicate-rewrite-db - empty FROM db!\n"); + return 1; } *val= 0; val+= 2; @@ -7782,9 +7794,8 @@ mysqld_get_one_option(int optid, *val++; if (!*val) { - fprintf(stderr, - "Bad syntax in replicate-rewrite-db - empty TO db!\n"); - exit(1); + sql_print_error("Bad syntax in replicate-rewrite-db - empty TO db!\n"); + return 1; } rpl_filter->add_db_rewrite(key, val); @@ -7812,8 +7823,8 @@ mysqld_get_one_option(int optid, { if (rpl_filter->add_do_table(argument)) { - fprintf(stderr, "Could not add do table rule '%s'!\n", argument); - exit(1); + sql_print_error("Could not add do table rule '%s'!\n", argument); + return 1; } break; } @@ -7821,8 +7832,8 @@ mysqld_get_one_option(int optid, { if (rpl_filter->add_wild_do_table(argument)) { - fprintf(stderr, "Could not add do table rule '%s'!\n", argument); - exit(1); + sql_print_error("Could not add do table rule '%s'!\n", argument); + return 1; } break; } @@ -7830,8 +7841,8 @@ mysqld_get_one_option(int optid, { if (rpl_filter->add_wild_ignore_table(argument)) { - fprintf(stderr, "Could not add ignore table rule '%s'!\n", argument); - exit(1); + sql_print_error("Could not add ignore table rule '%s'!\n", argument); + return 1; } break; } @@ -7839,8 +7850,8 @@ mysqld_get_one_option(int optid, { if (rpl_filter->add_ignore_table(argument)) { - fprintf(stderr, "Could not add ignore table rule '%s'!\n", argument); - exit(1); + sql_print_error("Could not add ignore table rule '%s'!\n", argument); + return 1; } break; } @@ -7863,7 +7874,9 @@ mysqld_get_one_option(int optid, { log_output_str= argument; log_output_options= - find_bit_type_or_exit(argument, &log_output_typelib, opt->name); + find_bit_type_or_exit(argument, &log_output_typelib, opt->name, &error); + if (error) + return 1; } break; } @@ -7873,7 +7886,7 @@ mysqld_get_one_option(int optid, sql_perror("Event scheduler is not supported in embedded build."); #else if (Events::set_opt_event_scheduler(argument)) - exit(1); + return 1; #endif break; case (int) OPT_SKIP_NEW: @@ -7912,7 +7925,7 @@ mysqld_get_one_option(int optid, case (int) OPT_SKIP_NETWORKING: #if defined(__NETWARE__) sql_perror("Can't start server: skip-networking option is currently not supported on NetWare"); - exit(1); + return 1; #endif opt_disable_networking=1; mysqld_port=0; @@ -7942,14 +7955,14 @@ mysqld_get_one_option(int optid, if (gethostname(myhostname,sizeof(myhostname)) < 0) { sql_perror("Can't start server: cannot get my own hostname!"); - exit(1); + return 1; } ent=gethostbyname(myhostname); } if (!ent) { sql_perror("Can't start server: cannot resolve hostname!"); - exit(1); + return 1; } my_bind_addr = (ulong) ((in_addr*)ent->h_addr_list[0])->s_addr; } @@ -8083,7 +8096,10 @@ mysqld_get_one_option(int optid, { myisam_recover_options_str=argument; myisam_recover_options= - find_bit_type_or_exit(argument, &myisam_recover_typelib, opt->name); + find_bit_type_or_exit(argument, &myisam_recover_typelib, opt->name, + &error); + if (error) + return 1; } ha_open_options|=HA_OPEN_ABORT_IF_CRASHED; break; @@ -8128,7 +8144,9 @@ mysqld_get_one_option(int optid, { sql_mode_str= argument; global_system_variables.sql_mode= - find_bit_type_or_exit(argument, &sql_mode_typelib, opt->name); + find_bit_type_or_exit(argument, &sql_mode_typelib, opt->name, &error); + if (error) + return 1; global_system_variables.sql_mode= fix_sql_mode(global_system_variables. sql_mode); break; @@ -8147,7 +8165,7 @@ mysqld_get_one_option(int optid, if (ft_boolean_check_syntax_string((uchar*) argument)) { fprintf(stderr, "Invalid ft-boolean-syntax string: %s\n", argument); - exit(1); + return 1; } strmake(ft_boolean_syntax, argument, sizeof(ft_boolean_syntax)-1); break; @@ -8167,13 +8185,17 @@ mysqld_get_one_option(int optid, /** Handle arguments for multiple key caches. */ -extern "C" uchar **mysql_getopt_value(const char *keyname, uint key_length, - const struct my_option *option); +extern "C" int mysql_getopt_value(uchar **value, + const char *keyname, uint key_length, + const struct my_option *option, + int *error); -uchar* * +static uchar* * mysql_getopt_value(const char *keyname, uint key_length, - const struct my_option *option) + const struct my_option *option, int *error) { + if (error) + *error= 0; switch (option->id) { case OPT_KEY_BUFFER_SIZE: case OPT_KEY_CACHE_BLOCK_SIZE: @@ -8182,7 +8204,11 @@ mysql_getopt_value(const char *keyname, uint key_length, { KEY_CACHE *key_cache; if (!(key_cache= get_or_create_key_cache(keyname, key_length))) - exit(1); + { + if (error) + *error= EXIT_OUT_OF_MEMORY; + return 0; + } switch (option->id) { case OPT_KEY_BUFFER_SIZE: return (uchar**) &key_cache->param_buff_size; @@ -8220,7 +8246,7 @@ void option_error_reporter(enum loglevel level, const char *format, ...) @todo - FIXME add EXIT_TOO_MANY_ARGUMENTS to "mysys_err.h" and return that code? */ -static void get_options(int *argc,char **argv) +static int get_options(int *argc,char **argv) { int ho_error; @@ -8234,7 +8260,7 @@ static void get_options(int *argc,char **argv) if ((ho_error= handle_options(argc, &argv, my_long_options, mysqld_get_one_option))) - exit(ho_error); + return ho_error; (*argc)++; /* add back one for the progname handle_options removes */ /* no need to do this for argv as we are discarding it. */ @@ -8273,7 +8299,8 @@ static void get_options(int *argc,char **argv) max_allowed_packet= global_system_variables.max_allowed_packet; net_buffer_length= global_system_variables.net_buffer_length; #endif - fix_paths(); + if (fix_paths()) + return 1; /* Set some global variables from the global_system_variables @@ -8300,7 +8327,7 @@ static void get_options(int *argc,char **argv) &global_system_variables.time_format) || init_global_datetime_format(MYSQL_TIMESTAMP_DATETIME, &global_system_variables.datetime_format)) - exit(1); + return 1; #ifdef EMBEDDED_LIBRARY one_thread_scheduler(&thread_scheduler); @@ -8313,6 +8340,7 @@ static void get_options(int *argc,char **argv) else pool_of_threads_scheduler(&thread_scheduler); /* purecov: tested */ #endif + return 0; } @@ -8376,7 +8404,7 @@ fn_format_relative_to_data_home(char * to, const char *name, } -static void fix_paths(void) +static int fix_paths(void) { char buff[FN_REFLEN],*pos; convert_dirname(mysql_home,mysql_home,NullS); @@ -8423,12 +8451,12 @@ static void fix_paths(void) charsets_dir=mysql_charsets_dir; if (init_tmpdir(&mysql_tmpdir_list, opt_mysql_tmpdir)) - exit(1); + return 1; #ifdef HAVE_REPLICATION if (!slave_load_tmpdir) { if (!(slave_load_tmpdir = (char*) my_strdup(mysql_tmpdir, MYF(MY_FAE)))) - exit(1); + return 1; } #endif /* HAVE_REPLICATION */ /* @@ -8441,30 +8469,37 @@ static void fix_paths(void) my_free(opt_secure_file_priv, MYF(0)); opt_secure_file_priv= my_strdup(buff, MYF(MY_FAE)); } + return 0; } static ulong find_bit_type_or_exit(const char *x, TYPELIB *bit_lib, - const char *option) + const char *option, int *error) { - ulong res; - + ulong result; const char **ptr; - if ((res= find_bit_type(x, bit_lib)) == ~(ulong) 0) + *error= 0; + if ((result= find_bit_type(x, bit_lib)) == ~(ulong) 0) { + char *buff= (char *) my_alloca(2048); + char *cbuf; ptr= bit_lib->type_names; - if (!*x) - fprintf(stderr, "No option given to %s\n", option); - else - fprintf(stderr, "Wrong option to %s. Option(s) given: %s\n", option, x); - fprintf(stderr, "Alternatives are: '%s'", *ptr); + cbuf= buff + ((!*x) ? + my_snprintf(buff, 2048, "No option given to %s\n", option) : + my_snprintf(buff, 2048, "Wrong option to %s. Option(s) given: %s\n", + option, x)); + cbuf+= my_snprintf(cbuf, 2048 - (cbuf-buff), "Alternatives are: '%s'", *ptr); while (*++ptr) - fprintf(stderr, ",'%s'", *ptr); - fprintf(stderr, "\n"); - exit(1); + cbuf+= my_snprintf(cbuf, 2048 - (cbuf-buff), ",'%s'", *ptr); + my_snprintf(cbuf, 2048 - (cbuf-buff), "\n"); + sql_perror(buff); + *error= 1; + my_afree(buff); + return 0; } - return res; + + return result; } From ff707d56d4e0bdb21149a70e34acc5e047506c5b Mon Sep 17 00:00:00 2001 From: Alexey Botchkov Date: Tue, 11 Nov 2008 14:42:32 +0400 Subject: [PATCH 003/132] Bug#31435 ha_innodb.cc:3983: ulint convert_search_mode_to_innobase(ha_rkey_function): Asse I think we don't need to issue an error statement in the convert_search_mode_to_innobase(). Returning the PAGE_CUR_UNSUPP value is enough as allows to handle this case depending on the requirements. per-file comments: sql/ha_innodb.cc Bug#31435 ha_innodb.cc:3983: ulint convert_search_mode_to_innobase(ha_rkey_function): Asse no error issued in convert_search_mode_to_innobase. ha_innobase::records_in_range() returns HA_POS_ERROR if search mode isn't supported. --- sql/ha_innodb.cc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sql/ha_innodb.cc b/sql/ha_innodb.cc index 1c0f8a6e9b3..611a1197215 100644 --- a/sql/ha_innodb.cc +++ b/sql/ha_innodb.cc @@ -3723,7 +3723,6 @@ convert_search_mode_to_innobase( case HA_READ_MBR_WITHIN: case HA_READ_MBR_DISJOINT: case HA_READ_MBR_EQUAL: - my_error(ER_TABLE_CANT_HANDLE_SPKEYS, MYF(0)); return(PAGE_CUR_UNSUPP); /* do not use "default:" in order to produce a gcc warning: enumeration value '...' not handled in switch @@ -5204,7 +5203,7 @@ ha_innobase::records_in_range( mode2); } else { - n_rows = 0; + n_rows = HA_POS_ERROR; } dtuple_free_for_mysql(heap1); From fc570243cf717ca0bd2bca2963ecdf99e402b212 Mon Sep 17 00:00:00 2001 From: Alexey Botchkov Date: Thu, 20 Nov 2008 19:16:20 +0400 Subject: [PATCH 004/132] Bug#40634 table scan temporary table is 4x slower due to mmap instead instead of caching mmap is slower that caching indeed. Here the problem is that mmap is used even if --myisam-use-mmap=OFF solved by checking the flag in ha_myisam::extra() as it is called in init_read_record() per-file comments: storage/myisam/ha_myisam.cc Bug#40634 table scan temporary table is 4x slower due to mmap instead instead of caching do nothing for HA_EXTRA_MMAP if no opt_myisam_use_mmap --- storage/myisam/ha_myisam.cc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/storage/myisam/ha_myisam.cc b/storage/myisam/ha_myisam.cc index b8d5a9af8d2..3d0ebd3e04a 100644 --- a/storage/myisam/ha_myisam.cc +++ b/storage/myisam/ha_myisam.cc @@ -1789,6 +1789,8 @@ int ha_myisam::extra(enum ha_extra_function operation) { if ((specialflag & SPECIAL_SAFE_MODE) && operation == HA_EXTRA_KEYREAD) return 0; + if (operation == HA_EXTRA_MMAP && !opt_myisam_use_mmap) + return 0; return mi_extra(file, operation, 0); } From 0ad6e488a2e5f0964a303ba4908ac18a4683b403 Mon Sep 17 00:00:00 2001 From: "Tatiana A. Nurnberg" Date: Mon, 2 Feb 2009 18:19:07 +0100 Subject: [PATCH 005/132] Bug#33550: mysqldump 4.0 compatibility broken mysqldump included character_set_client magic that is unknown before 4.1 even when asked for an appropriate compatibility mode. In compatibility (3.23, 4.0) mode, we do not output charset statements (not even in a "comment conditional"), nor do we do magic on the server, even if the server is sufficient new (4.1+). Table-names will be output converted to the charset requested by mysqldump; if such a conversion is not possible (Ivrit -> Latin), mysqldump will fail. client/mysqldump.c: in 3.23/4.0 compat mode, don't do charset magic, period. not in output, but not on the server, either! mysql-test/r/mysqldump-max.result: character_set_client magic lives in version-conditional now (except in compat 3.23/4.0 mode, in which case we don't output any at all!). mysql-test/r/mysqldump.result: character_set_client magic lives in version-conditional now (except in compat 3.23/4.0 mode, in which case we don't output any at all!). mysql-test/r/openssl_1.result: character_set_client magic lives in version-conditional now (except in compat 3.23/4.0 mode, in which case we don't output any at all!). mysql-test/t/mysqldump.test: character_set_client magic lives in version-conditional now (except in compat 3.23/4.0 mode, in which case we don't output any at all!). --- client/mysqldump.c | 11 +- mysql-test/r/mysqldump-max.result | 72 ++--- mysql-test/r/mysqldump.result | 422 +++++++++++++++++------------- mysql-test/r/openssl_1.result | 18 +- mysql-test/t/mysqldump.test | 18 ++ 5 files changed, 311 insertions(+), 230 deletions(-) diff --git a/client/mysqldump.c b/client/mysqldump.c index ced34f16212..97e8d6ed5ef 100644 --- a/client/mysqldump.c +++ b/client/mysqldump.c @@ -1129,7 +1129,8 @@ static int connect_to_db(char *host, char *user,char *passwd) DB_error(&mysql_connection, "when trying to connect"); DBUG_RETURN(1); } - if (mysql_get_server_version(&mysql_connection) < 40100) + if ((mysql_get_server_version(&mysql_connection) < 40100) || + (opt_compatible_mode & 3)) { /* Don't dump SET NAMES with a pre-4.1 server (bug#7997). */ opt_set_charset= 0; @@ -1857,11 +1858,11 @@ static uint get_table_structure(char *table, char *db, char *table_type, row= mysql_fetch_row(result); - fprintf(sql_file, - "SET @saved_cs_client = @@character_set_client;\n" - "SET character_set_client = utf8;\n" + fprintf(sql_file, (opt_compatible_mode & 3) ? "%s;\n" : + "/*!40101 SET @saved_cs_client = @@character_set_client */;\n" + "/*!40101 SET character_set_client = utf8 */;\n" "%s;\n" - "SET character_set_client = @saved_cs_client;\n", + "/*!40101 SET character_set_client = @saved_cs_client */;\n", row[1]); check_io(sql_file); diff --git a/mysql-test/r/mysqldump-max.result b/mysql-test/r/mysqldump-max.result index 261c7a7f197..b3a966b9b39 100644 --- a/mysql-test/r/mysqldump-max.result +++ b/mysql-test/r/mysqldump-max.result @@ -93,73 +93,73 @@ CREATE DATABASE /*!32312 IF NOT EXISTS*/ `test` /*!40100 DEFAULT CHARACTER SET l USE `test`; DROP TABLE IF EXISTS `t1`; -SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; CREATE TABLE `t1` ( `id` int(8) default NULL, `name` varchar(32) default NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1; -SET character_set_client = @saved_cs_client; +/*!40101 SET character_set_client = @saved_cs_client */; /*!40000 ALTER TABLE `t1` DISABLE KEYS */; INSERT DELAYED IGNORE INTO `t1` VALUES (1,'first value'),(2,'first value'),(3,'first value'),(4,'first value'),(5,'first value'); /*!40000 ALTER TABLE `t1` ENABLE KEYS */; DROP TABLE IF EXISTS `t2`; -SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; CREATE TABLE `t2` ( `id` int(8) default NULL, `name` varchar(32) default NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1; -SET character_set_client = @saved_cs_client; +/*!40101 SET character_set_client = @saved_cs_client */; /*!40000 ALTER TABLE `t2` DISABLE KEYS */; INSERT DELAYED IGNORE INTO `t2` VALUES (1,'first value'),(2,'first value'),(3,'first value'),(4,'first value'),(5,'first value'); /*!40000 ALTER TABLE `t2` ENABLE KEYS */; DROP TABLE IF EXISTS `t3`; -SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; CREATE TABLE `t3` ( `id` int(8) default NULL, `name` varchar(32) default NULL ) ENGINE=MEMORY DEFAULT CHARSET=latin1; -SET character_set_client = @saved_cs_client; +/*!40101 SET character_set_client = @saved_cs_client */; /*!40000 ALTER TABLE `t3` DISABLE KEYS */; INSERT DELAYED IGNORE INTO `t3` VALUES (1,'first value'),(2,'first value'),(3,'first value'),(4,'first value'),(5,'first value'); /*!40000 ALTER TABLE `t3` ENABLE KEYS */; DROP TABLE IF EXISTS `t4`; -SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; CREATE TABLE `t4` ( `id` int(8) default NULL, `name` varchar(32) default NULL ) ENGINE=MEMORY DEFAULT CHARSET=latin1; -SET character_set_client = @saved_cs_client; +/*!40101 SET character_set_client = @saved_cs_client */; /*!40000 ALTER TABLE `t4` DISABLE KEYS */; INSERT DELAYED IGNORE INTO `t4` VALUES (1,'first value'),(2,'first value'),(3,'first value'),(4,'first value'),(5,'first value'); /*!40000 ALTER TABLE `t4` ENABLE KEYS */; DROP TABLE IF EXISTS `t5`; -SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; CREATE TABLE `t5` ( `id` int(8) default NULL, `name` varchar(32) default NULL ) ENGINE=ARCHIVE DEFAULT CHARSET=latin1; -SET character_set_client = @saved_cs_client; +/*!40101 SET character_set_client = @saved_cs_client */; /*!40000 ALTER TABLE `t5` DISABLE KEYS */; INSERT DELAYED IGNORE INTO `t5` VALUES (1,'first value'),(2,'first value'),(3,'first value'),(4,'first value'),(5,'first value'); /*!40000 ALTER TABLE `t5` ENABLE KEYS */; DROP TABLE IF EXISTS `t6`; -SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; CREATE TABLE `t6` ( `id` int(8) default NULL, `name` varchar(32) default NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1; -SET character_set_client = @saved_cs_client; +/*!40101 SET character_set_client = @saved_cs_client */; /*!40000 ALTER TABLE `t6` DISABLE KEYS */; INSERT IGNORE INTO `t6` VALUES (1,'first value'),(2,'first value'),(3,'first value'),(4,'first value'),(5,'first value'); @@ -190,73 +190,73 @@ CREATE DATABASE /*!32312 IF NOT EXISTS*/ `test` /*!40100 DEFAULT CHARACTER SET l USE `test`; DROP TABLE IF EXISTS `t1`; -SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; CREATE TABLE `t1` ( `id` int(8) default NULL, `name` varchar(32) default NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1; -SET character_set_client = @saved_cs_client; +/*!40101 SET character_set_client = @saved_cs_client */; /*!40000 ALTER TABLE `t1` DISABLE KEYS */; INSERT DELAYED INTO `t1` VALUES (1,'first value'),(2,'first value'),(3,'first value'),(4,'first value'),(5,'first value'); /*!40000 ALTER TABLE `t1` ENABLE KEYS */; DROP TABLE IF EXISTS `t2`; -SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; CREATE TABLE `t2` ( `id` int(8) default NULL, `name` varchar(32) default NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1; -SET character_set_client = @saved_cs_client; +/*!40101 SET character_set_client = @saved_cs_client */; /*!40000 ALTER TABLE `t2` DISABLE KEYS */; INSERT DELAYED INTO `t2` VALUES (1,'first value'),(2,'first value'),(3,'first value'),(4,'first value'),(5,'first value'); /*!40000 ALTER TABLE `t2` ENABLE KEYS */; DROP TABLE IF EXISTS `t3`; -SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; CREATE TABLE `t3` ( `id` int(8) default NULL, `name` varchar(32) default NULL ) ENGINE=MEMORY DEFAULT CHARSET=latin1; -SET character_set_client = @saved_cs_client; +/*!40101 SET character_set_client = @saved_cs_client */; /*!40000 ALTER TABLE `t3` DISABLE KEYS */; INSERT DELAYED INTO `t3` VALUES (1,'first value'),(2,'first value'),(3,'first value'),(4,'first value'),(5,'first value'); /*!40000 ALTER TABLE `t3` ENABLE KEYS */; DROP TABLE IF EXISTS `t4`; -SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; CREATE TABLE `t4` ( `id` int(8) default NULL, `name` varchar(32) default NULL ) ENGINE=MEMORY DEFAULT CHARSET=latin1; -SET character_set_client = @saved_cs_client; +/*!40101 SET character_set_client = @saved_cs_client */; /*!40000 ALTER TABLE `t4` DISABLE KEYS */; INSERT DELAYED INTO `t4` VALUES (1,'first value'),(2,'first value'),(3,'first value'),(4,'first value'),(5,'first value'); /*!40000 ALTER TABLE `t4` ENABLE KEYS */; DROP TABLE IF EXISTS `t5`; -SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; CREATE TABLE `t5` ( `id` int(8) default NULL, `name` varchar(32) default NULL ) ENGINE=ARCHIVE DEFAULT CHARSET=latin1; -SET character_set_client = @saved_cs_client; +/*!40101 SET character_set_client = @saved_cs_client */; /*!40000 ALTER TABLE `t5` DISABLE KEYS */; INSERT DELAYED INTO `t5` VALUES (1,'first value'),(2,'first value'),(3,'first value'),(4,'first value'),(5,'first value'); /*!40000 ALTER TABLE `t5` ENABLE KEYS */; DROP TABLE IF EXISTS `t6`; -SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; CREATE TABLE `t6` ( `id` int(8) default NULL, `name` varchar(32) default NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1; -SET character_set_client = @saved_cs_client; +/*!40101 SET character_set_client = @saved_cs_client */; /*!40000 ALTER TABLE `t6` DISABLE KEYS */; INSERT INTO `t6` VALUES (1,'first value'),(2,'first value'),(3,'first value'),(4,'first value'),(5,'first value'); diff --git a/mysql-test/r/mysqldump.result b/mysql-test/r/mysqldump.result index 08a18d8de75..8b7e8f4430f 100644 --- a/mysql-test/r/mysqldump.result +++ b/mysql-test/r/mysqldump.result @@ -33,12 +33,12 @@ DROP TABLE t1; CREATE TABLE t1 (a decimal(64, 20)); INSERT INTO t1 VALUES ("1234567890123456789012345678901234567890"), ("0987654321098765432109876543210987654321"); -SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; CREATE TABLE `t1` ( `a` decimal(64,20) default NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1; -SET character_set_client = @saved_cs_client; +/*!40101 SET character_set_client = @saved_cs_client */; INSERT INTO `t1` VALUES ('1234567890123456789012345678901234567890.00000000000000000000'),('987654321098765432109876543210987654321.00000000000000000000'); DROP TABLE t1; # @@ -48,12 +48,12 @@ CREATE TABLE t1 (a double); INSERT INTO t1 VALUES ('-9e999999'); Warnings: Warning 1264 Out of range value adjusted for column 'a' at row 1 -SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; CREATE TABLE `t1` ( `a` double default NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1; -SET character_set_client = @saved_cs_client; +/*!40101 SET character_set_client = @saved_cs_client */; INSERT INTO `t1` VALUES (RES); DROP TABLE t1; # @@ -69,21 +69,21 @@ INSERT INTO t1 VALUES ('1.2345', 2.3456); INSERT INTO t1 VALUES ("1.2345", 2.3456); ERROR 42S22: Unknown column '1.2345' in 'field list' SET SQL_MODE=@OLD_SQL_MODE; -SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; CREATE TABLE `t1` ( `a` decimal(10,5) default NULL, `b` float default NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1; -SET character_set_client = @saved_cs_client; +/*!40101 SET character_set_client = @saved_cs_client */; INSERT INTO `t1` VALUES ('1.23450',2.3456),('1.23450',2.3456),('1.23450',2.3456),('1.23450',2.3456),('1.23450',2.3456); -SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; CREATE TABLE `t1` ( `a` decimal(10,5) default NULL, `b` float default NULL ); -SET character_set_client = @saved_cs_client; +/*!40101 SET character_set_client = @saved_cs_client */; INSERT INTO `t1` VALUES ('1.23450',2.3456),('1.23450',2.3456),('1.23450',2.3456),('1.23450',2.3456),('1.23450',2.3456); /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; @@ -97,13 +97,13 @@ INSERT INTO `t1` VALUES ('1.23450',2.3456),('1.23450',2.3456),('1.23450',2.3456) /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; DROP TABLE IF EXISTS `t1`; -SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; CREATE TABLE `t1` ( `a` decimal(10,5) default NULL, `b` float default NULL ); -SET character_set_client = @saved_cs_client; +/*!40101 SET character_set_client = @saved_cs_client */; LOCK TABLES `t1` WRITE; /*!40000 ALTER TABLE `t1` DISABLE KEYS */; @@ -126,13 +126,13 @@ UNLOCK TABLES; /*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */; /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; -SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; CREATE TABLE `t1` ( `a` decimal(10,5) default NULL, `b` float default NULL ); -SET character_set_client = @saved_cs_client; +/*!40101 SET character_set_client = @saved_cs_client */; INSERT INTO `t1` VALUES ('1.23450',2.3456),('1.23450',2.3456),('1.23450',2.3456),('1.23450',2.3456),('1.23450',2.3456); /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; @@ -208,12 +208,12 @@ INSERT INTO t1 VALUES (_koi8r x'C1C2C3C4C5'), (NULL); /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; DROP TABLE IF EXISTS `t1`; -SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; CREATE TABLE `t1` ( `a` varchar(255) default NULL ) ENGINE=MyISAM DEFAULT CHARSET=koi8r; -SET character_set_client = @saved_cs_client; +/*!40101 SET character_set_client = @saved_cs_client */; LOCK TABLES `t1` WRITE; /*!40000 ALTER TABLE `t1` DISABLE KEYS */; @@ -244,12 +244,9 @@ INSERT INTO t1 VALUES (1), (2); /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO,MYSQL40' */; /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; DROP TABLE IF EXISTS `t1`; -SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; CREATE TABLE `t1` ( `a` int(11) default NULL ) TYPE=MyISAM; -SET character_set_client = @saved_cs_client; LOCK TABLES `t1` WRITE; /*!40000 ALTER TABLE `t1` DISABLE KEYS */; @@ -270,12 +267,9 @@ UNLOCK TABLES; /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO,MYSQL323' */; /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; DROP TABLE IF EXISTS `t1`; -SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; CREATE TABLE `t1` ( `a` int(11) default NULL ) TYPE=MyISAM; -SET character_set_client = @saved_cs_client; LOCK TABLES `t1` WRITE; /*!40000 ALTER TABLE `t1` DISABLE KEYS */; @@ -294,12 +288,12 @@ DROP TABLE t1; # Bug #2592 'mysqldump doesn't quote "tricky" names correctly' # create table ```a` (i int); -SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; CREATE TABLE ```a` ( `i` int(11) default NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1; -SET character_set_client = @saved_cs_client; +/*!40101 SET character_set_client = @saved_cs_client */; drop table ```a`; # # Bug #2591 "mysqldump quotes names inconsistently" @@ -317,12 +311,12 @@ create table t1(a int); /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; DROP TABLE IF EXISTS `t1`; -SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; CREATE TABLE `t1` ( `a` int(11) default NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1; -SET character_set_client = @saved_cs_client; +/*!40101 SET character_set_client = @saved_cs_client */; LOCK TABLES `t1` WRITE; /*!40000 ALTER TABLE `t1` DISABLE KEYS */; @@ -345,12 +339,12 @@ UNLOCK TABLES; /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO,ANSI' */; /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; DROP TABLE IF EXISTS "t1"; -SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; CREATE TABLE "t1" ( "a" int(11) default NULL ); -SET character_set_client = @saved_cs_client; +/*!40101 SET character_set_client = @saved_cs_client */; LOCK TABLES "t1" WRITE; /*!40000 ALTER TABLE "t1" DISABLE KEYS */; @@ -376,12 +370,12 @@ set global sql_mode='ANSI_QUOTES'; /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; DROP TABLE IF EXISTS `t1`; -SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; CREATE TABLE `t1` ( `a` int(11) default NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1; -SET character_set_client = @saved_cs_client; +/*!40101 SET character_set_client = @saved_cs_client */; LOCK TABLES `t1` WRITE; /*!40000 ALTER TABLE `t1` DISABLE KEYS */; @@ -404,12 +398,12 @@ UNLOCK TABLES; /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO,ANSI' */; /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; DROP TABLE IF EXISTS "t1"; -SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; CREATE TABLE "t1" ( "a" int(11) default NULL ); -SET character_set_client = @saved_cs_client; +/*!40101 SET character_set_client = @saved_cs_client */; LOCK TABLES "t1" WRITE; /*!40000 ALTER TABLE "t1" DISABLE KEYS */; @@ -439,12 +433,12 @@ insert into t1 values (1),(2),(3); /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='' */; /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; DROP TABLE IF EXISTS `t1`; -SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; CREATE TABLE `t1` ( `a` int(11) default NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1; -SET character_set_client = @saved_cs_client; +/*!40101 SET character_set_client = @saved_cs_client */; /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; @@ -533,12 +527,12 @@ INSERT INTO t1 VALUES (_latin1 ' /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; DROP TABLE IF EXISTS `t1`; -SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; CREATE TABLE `t1` ( `a` char(10) default NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1; -SET character_set_client = @saved_cs_client; +/*!40101 SET character_set_client = @saved_cs_client */; LOCK TABLES `t1` WRITE; /*!40000 ALTER TABLE `t1` DISABLE KEYS */; @@ -569,12 +563,9 @@ UNLOCK TABLES; /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO,MYSQL323' */; /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; DROP TABLE IF EXISTS `t1`; -SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; CREATE TABLE `t1` ( `a` char(10) default NULL ) TYPE=MyISAM; -SET character_set_client = @saved_cs_client; LOCK TABLES `t1` WRITE; /*!40000 ALTER TABLE `t1` DISABLE KEYS */; @@ -595,12 +586,9 @@ UNLOCK TABLES; /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO,MYSQL323' */; /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; DROP TABLE IF EXISTS `t1`; -SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; CREATE TABLE `t1` ( `a` char(10) default NULL ) TYPE=MyISAM; -SET character_set_client = @saved_cs_client; LOCK TABLES `t1` WRITE; /*!40000 ALTER TABLE `t1` DISABLE KEYS */; @@ -621,12 +609,9 @@ UNLOCK TABLES; /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO,MYSQL323' */; /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; DROP TABLE IF EXISTS `t1`; -SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; CREATE TABLE `t1` ( `a` char(10) default NULL ) TYPE=MyISAM; -SET character_set_client = @saved_cs_client; LOCK TABLES `t1` WRITE; /*!40000 ALTER TABLE `t1` DISABLE KEYS */; @@ -660,12 +645,12 @@ INSERT INTO t2 VALUES (4),(5),(6); /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; DROP TABLE IF EXISTS `t2`; -SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; CREATE TABLE `t2` ( `a` int(11) default NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1; -SET character_set_client = @saved_cs_client; +/*!40101 SET character_set_client = @saved_cs_client */; LOCK TABLES `t2` WRITE; /*!40000 ALTER TABLE `t2` DISABLE KEYS */; @@ -701,12 +686,12 @@ INSERT INTO `t1` VALUES (0x602010000280100005E71A); /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; DROP TABLE IF EXISTS `t1`; -SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; CREATE TABLE `t1` ( `b` blob ) ENGINE=MyISAM DEFAULT CHARSET=latin1; -SET character_set_client = @saved_cs_client; +/*!40101 SET character_set_client = @saved_cs_client */; LOCK TABLES `t1` WRITE; /*!40000 ALTER TABLE `t1` DISABLE KEYS */; @@ -742,12 +727,12 @@ INSERT INTO t1 VALUES (4),(5),(6); /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; DROP TABLE IF EXISTS `t1`; -SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; CREATE TABLE `t1` ( `a` int(11) default NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1; -SET character_set_client = @saved_cs_client; +/*!40101 SET character_set_client = @saved_cs_client */; LOCK TABLES `t1` WRITE; /*!40000 ALTER TABLE `t1` DISABLE KEYS */; @@ -776,12 +761,12 @@ UNLOCK TABLES; /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; DROP TABLE IF EXISTS `t1`; -SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; CREATE TABLE `t1` ( `a` int(11) default NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1; -SET character_set_client = @saved_cs_client; +/*!40101 SET character_set_client = @saved_cs_client */; /*!40000 ALTER TABLE `t1` DISABLE KEYS */; INSERT DELAYED IGNORE INTO `t1` VALUES (1),(2),(3),(4),(5),(6); @@ -1145,8 +1130,8 @@ insert into t1 (F_8d3bba7425e7c98c50f52ca1b52d3735) values (1); /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; DROP TABLE IF EXISTS `t1`; -SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; CREATE TABLE `t1` ( `F_c4ca4238a0b923820dcc509a6f75849b` int(11) default NULL, `F_c81e728d9d4c2f636f067f89cc14862c` int(11) default NULL, @@ -1479,7 +1464,7 @@ CREATE TABLE `t1` ( `F_6faa8040da20ef399b63a72d0e4ab575` int(11) default NULL, `F_fe73f687e5bc5280214e0486b273a5f9` int(11) default NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1; -SET character_set_client = @saved_cs_client; +/*!40101 SET character_set_client = @saved_cs_client */; LOCK TABLES `t1` WRITE; /*!40000 ALTER TABLE `t1` DISABLE KEYS */; @@ -1520,12 +1505,12 @@ CREATE DATABASE /*!32312 IF NOT EXISTS*/ `test` /*!40100 DEFAULT CHARACTER SET l USE `test`; DROP TABLE IF EXISTS `t1`; -SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; CREATE TABLE `t1` ( `a` int(11) default NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1; -SET character_set_client = @saved_cs_client; +/*!40101 SET character_set_client = @saved_cs_client */; LOCK TABLES `t1` WRITE; /*!40000 ALTER TABLE `t1` DISABLE KEYS */; @@ -1564,19 +1549,19 @@ INSERT INTO t2 VALUES (1), (2); /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; DROP TABLE IF EXISTS `t1`; -SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; CREATE TABLE `t1` ( `a` int(11) default NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1; -SET character_set_client = @saved_cs_client; +/*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `t2`; -SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; CREATE TABLE `t2` ( `a` int(11) default NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1; -SET character_set_client = @saved_cs_client; +/*!40101 SET character_set_client = @saved_cs_client */; /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; /*!40101 SET SQL_MODE=@OLD_SQL_MODE */; @@ -1599,19 +1584,19 @@ SET character_set_client = @saved_cs_client; /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; DROP TABLE IF EXISTS `t1`; -SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; CREATE TABLE `t1` ( `a` int(11) default NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1; -SET character_set_client = @saved_cs_client; +/*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `t2`; -SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; CREATE TABLE `t2` ( `a` int(11) default NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1; -SET character_set_client = @saved_cs_client; +/*!40101 SET character_set_client = @saved_cs_client */; /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; /*!40101 SET SQL_MODE=@OLD_SQL_MODE */; @@ -1811,26 +1796,26 @@ create table t3(a int); /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; DROP TABLE IF EXISTS `t3`; -SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; CREATE TABLE `t3` ( `a` int(11) default NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1; -SET character_set_client = @saved_cs_client; +/*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `t1`; -SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; CREATE TABLE `t1` ( `a` int(11) default NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1; -SET character_set_client = @saved_cs_client; +/*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `t2`; -SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; CREATE TABLE `t2` ( `a` int(11) default NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1; -SET character_set_client = @saved_cs_client; +/*!40101 SET character_set_client = @saved_cs_client */; /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; /*!40101 SET SQL_MODE=@OLD_SQL_MODE */; @@ -1860,12 +1845,12 @@ mysqldump: Got error: 1064: You have an error in your SQL syntax; check the manu /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; DROP TABLE IF EXISTS `t1`; -SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; CREATE TABLE `t1` ( `a` int(11) default NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1; -SET character_set_client = @saved_cs_client; +/*!40101 SET character_set_client = @saved_cs_client */; /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; @@ -1896,15 +1881,15 @@ insert into t1 values (0815, 4711, 2006); /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO,ANSI' */; /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; DROP TABLE IF EXISTS "t1"; -SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; CREATE TABLE "t1" ( "a b" int(11) NOT NULL default '0', "c""d" int(11) NOT NULL default '0', "e`f" int(11) NOT NULL default '0', PRIMARY KEY ("a b","c""d","e`f") ); -SET character_set_client = @saved_cs_client; +/*!40101 SET character_set_client = @saved_cs_client */; LOCK TABLES "t1" WRITE; /*!40000 ALTER TABLE "t1" DISABLE KEYS */; @@ -1930,15 +1915,15 @@ UNLOCK TABLES; /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; DROP TABLE IF EXISTS `t1`; -SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; CREATE TABLE `t1` ( `a b` int(11) NOT NULL default '0', `c"d` int(11) NOT NULL default '0', `e``f` int(11) NOT NULL default '0', PRIMARY KEY (`a b`,`c"d`,`e``f`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1; -SET character_set_client = @saved_cs_client; +/*!40101 SET character_set_client = @saved_cs_client */; LOCK TABLES `t1` WRITE; /*!40000 ALTER TABLE `t1` DISABLE KEYS */; @@ -1984,13 +1969,13 @@ create view v2 as select * from t2 where a like 'a%' with check option; /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; DROP TABLE IF EXISTS `t2`; -SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; CREATE TABLE `t2` ( `a` varchar(30) default NULL, KEY `a` (`a`(5)) ) ENGINE=MyISAM DEFAULT CHARSET=latin1; -SET character_set_client = @saved_cs_client; +/*!40101 SET character_set_client = @saved_cs_client */; LOCK TABLES `t2` WRITE; /*!40000 ALTER TABLE `t2` DISABLE KEYS */; @@ -2068,12 +2053,12 @@ create view v1 as select * from t1; /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; DROP TABLE IF EXISTS `t1`; -SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; CREATE TABLE `t1` ( `a` int(11) default NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1; -SET character_set_client = @saved_cs_client; +/*!40101 SET character_set_client = @saved_cs_client */; LOCK TABLES `t1` WRITE; /*!40000 ALTER TABLE `t1` DISABLE KEYS */; @@ -2128,13 +2113,13 @@ create view v2 as select * from t2 where a like 'a%' with check option; /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; DROP TABLE IF EXISTS `t2`; -SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; CREATE TABLE `t2` ( `a` varchar(30) default NULL, KEY `a` (`a`(5)) ) ENGINE=MyISAM DEFAULT CHARSET=latin1; -SET character_set_client = @saved_cs_client; +/*!40101 SET character_set_client = @saved_cs_client */; LOCK TABLES `t2` WRITE; /*!40000 ALTER TABLE `t2` DISABLE KEYS */; @@ -2183,12 +2168,12 @@ INSERT INTO t1 VALUES ('\''); /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; DROP TABLE IF EXISTS `t1`; -SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; CREATE TABLE `t1` ( `a` char(10) default NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1; -SET character_set_client = @saved_cs_client; +/*!40101 SET character_set_client = @saved_cs_client */; LOCK TABLES `t1` WRITE; /*!40000 ALTER TABLE `t1` DISABLE KEYS */; @@ -2229,14 +2214,14 @@ select v3.a from v3, v1 where v1.a=v3.a and v3.b=3 limit 1; /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; DROP TABLE IF EXISTS `t1`; -SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; CREATE TABLE `t1` ( `a` int(11) default NULL, `b` int(11) default NULL, `c` varchar(30) default NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1; -SET character_set_client = @saved_cs_client; +/*!40101 SET character_set_client = @saved_cs_client */; LOCK TABLES `t1` WRITE; /*!40000 ALTER TABLE `t1` DISABLE KEYS */; @@ -2352,13 +2337,13 @@ CREATE DATABASE /*!32312 IF NOT EXISTS*/ `test` /*!40100 DEFAULT CHARACTER SET l USE `test`; DROP TABLE IF EXISTS `t1`; -SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; CREATE TABLE `t1` ( `a` int(11) default NULL, `b` bigint(20) default NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1; -SET character_set_client = @saved_cs_client; +/*!40101 SET character_set_client = @saved_cs_client */; LOCK TABLES `t1` WRITE; /*!40000 ALTER TABLE `t1` DISABLE KEYS */; @@ -2392,12 +2377,12 @@ end */;; DELIMITER ; /*!50003 SET SESSION SQL_MODE=@SAVE_SQL_MODE*/; DROP TABLE IF EXISTS `t2`; -SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; CREATE TABLE `t2` ( `a` int(11) default NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1; -SET character_set_client = @saved_cs_client; +/*!40101 SET character_set_client = @saved_cs_client */; LOCK TABLES `t2` WRITE; /*!40000 ALTER TABLE `t2` DISABLE KEYS */; @@ -2442,13 +2427,13 @@ CREATE DATABASE /*!32312 IF NOT EXISTS*/ `test` /*!40100 DEFAULT CHARACTER SET l USE `test`; DROP TABLE IF EXISTS `t1`; -SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; CREATE TABLE `t1` ( `a` int(11) default NULL, `b` bigint(20) default NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1; -SET character_set_client = @saved_cs_client; +/*!40101 SET character_set_client = @saved_cs_client */; LOCK TABLES `t1` WRITE; /*!40000 ALTER TABLE `t1` DISABLE KEYS */; @@ -2456,12 +2441,12 @@ INSERT INTO `t1` VALUES (1,NULL),(2,NULL),(4,NULL),(11,NULL); /*!40000 ALTER TABLE `t1` ENABLE KEYS */; UNLOCK TABLES; DROP TABLE IF EXISTS `t2`; -SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; CREATE TABLE `t2` ( `a` int(11) default NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1; -SET character_set_client = @saved_cs_client; +/*!40101 SET character_set_client = @saved_cs_client */; LOCK TABLES `t2` WRITE; /*!40000 ALTER TABLE `t2` DISABLE KEYS */; @@ -2585,12 +2570,12 @@ CREATE DATABASE /*!32312 IF NOT EXISTS*/ `test` /*!40100 DEFAULT CHARACTER SET l USE `test`; DROP TABLE IF EXISTS `t1`; -SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; CREATE TABLE `t1` ( `id` int(11) default NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1; -SET character_set_client = @saved_cs_client; +/*!40101 SET character_set_client = @saved_cs_client */; LOCK TABLES `t1` WRITE; /*!40000 ALTER TABLE `t1` DISABLE KEYS */; @@ -2678,13 +2663,13 @@ CREATE DATABASE /*!32312 IF NOT EXISTS*/ `test` /*!40100 DEFAULT CHARACTER SET l USE `test`; DROP TABLE IF EXISTS `t1`; -SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; CREATE TABLE `t1` ( `d` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP, UNIQUE KEY `d` (`d`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1; -SET character_set_client = @saved_cs_client; +/*!40101 SET character_set_client = @saved_cs_client */; LOCK TABLES `t1` WRITE; /*!40000 ALTER TABLE `t1` DISABLE KEYS */; @@ -2715,13 +2700,13 @@ CREATE DATABASE /*!32312 IF NOT EXISTS*/ `test` /*!40100 DEFAULT CHARACTER SET l USE `test`; DROP TABLE IF EXISTS `t1`; -SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; CREATE TABLE `t1` ( `d` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP, UNIQUE KEY `d` (`d`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1; -SET character_set_client = @saved_cs_client; +/*!40101 SET character_set_client = @saved_cs_client */; LOCK TABLES `t1` WRITE; /*!40000 ALTER TABLE `t1` DISABLE KEYS */; @@ -2768,12 +2753,12 @@ a2 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO,ANSI' */; /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; DROP TABLE IF EXISTS "t1 test"; -SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; CREATE TABLE "t1 test" ( "a1" int(11) default NULL ); -SET character_set_client = @saved_cs_client; +/*!40101 SET character_set_client = @saved_cs_client */; LOCK TABLES "t1 test" WRITE; /*!40000 ALTER TABLE "t1 test" DISABLE KEYS */; @@ -2791,12 +2776,12 @@ INSERT INTO `t2 test` SET a2 = NEW.a1; END */;; DELIMITER ; /*!50003 SET SESSION SQL_MODE=@SAVE_SQL_MODE*/; DROP TABLE IF EXISTS "t2 test"; -SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; CREATE TABLE "t2 test" ( "a2" int(11) default NULL ); -SET character_set_client = @saved_cs_client; +/*!40101 SET character_set_client = @saved_cs_client */; LOCK TABLES "t2 test" WRITE; /*!40000 ALTER TABLE "t2 test" DISABLE KEYS */; @@ -2845,14 +2830,14 @@ CREATE DATABASE /*!32312 IF NOT EXISTS*/ `test` /*!40100 DEFAULT CHARACTER SET l USE `test`; DROP TABLE IF EXISTS `t1`; -SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; CREATE TABLE `t1` ( `a` int(11) default NULL, `b` varchar(32) default NULL, `c` varchar(32) default NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1; -SET character_set_client = @saved_cs_client; +/*!40101 SET character_set_client = @saved_cs_client */; LOCK TABLES `t1` WRITE; /*!40000 ALTER TABLE `t1` DISABLE KEYS */; @@ -2940,12 +2925,12 @@ CREATE DATABASE /*!32312 IF NOT EXISTS*/ `test` /*!40100 DEFAULT CHARACTER SET l USE `test`; DROP TABLE IF EXISTS `t1`; -SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; CREATE TABLE `t1` ( `a` int(11) default NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1; -SET character_set_client = @saved_cs_client; +/*!40101 SET character_set_client = @saved_cs_client */; LOCK TABLES `t1` WRITE; /*!40000 ALTER TABLE `t1` DISABLE KEYS */; @@ -2991,13 +2976,13 @@ insert into t1 values ('',''); /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; DROP TABLE IF EXISTS `t1`; -SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; CREATE TABLE `t1` ( `a` binary(1) default NULL, `b` blob ) ENGINE=MyISAM DEFAULT CHARSET=latin1; -SET character_set_client = @saved_cs_client; +/*!40101 SET character_set_client = @saved_cs_client */; LOCK TABLES `t1` WRITE; /*!40000 ALTER TABLE `t1` DISABLE KEYS */; @@ -3026,13 +3011,13 @@ UNLOCK TABLES; /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; DROP TABLE IF EXISTS `t1`; -SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; CREATE TABLE `t1` ( `a` binary(1) default NULL, `b` blob ) ENGINE=MyISAM DEFAULT CHARSET=latin1; -SET character_set_client = @saved_cs_client; +/*!40101 SET character_set_client = @saved_cs_client */; LOCK TABLES `t1` WRITE; /*!40000 ALTER TABLE `t1` DISABLE KEYS */; @@ -3187,12 +3172,12 @@ CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mysqldump_test_db` /*!40100 DEFAULT CH USE `mysqldump_test_db`; DROP TABLE IF EXISTS `t1`; -SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; CREATE TABLE `t1` ( `id` int(11) default NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1; -SET character_set_client = @saved_cs_client; +/*!40101 SET character_set_client = @saved_cs_client */; LOCK TABLES `t1` WRITE; /*!40000 ALTER TABLE `t1` DISABLE KEYS */; @@ -3237,14 +3222,14 @@ create view nasishnasifu as select mysqldump_tables.basetable.id from mysqldump_ CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mysqldump_tables` /*!40100 DEFAULT CHARACTER SET latin1 */; USE `mysqldump_tables`; -SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; CREATE TABLE `basetable` ( `id` bigint(20) unsigned NOT NULL auto_increment, `tag` varchar(64) default NULL, UNIQUE KEY `id` (`id`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1; -SET character_set_client = @saved_cs_client; +/*!40101 SET character_set_client = @saved_cs_client */; CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mysqldump_views` /*!40100 DEFAULT CHARACTER SET latin1 */; @@ -3312,13 +3297,13 @@ mysqldump: Couldn't execute 'SHOW MASTER STATUS': Access denied; you need the SU mysqldump: Couldn't execute 'SHOW MASTER STATUS': Access denied; you need the SUPER,REPLICATION CLIENT privilege for this operation (1227) grant REPLICATION CLIENT on *.* to mysqltest_1@localhost; CHANGE MASTER TO MASTER_LOG_FILE='master-bin.000001', MASTER_LOG_POS=#; -SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; CREATE TABLE `t1` ( `a` int(11) default NULL, `b` varchar(34) default NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1; -SET character_set_client = @saved_cs_client; +/*!40101 SET character_set_client = @saved_cs_client */; drop table t1; drop user mysqltest_1@localhost; # @@ -3407,31 +3392,31 @@ CREATE TABLE t1 (a int) ENGINE=merge UNION=(t2, t3); /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; DROP TABLE IF EXISTS `t1`; -SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; CREATE TABLE `t1` ( `a` int(11) default NULL ) ENGINE=MRG_MyISAM DEFAULT CHARSET=latin1 UNION=(`t2`,`t3`); -SET character_set_client = @saved_cs_client; +/*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `t2`; -SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; CREATE TABLE `t2` ( `a` int(11) default NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1; -SET character_set_client = @saved_cs_client; +/*!40101 SET character_set_client = @saved_cs_client */; LOCK TABLES `t2` WRITE; /*!40000 ALTER TABLE `t2` DISABLE KEYS */; /*!40000 ALTER TABLE `t2` ENABLE KEYS */; UNLOCK TABLES; DROP TABLE IF EXISTS `t3`; -SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; CREATE TABLE `t3` ( `a` int(11) default NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1; -SET character_set_client = @saved_cs_client; +/*!40101 SET character_set_client = @saved_cs_client */; LOCK TABLES `t3` WRITE; /*!40000 ALTER TABLE `t3` DISABLE KEYS */; @@ -3507,13 +3492,13 @@ drop database mysqldump_test_db; # CREATE TABLE t1 (c1 INT, c2 LONGBLOB); INSERT INTO t1 SET c1=11, c2=REPEAT('q',509); -SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; CREATE TABLE `t1` ( `c1` int(11) default NULL, `c2` longblob ); -SET character_set_client = @saved_cs_client; +/*!40101 SET character_set_client = @saved_cs_client */; INSERT INTO `t1` VALUES (11,0x7171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171); DROP TABLE t1; # @@ -3571,6 +3556,83 @@ DROP TABLE t1,t2; -- Dump completed on DATE SET @@GLOBAL.CONCURRENT_INSERT = @OLD_CONCURRENT_INSERT; +SET NAMES utf8; +CREATE TABLE `straße` ( f1 INT ); +/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */; +/*!40103 SET TIME_ZONE='+00:00' */; +/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */; +/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */; +/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO,MYSQL323' */; +/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; +DROP TABLE IF EXISTS `straße`; +CREATE TABLE `straße` ( + `f1` int(11) default NULL +) TYPE=MyISAM; + +LOCK TABLES `straße` WRITE; +/*!40000 ALTER TABLE `straße` DISABLE KEYS */; +/*!40000 ALTER TABLE `straße` ENABLE KEYS */; +UNLOCK TABLES; +/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; + +/*!40101 SET SQL_MODE=@OLD_SQL_MODE */; +/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */; +/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */; +/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; + +/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */; +/*!40103 SET TIME_ZONE='+00:00' */; +/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */; +/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */; +/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO,MYSQL323' */; +/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; +DROP TABLE IF EXISTS `straße`; +CREATE TABLE `straße` ( + `f1` int(11) default NULL +) TYPE=MyISAM; + +LOCK TABLES `straße` WRITE; +/*!40000 ALTER TABLE `straße` DISABLE KEYS */; +/*!40000 ALTER TABLE `straße` ENABLE KEYS */; +UNLOCK TABLES; +/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; + +/*!40101 SET SQL_MODE=@OLD_SQL_MODE */; +/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */; +/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */; +/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; + +DROP TABLE `straße`; +CREATE TABLE `כדשגכחךלדגכחשךדגחכךלדגכ` ( f1 INT ); +/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */; +/*!40103 SET TIME_ZONE='+00:00' */; +/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */; +/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */; +/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO,MYSQL323' */; +/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; +DROP TABLE IF EXISTS `כדשגכחךלדגכחשךדגחכךלדגכ`; +CREATE TABLE `כדשגכחךלדגכחשךדגחכךלדגכ` ( + `f1` int(11) default NULL +) TYPE=MyISAM; + +LOCK TABLES `כדשגכחךלדגכחשךדגחכךלדגכ` WRITE; +/*!40000 ALTER TABLE `כדשגכחךלדגכחשךדגחכךלדגכ` DISABLE KEYS */; +/*!40000 ALTER TABLE `כדשגכחךלדגכחשךדגחכךלדגכ` ENABLE KEYS */; +UNLOCK TABLES; +/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; + +/*!40101 SET SQL_MODE=@OLD_SQL_MODE */; +/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */; +/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */; +/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; + +/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */; +/*!40103 SET TIME_ZONE='+00:00' */; +/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */; +/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */; +/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO,MYSQL323' */; +/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; +DROP TABLE `כדשגכחךלדגכחשךדגחכךלדגכ`; # # End of 5.0 tests # diff --git a/mysql-test/r/openssl_1.result b/mysql-test/r/openssl_1.result index 9c6c29eea47..32c8dfeac1c 100644 --- a/mysql-test/r/openssl_1.result +++ b/mysql-test/r/openssl_1.result @@ -77,12 +77,12 @@ INSERT INTO t1 VALUES (1), (2); /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; DROP TABLE IF EXISTS `t1`; -SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; CREATE TABLE `t1` ( `a` int(11) default NULL ); -SET character_set_client = @saved_cs_client; +/*!40101 SET character_set_client = @saved_cs_client */; LOCK TABLES `t1` WRITE; /*!40000 ALTER TABLE `t1` DISABLE KEYS */; @@ -111,12 +111,12 @@ UNLOCK TABLES; /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; DROP TABLE IF EXISTS `t1`; -SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; CREATE TABLE `t1` ( `a` int(11) default NULL ); -SET character_set_client = @saved_cs_client; +/*!40101 SET character_set_client = @saved_cs_client */; LOCK TABLES `t1` WRITE; /*!40000 ALTER TABLE `t1` DISABLE KEYS */; @@ -145,12 +145,12 @@ UNLOCK TABLES; /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; DROP TABLE IF EXISTS `t1`; -SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; CREATE TABLE `t1` ( `a` int(11) default NULL ); -SET character_set_client = @saved_cs_client; +/*!40101 SET character_set_client = @saved_cs_client */; LOCK TABLES `t1` WRITE; /*!40000 ALTER TABLE `t1` DISABLE KEYS */; diff --git a/mysql-test/t/mysqldump.test b/mysql-test/t/mysqldump.test index 2f11685385f..5b2af21c691 100644 --- a/mysql-test/t/mysqldump.test +++ b/mysql-test/t/mysqldump.test @@ -1606,6 +1606,24 @@ DROP TABLE t1,t2; SET @@GLOBAL.CONCURRENT_INSERT = @OLD_CONCURRENT_INSERT; +# +# Bug #33550 - mysqldump 4.0 compatibility broken +# + +SET NAMES utf8; +CREATE TABLE `straße` ( f1 INT ); +--exec $MYSQL_DUMP --character-sets-dir=$CHARSETSDIR --skip-comments --default-character-set=utf8 --compatible=mysql323 test +--exec $MYSQL_DUMP --character-sets-dir=$CHARSETSDIR --skip-comments --default-character-set=latin1 --compatible=mysql323 test +DROP TABLE `straße`; + +CREATE TABLE `כדשגכחךלדגכחשךדגחכךלדגכ` ( f1 INT ); +--exec $MYSQL_DUMP --character-sets-dir=$CHARSETSDIR --skip-comments --default-character-set=utf8 --compatible=mysql323 test +--error 2 +--exec $MYSQL_DUMP --character-sets-dir=$CHARSETSDIR --skip-comments --default-character-set=latin1 --compatible=mysql323 test +DROP TABLE `כדשגכחךלדגכחשךדגחכךלדגכ`; + + --echo # --echo # End of 5.0 tests --echo # + From d1fb6bbcc890955e634d644a002a707c3d8e7f67 Mon Sep 17 00:00:00 2001 From: "Tatiana A. Nurnberg" Date: Tue, 3 Feb 2009 02:43:32 +0100 Subject: [PATCH 006/132] Bug#40657: assertion with out of range variables and traditional sql_mode In STRICT mode, out-of-bounds values caused an error message to be queued (rather than just a warning), without any further error-like processing happening. (The error is queued during update, at which time it's too late. For it to be processed properly, it would need to be queued during check-stage.) The assertion rightfully complains that we're trying to send an OK while having an error queued. Changeset breaks a lot of tests out into check-stage. This also allows us to send more correct warnings/error messages. mysql-test/r/auto_increment_increment_basic.result: update test results reflecting more correct warnings mysql-test/r/auto_increment_increment_func.result: update test results reflecting more correct warnings mysql-test/r/auto_increment_offset_basic.result: update test results reflecting more correct warnings mysql-test/r/auto_increment_offset_func.result: update test results reflecting more correct warnings mysql-test/r/concurrent_insert_basic.result: update test results reflecting more correct warnings mysql-test/r/connect_timeout_basic.result: update test results reflecting more correct warnings mysql-test/r/default_week_format_basic.result: update test results reflecting more correct warnings mysql-test/r/delayed_insert_timeout_basic.result: update test results reflecting more correct warnings mysql-test/r/div_precision_increment_basic.result: update test results reflecting more correct warnings mysql-test/r/expire_logs_days_basic.result: update test results reflecting more correct warnings mysql-test/r/group_concat_max_len_basic.result: update test results reflecting more correct warnings mysql-test/r/interactive_timeout_basic.result: update test results reflecting more correct warnings mysql-test/r/max_allowed_packet_basic.result: update test results reflecting more correct warnings mysql-test/r/max_binlog_size_basic.result: update test results reflecting more correct warnings mysql-test/r/max_connections_basic.result: update test results reflecting more correct warnings mysql-test/r/max_delayed_threads_basic.result: update test results reflecting more correct warnings mysql-test/r/max_error_count_basic.result: update test results reflecting more correct warnings mysql-test/r/max_insert_delayed_threads_basic.result: update test results reflecting more correct warnings mysql-test/r/max_length_for_sort_data_basic.result: update test results reflecting more correct warnings mysql-test/r/max_prepared_stmt_count_basic.result: update test results reflecting more correct warnings mysql-test/r/max_relay_log_size_basic.result: update test results reflecting more correct warnings mysql-test/r/max_sort_length_basic.result: update test results reflecting more correct warnings mysql-test/r/max_sp_recursion_depth_basic.result: update test results reflecting more correct warnings mysql-test/r/myisam_data_pointer_size_basic.result: update test results reflecting more correct warnings mysql-test/r/net_buffer_length_basic.result: update test results reflecting more correct warnings mysql-test/r/net_read_timeout_basic.result: update test results reflecting more correct warnings mysql-test/r/net_write_timeout_basic.result: update test results reflecting more correct warnings mysql-test/r/optimizer_prune_level_basic.result: update test results reflecting more correct warnings mysql-test/r/optimizer_search_depth_basic.result: update test results reflecting more correct warnings mysql-test/r/preload_buffer_size_basic.result: update test results reflecting more correct warnings mysql-test/r/ps.result: update test results reflecting more correct warnings mysql-test/r/read_buffer_size_basic.result: update test results reflecting more correct warnings mysql-test/r/read_rnd_buffer_size_basic.result: update test results reflecting more correct warnings mysql-test/r/slave_net_timeout_basic.result: update test results reflecting more correct warnings mysql-test/r/slow_launch_time_basic.result: update test results reflecting more correct warnings mysql-test/r/table_definition_cache_basic.result: update test results reflecting more correct warnings mysql-test/r/table_lock_wait_timeout_basic.result: update test results reflecting more correct warnings mysql-test/r/table_open_cache_basic.result: update test results reflecting more correct warnings mysql-test/r/variables.result: add test case that throws error (rather than warning) in the middle of trying to set a system-variable. mysql-test/t/variables.test: add test case that throws error (rather than warning) in the middle of trying to set a system-variable. sql/set_var.cc: Add comments. Prevent double-warnings. Through warnings for negative values given to unsigned system-variables. Process errors and warnings at check() stage rather than update() stage, since we may only issue warnings at the latter. --- .../r/auto_increment_increment_basic.result | 4 +- .../r/auto_increment_increment_func.result | 2 +- .../r/auto_increment_offset_basic.result | 4 +- .../r/auto_increment_offset_func.result | 2 +- mysql-test/r/concurrent_insert_basic.result | 2 + mysql-test/r/connect_timeout_basic.result | 2 +- mysql-test/r/default_week_format_basic.result | 4 + .../r/delayed_insert_timeout_basic.result | 2 +- .../r/div_precision_increment_basic.result | 4 + mysql-test/r/expire_logs_days_basic.result | 4 + .../r/group_concat_max_len_basic.result | 4 +- mysql-test/r/interactive_timeout_basic.result | 4 +- mysql-test/r/max_allowed_packet_basic.result | 2 +- mysql-test/r/max_binlog_size_basic.result | 4 +- mysql-test/r/max_connections_basic.result | 4 +- mysql-test/r/max_delayed_threads_basic.result | 4 + mysql-test/r/max_error_count_basic.result | 8 + .../r/max_insert_delayed_threads_basic.result | 4 + .../r/max_length_for_sort_data_basic.result | 4 +- .../r/max_prepared_stmt_count_basic.result | 4 + mysql-test/r/max_relay_log_size_basic.result | 4 + mysql-test/r/max_sort_length_basic.result | 4 +- .../r/max_sp_recursion_depth_basic.result | 8 + .../r/myisam_data_pointer_size_basic.result | 2 +- mysql-test/r/net_buffer_length_basic.result | 2 +- mysql-test/r/net_read_timeout_basic.result | 4 +- mysql-test/r/net_write_timeout_basic.result | 4 +- .../r/optimizer_prune_level_basic.result | 4 + .../r/optimizer_search_depth_basic.result | 4 + mysql-test/r/preload_buffer_size_basic.result | 4 +- mysql-test/r/ps.result | 2 + mysql-test/r/read_buffer_size_basic.result | 4 +- .../r/read_rnd_buffer_size_basic.result | 4 +- mysql-test/r/slave_net_timeout_basic.result | 4 +- mysql-test/r/slow_launch_time_basic.result | 4 + .../r/table_definition_cache_basic.result | 2 +- .../r/table_lock_wait_timeout_basic.result | 4 +- mysql-test/r/table_open_cache_basic.result | 4 +- mysql-test/r/variables.result | 35 +++- mysql-test/t/variables.test | 35 ++++ sql/set_var.cc | 181 +++++++++++++----- 41 files changed, 297 insertions(+), 94 deletions(-) diff --git a/mysql-test/r/auto_increment_increment_basic.result b/mysql-test/r/auto_increment_increment_basic.result index c453d2322cf..75f76a60b33 100644 --- a/mysql-test/r/auto_increment_increment_basic.result +++ b/mysql-test/r/auto_increment_increment_basic.result @@ -61,7 +61,7 @@ SELECT @@global.auto_increment_increment; 1 SET @@global.auto_increment_increment = -1024; Warnings: -Warning 1292 Truncated incorrect auto-increment-increment value: '0' +Warning 1292 Truncated incorrect auto_increment_increment value: '-1024' SELECT @@global.auto_increment_increment; @@global.auto_increment_increment 1 @@ -89,7 +89,7 @@ SELECT @@session.auto_increment_increment; 1 SET @@session.auto_increment_increment = -2; Warnings: -Warning 1292 Truncated incorrect auto-increment-increment value: '0' +Warning 1292 Truncated incorrect auto_increment_increment value: '-2' SELECT @@session.auto_increment_increment; @@session.auto_increment_increment 1 diff --git a/mysql-test/r/auto_increment_increment_func.result b/mysql-test/r/auto_increment_increment_func.result index f0f1ada6d95..eeaa3949886 100644 --- a/mysql-test/r/auto_increment_increment_func.result +++ b/mysql-test/r/auto_increment_increment_func.result @@ -169,7 +169,7 @@ id name ## Verifying behavior of variable with negative value ## SET @@auto_increment_increment = -10; Warnings: -Warning 1292 Truncated incorrect auto-increment-increment value: '0' +Warning 1292 Truncated incorrect auto_increment_increment value: '-10' INSERT into t1(name) values('Record_17'); INSERT into t1(name) values('Record_18'); SELECT * from t1; diff --git a/mysql-test/r/auto_increment_offset_basic.result b/mysql-test/r/auto_increment_offset_basic.result index b5ccca8ce56..f91037cb7cf 100644 --- a/mysql-test/r/auto_increment_offset_basic.result +++ b/mysql-test/r/auto_increment_offset_basic.result @@ -61,7 +61,7 @@ SELECT @@global.auto_increment_offset; 1 SET @@global.auto_increment_offset = -1024; Warnings: -Warning 1292 Truncated incorrect auto-increment-offset value: '0' +Warning 1292 Truncated incorrect auto_increment_offset value: '-1024' SELECT @@global.auto_increment_offset; @@global.auto_increment_offset 1 @@ -94,7 +94,7 @@ SELECT @@session.auto_increment_offset; 1 SET @@session.auto_increment_offset = -2; Warnings: -Warning 1292 Truncated incorrect auto-increment-offset value: '0' +Warning 1292 Truncated incorrect auto_increment_offset value: '-2' SELECT @@session.auto_increment_offset; @@session.auto_increment_offset 1 diff --git a/mysql-test/r/auto_increment_offset_func.result b/mysql-test/r/auto_increment_offset_func.result index 5c953544e73..e166cb149f6 100644 --- a/mysql-test/r/auto_increment_offset_func.result +++ b/mysql-test/r/auto_increment_offset_func.result @@ -178,7 +178,7 @@ id name ## Assigning -ve value to variable ## SET @@auto_increment_offset = -10; Warnings: -Warning 1292 Truncated incorrect auto-increment-offset value: '0' +Warning 1292 Truncated incorrect auto_increment_offset value: '-10' SELECT @@auto_increment_offset = -10; @@auto_increment_offset = -10 0 diff --git a/mysql-test/r/concurrent_insert_basic.result b/mysql-test/r/concurrent_insert_basic.result index e6614ea6abb..2c7fc4296dd 100644 --- a/mysql-test/r/concurrent_insert_basic.result +++ b/mysql-test/r/concurrent_insert_basic.result @@ -28,6 +28,8 @@ SELECT @@global.concurrent_insert; 2 '#--------------------FN_DYNVARS_018_04-------------------------#' SET @@global.concurrent_insert = -1; +Warnings: +Warning 1292 Truncated incorrect concurrent_insert value: '-1' Select @@global.concurrent_insert; @@global.concurrent_insert 0 diff --git a/mysql-test/r/connect_timeout_basic.result b/mysql-test/r/connect_timeout_basic.result index 7cdd747fc15..cc84405cf86 100644 --- a/mysql-test/r/connect_timeout_basic.result +++ b/mysql-test/r/connect_timeout_basic.result @@ -35,7 +35,7 @@ SELECT @@global.connect_timeout; 2 SET @@global.connect_timeout = -1024; Warnings: -Warning 1292 Truncated incorrect connect_timeout value: '0' +Warning 1292 Truncated incorrect connect_timeout value: '-1024' SELECT @@global.connect_timeout; @@global.connect_timeout 2 diff --git a/mysql-test/r/default_week_format_basic.result b/mysql-test/r/default_week_format_basic.result index d513ef1c41e..aa5e0b264d3 100644 --- a/mysql-test/r/default_week_format_basic.result +++ b/mysql-test/r/default_week_format_basic.result @@ -64,6 +64,8 @@ SELECT @@global.default_week_format; @@global.default_week_format 7 SET @@global.default_week_format = -1024; +Warnings: +Warning 1292 Truncated incorrect default_week_format value: '-1024' SELECT @@global.default_week_format; @@global.default_week_format 0 @@ -100,6 +102,8 @@ SELECT @@session.default_week_format; @@session.default_week_format 7 SET @@session.default_week_format = -2; +Warnings: +Warning 1292 Truncated incorrect default_week_format value: '-2' SELECT @@session.default_week_format; @@session.default_week_format 0 diff --git a/mysql-test/r/delayed_insert_timeout_basic.result b/mysql-test/r/delayed_insert_timeout_basic.result index 4049907eb80..e8eab4da3cc 100644 --- a/mysql-test/r/delayed_insert_timeout_basic.result +++ b/mysql-test/r/delayed_insert_timeout_basic.result @@ -35,7 +35,7 @@ SELECT @@global.delayed_insert_timeout; 1 SET @@global.delayed_insert_timeout = -1024; Warnings: -Warning 1292 Truncated incorrect delayed_insert_timeout value: '0' +Warning 1292 Truncated incorrect delayed_insert_timeout value: '-1024' SELECT @@global.delayed_insert_timeout; @@global.delayed_insert_timeout 1 diff --git a/mysql-test/r/div_precision_increment_basic.result b/mysql-test/r/div_precision_increment_basic.result index d0311afa681..f78855fcaae 100644 --- a/mysql-test/r/div_precision_increment_basic.result +++ b/mysql-test/r/div_precision_increment_basic.result @@ -78,6 +78,8 @@ SELECT @@global.div_precision_increment; @@global.div_precision_increment 30 SET @@global.div_precision_increment = -1024; +Warnings: +Warning 1292 Truncated incorrect div_precision_increment value: '-1024' SELECT @@global.div_precision_increment; @@global.div_precision_increment 0 @@ -100,6 +102,8 @@ SELECT @@session.div_precision_increment; @@session.div_precision_increment 30 SET @@session.div_precision_increment = -2; +Warnings: +Warning 1292 Truncated incorrect div_precision_increment value: '-2' SELECT @@session.div_precision_increment; @@session.div_precision_increment 0 diff --git a/mysql-test/r/expire_logs_days_basic.result b/mysql-test/r/expire_logs_days_basic.result index 66aa5fa42a5..1abab8e68b0 100644 --- a/mysql-test/r/expire_logs_days_basic.result +++ b/mysql-test/r/expire_logs_days_basic.result @@ -32,6 +32,8 @@ SELECT @@global.expire_logs_days; 21 '#--------------------FN_DYNVARS_029_04-------------------------#' SET @@global.expire_logs_days = -1; +Warnings: +Warning 1292 Truncated incorrect expire_logs_days value: '-1' SELECT @@global.expire_logs_days; @@global.expire_logs_days 0 @@ -53,6 +55,8 @@ SELECT @@global.expire_logs_days; @@global.expire_logs_days 99 SET @@global.expire_logs_days = -1024; +Warnings: +Warning 1292 Truncated incorrect expire_logs_days value: '-1024' SELECT @@global.expire_logs_days; @@global.expire_logs_days 0 diff --git a/mysql-test/r/group_concat_max_len_basic.result b/mysql-test/r/group_concat_max_len_basic.result index 5704f00c014..4821ca91308 100644 --- a/mysql-test/r/group_concat_max_len_basic.result +++ b/mysql-test/r/group_concat_max_len_basic.result @@ -65,7 +65,7 @@ SELECT @@global.group_concat_max_len; 4 SET @@global.group_concat_max_len = -1024; Warnings: -Warning 1292 Truncated incorrect group_concat_max_len value: '0' +Warning 1292 Truncated incorrect group_concat_max_len value: '-1024' SELECT @@global.group_concat_max_len; @@global.group_concat_max_len 4 @@ -91,7 +91,7 @@ SELECT @@session.group_concat_max_len; 4 SET @@session.group_concat_max_len = -2; Warnings: -Warning 1292 Truncated incorrect group_concat_max_len value: '0' +Warning 1292 Truncated incorrect group_concat_max_len value: '-2' SELECT @@session.group_concat_max_len; @@session.group_concat_max_len 4 diff --git a/mysql-test/r/interactive_timeout_basic.result b/mysql-test/r/interactive_timeout_basic.result index 0777596db07..519fef8a6e5 100644 --- a/mysql-test/r/interactive_timeout_basic.result +++ b/mysql-test/r/interactive_timeout_basic.result @@ -61,7 +61,7 @@ SELECT @@global.interactive_timeout; 1 SET @@global.interactive_timeout = -1024; Warnings: -Warning 1292 Truncated incorrect interactive_timeout value: '0' +Warning 1292 Truncated incorrect interactive_timeout value: '-1024' SELECT @@global.interactive_timeout; @@global.interactive_timeout 1 @@ -89,7 +89,7 @@ SELECT @@session.interactive_timeout; 1 SET @@session.interactive_timeout = -2; Warnings: -Warning 1292 Truncated incorrect interactive_timeout value: '0' +Warning 1292 Truncated incorrect interactive_timeout value: '-2' SELECT @@session.interactive_timeout; @@session.interactive_timeout 1 diff --git a/mysql-test/r/max_allowed_packet_basic.result b/mysql-test/r/max_allowed_packet_basic.result index 0745d5a36e1..ca5b87f19cb 100644 --- a/mysql-test/r/max_allowed_packet_basic.result +++ b/mysql-test/r/max_allowed_packet_basic.result @@ -76,7 +76,7 @@ SELECT @@global.max_allowed_packet; 1024 SET @@global.max_allowed_packet = -1024; Warnings: -Warning 1292 Truncated incorrect max_allowed_packet value: '0' +Warning 1292 Truncated incorrect max_allowed_packet value: '-1024' SELECT @@global.max_allowed_packet; @@global.max_allowed_packet 1024 diff --git a/mysql-test/r/max_binlog_size_basic.result b/mysql-test/r/max_binlog_size_basic.result index 291b687f76c..658289628b0 100644 --- a/mysql-test/r/max_binlog_size_basic.result +++ b/mysql-test/r/max_binlog_size_basic.result @@ -39,7 +39,7 @@ SELECT @@global.max_binlog_size; '#--------------------FN_DYNVARS_072_04-------------------------#' SET @@global.max_binlog_size = -1; Warnings: -Warning 1292 Truncated incorrect max_binlog_size value: '0' +Warning 1292 Truncated incorrect max_binlog_size value: '-1' SELECT @@global.max_binlog_size; @@global.max_binlog_size 4096 @@ -56,7 +56,7 @@ SELECT @@global.max_binlog_size; 1073741824 SET @@global.max_binlog_size = -1024; Warnings: -Warning 1292 Truncated incorrect max_binlog_size value: '0' +Warning 1292 Truncated incorrect max_binlog_size value: '-1024' SELECT @@global.max_binlog_size; @@global.max_binlog_size 4096 diff --git a/mysql-test/r/max_connections_basic.result b/mysql-test/r/max_connections_basic.result index ccedff01c54..d917cd97b25 100644 --- a/mysql-test/r/max_connections_basic.result +++ b/mysql-test/r/max_connections_basic.result @@ -39,7 +39,7 @@ SELECT @@global.max_connections; '#--------------------FN_DYNVARS_074_04-------------------------#' SET @@global.max_connections = -1; Warnings: -Warning 1292 Truncated incorrect max_connections value: '0' +Warning 1292 Truncated incorrect max_connections value: '-1' SELECT @@global.max_connections; @@global.max_connections 1 @@ -56,7 +56,7 @@ SELECT @@global.max_connections; 100000 SET @@global.max_connections = -1024; Warnings: -Warning 1292 Truncated incorrect max_connections value: '0' +Warning 1292 Truncated incorrect max_connections value: '-1024' SELECT @@global.max_connections; @@global.max_connections 1 diff --git a/mysql-test/r/max_delayed_threads_basic.result b/mysql-test/r/max_delayed_threads_basic.result index e0b2a3ee1cd..946c24e3082 100644 --- a/mysql-test/r/max_delayed_threads_basic.result +++ b/mysql-test/r/max_delayed_threads_basic.result @@ -76,10 +76,14 @@ SELECT @@session.max_delayed_threads; 16383 '#------------------FN_DYNVARS_075_05-----------------------#' SET @@global.max_delayed_threads = -1024; +Warnings: +Warning 1292 Truncated incorrect max_delayed_threads value: '-1024' SELECT @@global.max_delayed_threads; @@global.max_delayed_threads 0 SET @@global.max_delayed_threads = -1; +Warnings: +Warning 1292 Truncated incorrect max_delayed_threads value: '-1' SELECT @@global.max_delayed_threads; @@global.max_delayed_threads 0 diff --git a/mysql-test/r/max_error_count_basic.result b/mysql-test/r/max_error_count_basic.result index 2046a5e9dfa..7be8e0f37a3 100644 --- a/mysql-test/r/max_error_count_basic.result +++ b/mysql-test/r/max_error_count_basic.result @@ -63,10 +63,14 @@ SELECT @@session.max_error_count; 65534 '#------------------FN_DYNVARS_076_05-----------------------#' SET @@global.max_error_count = -1; +Warnings: +Warning 1292 Truncated incorrect max_error_count value: '-1' SELECT @@global.max_error_count; @@global.max_error_count 0 SET @@global.max_error_count = -1024; +Warnings: +Warning 1292 Truncated incorrect max_error_count value: '-1024' SELECT @@global.max_error_count; @@global.max_error_count 0 @@ -93,6 +97,8 @@ SELECT @@global.max_error_count; @@global.max_error_count 65535 SET @@session.max_error_count = -1; +Warnings: +Warning 1292 Truncated incorrect max_error_count value: '-1' SELECT @@session.max_error_count; @@session.max_error_count 0 @@ -102,6 +108,8 @@ SELECT @@session.max_error_count; @@session.max_error_count 65535 SET @@session.max_error_count = -2; +Warnings: +Warning 1292 Truncated incorrect max_error_count value: '-2' SELECT @@session.max_error_count; @@session.max_error_count 0 diff --git a/mysql-test/r/max_insert_delayed_threads_basic.result b/mysql-test/r/max_insert_delayed_threads_basic.result index 31c1fcec396..2f2f7f0c0fc 100644 --- a/mysql-test/r/max_insert_delayed_threads_basic.result +++ b/mysql-test/r/max_insert_delayed_threads_basic.result @@ -77,10 +77,14 @@ SELECT @@session.max_insert_delayed_threads; 16383 '#------------------FN_DYNVARS_078_05-----------------------#' SET @@global.max_insert_delayed_threads = -1024; +Warnings: +Warning 1292 Truncated incorrect max_insert_delayed_threads value: '-1024' SELECT @@global.max_insert_delayed_threads; @@global.max_insert_delayed_threads 0 SET @@global.max_insert_delayed_threads = -1; +Warnings: +Warning 1292 Truncated incorrect max_insert_delayed_threads value: '-1' SELECT @@global.max_insert_delayed_threads; @@global.max_insert_delayed_threads 0 diff --git a/mysql-test/r/max_length_for_sort_data_basic.result b/mysql-test/r/max_length_for_sort_data_basic.result index 3edd3e86262..8936946c774 100644 --- a/mysql-test/r/max_length_for_sort_data_basic.result +++ b/mysql-test/r/max_length_for_sort_data_basic.result @@ -71,7 +71,7 @@ SELECT @@session.max_length_for_sort_data; '#------------------FN_DYNVARS_080_05-----------------------#' SET @@global.max_length_for_sort_data = -1024; Warnings: -Warning 1292 Truncated incorrect max_length_for_sort_data value: '0' +Warning 1292 Truncated incorrect max_length_for_sort_data value: '-1024' SELECT @@global.max_length_for_sort_data; @@global.max_length_for_sort_data 4 @@ -111,7 +111,7 @@ SELECT @@session.max_length_for_sort_data; 8388608 SET @@session.max_length_for_sort_data = -1; Warnings: -Warning 1292 Truncated incorrect max_length_for_sort_data value: '0' +Warning 1292 Truncated incorrect max_length_for_sort_data value: '-1' SELECT @@session.max_length_for_sort_data; @@session.max_length_for_sort_data 4 diff --git a/mysql-test/r/max_prepared_stmt_count_basic.result b/mysql-test/r/max_prepared_stmt_count_basic.result index ebc7da8c7f8..9c28c287980 100644 --- a/mysql-test/r/max_prepared_stmt_count_basic.result +++ b/mysql-test/r/max_prepared_stmt_count_basic.result @@ -36,6 +36,8 @@ SELECT @@global.max_prepared_stmt_count; 65535 '#--------------------FN_DYNVARS_081_04-------------------------#' SET @@global.max_prepared_stmt_count = -1; +Warnings: +Warning 1292 Truncated incorrect max_prepared_stmt_count value: '-1' SELECT @@global.max_prepared_stmt_count; @@global.max_prepared_stmt_count 0 @@ -51,6 +53,8 @@ SELECT @@global.max_prepared_stmt_count; @@global.max_prepared_stmt_count 1048576 SET @@global.max_prepared_stmt_count = -1024; +Warnings: +Warning 1292 Truncated incorrect max_prepared_stmt_count value: '-1024' SELECT @@global.max_prepared_stmt_count; @@global.max_prepared_stmt_count 0 diff --git a/mysql-test/r/max_relay_log_size_basic.result b/mysql-test/r/max_relay_log_size_basic.result index c0042f497ad..168459cf7b6 100644 --- a/mysql-test/r/max_relay_log_size_basic.result +++ b/mysql-test/r/max_relay_log_size_basic.result @@ -38,6 +38,8 @@ SELECT @@global.max_relay_log_size; 'Bug# 34877: Invalid Values are coming in variable on assigning valid values'; '#--------------------FN_DYNVARS_082_04-------------------------#' SET @@global.max_relay_log_size = -1; +Warnings: +Warning 1292 Truncated incorrect max_relay_log_size value: '-1' SELECT @@global.max_relay_log_size; @@global.max_relay_log_size 0 @@ -53,6 +55,8 @@ SELECT @@global.max_relay_log_size; @@global.max_relay_log_size 1073741824 SET @@global.max_relay_log_size = -1024; +Warnings: +Warning 1292 Truncated incorrect max_relay_log_size value: '-1024' SELECT @@global.max_relay_log_size; @@global.max_relay_log_size 0 diff --git a/mysql-test/r/max_sort_length_basic.result b/mysql-test/r/max_sort_length_basic.result index 73dd31ea4e7..f0a9ca83376 100644 --- a/mysql-test/r/max_sort_length_basic.result +++ b/mysql-test/r/max_sort_length_basic.result @@ -71,7 +71,7 @@ SELECT @@session.max_sort_length; '#------------------FN_DYNVARS_084_05-----------------------#' SET @@global.max_sort_length = -1024; Warnings: -Warning 1292 Truncated incorrect max_sort_length value: '0' +Warning 1292 Truncated incorrect max_sort_length value: '-1024' SELECT @@global.max_sort_length; @@global.max_sort_length 4 @@ -111,7 +111,7 @@ SELECT @@session.max_sort_length; 8388608 SET @@session.max_sort_length = -1; Warnings: -Warning 1292 Truncated incorrect max_sort_length value: '0' +Warning 1292 Truncated incorrect max_sort_length value: '-1' SELECT @@session.max_sort_length; @@session.max_sort_length 4 diff --git a/mysql-test/r/max_sp_recursion_depth_basic.result b/mysql-test/r/max_sp_recursion_depth_basic.result index 8c79f3c5fc7..e5f267253f4 100644 --- a/mysql-test/r/max_sp_recursion_depth_basic.result +++ b/mysql-test/r/max_sp_recursion_depth_basic.result @@ -74,6 +74,8 @@ SELECT @@session.max_sp_recursion_depth; 150 '#------------------FN_DYNVARS_085_05-----------------------#' SET @@global.max_sp_recursion_depth = -1024; +Warnings: +Warning 1292 Truncated incorrect max_sp_recursion_depth value: '-1024' SELECT @@global.max_sp_recursion_depth; @@global.max_sp_recursion_depth 0 @@ -84,6 +86,8 @@ SELECT @@global.max_sp_recursion_depth; @@global.max_sp_recursion_depth 255 SET @@global.max_sp_recursion_depth = -1; +Warnings: +Warning 1292 Truncated incorrect max_sp_recursion_depth value: '-1' SELECT @@global.max_sp_recursion_depth; @@global.max_sp_recursion_depth 0 @@ -110,6 +114,8 @@ SELECT @@session.max_sp_recursion_depth; @@session.max_sp_recursion_depth 255 SET @@session.max_sp_recursion_depth = -1; +Warnings: +Warning 1292 Truncated incorrect max_sp_recursion_depth value: '-1' SELECT @@session.max_sp_recursion_depth; @@session.max_sp_recursion_depth 0 @@ -120,6 +126,8 @@ SELECT @@session.max_sp_recursion_depth; @@session.max_sp_recursion_depth 255 SET @@session.max_sp_recursion_depth = -001; +Warnings: +Warning 1292 Truncated incorrect max_sp_recursion_depth value: '-1' SELECT @@session.max_sp_recursion_depth; @@session.max_sp_recursion_depth 0 diff --git a/mysql-test/r/myisam_data_pointer_size_basic.result b/mysql-test/r/myisam_data_pointer_size_basic.result index d2b0bebe029..86f7788fcdf 100644 --- a/mysql-test/r/myisam_data_pointer_size_basic.result +++ b/mysql-test/r/myisam_data_pointer_size_basic.result @@ -48,7 +48,7 @@ ERROR HY000: Variable 'myisam_data_pointer_size' is a GLOBAL variable and should '#------------------FN_DYNVARS_093_05-----------------------#' SET @@global.myisam_data_pointer_size = -1; Warnings: -Warning 1292 Truncated incorrect myisam_data_pointer_size value: '0' +Warning 1292 Truncated incorrect myisam_data_pointer_size value: '-1' SELECT @@global.myisam_data_pointer_size; @@global.myisam_data_pointer_size 2 diff --git a/mysql-test/r/net_buffer_length_basic.result b/mysql-test/r/net_buffer_length_basic.result index be7e9082332..07f933b5a4b 100644 --- a/mysql-test/r/net_buffer_length_basic.result +++ b/mysql-test/r/net_buffer_length_basic.result @@ -50,7 +50,7 @@ SELECT @@global.net_buffer_length; 1024 SET @@global.net_buffer_length = -1024; Warnings: -Warning 1292 Truncated incorrect net_buffer_length value: '0' +Warning 1292 Truncated incorrect net_buffer_length value: '-1024' SELECT @@global.net_buffer_length; @@global.net_buffer_length 1024 diff --git a/mysql-test/r/net_read_timeout_basic.result b/mysql-test/r/net_read_timeout_basic.result index 90a6ef72718..aeee25c6526 100644 --- a/mysql-test/r/net_read_timeout_basic.result +++ b/mysql-test/r/net_read_timeout_basic.result @@ -61,7 +61,7 @@ SELECT @@global.net_read_timeout; 1 SET @@global.net_read_timeout = -1024; Warnings: -Warning 1292 Truncated incorrect net_read_timeout value: '0' +Warning 1292 Truncated incorrect net_read_timeout value: '-1024' SELECT @@global.net_read_timeout; @@global.net_read_timeout 1 @@ -89,7 +89,7 @@ SELECT @@session.net_read_timeout; 1 SET @@session.net_read_timeout = -2; Warnings: -Warning 1292 Truncated incorrect net_read_timeout value: '0' +Warning 1292 Truncated incorrect net_read_timeout value: '-2' SELECT @@session.net_read_timeout; @@session.net_read_timeout 1 diff --git a/mysql-test/r/net_write_timeout_basic.result b/mysql-test/r/net_write_timeout_basic.result index 35a2cf069e3..8857b8c0e37 100644 --- a/mysql-test/r/net_write_timeout_basic.result +++ b/mysql-test/r/net_write_timeout_basic.result @@ -61,7 +61,7 @@ SELECT @@global.net_write_timeout; 1 SET @@global.net_write_timeout = -1024; Warnings: -Warning 1292 Truncated incorrect net_write_timeout value: '0' +Warning 1292 Truncated incorrect net_write_timeout value: '-1024' SELECT @@global.net_write_timeout; @@global.net_write_timeout 1 @@ -89,7 +89,7 @@ SELECT @@session.net_write_timeout; 1 SET @@session.net_write_timeout = -2; Warnings: -Warning 1292 Truncated incorrect net_write_timeout value: '0' +Warning 1292 Truncated incorrect net_write_timeout value: '-2' SELECT @@session.net_write_timeout; @@session.net_write_timeout 1 diff --git a/mysql-test/r/optimizer_prune_level_basic.result b/mysql-test/r/optimizer_prune_level_basic.result index 46fe70c40d0..c126569ebcd 100644 --- a/mysql-test/r/optimizer_prune_level_basic.result +++ b/mysql-test/r/optimizer_prune_level_basic.result @@ -81,6 +81,8 @@ ERROR 42000: Incorrect argument type to variable 'optimizer_prune_level' SET @@global.optimizer_prune_level = FELSE; ERROR 42000: Incorrect argument type to variable 'optimizer_prune_level' SET @@global.optimizer_prune_level = -1024; +Warnings: +Warning 1292 Truncated incorrect optimizer_prune_level value: '-1024' SELECT @@global.optimizer_prune_level; @@global.optimizer_prune_level 0 @@ -107,6 +109,8 @@ ERROR 42000: Incorrect argument type to variable 'optimizer_prune_level' SET @@session.optimizer_prune_level = 'OFN'; ERROR 42000: Incorrect argument type to variable 'optimizer_prune_level' SET @@session.optimizer_prune_level = -2; +Warnings: +Warning 1292 Truncated incorrect optimizer_prune_level value: '-2' SELECT @@session.optimizer_prune_level; @@session.optimizer_prune_level 0 diff --git a/mysql-test/r/optimizer_search_depth_basic.result b/mysql-test/r/optimizer_search_depth_basic.result index 9c26339839e..9c49ae7e73f 100644 --- a/mysql-test/r/optimizer_search_depth_basic.result +++ b/mysql-test/r/optimizer_search_depth_basic.result @@ -72,6 +72,8 @@ SELECT @@global.optimizer_search_depth; @@global.optimizer_search_depth 63 SET @@global.optimizer_search_depth = -1; +Warnings: +Warning 1292 Truncated incorrect optimizer_search_depth value: '-1' SELECT @@global.optimizer_search_depth; @@global.optimizer_search_depth 0 @@ -98,6 +100,8 @@ SELECT @@session.optimizer_search_depth; @@session.optimizer_search_depth 63 SET @@session.optimizer_search_depth = -2; +Warnings: +Warning 1292 Truncated incorrect optimizer_search_depth value: '-2' SELECT @@session.optimizer_search_depth; @@session.optimizer_search_depth 0 diff --git a/mysql-test/r/preload_buffer_size_basic.result b/mysql-test/r/preload_buffer_size_basic.result index 775b670d3bc..fd8bdd222d2 100644 --- a/mysql-test/r/preload_buffer_size_basic.result +++ b/mysql-test/r/preload_buffer_size_basic.result @@ -77,7 +77,7 @@ SELECT @@global.preload_buffer_size; 1024 SET @@global.preload_buffer_size = -1; Warnings: -Warning 1292 Truncated incorrect preload_buffer_size value: '0' +Warning 1292 Truncated incorrect preload_buffer_size value: '-1' SELECT @@global.preload_buffer_size; @@global.preload_buffer_size 1024 @@ -111,7 +111,7 @@ SELECT @@session.preload_buffer_size; 1024 SET @@session.preload_buffer_size = -2; Warnings: -Warning 1292 Truncated incorrect preload_buffer_size value: '0' +Warning 1292 Truncated incorrect preload_buffer_size value: '-2' SELECT @@session.preload_buffer_size; @@session.preload_buffer_size 1024 diff --git a/mysql-test/r/ps.result b/mysql-test/r/ps.result index 05b2d18889b..df996f0f515 100644 --- a/mysql-test/r/ps.result +++ b/mysql-test/r/ps.result @@ -803,6 +803,8 @@ select @@max_prepared_stmt_count; @@max_prepared_stmt_count 16382 set global max_prepared_stmt_count=-1; +Warnings: +Warning 1292 Truncated incorrect max_prepared_stmt_count value: '-1' select @@max_prepared_stmt_count; @@max_prepared_stmt_count 0 diff --git a/mysql-test/r/read_buffer_size_basic.result b/mysql-test/r/read_buffer_size_basic.result index 799f7b56235..fe4fa4138c1 100644 --- a/mysql-test/r/read_buffer_size_basic.result +++ b/mysql-test/r/read_buffer_size_basic.result @@ -81,7 +81,7 @@ SELECT @@global.read_buffer_size= 8200 OR @@global.read_buffer_size= 8228 ; 1 SET @@global.read_buffer_size = -1024; Warnings: -Warning 1292 Truncated incorrect read_buffer_size value: '0' +Warning 1292 Truncated incorrect read_buffer_size value: '-1024' SELECT @@global.read_buffer_size= 8200 OR @@global.read_buffer_size= 8228 ; @@global.read_buffer_size= 8200 OR @@global.read_buffer_size= 8228 1 @@ -107,7 +107,7 @@ SELECT @@session.read_buffer_size= 8200 OR @@session.read_buffer_size= 8228 ; 1 SET @@session.read_buffer_size = -2; Warnings: -Warning 1292 Truncated incorrect read_buffer_size value: '0' +Warning 1292 Truncated incorrect read_buffer_size value: '-2' SELECT @@session.read_buffer_size= 8200 OR @@session.read_buffer_size= 8228 ; @@session.read_buffer_size= 8200 OR @@session.read_buffer_size= 8228 1 diff --git a/mysql-test/r/read_rnd_buffer_size_basic.result b/mysql-test/r/read_rnd_buffer_size_basic.result index c51b0591054..f0c73409430 100644 --- a/mysql-test/r/read_rnd_buffer_size_basic.result +++ b/mysql-test/r/read_rnd_buffer_size_basic.result @@ -83,7 +83,7 @@ SELECT @@global.read_rnd_buffer_size= 8200 OR @@global.read_rnd_buffer_size= 822 1 SET @@global.read_rnd_buffer_size = -1024; Warnings: -Warning 1292 Truncated incorrect read_rnd_buffer_size value: '0' +Warning 1292 Truncated incorrect read_rnd_buffer_size value: '-1024' SELECT @@global.read_rnd_buffer_size= 8200 OR @@global.read_rnd_buffer_size= 8228; @@global.read_rnd_buffer_size= 8200 OR @@global.read_rnd_buffer_size= 8228 1 @@ -109,7 +109,7 @@ SELECT @@session.read_rnd_buffer_size= 8200 OR @@session.read_rnd_buffer_size= 8 1 SET @@session.read_rnd_buffer_size = -2; Warnings: -Warning 1292 Truncated incorrect read_rnd_buffer_size value: '0' +Warning 1292 Truncated incorrect read_rnd_buffer_size value: '-2' SELECT @@session.read_rnd_buffer_size= 8200 OR @@session.read_rnd_buffer_size= 8228; @@session.read_rnd_buffer_size= 8200 OR @@session.read_rnd_buffer_size= 8228 1 diff --git a/mysql-test/r/slave_net_timeout_basic.result b/mysql-test/r/slave_net_timeout_basic.result index d672d0152d7..fb8812745cc 100644 --- a/mysql-test/r/slave_net_timeout_basic.result +++ b/mysql-test/r/slave_net_timeout_basic.result @@ -58,13 +58,13 @@ ERROR HY000: Variable 'slave_net_timeout' is a GLOBAL variable and should be set '#------------------FN_DYNVARS_146_05-----------------------#' SET @@global.slave_net_timeout = -1; Warnings: -Warning 1292 Truncated incorrect slave_net_timeout value: '0' +Warning 1292 Truncated incorrect slave_net_timeout value: '-1' SELECT @@global.slave_net_timeout; @@global.slave_net_timeout 1 SET @@global.slave_net_timeout = -2147483648; Warnings: -Warning 1292 Truncated incorrect slave_net_timeout value: '0' +Warning 1292 Truncated incorrect slave_net_timeout value: '-2147483648' SELECT @@global.slave_net_timeout; @@global.slave_net_timeout 1 diff --git a/mysql-test/r/slow_launch_time_basic.result b/mysql-test/r/slow_launch_time_basic.result index c42942fba1a..da13af4f4e8 100644 --- a/mysql-test/r/slow_launch_time_basic.result +++ b/mysql-test/r/slow_launch_time_basic.result @@ -36,6 +36,8 @@ SELECT @@global.slow_launch_time; 65536 '#--------------------FN_DYNVARS_150_04-------------------------#' SET @@global.slow_launch_time = -1; +Warnings: +Warning 1292 Truncated incorrect slow_launch_time value: '-1' SELECT @@global.slow_launch_time; @@global.slow_launch_time 0 @@ -57,6 +59,8 @@ SELECT @@global.slow_launch_time; @@global.slow_launch_time 31536000 SET @@global.slow_launch_time = -1024; +Warnings: +Warning 1292 Truncated incorrect slow_launch_time value: '-1024' SELECT @@global.slow_launch_time; @@global.slow_launch_time 0 diff --git a/mysql-test/r/table_definition_cache_basic.result b/mysql-test/r/table_definition_cache_basic.result index 5f0e1960358..612d4138003 100644 --- a/mysql-test/r/table_definition_cache_basic.result +++ b/mysql-test/r/table_definition_cache_basic.result @@ -45,7 +45,7 @@ SELECT @@global.table_definition_cache; 256 SET @@global.table_definition_cache = -1024; Warnings: -Warning 1292 Truncated incorrect table_definition_cache value: '0' +Warning 1292 Truncated incorrect table_definition_cache value: '-1024' SELECT @@global.table_definition_cache; @@global.table_definition_cache 256 diff --git a/mysql-test/r/table_lock_wait_timeout_basic.result b/mysql-test/r/table_lock_wait_timeout_basic.result index 13771980188..a500581c228 100644 --- a/mysql-test/r/table_lock_wait_timeout_basic.result +++ b/mysql-test/r/table_lock_wait_timeout_basic.result @@ -37,13 +37,13 @@ SELECT @@global.table_lock_wait_timeout ; '#--------------------FN_DYNVARS_001_04-------------------------#' SET @@global.table_lock_wait_timeout = -1; Warnings: -Warning 1292 Truncated incorrect table_lock_wait_timeout value: '0' +Warning 1292 Truncated incorrect table_lock_wait_timeout value: '-1' SET @@global.table_lock_wait_timeout= 100000000000; Warnings: Warning 1292 Truncated incorrect table_lock_wait_timeout value: '100000000000' SET @@global.table_lock_wait_timeout= -1024; Warnings: -Warning 1292 Truncated incorrect table_lock_wait_timeout value: '0' +Warning 1292 Truncated incorrect table_lock_wait_timeout value: '-1024' SET @@global.table_lock_wait_timeout= 0; Warnings: Warning 1292 Truncated incorrect table_lock_wait_timeout value: '0' diff --git a/mysql-test/r/table_open_cache_basic.result b/mysql-test/r/table_open_cache_basic.result index ca02d32386f..080bcb6537e 100644 --- a/mysql-test/r/table_open_cache_basic.result +++ b/mysql-test/r/table_open_cache_basic.result @@ -39,7 +39,7 @@ SELECT @@global.table_open_cache ; '#--------------------FN_DYNVARS_001_04-------------------------#' SET @@global.table_open_cache = -1; Warnings: -Warning 1292 Truncated incorrect table_open_cache value: '0' +Warning 1292 Truncated incorrect table_open_cache value: '-1' SELECT @@global.table_open_cache ; @@global.table_open_cache 1 @@ -51,7 +51,7 @@ SELECT @@global.table_open_cache ; 524288 SET @@global.table_open_cache = -1024; Warnings: -Warning 1292 Truncated incorrect table_open_cache value: '0' +Warning 1292 Truncated incorrect table_open_cache value: '-1024' SELECT @@global.table_open_cache ; @@global.table_open_cache 1 diff --git a/mysql-test/r/variables.result b/mysql-test/r/variables.result index ac78d8e1871..9fe565f938c 100644 --- a/mysql-test/r/variables.result +++ b/mysql-test/r/variables.result @@ -703,7 +703,7 @@ VARIABLE_NAME VARIABLE_VALUE MYISAM_DATA_POINTER_SIZE 7 SET GLOBAL table_open_cache=-1; Warnings: -Warning 1292 Truncated incorrect table_open_cache value: '0' +Warning 1292 Truncated incorrect table_open_cache value: '-1' SHOW VARIABLES LIKE 'table_open_cache'; Variable_name Value table_open_cache 1 @@ -1337,3 +1337,36 @@ SET @@session.thread_stack= 7; ERROR HY000: Variable 'thread_stack' is a read only variable SET @@global.thread_stack= 7; ERROR HY000: Variable 'thread_stack' is a read only variable +SELECT @@global.expire_logs_days INTO @old_eld; +SET GLOBAL expire_logs_days = -1; +Warnings: +Warning 1292 Truncated incorrect expire_logs_days value: '-1' +needs to've been adjusted (0) +SELECT @@global.expire_logs_days; +@@global.expire_logs_days +0 +SET GLOBAL expire_logs_days = 11; +SET @old_mode=@@sql_mode; +SET SESSION sql_mode = 'TRADITIONAL'; +SET GLOBAL expire_logs_days = 100; +ERROR 42000: Variable 'expire_logs_days' can't be set to the value of '100' +needs to be unchanged (11) +SELECT @@global.expire_logs_days; +@@global.expire_logs_days +11 +SET SESSION sql_mode = @old_mode; +SET GLOBAL expire_logs_days = 100; +Warnings: +Warning 1292 Truncated incorrect expire_logs_days value: '100' +needs to've been adjusted (99) +SELECT @@global.expire_logs_days; +@@global.expire_logs_days +99 +SET GLOBAL expire_logs_days = 11; +SET GLOBAL expire_logs_days = 99; +needs to pass with no warnings (99) +SELECT @@global.expire_logs_days; +@@global.expire_logs_days +99 +SET GLOBAL expire_logs_days = @old_eld; +End of 5.1 tests diff --git a/mysql-test/t/variables.test b/mysql-test/t/variables.test index 828cb3a2916..9b611558447 100644 --- a/mysql-test/t/variables.test +++ b/mysql-test/t/variables.test @@ -1077,3 +1077,38 @@ SET @@session.thread_stack= 7; --error ER_INCORRECT_GLOBAL_LOCAL_VAR SET @@global.thread_stack= 7; # + +# +# Bug #40657 - assertion with out of range variables and traditional sql_mode +# + +SELECT @@global.expire_logs_days INTO @old_eld; + +SET GLOBAL expire_logs_days = -1; +--echo needs to've been adjusted (0) +SELECT @@global.expire_logs_days; + +SET GLOBAL expire_logs_days = 11; +SET @old_mode=@@sql_mode; +SET SESSION sql_mode = 'TRADITIONAL'; +--error ER_WRONG_VALUE_FOR_VAR +SET GLOBAL expire_logs_days = 100; +--echo needs to be unchanged (11) +SELECT @@global.expire_logs_days; +SET SESSION sql_mode = @old_mode; + +SET GLOBAL expire_logs_days = 100; +--echo needs to've been adjusted (99) +SELECT @@global.expire_logs_days; + +SET GLOBAL expire_logs_days = 11; +SET GLOBAL expire_logs_days = 99; +--echo needs to pass with no warnings (99) +SELECT @@global.expire_logs_days; + +# cleanup +SET GLOBAL expire_logs_days = @old_eld; + + + +--echo End of 5.1 tests diff --git a/sql/set_var.cc b/sql/set_var.cc index a371c1113ef..e2f3590311c 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -134,8 +134,8 @@ static int check_max_delayed_threads(THD *thd, set_var *var); static void fix_thd_mem_root(THD *thd, enum_var_type type); static void fix_trans_mem_root(THD *thd, enum_var_type type); static void fix_server_id(THD *thd, enum_var_type type); -static ulonglong fix_unsigned(THD *, ulonglong, const struct my_option *); -static bool get_unsigned(THD *thd, set_var *var); +static int get_unsigned(THD *thd, set_var *var); +static bool fix_unsigned(THD *, ulonglong *, bool, const struct my_option *); bool throw_bounds_warning(THD *thd, bool fixed, bool unsignd, const char *name, longlong val); static KEY_CACHE *create_key_cache(const char *name, uint length); @@ -1365,6 +1365,19 @@ static void fix_server_id(THD *thd, enum_var_type type) } +/** + Throw warning (error in STRICT mode) if value for variable needed bounding. + Only call from check(), not update(), because an error in update() would be + bad mojo. Plug-in interface also uses this. + + @param thd thread handle + @param fixed did we have to correct the value? (throw warn/err if so) + @param unsignd is value's type unsigned? + @param name variable's name + @param val variable's value + + @retval TRUE on error, FALSE otherwise (warning or OK) + */ bool throw_bounds_warning(THD *thd, bool fixed, bool unsignd, const char *name, longlong val) { @@ -1390,17 +1403,44 @@ bool throw_bounds_warning(THD *thd, bool fixed, bool unsignd, return FALSE; } -static ulonglong fix_unsigned(THD *thd, ulonglong num, - const struct my_option *option_limits) -{ - my_bool fixed= FALSE; - ulonglong out= getopt_ull_limit_value(num, option_limits, &fixed); - throw_bounds_warning(thd, fixed, TRUE, option_limits->name, (longlong) num); - return out; +/** + check an unsigned user-supplied value for a systemvariable against bounds. + if we needed to adjust the value, throw a warning/error. + + @param thd thread handle + @param num the value the user gave + @param warn throw warning/error (FALSE if we get here from + get_unsigned(), so we don't throw two warnings if + user supplies negative value to an unsigned variable) + @param option_limits the bounds-record + + @retval TRUE on error, FALSE otherwise (warning or OK) + */ +static bool fix_unsigned(THD *thd, ulonglong *num, bool warn, + const struct my_option *option_limits) +{ + my_bool fixed = FALSE; + ulonglong unadjusted= *num; + + *num= getopt_ull_limit_value(unadjusted, option_limits, &fixed); + + return warn && throw_bounds_warning(thd, fixed, TRUE, option_limits->name, + (longlong) unadjusted); + } -static bool get_unsigned(THD *thd, set_var *var) + +/** + Get unsigned system-variable. + Negative value does not wrap around, but becomes zero. + + @param thd thread handle + @param var the system-variable to get + + @retval 0 - OK, 1 - warning, 2 - error + */ +static int get_unsigned(THD *thd, set_var *var) { if (var->value->unsigned_flag) var->save_result.ulonglong_value= (ulonglong) var->value->val_int(); @@ -1408,6 +1448,8 @@ static bool get_unsigned(THD *thd, set_var *var) { longlong v= var->value->val_int(); var->save_result.ulonglong_value= (ulonglong) ((v < 0) ? 0 : v); + if (v < 0) + return throw_bounds_warning(thd, TRUE, FALSE, var->var->name, v) ? 2 : 1; } return 0; } @@ -1423,29 +1465,33 @@ sys_var_long_ptr(sys_var_chain *chain, const char *name_arg, ulong *value_ptr_ar bool sys_var_long_ptr_global::check(THD *thd, set_var *var) { - return get_unsigned(thd, var); -} + bool ret = FALSE; + int got_warnings= get_unsigned(thd, var); -bool sys_var_long_ptr_global::update(THD *thd, set_var *var) -{ - ulonglong tmp= var->save_result.ulonglong_value; - pthread_mutex_lock(guard); - if (option_limits) - *value= (ulong) fix_unsigned(thd, tmp, option_limits); + if (got_warnings == 2) + ret= TRUE; + else if (option_limits) + ret= fix_unsigned(thd, &var->save_result.ulonglong_value, + (got_warnings == 0), option_limits); else { #if SIZEOF_LONG < SIZEOF_LONG_LONG /* Avoid overflows on 32 bit systems */ - if (tmp > ULONG_MAX) + if (var->save_result.ulonglong_value > ULONG_MAX) { - tmp= ULONG_MAX; - throw_bounds_warning(thd, TRUE, TRUE, name, - (longlong) var->save_result.ulonglong_value); + ret= throw_bounds_warning(thd, TRUE, TRUE, name, + (longlong) var->save_result.ulonglong_value); + var->save_result.ulonglong_value= ULONG_MAX; } #endif - *value= (ulong) tmp; } + return ret; +} +bool sys_var_long_ptr_global::update(THD *thd, set_var *var) +{ + pthread_mutex_lock(guard); + *value= (ulong) var->save_result.ulonglong_value; pthread_mutex_unlock(guard); return 0; } @@ -1466,9 +1512,8 @@ bool sys_var_ulonglong_ptr::update(THD *thd, set_var *var) ulonglong tmp= var->save_result.ulonglong_value; pthread_mutex_lock(&LOCK_global_system_variables); if (option_limits) - *value= (ulonglong) fix_unsigned(thd, tmp, option_limits); - else - *value= (ulonglong) tmp; + fix_unsigned(thd, &tmp, FALSE, option_limits); + *value= (ulonglong) tmp; pthread_mutex_unlock(&LOCK_global_system_variables); return 0; } @@ -1518,35 +1563,47 @@ uchar *sys_var_enum_const::value_ptr(THD *thd, enum_var_type type, bool sys_var_thd_ulong::check(THD *thd, set_var *var) { - return (get_unsigned(thd, var) || - (check_func && (*check_func)(thd, var))); -} + ulonglong tmp; + int got_warnings= get_unsigned(thd, var); -bool sys_var_thd_ulong::update(THD *thd, set_var *var) -{ - ulonglong tmp= var->save_result.ulonglong_value; + if (got_warnings == 2) + return TRUE; + + tmp= var->save_result.ulonglong_value; /* Don't use bigger value than given with --maximum-variable-name=.. */ if ((ulong) tmp > max_system_variables.*offset) { - throw_bounds_warning(thd, TRUE, TRUE, name, (longlong) tmp); + if (throw_bounds_warning(thd, TRUE, TRUE, name, (longlong) tmp)) + return TRUE; tmp= max_system_variables.*offset; } if (option_limits) - tmp= (ulong) fix_unsigned(thd, tmp, option_limits); + { + if (fix_unsigned(thd, &tmp, (got_warnings == 0), option_limits)) + return TRUE; + } #if SIZEOF_LONG < SIZEOF_LONG_LONG else if (tmp > ULONG_MAX) { + if (throw_bounds_warning(thd, TRUE, TRUE, name, (longlong) tmp)) + return TRUE; tmp= ULONG_MAX; - throw_bounds_warning(thd, TRUE, TRUE, name, (longlong) var->save_result.ulonglong_value); } #endif + var->save_result.ulonglong_value= (ulong) tmp; + + return ((check_func && (*check_func)(thd, var))); +} + +bool sys_var_thd_ulong::update(THD *thd, set_var *var) +{ if (var->type == OPT_GLOBAL) - global_system_variables.*offset= (ulong) tmp; + global_system_variables.*offset= (ulong) var->save_result.ulonglong_value; else - thd->variables.*offset= (ulong) tmp; + thd->variables.*offset= (ulong) var->save_result.ulonglong_value; return 0; } @@ -1585,7 +1642,8 @@ bool sys_var_thd_ha_rows::update(THD *thd, set_var *var) tmp= max_system_variables.*offset; if (option_limits) - tmp= (ha_rows) fix_unsigned(thd, tmp, option_limits); + fix_unsigned(thd, &tmp, FALSE, option_limits); + if (var->type == OPT_GLOBAL) { /* Lock is needed to make things safe on 32 bit systems */ @@ -1626,27 +1684,44 @@ uchar *sys_var_thd_ha_rows::value_ptr(THD *thd, enum_var_type type, bool sys_var_thd_ulonglong::check(THD *thd, set_var *var) { - return get_unsigned(thd, var); + ulonglong tmp; + int got_warnings= get_unsigned(thd, var); + + if (got_warnings == 2) + return TRUE; + + tmp= var->save_result.ulonglong_value; + + if (tmp > max_system_variables.*offset) + { + if (throw_bounds_warning(thd, TRUE, TRUE, name, (longlong) tmp)) + return TRUE; + tmp= max_system_variables.*offset; + } + + if (option_limits) + { + if (fix_unsigned(thd, &tmp, (got_warnings == 0), option_limits)) + return TRUE; + } + + var->save_result.ulonglong_value= tmp; + + return FALSE; } bool sys_var_thd_ulonglong::update(THD *thd, set_var *var) { - ulonglong tmp= var->save_result.ulonglong_value; - - if (tmp > max_system_variables.*offset) - tmp= max_system_variables.*offset; - - if (option_limits) - tmp= fix_unsigned(thd, tmp, option_limits); if (var->type == OPT_GLOBAL) { /* Lock is needed to make things safe on 32 bit systems */ pthread_mutex_lock(&LOCK_global_system_variables); - global_system_variables.*offset= (ulonglong) tmp; + global_system_variables.*offset= (ulonglong) + var->save_result.ulonglong_value; pthread_mutex_unlock(&LOCK_global_system_variables); } else - thd->variables.*offset= (ulonglong) tmp; + thd->variables.*offset= (ulonglong) var->save_result.ulonglong_value; return 0; } @@ -2278,8 +2353,8 @@ bool sys_var_key_buffer_size::update(THD *thd, set_var *var) goto end; } - key_cache->param_buff_size= - (ulonglong) fix_unsigned(thd, tmp, option_limits); + fix_unsigned(thd, &tmp, FALSE, option_limits); + key_cache->param_buff_size= (ulonglong) tmp; /* If key cache didn't existed initialize it, else resize it */ key_cache->in_init= 1; @@ -2307,7 +2382,7 @@ end: */ bool sys_var_key_cache_long::update(THD *thd, set_var *var) { - ulong tmp= (ulong) var->value->val_int(); + ulonglong tmp= (ulonglong) (ulong) var->value->val_int(); LEX_STRING *base_name= &var->base; bool error= 0; @@ -2332,8 +2407,8 @@ bool sys_var_key_cache_long::update(THD *thd, set_var *var) if (key_cache->in_init) goto end; - *((ulong*) (((char*) key_cache) + offset))= - (ulong) fix_unsigned(thd, tmp, option_limits); + fix_unsigned(thd, &tmp, FALSE, option_limits); + *((ulong*) (((char*) key_cache) + offset))= (ulong) tmp; /* Don't create a new key cache if it didn't exist From ece8757cec010bc30fda2eafdf2df019e22d1abd Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 11 Feb 2009 21:33:46 +0100 Subject: [PATCH 007/132] Changed to use the correct "__sun" and "__hpux" predefined preprocessor symbols in libedit --- cmd-line-utils/libedit/readline/readline.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd-line-utils/libedit/readline/readline.h b/cmd-line-utils/libedit/readline/readline.h index c4806734bc5..18456fcfbcf 100644 --- a/cmd-line-utils/libedit/readline/readline.h +++ b/cmd-line-utils/libedit/readline/readline.h @@ -66,7 +66,7 @@ typedef KEYMAP_ENTRY *Keymap; #ifndef CTRL #include -#if !defined(__sun__) && !defined(__hpux__) +#if !defined(__sun) && !defined(__hpux) #include #endif #ifndef CTRL From 69d59240acb30f5fd8dc9e93d09057ca0fb31f23 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 12 Feb 2009 03:31:31 +0100 Subject: [PATCH 008/132] Exclude libedit inclusion of on AIX as well --- cmd-line-utils/libedit/readline/readline.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd-line-utils/libedit/readline/readline.h b/cmd-line-utils/libedit/readline/readline.h index 18456fcfbcf..c77b080c439 100644 --- a/cmd-line-utils/libedit/readline/readline.h +++ b/cmd-line-utils/libedit/readline/readline.h @@ -66,7 +66,7 @@ typedef KEYMAP_ENTRY *Keymap; #ifndef CTRL #include -#if !defined(__sun) && !defined(__hpux) +#if !defined(__sun) && !defined(__hpux) && !defined(_AIX) #include #endif #ifndef CTRL From d52312295ba325ee54c070a8ea85ba124f6337cd Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 12 Feb 2009 16:01:38 +0100 Subject: [PATCH 009/132] More portability fixes. --- cmd-line-utils/libedit/makelist.sh | 4 ++-- cmd-line-utils/libedit/readline.c | 5 +---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/cmd-line-utils/libedit/makelist.sh b/cmd-line-utils/libedit/makelist.sh index fdd3f934e15..5d25b4776c9 100644 --- a/cmd-line-utils/libedit/makelist.sh +++ b/cmd-line-utils/libedit/makelist.sh @@ -84,7 +84,7 @@ case $FLAG in cat $FILES | $AWK ' BEGIN { printf("/* Automatically generated file, do not edit */\n"); - printf("#include \"sys.h\"\n#include \"el.h\"\n"); + printf("#include \"config.h\"\n#include \"el.h\"\n"); printf("private const struct el_bindings_t el_func_help[] = {\n"); low = "abcdefghijklmnopqrstuvwxyz_"; high = "ABCDEFGHIJKLMNOPQRSTUVWXYZ_"; @@ -169,7 +169,7 @@ case $FLAG in cat $FILES | $AWK '/el_action_t/ { print $3 }' | sort | $AWK ' BEGIN { printf("/* Automatically generated file, do not edit */\n"); - printf("#include \"sys.h\"\n#include \"el.h\"\n"); + printf("#include \"config.h\"\n#include \"el.h\"\n"); printf("private const el_func_t el_func[] = {"); maxlen = 80; needn = 1; diff --git a/cmd-line-utils/libedit/readline.c b/cmd-line-utils/libedit/readline.c index ca8796fbd37..1f1b18c97d8 100644 --- a/cmd-line-utils/libedit/readline.c +++ b/cmd-line-utils/libedit/readline.c @@ -51,13 +51,10 @@ #else #include "np/vis.h" #endif -#ifdef HAVE_ALLOCA_H -#include -#endif +#include "readline/readline.h" #include "el.h" #include "fcns.h" /* for EL_NUM_FCNS */ #include "histedit.h" -#include "readline/readline.h" #include "filecomplete.h" void rl_prep_terminal(int); From 12f09e5ac0ae3a9edb50f04b89dd251bf7871fc5 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 13 Feb 2009 10:38:53 +0100 Subject: [PATCH 010/132] Work around for bug in some versions of the File::Temp Perl module --- mysql-test/mysql-test-run.pl | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index ba426446075..89eed6a1736 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -107,6 +107,17 @@ our $default_vardir; our $opt_vardir; # Path to use for var/ dir my $path_vardir_trace; # unix formatted opt_vardir for trace files my $opt_tmpdir; # Path to use for tmp/ dir +my $opt_tmpdir_pid; + +END { + if ( defined $opt_tmpdir_pid and $opt_tmpdir_pid == $$ ) + { + # Remove the tempdir this process has created + mtr_verbose("Removing tmpdir '$opt_tmpdir"); + rmtree($opt_tmpdir); + } +} + my $path_config_file; # The generated config file, var/my.cnf # Visual Studio produces executables in different sub-directories based on the @@ -1066,8 +1077,11 @@ sub command_line_setup { " creating a shorter one..."); # Create temporary directory in standard location for temporary files - $opt_tmpdir= tempdir( TMPDIR => 1, CLEANUP => 1 ); + $opt_tmpdir= tempdir( TMPDIR => 1, CLEANUP => 0 ); mtr_report(" - using tmpdir: '$opt_tmpdir'\n"); + + # Remember pid that created dir so it's removed by correct process + $opt_tmpdir_pid= $$; } } $opt_tmpdir =~ s,/+$,,; # Remove ending slash if any From 018624301cb85418a09b63cff131eae2a695e1a1 Mon Sep 17 00:00:00 2001 From: MySQL Build Team Date: Fri, 13 Feb 2009 10:42:27 +0100 Subject: [PATCH 011/132] Added to source package the file "mysql-test/suite/bugs/combinations" and the directory "mysql-test/suite/jp/include" --- mysql-test/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mysql-test/Makefile.am b/mysql-test/Makefile.am index dc9fbbd9aa5..60679e5b06d 100644 --- a/mysql-test/Makefile.am +++ b/mysql-test/Makefile.am @@ -81,7 +81,7 @@ TEST_DIRS = t r include std_data std_data/parts \ std_data/funcs_1 \ extra/binlog_tests/ extra/rpl_tests \ suite/binlog suite/binlog/t suite/binlog/r suite/binlog/std_data \ - suite/bugs/data suite/bugs/t suite/bugs/r \ + suite/bugs suite/bugs/data suite/bugs/t suite/bugs/r \ suite/federated \ suite/funcs_1 suite/funcs_1/bitdata \ suite/funcs_1/include suite/funcs_1/lib suite/funcs_1/r \ @@ -90,7 +90,7 @@ TEST_DIRS = t r include std_data std_data/parts \ suite/funcs_2 suite/funcs_2/charset suite/funcs_2/data \ suite/funcs_2/include suite/funcs_2/lib suite/funcs_2/r \ suite/funcs_2/t \ - suite/jp suite/jp/t suite/jp/r suite/jp/std_data \ + suite/jp suite/jp/t suite/jp/r suite/jp/std_data suite/jp/include \ suite/manual/t suite/manual/r \ suite/ndb_team suite/ndb_team/t suite/ndb_team/r \ suite/rpl suite/rpl/data suite/rpl/include suite/rpl/r \ From 39bf7340886aaa7c804c34fb5ee780a39cc08f69 Mon Sep 17 00:00:00 2001 From: Anurag Shekhar Date: Fri, 13 Feb 2009 17:11:54 +0530 Subject: [PATCH 012/132] Bug#40321 ha_myisam::info could update rec_per_key incorrectly MyISAM did copy of key statistics incorrectly, which may cause server crash or incorrect cardinality values. This may happen only on platforms where size of long differs from size of pointer. To determine number of bytes to be copied from array of ulong, MyISAM mistakenly used sizoef(pointer) instead of sizeof(ulong). --- storage/myisam/ha_myisam.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/storage/myisam/ha_myisam.cc b/storage/myisam/ha_myisam.cc index 4073044bf63..eb31c0b84cf 100644 --- a/storage/myisam/ha_myisam.cc +++ b/storage/myisam/ha_myisam.cc @@ -1753,7 +1753,7 @@ int ha_myisam::info(uint flag) if (share->key_parts) memcpy((char*) table->key_info[0].rec_per_key, (char*) misam_info.rec_per_key, - sizeof(table->key_info[0].rec_per_key)*share->key_parts); + sizeof(table->key_info[0].rec_per_key[0])*share->key_parts); if (share->tmp_table == NO_TMP_TABLE) pthread_mutex_unlock(&share->mutex); From 60f7f87abba10cee407e866356ea0f6f145052ba Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 14 Feb 2009 01:43:21 +0100 Subject: [PATCH 013/132] Disabled libedit use of '__weak_reference' on FreeBSD, doesn't compile --- cmd-line-utils/libedit/vi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd-line-utils/libedit/vi.c b/cmd-line-utils/libedit/vi.c index 602383f3231..00a9f493a9b 100644 --- a/cmd-line-utils/libedit/vi.c +++ b/cmd-line-utils/libedit/vi.c @@ -914,14 +914,14 @@ vi_comment_out(EditLine *el, int c) * NB: posix implies that we should enter insert mode, however * this is against historical precedent... */ -#ifdef __weak_reference +#if defined(__weak_reference) && !defined(__FreeBSD__) extern char *get_alias_text(const char *) __weak_reference(get_alias_text); #endif protected el_action_t /*ARGSUSED*/ vi_alias(EditLine *el, int c) { -#ifdef __weak_reference +#if defined(__weak_reference) && !defined(__FreeBSD__) char alias_name[3]; char *alias_text; From 338aefcb386a4011fcbd671f717b9bd973c94745 Mon Sep 17 00:00:00 2001 From: Timothy Smith Date: Sun, 15 Feb 2009 03:18:30 +0100 Subject: [PATCH 014/132] Add the IBM DB2 for i storage engine. Modify plugins.m4 configuration framework so that plugins which are not built still get added to the source distribution during make dist. This came up now because we can only build ibmdb2i on i5/OS, and we can't bootstrap our source dist on that platform. The solution is to specify DIST_SUBDIRS containing all plugins, separate from SUBDIRS which contains the plugins which are actually built. This ibmdb2i code is from the ibmdb2i-ga3-src.zip file, with a patch to plug.in to disable the plugin if the PASE environment isn't available. --- config/ac-macros/plugins.m4 | 72 +- plugin/Makefile.am | 2 +- storage/Makefile.am | 1 + storage/ibmdb2i/CMakeLists.txt | 25 + storage/ibmdb2i/Makefile.am | 53 + storage/ibmdb2i/db2i_blobCollection.cc | 107 + storage/ibmdb2i/db2i_blobCollection.h | 146 + storage/ibmdb2i/db2i_charsetSupport.cc | 793 +++++ storage/ibmdb2i/db2i_charsetSupport.h | 65 + storage/ibmdb2i/db2i_collationSupport.cc | 360 +++ storage/ibmdb2i/db2i_collationSupport.h | 45 + storage/ibmdb2i/db2i_constraints.cc | 699 +++++ storage/ibmdb2i/db2i_conversion.cc | 1168 +++++++ storage/ibmdb2i/db2i_errors.cc | 296 ++ storage/ibmdb2i/db2i_errors.h | 91 + storage/ibmdb2i/db2i_file.cc | 513 ++++ storage/ibmdb2i/db2i_file.h | 441 +++ storage/ibmdb2i/db2i_global.h | 138 + storage/ibmdb2i/db2i_iconv.h | 51 + storage/ibmdb2i/db2i_ileBridge.cc | 1331 ++++++++ storage/ibmdb2i/db2i_ileBridge.h | 488 +++ storage/ibmdb2i/db2i_ioBuffers.cc | 332 ++ storage/ibmdb2i/db2i_ioBuffers.h | 411 +++ storage/ibmdb2i/db2i_misc.h | 95 + storage/ibmdb2i/db2i_myconv.cc | 1498 +++++++++ storage/ibmdb2i/db2i_myconv.h | 3200 ++++++++++++++++++++ storage/ibmdb2i/db2i_rir.cc | 441 +++ storage/ibmdb2i/db2i_safeString.h | 98 + storage/ibmdb2i/db2i_sqlStatementStream.cc | 86 + storage/ibmdb2i/db2i_sqlStatementStream.h | 151 + storage/ibmdb2i/db2i_validatedPointer.h | 162 + storage/ibmdb2i/ha_ibmdb2i.cc | 3171 +++++++++++++++++++ storage/ibmdb2i/ha_ibmdb2i.h | 727 +++++ storage/ibmdb2i/plug.in | 12 + 34 files changed, 17247 insertions(+), 22 deletions(-) create mode 100644 storage/ibmdb2i/CMakeLists.txt create mode 100644 storage/ibmdb2i/Makefile.am create mode 100644 storage/ibmdb2i/db2i_blobCollection.cc create mode 100644 storage/ibmdb2i/db2i_blobCollection.h create mode 100644 storage/ibmdb2i/db2i_charsetSupport.cc create mode 100644 storage/ibmdb2i/db2i_charsetSupport.h create mode 100644 storage/ibmdb2i/db2i_collationSupport.cc create mode 100644 storage/ibmdb2i/db2i_collationSupport.h create mode 100644 storage/ibmdb2i/db2i_constraints.cc create mode 100644 storage/ibmdb2i/db2i_conversion.cc create mode 100644 storage/ibmdb2i/db2i_errors.cc create mode 100644 storage/ibmdb2i/db2i_errors.h create mode 100644 storage/ibmdb2i/db2i_file.cc create mode 100644 storage/ibmdb2i/db2i_file.h create mode 100644 storage/ibmdb2i/db2i_global.h create mode 100644 storage/ibmdb2i/db2i_iconv.h create mode 100644 storage/ibmdb2i/db2i_ileBridge.cc create mode 100644 storage/ibmdb2i/db2i_ileBridge.h create mode 100644 storage/ibmdb2i/db2i_ioBuffers.cc create mode 100644 storage/ibmdb2i/db2i_ioBuffers.h create mode 100644 storage/ibmdb2i/db2i_misc.h create mode 100644 storage/ibmdb2i/db2i_myconv.cc create mode 100644 storage/ibmdb2i/db2i_myconv.h create mode 100644 storage/ibmdb2i/db2i_rir.cc create mode 100644 storage/ibmdb2i/db2i_safeString.h create mode 100644 storage/ibmdb2i/db2i_sqlStatementStream.cc create mode 100644 storage/ibmdb2i/db2i_sqlStatementStream.h create mode 100644 storage/ibmdb2i/db2i_validatedPointer.h create mode 100644 storage/ibmdb2i/ha_ibmdb2i.cc create mode 100644 storage/ibmdb2i/ha_ibmdb2i.h create mode 100644 storage/ibmdb2i/plug.in diff --git a/config/ac-macros/plugins.m4 b/config/ac-macros/plugins.m4 index 8dfb698709f..e1da6fd11f5 100644 --- a/config/ac-macros/plugins.m4 +++ b/config/ac-macros/plugins.m4 @@ -302,7 +302,9 @@ AC_DEFUN([MYSQL_CONFIGURE_PLUGINS],[ _MYSQL_CONFIGURE_PLUGINS(m4_bpatsubst(__mysql_plugin_list__, :, [,])) _MYSQL_EMIT_PLUGIN_ACTIONS(m4_bpatsubst(__mysql_plugin_list__, :, [,])) AC_SUBST([mysql_se_dirs]) + AC_SUBST([mysql_se_distdirs]) AC_SUBST([mysql_pg_dirs]) + AC_SUBST([mysql_pg_distdirs]) AC_SUBST([mysql_se_unittest_dirs]) AC_SUBST([mysql_pg_unittest_dirs]) AC_SUBST([condition_dependent_plugin_modules]) @@ -354,6 +356,24 @@ AC_DEFUN([__MYSQL_EMIT_CHECK_PLUGIN],[ fi AC_MSG_RESULT([no]) ],[ + + # Plugin is not disabled, determine if it should be built, + # or only distributed + + m4_ifdef([$6], [ + if test ! -d "$srcdir/$6"; then + # Plugin directory was removed after autoconf was run; treat + # this as a disabled plugin + if test "X[$with_plugin_]$2" = Xyes; then + AC_MSG_RESULT([error]) + AC_MSG_ERROR([disabled]) + fi + + # The result message will be printed below + [with_plugin_]$2=no + fi + ]) + m4_ifdef([$9],[ if test "X[$with_plugin_]$2" = Xno; then AC_MSG_RESULT([error]) @@ -372,6 +392,8 @@ AC_DEFUN([__MYSQL_EMIT_CHECK_PLUGIN],[ ;; esac ]) + + if test "X[$with_plugin_]$2" = Xno; then AC_MSG_RESULT([no]) else @@ -448,28 +470,36 @@ dnl Although this is "pretty", it breaks libmysqld build condition_dependent_plugin_includes="$condition_dependent_plugin_includes -I[\$(top_srcdir)]/$6/m4_bregexp($11, [^.+[/$]], [\&])" ]) fi - m4_ifdef([$6],[ - if test -n "$mysql_use_plugin_dir" ; then - mysql_plugin_dirs="$mysql_plugin_dirs $6" - m4_syscmd(test -f "$6/configure") - ifelse(m4_sysval, 0, - [AC_CONFIG_SUBDIRS($6)], - [AC_CONFIG_FILES($6/Makefile)] - ) - ifelse(m4_substr($6, 0, 8), [storage/], - [ - [mysql_se_dirs="$mysql_se_dirs ]m4_substr($6, 8)" - mysql_se_unittest_dirs="$mysql_se_unittest_dirs ../$6" - ], - m4_substr($6, 0, 7), [plugin/], - [ - [mysql_pg_dirs="$mysql_pg_dirs ]m4_substr($6, 7)" - mysql_pg_unittest_dirs="$mysql_pg_unittest_dirs ../$6" - ], - [AC_FATAL([don't know how to handle plugin dir ]$6)]) - fi - ]) fi + + m4_ifdef([$6], [ + if test -d "$srcdir/$6"; then + # Even if we don't build a plugin, we bundle its source into the dist + # file. So its Makefile (and Makefiles for any subdirs) must be + # generated for 'make dist' to work. + m4_syscmd(test -f "$6/configure") + ifelse(m4_sysval, 0, + [AC_CONFIG_SUBDIRS($6)], + [AC_CONFIG_FILES($6/Makefile)] + ) + + ifelse( + m4_substr($6, 0, 8), [storage/], [ + mysql_se_distdirs="$mysql_se_distdirs m4_substr($6, 8)" + if test -n "$mysql_use_plugin_dir" ; then + mysql_se_dirs="$mysql_se_dirs m4_substr($6, 8)" + mysql_se_unittest_dirs="$mysql_se_unittest_dirs ../$6" + fi], + + m4_substr($6, 0, 7), [plugin/], [ + mysql_pg_distdirs="$mysql_pg_distdirs m4_substr($6, 7)" + if test -n "$mysql_use_plugin_dir" ; then + mysql_pg_dirs="$mysql_pg_dirs m4_substr($6, 7)" + mysql_pg_unittest_dirs="$mysql_pg_unittest_dirs ../$6" + fi], + [AC_FATAL([don't know how to handle plugin dir ]$6)]) + fi + ]) ]) ]) diff --git a/plugin/Makefile.am b/plugin/Makefile.am index 22f6bfd88b2..68f1f939836 100644 --- a/plugin/Makefile.am +++ b/plugin/Makefile.am @@ -22,7 +22,7 @@ AUTOMAKE_OPTIONS = foreign EXTRA_DIST = fulltext/configure.in SUBDIRS = @mysql_pg_dirs@ -DIST_SUBDIRS = daemon_example fulltext +DIST_SUBDIRS = @mysql_pg_distdirs@ # Don't update the files from bitkeeper %::SCCS/s.% diff --git a/storage/Makefile.am b/storage/Makefile.am index b978453d29d..4f19be3a361 100644 --- a/storage/Makefile.am +++ b/storage/Makefile.am @@ -20,6 +20,7 @@ AUTOMAKE_OPTIONS = foreign # These are built from source in the Docs directory EXTRA_DIST = SUBDIRS = @mysql_se_dirs@ +DIST_SUBDIRS = @mysql_se_distdirs@ # Don't update the files from bitkeeper %::SCCS/s.% diff --git a/storage/ibmdb2i/CMakeLists.txt b/storage/ibmdb2i/CMakeLists.txt new file mode 100644 index 00000000000..11cc4300569 --- /dev/null +++ b/storage/ibmdb2i/CMakeLists.txt @@ -0,0 +1,25 @@ +# Copyright (C) 2006 MySQL AB +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX") +SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX") + +INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/sql + ${CMAKE_SOURCE_DIR}/regex + ${CMAKE_SOURCE_DIR}/extra/yassl/include) +ADD_LIBRARY(ibmdb2i ha_ibmdb2i.cc db2i_ileBridge.cc db2i_conversion.cc + db2i_blobCollection.cc db2i_file.cc db2i_charsetSupport.cc + db2i_collationSupport.cc db2i_errors.cc db2i_constraints.cc + db2i_rir.cc db2i_sqlStatementStream.cc db2i_ioBuffers.cc db2i_myconv.cc) diff --git a/storage/ibmdb2i/Makefile.am b/storage/ibmdb2i/Makefile.am new file mode 100644 index 00000000000..2436a764429 --- /dev/null +++ b/storage/ibmdb2i/Makefile.am @@ -0,0 +1,53 @@ +# +# Copyright (c) 2007, 2008, IBM Corporation. +# All rights reserved. +# +# + +#called from the top level Makefile + +MYSQLDATAdir = $(localstatedir) +MYSQLSHAREdir = $(pkgdatadir) +MYSQLBASEdir= $(prefix) +MYSQLLIBdir= $(pkglibdir) +pkgplugindir = $(pkglibdir)/plugin +INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include \ + -I$(top_srcdir)/regex \ + -I$(top_srcdir)/sql \ + -I$(srcdir) \ + -I$ /afs/rchland.ibm.com/lande/shadow/dev2000/osxpf/v5r4m0f.xpf/cur/cmvc/base.pgm/my.xpf/apis \ + -I$ /afs/rchland.ibm.com/lande/shadow/dev2000/osxpf/v5r4m0.xpf/bld/cmvc/base.pgm/lg.xpf \ + -I$ /afs/rchland.ibm.com/lande/shadow/dev2000/osxpf/v5r4m0.xpf/bld/cmvc/base.pgm/tq.xpf +WRAPLIBS= + +LDADD = + +DEFS = @DEFS@ + +noinst_HEADERS = ha_ibmdb2i.h db2i_collationSupport.h db2i_file.h \ + db2i_ioBuffers.h db2i_blobCollection.h \ + db2i_global.h db2i_misc.h db2i_charsetSupport.h db2i_errors.h \ + db2i_ileBridge.h db2i_validatedPointer.h + +EXTRA_LTLIBRARIES = ha_ibmdb2i.la +pkgplugin_LTLIBRARIES = @plugin_ibmdb2i_shared_target@ +ha_ibmdb2i_la_LIBADD = -liconv +ha_ibmdb2i_la_LDFLAGS = -module -rpath $(MYSQLLIBdir) +ha_ibmdb2i_la_CXXFLAGS= $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN +ha_ibmdb2i_la_CFLAGS = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN +ha_ibmdb2i_la_SOURCES = ha_ibmdb2i.cc db2i_ileBridge.cc db2i_conversion.cc \ + db2i_blobCollection.cc db2i_file.cc db2i_charsetSupport.cc \ + db2i_collationSupport.cc db2i_errors.cc db2i_constraints.cc \ + db2i_rir.cc db2i_sqlStatementStream.cc db2i_ioBuffers.cc \ + db2i_myconv.cc + +EXTRA_LIBRARIES = libibmdb2i.a +noinst_LIBRARIES = @plugin_ibmdb2i_static_target@ +libibmdb2i_a_CXXFLAGS = $(AM_CFLAGS) +libibmdb2i_a_CFLAGS = $(AM_CFLAGS) +libibmdb2i_a_SOURCES= $(ha_ibmdb2i_la_SOURCES) + + +EXTRA_DIST = CMakeLists.txt plug.in +# Don't update the files from bitkeeper +%::SCCS/s.% diff --git a/storage/ibmdb2i/db2i_blobCollection.cc b/storage/ibmdb2i/db2i_blobCollection.cc new file mode 100644 index 00000000000..17101c9c0a4 --- /dev/null +++ b/storage/ibmdb2i/db2i_blobCollection.cc @@ -0,0 +1,107 @@ +/* +Licensed Materials - Property of IBM +DB2 Storage Engine Enablement +Copyright IBM Corporation 2007,2008 +All rights reserved + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + (a) Redistributions of source code must retain this list of conditions, the + copyright notice in section {d} below, and the disclaimer following this + list of conditions. + (b) Redistributions in binary form must reproduce this list of conditions, the + copyright notice in section (d) below, and the disclaimer following this + list of conditions, in the documentation and/or other materials provided + with the distribution. + (c) The name of IBM may not be used to endorse or promote products derived from + this software without specific prior written permission. + (d) The text of the required copyright notice is: + Licensed Materials - Property of IBM + DB2 Storage Engine Enablement + Copyright IBM Corporation 2007,2008 + All rights reserved + +THIS SOFTWARE IS PROVIDED BY IBM CORPORATION "AS IS" AND ANY EXPRESS OR IMPLIED +WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT +SHALL IBM CORPORATION BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT +OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT INCLUDING NEGLIGENCE OR OTHERWISE) ARISING +IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY +OF SUCH DAMAGE. +*/ + + +#include "db2i_blobCollection.h" + +/** + Return the size to use when allocating space for blob reads. + + @param fieldIndex The field to allocate for + @param[out] shouldProtect Indicates whether storage protection should be + applied to the space, because the size returned is + smaller than the maximum possible size. +*/ + +uint32 +BlobCollection::getSizeToAllocate(int fieldIndex, bool& shouldProtect) +{ + Field* field = table->getMySQLTable()->field[fieldIndex]; + uint fieldLength = field->max_display_length(); + + if (fieldLength <= MAX_FULL_ALLOCATE_BLOB_LENGTH) + { + shouldProtect = false; + return fieldLength; + } + + shouldProtect = true; + + uint curMaxSize = table->getBlobFieldActualSize(fieldIndex); + + uint defaultAllocSize = min(defaultAllocation, fieldLength); + + return max(defaultAllocSize, curMaxSize); + +} + +void +BlobCollection::generateBuffer(int fieldIndex) +{ + DBUG_ASSERT(table->db2Field(fieldIndex).isBlob()); + + bool protect; + buffers[table->getBlobIdFromField(fieldIndex)].Malloc(getSizeToAllocate(fieldIndex, protect), protect); + + return; +} + +/** + Realloc the read buffer associated with a blob field. + + This is used when the previous allocation for a blob field is found to be + too small (this is discovered when QMY_READ trips over the protected boundary + page). + + @param fieldIndex The field to be reallocated + @param size The size of buffer to allocate for this field. +*/ + +ValidatedPointer& +BlobCollection::reallocBuffer(int fieldIndex, size_t size) +{ + ProtectedBuffer& buf = buffers[table->getBlobIdFromField(fieldIndex)]; + if (size <= buf.allocLen()) + return buf.ptr(); + + table->updateBlobFieldActualSize(fieldIndex, size); + + DBUG_PRINT("BlobCollection::reallocBuffer",("PERF: reallocing %d to %d: ", fieldIndex, size)); + + bool protect; + buf.Free(); + buf.Malloc(getSizeToAllocate(fieldIndex, protect), protect); + return buf.ptr(); +} diff --git a/storage/ibmdb2i/db2i_blobCollection.h b/storage/ibmdb2i/db2i_blobCollection.h new file mode 100644 index 00000000000..35cfacbf42a --- /dev/null +++ b/storage/ibmdb2i/db2i_blobCollection.h @@ -0,0 +1,146 @@ +/* +Licensed Materials - Property of IBM +DB2 Storage Engine Enablement +Copyright IBM Corporation 2007,2008 +All rights reserved + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + (a) Redistributions of source code must retain this list of conditions, the + copyright notice in section {d} below, and the disclaimer following this + list of conditions. + (b) Redistributions in binary form must reproduce this list of conditions, the + copyright notice in section (d) below, and the disclaimer following this + list of conditions, in the documentation and/or other materials provided + with the distribution. + (c) The name of IBM may not be used to endorse or promote products derived from + this software without specific prior written permission. + (d) The text of the required copyright notice is: + Licensed Materials - Property of IBM + DB2 Storage Engine Enablement + Copyright IBM Corporation 2007,2008 + All rights reserved + +THIS SOFTWARE IS PROVIDED BY IBM CORPORATION "AS IS" AND ANY EXPRESS OR IMPLIED +WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT +SHALL IBM CORPORATION BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT +OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT INCLUDING NEGLIGENCE OR OTHERWISE) ARISING +IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY +OF SUCH DAMAGE. +*/ + + +#ifndef DB2I_BLOBCOLLECTION_H +#define DB2I_BLOBCOLLECTION_H + +#include "db2i_global.h" +#include "db2i_file.h" + +/** + @class ProtectedBuffer + @brief Implements memory management for (optionally) protected buffers. + + Buffers created with the protection option will have a guard page set on the + page following requested allocation size. The side effect is that the actual + allocation is up to 2*4096-1 bytes larger than the size requested by the + using code. +*/ + +class ProtectedBuffer +{ +public: + ProtectedBuffer() : protectBuf(false) + {;} + + void Malloc(size_t size, bool protect = false) + { + protectBuf = protect; + bufptr.alloc(size + (protectBuf ? 0x1fff : 0x0)); + if ((void*)bufptr != NULL) + { + len = size; + if (protectBuf) + mprotect(protectedPage(), 0x1000, PROT_NONE); + } + } + + void Free() + { + if ((void*)bufptr != NULL) + { + if (protectBuf) + mprotect(protectedPage(), 0x1000, PROT_READ | PROT_WRITE); + bufptr.dealloc(); + } + } + + ~ProtectedBuffer() + { + Free(); + } + + ValidatedPointer& ptr() {return bufptr;} + bool isProtected() const {return protectBuf;} + size_t allocLen() const {return len;} +private: + void* protectedPage() + { + return (void*)(((address64_t)(void*)bufptr + len + 0x1000) & ~0xfff); + } + + ValidatedPointer bufptr; + size_t len; + bool protectBuf; + +}; + + +/** + @class BlobCollection + @brief Manages memory allocation for reading blobs associated with a table. + + Allocations are done on-demand and are protected with a guard page if less + than the max possible size is allocated. +*/ +class BlobCollection +{ + public: + BlobCollection(db2i_table* db2Table, uint32 defaultAllocSize) : + defaultAllocation(defaultAllocSize), table(db2Table) + { + buffers = new ProtectedBuffer[table->getBlobCount()]; + } + + ~BlobCollection() + { + delete[] buffers; + } + + ValidatedPointer& getBufferPtr(int fieldIndex) + { + int blobIndex = table->getBlobIdFromField(fieldIndex); + if ((char*)buffers[blobIndex].ptr() == NULL) + generateBuffer(fieldIndex); + + return buffers[blobIndex].ptr(); + } + + ValidatedPointer& reallocBuffer(int fieldIndex, size_t size); + + + private: + + uint32 getSizeToAllocate(int fieldIndex, bool& shouldProtect); + void generateBuffer(int fieldIndex); + + db2i_table* table; // The table being read + ProtectedBuffer* buffers; // The buffers + uint32 defaultAllocation; + /* The default size to use when first allocating a buffer */ +}; + +#endif diff --git a/storage/ibmdb2i/db2i_charsetSupport.cc b/storage/ibmdb2i/db2i_charsetSupport.cc new file mode 100644 index 00000000000..41f7ef0e32f --- /dev/null +++ b/storage/ibmdb2i/db2i_charsetSupport.cc @@ -0,0 +1,793 @@ +/* +Licensed Materials - Property of IBM +DB2 Storage Engine Enablement +Copyright IBM Corporation 2007,2008 +All rights reserved + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + (a) Redistributions of source code must retain this list of conditions, the + copyright notice in section {d} below, and the disclaimer following this + list of conditions. + (b) Redistributions in binary form must reproduce this list of conditions, the + copyright notice in section (d) below, and the disclaimer following this + list of conditions, in the documentation and/or other materials provided + with the distribution. + (c) The name of IBM may not be used to endorse or promote products derived from + this software without specific prior written permission. + (d) The text of the required copyright notice is: + Licensed Materials - Property of IBM + DB2 Storage Engine Enablement + Copyright IBM Corporation 2007,2008 + All rights reserved + +THIS SOFTWARE IS PROVIDED BY IBM CORPORATION "AS IS" AND ANY EXPRESS OR IMPLIED +WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT +SHALL IBM CORPORATION BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT +OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT INCLUDING NEGLIGENCE OR OTHERWISE) ARISING +IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY +OF SUCH DAMAGE. +*/ + + + +#include "db2i_charsetSupport.h" +#include "as400_types.h" +#include "as400_protos.h" +#include "db2i_ileBridge.h" +#include "qlgusr.h" +#include "db2i_errors.h" + + +/* + The following arrays define a mapping between IANA-style text descriptors and + IBM i CCSID text descriptors. The mapping is a 1-to-1 correlation between + corresponding array slots. +*/ +#define MAX_IANASTRING 23 +static const char ianaStringType[MAX_IANASTRING][10] = +{ + {"ascii"}, + {"Big5"}, //big5 + {"cp1250"}, + {"cp1251"}, + {"cp1256"}, + {"cp850"}, + {"cp852"}, + {"cp866"}, + {"IBM943"}, //cp932 + {"EUC-KR"}, //euckr + {"IBM1381"}, //gb2312 + {"IBM1386"}, //gbk + {"greek"}, + {"hebrew"}, + {"latin1"}, + {"latin2"}, + {"latin5"}, + {"macce"}, + {"tis620"}, + {"Shift_JIS"}, //sjis + {"ucs2"}, + {"EUC-JP"}, //ujis + {"utf8"} +}; +static const char ccsidType[MAX_IANASTRING][6] = +{ + {"367"}, //ascii + {"950"}, //big5 + {"1250"}, //cp1250 + {"1251"}, //cp1251 + {"1256"}, //cp1256 + {"850"}, //cp850 + {"852"}, //cp852 + {"866"}, //cp866 + {"943"}, //cp932 + {"970"}, //euckr + {"1381"}, //gb2312 + {"1386"}, //gbk + {"813"}, //greek + {"916"}, //hebrew + {"923"}, //latin1 + {"912"}, //latin2 + {"920"}, //latin5 + {"1282"}, //macce + {"874"}, //tis620 + {"943"}, //sjis + {"13488"},//ucs2 + {"5050"}, //ujis + {"1208"} //utf8 +}; + +static _ILEpointer *QlgCvtTextDescToDesc_sym; + +/* We keep a cache of the mapping for text descriptions obtained via + QlgTextDescToDesc. The following structures implement this cache. */ +static HASH textDescMapHash; +static MEM_ROOT textDescMapMemroot; +static pthread_mutex_t textDescMapHashMutex; +struct TextDescMap +{ + struct HashKey + { + int32 inType; + int32 outType; + char inDesc[Qlg_MaxDescSize]; + } hashKey; + char outDesc[Qlg_MaxDescSize]; +}; + +/* We keep a cache of the mapping for open iconv descriptors. The following + structures implement this cache. */ +static HASH iconvMapHash; +static MEM_ROOT iconvMapMemroot; +static pthread_mutex_t iconvMapHashMutex; +struct IconvMap +{ + struct HashKey + { + uint16 direction; // This is a uint16 instead of a uchar to avoid garbage data in the key from compiler padding + uint16 db2CCSID; + const CHARSET_INFO* myCharset; + } hashKey; + iconv_t iconvDesc; +}; + + +/** + Initialize the static structures used by this module. + + This must only be called once per plugin instantiation. + + @return 0 if successful. Failure otherwise +*/ +int32 initCharsetSupport() +{ + DBUG_ENTER("initCharsetSupport"); + + int actmark = _ILELOAD("QSYS/QLGUSR", ILELOAD_LIBOBJ); + if ( actmark == -1 ) + { + DBUG_PRINT("initCharsetSupport", ("conversion srvpgm activation failed")); + DBUG_RETURN(1); + } + + QlgCvtTextDescToDesc_sym = (ILEpointer*)malloc_aligned(sizeof(ILEpointer)); + if (_ILESYM(QlgCvtTextDescToDesc_sym, actmark, "QlgCvtTextDescToDesc") == -1) + { + DBUG_PRINT("initCharsetSupport", + ("resolve of QlgCvtTextDescToDesc failed")); + DBUG_RETURN(errno); + } + + VOID(pthread_mutex_init(&textDescMapHashMutex,MY_MUTEX_INIT_FAST)); + hash_init(&textDescMapHash, &my_charset_bin, 10, offsetof(TextDescMap, hashKey), sizeof(TextDescMap::hashKey), 0, 0, HASH_UNIQUE); + + VOID(pthread_mutex_init(&iconvMapHashMutex,MY_MUTEX_INIT_FAST)); + hash_init(&iconvMapHash, &my_charset_bin, 10, offsetof(IconvMap, hashKey), sizeof(IconvMap::hashKey), 0, 0, HASH_UNIQUE); + + init_alloc_root(&textDescMapMemroot, 2048, 0); + init_alloc_root(&iconvMapMemroot, 256, 0); + + initMyconv(); + + DBUG_RETURN(0); +} + +/** + Cleanup the static structures used by this module. + + This must only be called once per plugin instantiation and only if + initCharsetSupport() was successful. +*/ +void doneCharsetSupport() +{ + cleanupMyconv(); + + free_root(&textDescMapMemroot, 0); + free_root(&iconvMapMemroot, 0); + + pthread_mutex_destroy(&textDescMapHashMutex); + hash_free(&textDescMapHash); + pthread_mutex_destroy(&iconvMapHashMutex); + hash_free(&iconvMapHash); + free_aligned(QlgCvtTextDescToDesc_sym); +} + + +/** + Convert a text description from one type to another. + + This function is just a wrapper for the IBM i QlgTextDescToDesc function plus + some overrides for conversions that the API does not handle correctly and + support for caching the computed conversion. + + @param inType The type of descriptor pointed to by "in". + @param outType The type of descriptor requested for "out". + @param in The descriptor to be convereted. + @param[out] out The equivalent descriptor + @param hashKey The hash key to be used for caching the conversion result. + + @return 0 if successful. Failure otherwise +*/ +static int32 getNewTextDesc(const int32 inType, + const int32 outType, + const char* in, + char* out, + const TextDescMap::HashKey* hashKey) +{ + DBUG_ENTER("db2i_charsetSupport::getNewTextDesc"); + const arg_type_t signature[] = { ARG_INT32, ARG_INT32, ARG_MEMPTR, ARG_INT32, ARG_MEMPTR, ARG_INT32, ARG_INT32, ARG_END }; + struct ArgList + { + ILEarglist_base base; + int32 CRDIInType; + int32 CRDIOutType; + ILEpointer CRDIDesc; + int32 CRDIDescSize; + ILEpointer CRDODesc; + int32 CRDODescSize; + int32 CTDCCSID; + } *arguments; + + if ((inType == Qlg_TypeIANA) && (outType == Qlg_TypeAix41)) + { + // Override non-standard charsets + if (unlikely(strcmp("IBM1381", in) == 0)) + { + strcpy(out, "IBM-1381"); + DBUG_RETURN(0); + } + } + else if ((inType == Qlg_TypeAS400CCSID) && (outType == Qlg_TypeAix41)) + { + // Override non-standard charsets + if (unlikely(strcmp("1148", in) == 0)) + { + strcpy(out, "IBM-1148"); + DBUG_RETURN(0); + } + } + + char argBuf[sizeof(ArgList)+15]; + arguments = (ArgList*)roundToQuadWordBdy(argBuf); + + arguments->CRDIInType = inType; + arguments->CRDIOutType = outType; + arguments->CRDIDesc.s.addr = (address64_t) in; + arguments->CRDIDescSize = Qlg_MaxDescSize; + arguments->CRDODesc.s.addr = (address64_t) out; + arguments->CRDODescSize = Qlg_MaxDescSize; + arguments->CTDCCSID = 819; + _ILECALL(QlgCvtTextDescToDesc_sym, + &arguments->base, + signature, + RESULT_INT32); + if (unlikely(arguments->base.result.s_int32.r_int32 < 0)) + { + getErrTxt(DB2I_ERR_ILECALL,"QlgCvtTextDescToDesc",arguments->base.result.s_int32.r_int32); + DBUG_RETURN(DB2I_ERR_ILECALL); + } + + // Store the conversion information into a cache entry + TextDescMap* mapping = (TextDescMap*)alloc_root(&textDescMapMemroot, sizeof(TextDescMap)); + if (unlikely(!mapping)) + DBUG_RETURN(HA_ERR_OUT_OF_MEM); + memcpy(&(mapping->hashKey), hashKey, sizeof(hashKey)); + strcpy(mapping->outDesc, out); + pthread_mutex_lock(&textDescMapHashMutex); + my_hash_insert(&textDescMapHash, (const uchar*)mapping); + pthread_mutex_unlock(&textDescMapHashMutex); + + DBUG_RETURN(0); +} + + +/** + Convert a text description from one type to another. + + This function takes a text description in one representation and converts + it into another representation. Although the OS provides some facilities for + doing this, the support is not complete, nor does MySQL always use standard + identifiers. Therefore, there are a lot of hardcoded overrides required. + There is probably some room for optimization here, but this should not be + called frequently under most circumstances. + + @param inType The type of descriptor pointed to by "in". + @param outType The type of descriptor requested for "out". + @param in The descriptor to be convereted. + @param[out] out The equivalent descriptor + + @return 0 if successful. Failure otherwise +*/ +static int32 convertTextDesc(const int32 inType, const int32 outType, const char* inDesc, char* outDesc) +{ + DBUG_ENTER("db2i_charsetSupport::convertTextDesc"); + const char* inDescOverride; + + if (inType == Qlg_TypeIANA) + { + // Override non-standard charsets + if (strcmp("big5", inDesc) == 0) + inDescOverride = "Big5"; + else if (strcmp("cp932", inDesc) == 0) + inDescOverride = "IBM943"; + else if (strcmp("euckr", inDesc) == 0) + inDescOverride = "EUC-KR"; + else if (strcmp("gb2312", inDesc) == 0) + inDescOverride = "IBM1381"; + else if (strcmp("gbk", inDesc) == 0) + inDescOverride = "IBM1386"; + else if (strcmp("sjis", inDesc) == 0) + inDescOverride = "Shift_JIS"; + else if (strcmp("ujis", inDesc) == 0) + inDescOverride = "EUC-JP"; + else + inDescOverride = inDesc; + + // Hardcode non-standard charsets + if (outType == Qlg_TypeAix41) + { + if (strcmp("Big5", inDescOverride) == 0) + { + strcpy(outDesc,"big5"); + DBUG_RETURN(0); + } + else if (strcmp("IBM1386", inDescOverride) == 0) + { + strcpy(outDesc,"GBK"); + DBUG_RETURN(0); + } + else if (strcmp("Shift_JIS", inDescOverride) == 0 || + strcmp("IBM943", inDescOverride) == 0) + { + strcpy(outDesc,"IBM-943"); + DBUG_RETURN(0); + } + else if (strcmp("tis620", inDescOverride) == 0) + { + strcpy(outDesc,"TIS-620"); + DBUG_RETURN(0); + } + else if (strcmp("ucs2", inDescOverride) == 0) + { + strcpy(outDesc,"UCS-2"); + DBUG_RETURN(0); + } + else if (strcmp("cp1250", inDescOverride) == 0) + { + strcpy(outDesc,"IBM-1250"); + DBUG_RETURN(0); + } + else if (strcmp("cp1251", inDescOverride) == 0) + { + strcpy(outDesc,"IBM-1251"); + DBUG_RETURN(0); + } + else if (strcmp("cp1256", inDescOverride) == 0) + { + strcpy(outDesc,"IBM-1256"); + DBUG_RETURN(0); + } + } + else if (outType == Qlg_TypeAS400CCSID) + { + // See if we can fast path the convert + for (int loopCnt = 0; loopCnt < MAX_IANASTRING; ++loopCnt) + { + if (strcmp((char*)ianaStringType[loopCnt],inDescOverride) == 0) + { + strcpy(outDesc,ccsidType[loopCnt]); + DBUG_RETURN(0); + } + } + } + } + else + inDescOverride = inDesc; + + // We call getNewTextDesc for all other conversions and cache the result. + TextDescMap *mapping; + TextDescMap::HashKey hashKey; + hashKey.inType= inType; + hashKey.outType= outType; + uint32 len = strlen(inDescOverride); + memcpy(hashKey.inDesc, inDescOverride, len); + memset(hashKey.inDesc+len, 0, sizeof(hashKey.inDesc) - len); + + if (!(mapping=(TextDescMap *) hash_search(&textDescMapHash, + (const uchar*)&hashKey, + sizeof(hashKey)))) + { + DBUG_RETURN(getNewTextDesc(inType, outType, inDescOverride, outDesc, &hashKey)); + } + else + { + strcpy(outDesc, mapping->outDesc); + } + DBUG_RETURN(0); +} + + +/** + Convert an IANA character set name into a DB2 for i CCSID value. + + @param parmIANADesc An IANA character set name + @param[out] db2Ccsid The equivalent CCSID value + + @return 0 if successful. Failure otherwise +*/ +int32 convertIANAToDb2Ccsid(const char* parmIANADesc, uint16* db2Ccsid) +{ + int32 rc; + uint16 aixCcsid; + char aixCcsidString[Qlg_MaxDescSize]; + int aixEncodingScheme; + int db2EncodingScheme; + rc = convertTextDesc(Qlg_TypeIANA, Qlg_TypeAS400CCSID, parmIANADesc, aixCcsidString); + if (rc != 0) + return rc; + aixCcsid = atoi(aixCcsidString); + rc = getEncodingScheme(aixCcsid, aixEncodingScheme); + if (rc != 0) + return rc; + switch(aixEncodingScheme) { // Select on encoding scheme + case 0x1100: // EDCDIC SBCS + case 0x2100: // ASCII SBCS + case 0x4100: // AIX SBCS + case 0x4105: // MS Windows + case 0x5100: // ISO 7 bit ASCII + db2EncodingScheme = 0x1100; + break; + case 0x1200: // EDCDIC DBCS + case 0x2200: // ASCII DBCS + db2EncodingScheme = 0x1200; + break; + case 0x1301: // EDCDIC Mixed + case 0x2300: // ASCII Mixed + case 0x4403: // EUC (ISO 2022) + db2EncodingScheme = 0x1301; + break; + case 0x7200: // UCS2 + db2EncodingScheme = 0x7200; + break; + case 0x7807: // UTF-8 + db2EncodingScheme = 0x7807; + break; + case 0x7500: // UTF-32 + db2EncodingScheme = 0x7500; + break; + default: // Unknown + { + getErrTxt(DB2I_ERR_UNKNOWN_ENCODING,aixEncodingScheme); + return DB2I_ERR_UNKNOWN_ENCODING; + } + break; + } + if (aixEncodingScheme == db2EncodingScheme) + { + *db2Ccsid = aixCcsid; + } + else + { + rc = getAssociatedCCSID(aixCcsid, db2EncodingScheme, db2Ccsid); // EDCDIC SBCS + if (rc != 0) + return rc; + } + + return 0; +} + + +/** + Obtain the encoding scheme of a CCSID. + + @param inCcsid An IBM i CCSID + @param[out] outEncodingScheme The associated encoding scheme + + @return 0 if successful. Failure otherwise +*/ +int32 getEncodingScheme(const uint16 inCcsid, int32& outEncodingScheme) +{ + DBUG_ENTER("db2i_charsetSupport::getEncodingScheme"); + + static bool ptrInited = FALSE; + static char ptrSpace[sizeof(ILEpointer) + 15]; + static ILEpointer* ptrToPtr = (ILEpointer*)roundToQuadWordBdy(ptrSpace); + int rc; + + if (!ptrInited) + { + rc = _RSLOBJ2(ptrToPtr, RSLOBJ_TS_PGM, "QTQGESP", "QSYS"); + + if (rc) + { + getErrTxt(DB2I_ERR_RESOLVE_OBJ,"QTQGESP","QSYS","*PGM",errno); + DBUG_RETURN(DB2I_ERR_RESOLVE_OBJ); + } + ptrInited = TRUE; + } + + DBUG_ASSERT(inCcsid != 0); + + int GESPCCSID = inCcsid; + int GESPLen = 32; + int GESPNbrVal = 0; + int32 GESPES; + int GESPCSCPL[32]; + int GESPFB[3]; + void* ILEArgv[7]; + ILEArgv[0] = &GESPCCSID; + ILEArgv[1] = &GESPLen; + ILEArgv[2] = &GESPNbrVal; + ILEArgv[3] = &GESPES; + ILEArgv[4] = &GESPCSCPL; + ILEArgv[5] = &GESPFB; + ILEArgv[6] = NULL; + + rc = _PGMCALL(ptrToPtr, (void**)&ILEArgv, 0); + + if (rc) + { + getErrTxt(DB2I_ERR_PGMCALL,"QTQGESP","QSYS",rc); + DBUG_RETURN(DB2I_ERR_PGMCALL); + } + if (GESPFB[0] != 0 || + GESPFB[1] != 0 || + GESPFB[2] != 0) + { + getErrTxt(DB2I_ERR_QTQGESP,GESPFB[0],GESPFB[1],GESPFB[2]); + DBUG_RETURN(DB2I_ERR_QTQGESP); + } + outEncodingScheme = GESPES; + + DBUG_RETURN(0); +} + + +/** + Get the best fit equivalent CCSID. (Wrapper for QTQGRDC API) + + @param inCcsid An IBM i CCSID + @param inEncodingScheme The encoding scheme + @param[out] outCcsid The equivalent CCSID + + @return 0 if successful. Failure otherwise +*/ +int32 getAssociatedCCSID(const uint16 inCcsid, const int inEncodingScheme, uint16* outCcsid) +{ + DBUG_ENTER("db2i_charsetSupport::getAssociatedCCSID"); + static bool ptrInited = FALSE; + static char ptrSpace[sizeof(ILEpointer) + 15]; + static ILEpointer* ptrToPtr = (ILEpointer*)roundToQuadWordBdy(ptrSpace); + int rc; + + // Override non-standard charsets + if ((inCcsid == 923) && (inEncodingScheme == 0x1100)) + { + *outCcsid = 1148; + DBUG_RETURN(0); + } + + if (!ptrInited) + { + rc = _RSLOBJ2(ptrToPtr, RSLOBJ_TS_PGM, "QTQGRDC", "QSYS"); + + if (rc) + { + getErrTxt(DB2I_ERR_RESOLVE_OBJ,"QTQGRDC","QSYS","*PGM",errno); + DBUG_RETURN(DB2I_ERR_RESOLVE_OBJ); + } + ptrInited = TRUE; + } + + int GRDCCCSID = inCcsid; + int GRDCES = inEncodingScheme; + int GRDCSel = 0; + int GRDCAssCCSID; + int GRDCFB[3]; + void* ILEArgv[7]; + ILEArgv[0] = &GRDCCCSID; + ILEArgv[1] = &GRDCES; + ILEArgv[2] = &GRDCSel; + ILEArgv[3] = &GRDCAssCCSID; + ILEArgv[4] = &GRDCFB; + ILEArgv[5] = NULL; + + rc = _PGMCALL(ptrToPtr, (void**)&ILEArgv, 0); + + if (rc) + { + getErrTxt(DB2I_ERR_PGMCALL,"QTQGRDC","QSYS",rc); + DBUG_RETURN(DB2I_ERR_PGMCALL); + } + if (GRDCFB[0] != 0 || + GRDCFB[1] != 0 || + GRDCFB[2] != 0) + { + getErrTxt(DB2I_ERR_QTQGRDC,GRDCFB[0],GRDCFB[1],GRDCFB[2]); + DBUG_RETURN(DB2I_ERR_QTQGRDC); + } + + *outCcsid = GRDCAssCCSID; + + DBUG_RETURN(0); +} + +/** + Open an iconv conversion between a MySQL charset and the respective IBM i CCSID + + @param direction The direction of the conversion + @param mysqlCSName Name of the MySQL character set + @param db2CCSID The IBM i CCSID + @param hashKey The key to use for inserting the opened conversion into the cache + @param[out] newConversion The iconv descriptor + + @return 0 if successful. Failure otherwise +*/ +static int32 openNewConversion(enum_conversionDirection direction, + const char* mysqlCSName, + uint16 db2CCSID, + IconvMap::HashKey* hashKey, + iconv_t& newConversion) +{ + DBUG_ENTER("db2i_charsetSupport::openNewConversion"); + + char mysqlAix41Desc[Qlg_MaxDescSize]; + char db2Aix41Desc[Qlg_MaxDescSize]; + char db2CcsidString[6] = ""; + int32 rc; + + /* + First we have to convert the MySQL IANA-like name and the DB2 CCSID into + there equivalent iconv descriptions. + */ + rc = convertTextDesc(Qlg_TypeIANA, Qlg_TypeAix41, mysqlCSName, mysqlAix41Desc); + if (rc) + DBUG_RETURN(rc); + CHARSET_INFO *cs= &my_charset_bin; + (uint)(cs->cset->long10_to_str)(cs,db2CcsidString,sizeof(db2CcsidString), 10, db2CCSID); + rc = convertTextDesc(Qlg_TypeAS400CCSID, Qlg_TypeAix41, db2CcsidString, db2Aix41Desc); + if (rc) + DBUG_RETURN(rc); + + /* Call iconv to open the conversion. */ + if (direction == toDB2) + { + newConversion = iconv_open(db2Aix41Desc, mysqlAix41Desc); + if (newConversion == (iconv_t) -1) + { + getErrTxt(DB2I_ERR_ICONV_OPEN, mysqlAix41Desc, db2Aix41Desc, errno); + DBUG_RETURN(DB2I_ERR_ICONV_OPEN); + } + } + else + { + newConversion = iconv_open(mysqlAix41Desc, db2Aix41Desc); + if (newConversion == (iconv_t) -1) + { + getErrTxt(DB2I_ERR_ICONV_OPEN, db2Aix41Desc, mysqlAix41Desc, errno); + DBUG_RETURN(DB2I_ERR_ICONV_OPEN); + } + } + + /* Insert the new conversion into the cache. */ + IconvMap* mapping = (IconvMap*)alloc_root(&iconvMapMemroot, sizeof(IconvMap)); + if (!mapping) + { + my_error(ER_OUTOFMEMORY, MYF(0), sizeof(IconvMap)); + DBUG_RETURN( HA_ERR_OUT_OF_MEM); + } + memcpy(&(mapping->hashKey), hashKey, sizeof(mapping->hashKey)); + mapping->iconvDesc = newConversion; + pthread_mutex_lock(&iconvMapHashMutex); + my_hash_insert(&iconvMapHash, (const uchar*)mapping); + pthread_mutex_unlock(&iconvMapHashMutex); + + DBUG_RETURN(0); +} + + +/** + Open an iconv conversion between a MySQL charset and the respective IBM i CCSID + + @param direction The direction of the conversion + @param cs The MySQL character set + @param db2CCSID The IBM i CCSID + @param[out] newConversion The iconv descriptor + + @return 0 if successful. Failure otherwise +*/ +int32 getConversion(enum_conversionDirection direction, const CHARSET_INFO* cs, uint16 db2CCSID, iconv_t& conversion) +{ + DBUG_ENTER("db2i_charsetSupport::convChars"); + + int32 rc; + + /* Build the hash key */ + IconvMap::HashKey hashKey; + hashKey.direction= direction; + hashKey.myCharset= cs; + hashKey.db2CCSID= db2CCSID; + + /* Look for the conversion in the cache and add it if it is not there. */ + IconvMap *mapping; + if (!(mapping= (IconvMap *) hash_search(&iconvMapHash, + (const uchar*)&hashKey, + sizeof(hashKey)))) + { + DBUG_PRINT("getConversion", ("Hash miss for direction=%d, cs=%s, ccsid=%d", direction, cs->name, db2CCSID)); + rc= openNewConversion(direction, cs->csname, db2CCSID, &hashKey, conversion); + if (rc) + DBUG_RETURN(rc); + } + else + { + conversion= mapping->iconvDesc; + } + + DBUG_RETURN(0); +} + +/** + Fast-path conversion from ASCII to EBCDIC for use in converting + identifiers to be sent to the QMY APIs. + + @param input ASCII data + @param[out] ouput EBCDIC data + @param ilen Size of input buffer and output buffer +*/ +int convToEbcdic(const char* input, char* output, size_t ilen) +{ + static bool inited = FALSE; + static iconv_t ic; + + if (ilen == 0) + return 0; + + if (!inited) + { + ic = iconv_open( "IBM-037", "ISO8859-1" ); + inited = TRUE; + } + size_t substitutedChars; + size_t olen = ilen; + if (iconv( ic, (char**)&input, &ilen, &output, &olen, &substitutedChars ) == -1) + return errno; + + return 0; +} + + +/** + Fast-path conversion from EBCDIC to ASCII for use in converting + data received from the QMY APIs. + + @param input EBCDIC data + @param[out] ouput ASCII data + @param ilen Size of input buffer and output buffer +*/ +int convFromEbcdic(const char* input, char* output, size_t ilen) +{ + static bool inited = FALSE; + static iconv_t ic; + + if (ilen == 0) + return 0; + + if (!inited) + { + ic = iconv_open("ISO8859-1", "IBM-037"); + inited = TRUE; + } + + size_t substitutedChars; + size_t olen = ilen; + if (iconv( ic, (char**)&input, &ilen, &output, &olen, &substitutedChars) == -1) + return errno; + + return 0; +} diff --git a/storage/ibmdb2i/db2i_charsetSupport.h b/storage/ibmdb2i/db2i_charsetSupport.h new file mode 100644 index 00000000000..77051e1e0db --- /dev/null +++ b/storage/ibmdb2i/db2i_charsetSupport.h @@ -0,0 +1,65 @@ +/* +Licensed Materials - Property of IBM +DB2 Storage Engine Enablement +Copyright IBM Corporation 2007,2008 +All rights reserved + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + (a) Redistributions of source code must retain this list of conditions, the + copyright notice in section {d} below, and the disclaimer following this + list of conditions. + (b) Redistributions in binary form must reproduce this list of conditions, the + copyright notice in section (d) below, and the disclaimer following this + list of conditions, in the documentation and/or other materials provided + with the distribution. + (c) The name of IBM may not be used to endorse or promote products derived from + this software without specific prior written permission. + (d) The text of the required copyright notice is: + Licensed Materials - Property of IBM + DB2 Storage Engine Enablement + Copyright IBM Corporation 2007,2008 + All rights reserved + +THIS SOFTWARE IS PROVIDED BY IBM CORPORATION "AS IS" AND ANY EXPRESS OR IMPLIED +WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT +SHALL IBM CORPORATION BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT +OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT INCLUDING NEGLIGENCE OR OTHERWISE) ARISING +IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY +OF SUCH DAMAGE. +*/ + + +#ifndef DB2I_CHARSETSUPPORT_H +#define DB2I_CHARSETSUPPORT_H + +#include "db2i_global.h" +#include "mysql_priv.h" +#include +#include "db2i_iconv.h" + +/** + @enum enum_conversionDirection + + Conversion directions for getConversion() +*/ +enum enum_conversionDirection +{ + toMySQL, + toDB2 +}; + +int initCharsetSupport(); +void doneCharsetSupport(); +int32 convertIANAToDb2Ccsid(const char* parmIANADesc, uint16* db2Ccsid); +int32 getEncodingScheme(const uint16 inCcsid, int32& outEncodingScheme); +int32 getAssociatedCCSID(const uint16 inCcsid, const int inEncodingScheme, uint16* outCcsid); +int convToEbcdic(const char* input, char* output, size_t ilen); +int convFromEbcdic(const char* input, char* output, size_t ilen); +int32 getConversion(enum_conversionDirection direction, const CHARSET_INFO* cs, uint16 db2CCSID, iconv_t& conversion); + +#endif diff --git a/storage/ibmdb2i/db2i_collationSupport.cc b/storage/ibmdb2i/db2i_collationSupport.cc new file mode 100644 index 00000000000..a6ffd661b81 --- /dev/null +++ b/storage/ibmdb2i/db2i_collationSupport.cc @@ -0,0 +1,360 @@ +/* +Licensed Materials - Property of IBM +DB2 Storage Engine Enablement +Copyright IBM Corporation 2007,2008 +All rights reserved + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + (a) Redistributions of source code must retain this list of conditions, the + copyright notice in section {d} below, and the disclaimer following this + list of conditions. + (b) Redistributions in binary form must reproduce this list of conditions, the + copyright notice in section (d) below, and the disclaimer following this + list of conditions, in the documentation and/or other materials provided + with the distribution. + (c) The name of IBM may not be used to endorse or promote products derived from + this software without specific prior written permission. + (d) The text of the required copyright notice is: + Licensed Materials - Property of IBM + DB2 Storage Engine Enablement + Copyright IBM Corporation 2007,2008 + All rights reserved + +THIS SOFTWARE IS PROVIDED BY IBM CORPORATION "AS IS" AND ANY EXPRESS OR IMPLIED +WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT +SHALL IBM CORPORATION BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT +OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT INCLUDING NEGLIGENCE OR OTHERWISE) ARISING +IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY +OF SUCH DAMAGE. +*/ + + +#include "db2i_collationSupport.h" +#include "db2i_errors.h" + + +/* + The following arrays define a mapping between MySQL collation names and + corresponding IBM i sort sequences. The mapping is a 1-to-1 correlation + between corresponding array slots but is incomplete without case-sensitivity + markers dynamically added to the mySqlSortSequence names. +*/ +#define MAX_COLLATION 89 +static const char* mySQLCollation[MAX_COLLATION] = +{ + {"ascii_general"}, + {"ascii"}, + {"big5_chinese"}, + {"big5"}, + {"cp1250_croatian"}, + {"cp1250_czech"}, + {"cp1250_general"}, + {"cp1250_polish"}, + {"cp1250"}, + {"cp1251_bulgarian"}, + {"cp1251_general"}, + {"cp1251"}, + {"cp1256_general"}, + {"cp1256"}, + {"cp850_general"}, + {"cp850"}, + {"cp852_general"}, + {"cp852"}, + {"cp932_japanese"}, + {"cp932"}, + {"euckr_korean"}, + {"euckr"}, + {"gb2312_chinese"}, + {"gb2312"}, + {"gbk_chinese"}, + {"gbk"}, + {"greek_general"}, + {"greek"}, + {"hebrew_general"}, + {"hebrew"}, + {"latin1_danish"}, + {"latin1_general"}, + {"latin1_german1"}, + {"latin1_spanish"}, + {"latin1_swedish"}, + {"latin1"}, + {"latin2_croatian"}, + {"latin2_czech"}, + {"latin2_general"}, + {"latin2_hungarian"}, + {"latin2"}, + {"latin5_turkish"}, + {"latin5"}, + {"macce_general"}, + {"macce"}, + {"sjis_japanese"}, + {"sjis"}, + {"tis620_thai"}, + {"tis620"}, + {"ucs2_czech"}, + {"ucs2_danish"}, + {"ucs2_esperanto"}, + {"ucs2_estonian"}, + {"ucs2_general"}, + {"ucs2_hungarian"}, + {"ucs2_icelandic"}, + {"ucs2_latvian"}, + {"ucs2_lithuanian"}, + {"ucs2_persian"}, + {"ucs2_polish"}, + {"ucs2_romanian"}, + {"ucs2_slovak"}, + {"ucs2_slovenian"}, + {"ucs2_spanish"}, + {"ucs2_spanish2"}, + {"ucs2_turkish"}, + {"ucs2_unicode"}, + {"ucs2"}, + {"ujis_japanese"}, + {"ujis"}, + {"utf8_czech"}, + {"utf8_danish"}, + {"utf8_esperanto"}, + {"utf8_estonian"}, + {"utf8_general"}, + {"utf8_hungarian"}, + {"utf8_icelandic"}, + {"utf8_latvian"}, + {"utf8_lithuanian"}, + {"utf8_persian"}, + {"utf8_polish"}, + {"utf8_romanian"}, + {"utf8_slovak"}, + {"utf8_slovenian"}, + {"utf8_spanish"}, + {"utf8_spanish2"}, + {"utf8_turkish"}, + {"utf8_unicode"}, + {"utf8"} +}; + + +static const char* mySqlSortSequence[MAX_COLLATION] = +{ + {"QALA101F4"}, + {"QBLA101F4"}, + {"QACHT04B0"}, + {"QBCHT04B0"}, + {"QALA20481"}, + {"QBLA20481"}, + {"QCLA20481"}, + {"QDLA20481"}, + {"QELA20481"}, + {"QACYR0401"}, + {"QBCYR0401"}, + {"QCCYR0401"}, + {"QAARA01A4"}, + {"QBARA01A4"}, + {"QCLA101F4"}, + {"QDLA101F4"}, + {"QALA20366"}, + {"QBLA20366"}, + {"QAJPN04B0"}, + {"QBJPN04B0"}, + {"QAKOR04B0"}, + {"QBKOR04B0"}, + {"QACHS04B0"}, + {"QBCHS04B0"}, + {"QCCHS04B0"}, + {"QDCHS04B0"}, + {"QAELL036B"}, + {"QBELL036B"}, + {"QAHEB01A8"}, + {"QBHEB01A8"}, + {"QALA1047C"}, + {"QBLA1047C"}, + {"QCLA1047C"}, + {"QDLA1047C"}, + {"QELA1047C"}, + {"QFLA1047C"}, + {"QCLA20366"}, + {"QDLA20366"}, + {"QELA20366"}, + {"QFLA20366"}, + {"QGLA20366"}, + {"QATRK0402"}, + {"QBTRK0402"}, + {"QHLA20366"}, + {"QILA20366"}, + {"QCJPN04B0"}, + {"QDJPN04B0"}, + {"QATHA0346"}, + {"QBTHA0346"}, + {"ACS"}, + {"ADA"}, + {"AEO"}, + {"AET"}, + {"QAUCS04B0"}, + {"AHU"}, + {"AIS"}, + {"ALV"}, + {"ALT"}, + {"AFA"}, + {"APL"}, + {"ARO"}, + {"ASK"}, + {"ASL"}, + {"AES"}, + {"AES__TRADIT"}, + {"ATR"}, + {"AEN"}, + {"*HEX"}, + {"QEJPN04B0"}, + {"QFJPN04B0"}, + {"ACS"}, + {"ADA"}, + {"AEO"}, + {"AET"}, + {"QAUCS04B0"}, + {"AHU"}, + {"AIS"}, + {"ALV"}, + {"ALT"}, + {"AFA"}, + {"APL"}, + {"ARO"}, + {"ASK"}, + {"ASL"}, + {"AES"}, + {"AES__TRADIT"}, + {"ATR"}, + {"AEN"}, + {"*HEX"} +}; + + +/** + Get the IBM i sort sequence that corresponds to the given MySQL collation. + + @param fieldCharSet The collated character set + @param[out] rtnSortSequence The corresponding sort sequence + + @return 0 if successful. Failure otherwise +*/ +static int32 getAssociatedSortSequence(const CHARSET_INFO *fieldCharSet, const char** rtnSortSequence) +{ + DBUG_ENTER("ha_ibmdb2i::getAssociatedSortSequence"); + + if (strcmp(fieldCharSet->csname,"binary") != 0) + { + int collationSearchLen = strlen(fieldCharSet->name); + if (fieldCharSet->state & MY_CS_BINSORT) + collationSearchLen -= 4; + else + collationSearchLen -= 3; + + uint16 loopCnt = 0; + for (loopCnt; loopCnt < MAX_COLLATION; ++loopCnt) + { + if ((strlen(mySQLCollation[loopCnt]) == collationSearchLen) && + (strncmp((char*)mySQLCollation[loopCnt], fieldCharSet->name, collationSearchLen) == 0)) + break; + } + if (loopCnt == MAX_COLLATION) // Did not find associated sort sequence + { + getErrTxt(DB2I_ERR_SRTSEQ); + DBUG_RETURN(DB2I_ERR_SRTSEQ); + } + *rtnSortSequence = mySqlSortSequence[loopCnt]; + } + + DBUG_RETURN(0); +} + + +/** + Update sort sequence information for a key. + + This function accumulates information about a key as it is called for each + field composing the key. The caller should invoke the function for each field + and (with the exception of the curField parm) preserve the values for the + parms across invocations, until a particular key has been evaluated. Once + the last field in the key has been evaluated, the fileSortSequence and + fileSortSequenceLibrary parms will contain the correct information for + creating the corresponding DB2 key. + + @param curField The field under consideration + @param[in, out] fileSortSequenceType The type of the current key's sort seq + @param[in, out] fileSortSequence The IBM i identifier for the DB2 sort sequence + that corresponds + + @return 0 if successful. Failure otherwise +*/ +int32 updateAssociatedSortSequence(const Field *curField, + char* fileSortSequenceType, + char* fileSortSequence, + char* fileSortSequenceLibrary) +{ + DBUG_ENTER("ha_ibmdb2i::updateAssociatedSortSequence"); + DBUG_ASSERT(curField); + CHARSET_INFO* fieldCharSet = curField->charset(); + if (strcmp(fieldCharSet->csname,"binary") != 0) + { + char newSortSequence[11] = ""; + char newSortSequenceType = ' '; + const char* foundSortSequence; + int rc = getAssociatedSortSequence(fieldCharSet, &foundSortSequence); + if (rc) DBUG_RETURN (rc); + switch(foundSortSequence[0]) + { + case '*': // Binary + strcat(newSortSequence,foundSortSequence); + newSortSequenceType = 'B'; + break; + case 'Q': // Non-ICU sort sequence + strcat(newSortSequence,foundSortSequence); + if ((fieldCharSet->state & MY_CS_BINSORT) != 0) + { + strcat(newSortSequence,"U"); + } + else if ((fieldCharSet->state & MY_CS_CSSORT) != 0) + { + strcat(newSortSequence,"U"); + } + else + { + strcat(newSortSequence,"S"); + } + newSortSequenceType = 'N'; + break; + default: // ICU sort sequence + { + if ((fieldCharSet->state & MY_CS_CSSORT) == 0) + { + if (osVersion.v >= 6) + strcat(newSortSequence,"I34"); // ICU 3.4 + else + strcat(newSortSequence,"I26"); // ICU 2.6.1 + } + strcat(newSortSequence,foundSortSequence); + newSortSequenceType = 'I'; + } + break; + } + if (*fileSortSequenceType == ' ') // If no sort sequence has been set yet + { + // Set associated sort sequence + strcpy(fileSortSequence,newSortSequence); + strcpy(fileSortSequenceLibrary,"QSYS"); + *fileSortSequenceType = newSortSequenceType; + } + else if (strcmp(fileSortSequence,newSortSequence) != 0) + { + // Only one sort sequence/collation is supported for each DB2 index. + getErrTxt(DB2I_ERR_MIXED_COLLATIONS); + DBUG_RETURN(DB2I_ERR_MIXED_COLLATIONS); + } + } + + DBUG_RETURN(0); +} diff --git a/storage/ibmdb2i/db2i_collationSupport.h b/storage/ibmdb2i/db2i_collationSupport.h new file mode 100644 index 00000000000..315d6ae4403 --- /dev/null +++ b/storage/ibmdb2i/db2i_collationSupport.h @@ -0,0 +1,45 @@ +/* +Licensed Materials - Property of IBM +DB2 Storage Engine Enablement +Copyright IBM Corporation 2007,2008 +All rights reserved + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + (a) Redistributions of source code must retain this list of conditions, the + copyright notice in section {d} below, and the disclaimer following this + list of conditions. + (b) Redistributions in binary form must reproduce this list of conditions, the + copyright notice in section (d) below, and the disclaimer following this + list of conditions, in the documentation and/or other materials provided + with the distribution. + (c) The name of IBM may not be used to endorse or promote products derived from + this software without specific prior written permission. + (d) The text of the required copyright notice is: + Licensed Materials - Property of IBM + DB2 Storage Engine Enablement + Copyright IBM Corporation 2007,2008 + All rights reserved + +THIS SOFTWARE IS PROVIDED BY IBM CORPORATION "AS IS" AND ANY EXPRESS OR IMPLIED +WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT +SHALL IBM CORPORATION BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT +OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT INCLUDING NEGLIGENCE OR OTHERWISE) ARISING +IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY +OF SUCH DAMAGE. +*/ + + +#ifndef DB2I_COLLATIONSUPPORT_H +#define DB2I_COLLATIONSUPPORT_H + +#include "db2i_global.h" +#include "mysql_priv.h" + +int32 updateAssociatedSortSequence(const Field *curField, char* fileSortSequenceType, char* fileSortSequence, char* fileSortSequenceLibrary); + +#endif diff --git a/storage/ibmdb2i/db2i_constraints.cc b/storage/ibmdb2i/db2i_constraints.cc new file mode 100644 index 00000000000..d219aa05737 --- /dev/null +++ b/storage/ibmdb2i/db2i_constraints.cc @@ -0,0 +1,699 @@ +/* +Licensed Materials - Property of IBM +DB2 Storage Engine Enablement +Copyright IBM Corporation 2007,2008 +All rights reserved + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + (a) Redistributions of source code must retain this list of conditions, the + copyright notice in section {d} below, and the disclaimer following this + list of conditions. + (b) Redistributions in binary form must reproduce this list of conditions, the + copyright notice in section (d) below, and the disclaimer following this + list of conditions, in the documentation and/or other materials provided + with the distribution. + (c) The name of IBM may not be used to endorse or promote products derived from + this software without specific prior written permission. + (d) The text of the required copyright notice is: + Licensed Materials - Property of IBM + DB2 Storage Engine Enablement + Copyright IBM Corporation 2007,2008 + All rights reserved + +THIS SOFTWARE IS PROVIDED BY IBM CORPORATION "AS IS" AND ANY EXPRESS OR IMPLIED +WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT +SHALL IBM CORPORATION BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT +OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT INCLUDING NEGLIGENCE OR OTHERWISE) ARISING +IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY +OF SUCH DAMAGE. +*/ + + + +#include "ha_ibmdb2i.h" +#include "db2i_safeString.h" + +// This function is called when building the CREATE TABLE information for +// foreign key constraints. It converts a constraint, table, schema, or +// field name from EBCDIC to ASCII. If the DB2 name is quoted, it removes +// those quotes. It then adds the appropriate quotes for a MySQL identifier. + +static void convNameForCreateInfo(THD *thd, SafeString& info, char* fromName, int len) +{ + int quote; + char cquote; // Quote character + char convName[MAX_DB2_FILENAME_LENGTH]; // Converted name + + memset(convName, 0, sizeof(convName)); + convFromEbcdic(fromName, convName, len); + quote = get_quote_char_for_identifier(thd, convName, len); + cquote = (char) quote; + if (quote != EOF) + info.strcat(cquote); + if (convName[0] == '"') // If DB2 name was quoted, remove quotes + { + if (strstr(convName, "\"\"")) + stripExtraQuotes(convName+1, len-1); + info.strncat((char*)(convName+1), len-2); + } + else // DB2 name was not quoted + info.strncat(convName, len); + if (quote != EOF) + info.strcat(cquote); +} + +/** + Evaluate the parse tree to build foreign key constraint clauses + + @parm lex The parse tree + @parm appendHere The DB2 string to receive the constraint clauses + @parm path The path to the table under consideration + @parm fields Pointer to the table's list of field pointers + @parm[in, out] fileSortSequenceType The sort sequence type associated with the table + @parm[in, out] fileSortSequence The sort sequence associated with the table + @parm[in, out] fileSortSequenceLibrary The sort sequence library associated with the table + + @return 0 if successful; HA_ERR_CANNOT_ADD_FOREIGN otherwise +*/ +int ha_ibmdb2i::buildDB2ConstraintString(LEX* lex, + String& appendHere, + const char* path, + Field** fields, + char* fileSortSequenceType, + char* fileSortSequence, + char* fileSortSequenceLibrary) +{ + List_iterator keyIter(lex->alter_info.key_list); + char colName[MAX_DB2_COLNAME_LENGTH+1]; + + Key* curKey; + + while (curKey = keyIter++) + { + if (curKey->type == Key::FOREIGN_KEY) + { + appendHere.append(STRING_WITH_LEN(", ")); + + Foreign_key* fk = (Foreign_key*)curKey; + + char db2LibName[MAX_DB2_SCHEMANAME_LENGTH+1]; + if (fk->name) + { + char db2FKName[MAX_DB2_FILENAME_LENGTH+1]; + appendHere.append(STRING_WITH_LEN("CONSTRAINT ")); + if (fk->ref_table->db.str) + { + convertMySQLNameToDB2Name(fk->ref_table->db.str, db2LibName, sizeof(db2LibName)); + } + else + { + db2i_table::getDB2LibNameFromPath(path, db2LibName); + } + if (lower_case_table_names == 1) + my_casedn_str(files_charset_info, db2LibName); + appendHere.append(db2LibName); + + appendHere.append('.'); + + convertMySQLNameToDB2Name(fk->name, db2FKName, sizeof(db2FKName)); + appendHere.append(db2FKName); + } + + appendHere.append(STRING_WITH_LEN(" FOREIGN KEY (")); + + bool firstTime = true; + + List_iterator column(fk->columns); + Key_part_spec* curColumn; + + while (curColumn = column++) + { + if (!firstTime) + { + appendHere.append(','); + } + firstTime = false; + + convertMySQLNameToDB2Name(curColumn->field_name, colName, sizeof(colName)); + appendHere.append(colName); + + // DB2 requires that the sort sequence on the child table match the parent table's + // sort sequence. We ensure that happens by updating the sort sequence according + // to the constrained fields. + Field** field = fields; + do + { + if (strcmp((*field)->field_name, curColumn->field_name) == 0) + { + int rc = updateAssociatedSortSequence((*field), + fileSortSequenceType, + fileSortSequence, + fileSortSequenceLibrary); + + if (unlikely(rc)) return rc; + } + } while (*(++field)); + } + + firstTime = true; + + appendHere.append(STRING_WITH_LEN(") REFERENCES ")); + + if (fk->ref_table->db.str) + { + convertMySQLNameToDB2Name(fk->ref_table->db.str, db2LibName, sizeof(db2LibName)); + } + else + { + db2i_table::getDB2LibNameFromPath(path, db2LibName); + } + if (lower_case_table_names == 1) + my_casedn_str(files_charset_info, db2LibName); + appendHere.append(db2LibName); + appendHere.append('.'); + + char db2FileName[MAX_DB2_FILENAME_LENGTH+1]; + convertMySQLNameToDB2Name(fk->ref_table->table.str, db2FileName, sizeof(db2FileName)); + if (lower_case_table_names) + my_casedn_str(files_charset_info, db2FileName); + appendHere.append(db2FileName); + + + if (!fk->ref_columns.is_empty()) + { + List_iterator ref(fk->ref_columns); + Key_part_spec* curRef; + appendHere.append(STRING_WITH_LEN(" (")); + + + while (curRef = ref++) + { + if (!firstTime) + { + appendHere.append(','); + } + firstTime = false; + + convertMySQLNameToDB2Name(curRef->field_name, colName, sizeof(colName)); + appendHere.append(colName); + } + + appendHere.append(STRING_WITH_LEN(") ")); + } + + if (fk->delete_opt != Foreign_key::FK_OPTION_UNDEF) + { + appendHere.append(STRING_WITH_LEN("ON DELETE ")); + switch (fk->delete_opt) + { + case Foreign_key::FK_OPTION_RESTRICT: + appendHere.append(STRING_WITH_LEN("RESTRICT ")); break; + case Foreign_key::FK_OPTION_CASCADE: + appendHere.append(STRING_WITH_LEN("CASCADE ")); break; + case Foreign_key::FK_OPTION_SET_NULL: + appendHere.append(STRING_WITH_LEN("SET NULL ")); break; + case Foreign_key::FK_OPTION_NO_ACTION: + appendHere.append(STRING_WITH_LEN("NO ACTION ")); break; + case Foreign_key::FK_OPTION_DEFAULT: + appendHere.append(STRING_WITH_LEN("SET DEFAULT ")); break; + default: + return HA_ERR_CANNOT_ADD_FOREIGN; break; + } + } + + if (fk->update_opt != Foreign_key::FK_OPTION_UNDEF) + { + appendHere.append(STRING_WITH_LEN("ON UPDATE ")); + switch (fk->update_opt) + { + case Foreign_key::FK_OPTION_RESTRICT: + appendHere.append(STRING_WITH_LEN("RESTRICT ")); break; + case Foreign_key::FK_OPTION_NO_ACTION: + appendHere.append(STRING_WITH_LEN("NO ACTION ")); break; + default: + return HA_ERR_CANNOT_ADD_FOREIGN; break; + } + } + + } + + } + + return 0; +} + + +/*********************************************************************** +Get the foreign key information in the form of a character string so +that it can be inserted into a CREATE TABLE statement. This is used by +the SHOW CREATE TABLE statement. The string will later be freed by the +free_foreign_key_create_info() method. +************************************************************************/ + +char* ha_ibmdb2i::get_foreign_key_create_info(void) +{ + DBUG_ENTER("ha_ibmdb2i::get_foreign_key_create_info"); + int rc = 0; + char* infoBuffer = NULL; // Pointer to string returned to MySQL + uint32 constraintSpaceLength;// Length of space passed to DB2 + ValidatedPointer constraintSpace; // Space pointer passed to DB2 + uint32 neededLen; // Length returned from DB2 + uint32 cstCnt; // Number of foreign key constraints from DB2 + uint32 fld; // + constraint_hdr* cstHdr; // Pointer to constraint header structure + FK_constraint* FKCstDef; // Pointer to constraint definition structure + cst_name* fieldName; // Pointer to field name structure + char* tempPtr; // Temp pointer for traversing constraint space + char convName[128]; + + /* Allocate space to retrieve the DB2 constraint information. */ + + if (!(share = get_share(table_share->path.str, table))) + DBUG_RETURN(NULL); + + constraintSpaceLength = 5000; // Try allocating 5000 bytes and see if enough. + + initBridge(); + + constraintSpace.alloc(constraintSpaceLength); + rc = bridge()->expectErrors(QMY_ERR_NEED_MORE_SPACE) + ->constraints(db2Table->dataFile()->getMasterDefnHandle(), + constraintSpace, + constraintSpaceLength, + &neededLen, + &cstCnt); + + if (unlikely(rc == QMY_ERR_NEED_MORE_SPACE)) + { + constraintSpaceLength = neededLen; // Get length of space that's needed + constraintSpace.realloc(constraintSpaceLength); + rc = bridge()->expectErrors(QMY_ERR_NEED_MORE_SPACE) + ->constraints(db2Table->dataFile()->getMasterDefnHandle(), + constraintSpace, + constraintSpaceLength, + &neededLen, + &cstCnt); + } + + /* If constraint information was returned by DB2, build a text string */ + /* to return to MySQL. */ + + if ((rc == 0) && (cstCnt > 0)) + { + THD* thd = ha_thd(); + infoBuffer = (char*) my_malloc(MAX_FOREIGN_LEN + 1, MYF(MY_WME)); + if (infoBuffer == NULL) + { + free_share(share); + DBUG_RETURN(NULL); + } + + SafeString info(infoBuffer, MAX_FOREIGN_LEN + 1); + + /* Loop through the DB2 constraints and build a text string for each foreign */ + /* key constraint that is found. */ + + tempPtr = constraintSpace; + cstHdr = (constraint_hdr_t*)(void*)constraintSpace; // Address first constraint definition + for (int i = 0; i < cstCnt && !info.overflowed(); ++i) + { + if (cstHdr->CstType[0] == QMY_CST_FK) // If this is a foreign key constraint + { + tempPtr = (char*)(tempPtr + cstHdr->CstDefOff); + FKCstDef = (FK_constraint_t*)tempPtr; + + /* Process the constraint name. */ + + info.strncat(STRING_WITH_LEN(" CONSTRAINT ")); + convNameForCreateInfo(thd, info, + FKCstDef->CstName.Name, FKCstDef->CstName.Len); + + /* Process the names of the foreign keys. */ + + info.strncat(STRING_WITH_LEN(" FOREIGN KEY (")); + tempPtr = (char*)(tempPtr + FKCstDef->KeyColOff); + fieldName= (cst_name_t*)tempPtr; + for (fld = 0; fld < FKCstDef->KeyCnt; ++fld) + { + convNameForCreateInfo(thd, info, fieldName->Name, fieldName->Len); + if ((fld + 1) < FKCstDef->KeyCnt) + { + info.strncat(STRING_WITH_LEN(", ")); + fieldName = fieldName + 1; + } + } + + /* Process the schema-name and name of the referenced table. */ + + info.strncat(STRING_WITH_LEN(") REFERENCES ")); + convNameForCreateInfo(thd, info, + FKCstDef->RefSchema.Name, FKCstDef->RefSchema.Len); + info.strcat('.'); + convNameForCreateInfo(thd, info, + FKCstDef->RefTable.Name, FKCstDef->RefTable.Len); + info.strncat(STRING_WITH_LEN(" (")); + + /* Process the names of the referenced keys. */ + + tempPtr = (char*)FKCstDef; + tempPtr = (char*)(tempPtr + FKCstDef->RefColOff); + fieldName= (cst_name_t*)tempPtr; + for (fld = 0; fld < FKCstDef->RefCnt; ++fld) + { + convNameForCreateInfo(thd, info, fieldName->Name, fieldName->Len); + if ((fld + 1) < FKCstDef->RefCnt) + { + info.strncat(STRING_WITH_LEN(", ")); + fieldName = fieldName + 1; + } + } + + /* Process the ON UPDATE and ON DELETE rules. */ + + info.strncat(STRING_WITH_LEN(") ON UPDATE ")); + switch(FKCstDef->UpdMethod) + { + case QMY_NOACTION: info.strncat(STRING_WITH_LEN("NO ACTION")); break; + case QMY_RESTRICT: info.strncat(STRING_WITH_LEN("RESTRICT")); break; + default: break; + } + info.strncat(STRING_WITH_LEN(" ON DELETE ")); + switch(FKCstDef->DltMethod) + { + case QMY_CASCADE: info.strncat(STRING_WITH_LEN("CASCADE")); break; + case QMY_SETDFT: info.strncat(STRING_WITH_LEN("SET DEFAULT")); break; + case QMY_SETNULL: info.strncat(STRING_WITH_LEN("SET NULL")); break; + case QMY_NOACTION: info.strncat(STRING_WITH_LEN("NO ACTION")); break; + case QMY_RESTRICT: info.strncat(STRING_WITH_LEN("RESTRICT")); break; + default: break; + } + } + + /* Address the next constraint, if any. */ + + if ((i+1) < cstCnt) + { + info.strcat(','); + tempPtr = (char*)cstHdr + cstHdr->CstLen; + cstHdr = (constraint_hdr_t*)(tempPtr); + } + } + } + + /* Cleanup and return */ + free_share(share); + + DBUG_RETURN(infoBuffer); +} + +/*********************************************************************** +Free the foreign key create info (for a table) that was acquired by the +get_foreign_key_create_info() method. +***********************************************************************/ + +void ha_ibmdb2i::free_foreign_key_create_info(char* info) +{ + DBUG_ENTER("ha_ibmdb2i::free_foreign_key_create_info"); + + if (info) + { + my_free(info, MYF(0)); + } + DBUG_VOID_RETURN; +} + +/*********************************************************************** +This method returns to MySQL a list, with one entry in the list describing +each foreign key constraint. +***********************************************************************/ + +int ha_ibmdb2i::get_foreign_key_list(THD *thd, List *f_key_list) +{ + DBUG_ENTER("ha_ibmdb2i::get_foreign_key_list"); + int rc = 0; + uint32 constraintSpaceLength; // Length of space passed to DB2 + ValidatedPointer constraintSpace; // Space pointer passed to DB2 + uint16 rtnCode; // Return code from DB2 + uint32 neededLen; // Bytes needed to contain DB2 constraint info + uint32 cstCnt; // Number of constraints returned by DB2 + uint32 fld; + constraint_hdr* cstHdr; // Pointer to a cst header structure + FK_constraint* FKCstDef; // Pointer to definition of foreign key constraint + cst_name* fieldName; // Pointer to field name structure + const char *method; + ulong methodLen; + bool gotShare = FALSE; // Indicator for local get_share + char* tempPtr; // Temp pointer for traversing constraint space + char convName[128]; + + // Allocate space to retrieve the DB2 constraint information. + if (!(share = get_share(table_share->path.str, table))) + DBUG_RETURN(0); + + constraintSpaceLength = 5000; // Try allocating 5000 bytes and see if enough. + + constraintSpace.alloc(constraintSpaceLength); + rc = bridge()->expectErrors(QMY_ERR_NEED_MORE_SPACE) + ->constraints(db2Table->dataFile()->getMasterDefnHandle(), + constraintSpace, + constraintSpaceLength, + &neededLen, + &cstCnt); + + if (unlikely(rc == QMY_ERR_NEED_MORE_SPACE)) + { + constraintSpaceLength = neededLen; // Get length of space that's needed + constraintSpace.realloc(constraintSpaceLength); + rc = bridge()->expectErrors(QMY_ERR_NEED_MORE_SPACE) + ->constraints(db2Table->dataFile()->getMasterDefnHandle(), + constraintSpace, + constraintSpaceLength, + &neededLen, + &cstCnt); + } + + /* If constraint information was returned by DB2, build a text string */ + /* to return to MySQL. */ + if ((rc == 0) && (cstCnt > 0)) + { + tempPtr = constraintSpace; + cstHdr = (constraint_hdr_t*)(void*)constraintSpace; // Address first constraint definition + for (int i = 0; i < cstCnt; ++i) + { + if (cstHdr->CstType[0] == QMY_CST_FK) // If this is a foreign key constraint + { + FOREIGN_KEY_INFO f_key_info; + LEX_STRING *name= 0; + tempPtr = (char*)(tempPtr + cstHdr->CstDefOff); + FKCstDef = (FK_constraint_t*)tempPtr; + + /* Process the constraint name. */ + + convFromEbcdic(FKCstDef->CstName.Name, convName,FKCstDef->CstName.Len); + if (convName[0] == '"') // If quoted, exclude quotes. + f_key_info.forein_id = thd_make_lex_string(thd, 0, + convName + 1, (uint) (FKCstDef->CstName.Len - 2), 1); + else // Not quoted + f_key_info.forein_id = thd_make_lex_string(thd, 0, + convName, (uint) FKCstDef->CstName.Len, 1); + + /* Process the names of the foreign keys. */ + + + tempPtr = (char*)(tempPtr + FKCstDef->KeyColOff); + fieldName = (cst_name_t*)tempPtr; + for (fld = 0; fld < FKCstDef->KeyCnt; ++fld) + { + convFromEbcdic(fieldName->Name, convName, fieldName->Len); + if (convName[0] == '"') // If quoted, exclude quotes. + name = thd_make_lex_string(thd, name, + convName + 1, (uint) (fieldName->Len - 2), 1); + else + name = thd_make_lex_string(thd, name, convName, (uint) fieldName->Len, 1); + f_key_info.foreign_fields.push_back(name); + if ((fld + 1) < FKCstDef->KeyCnt) + fieldName = fieldName + 1; + } + + /* Process the schema and name of the referenced table. */ + + convFromEbcdic(FKCstDef->RefSchema.Name, convName, FKCstDef->RefSchema.Len); + if (convName[0] == '"') // If quoted, exclude quotes. + f_key_info.referenced_db = thd_make_lex_string(thd, 0, + convName + 1, (uint) (FKCstDef->RefSchema.Len -2), 1); + else + f_key_info.referenced_db = thd_make_lex_string(thd, 0, + convName, (uint) FKCstDef->RefSchema.Len, 1); + convFromEbcdic(FKCstDef->RefTable.Name, convName, FKCstDef->RefTable.Len); + if (convName[0] == '"') // If quoted, exclude quotes. + f_key_info.referenced_table = thd_make_lex_string(thd, 0, + convName +1, (uint) (FKCstDef->RefTable.Len -2), 1); + else + f_key_info.referenced_table = thd_make_lex_string(thd, 0, + convName, (uint) FKCstDef->RefTable.Len, 1); + + /* Process the names of the referenced keys. */ + + tempPtr = (char*)FKCstDef; + tempPtr = (char*)(tempPtr + FKCstDef->RefColOff); + fieldName= (cst_name_t*)tempPtr; + for (fld = 0; fld < FKCstDef->RefCnt; ++fld) + { + convFromEbcdic(fieldName->Name, convName, fieldName->Len); + if (convName[0] == '"') // If quoted, exclude quotes. + name = thd_make_lex_string(thd, name, + convName + 1, (uint) (fieldName->Len -2), 1); + else + name = thd_make_lex_string(thd, name, convName, (uint) fieldName->Len, 1); + f_key_info.referenced_fields.push_back(name); + if ((fld + 1) < FKCstDef->RefCnt) + fieldName = fieldName + 1; + } + + /* Process the ON UPDATE and ON DELETE rules. */ + + switch(FKCstDef->UpdMethod) + { + case QMY_NOACTION: + { + method = "NO ACTION"; + methodLen=9; + } + break; + case QMY_RESTRICT: + { + method = "RESTRICT"; + methodLen = 8; + } + break; + default: break; + } + f_key_info.update_method = thd_make_lex_string( + thd, f_key_info.update_method, method, methodLen, 1); + switch(FKCstDef->DltMethod) + { + case QMY_CASCADE: + { + method = "CASCADE"; + methodLen = 7; + } + break; + case QMY_SETDFT: + { + method = "SET DEFAULT"; + methodLen = 11; + } + break; + case QMY_SETNULL: + { + method = "SET NULL"; + methodLen = 8; + } + break; + case QMY_NOACTION: + { + method = "NO ACTION"; + methodLen = 9; + } + break; + case QMY_RESTRICT: + { + method = "RESTRICT"; + methodLen = 8; + } + break; + default: break; + } + f_key_info.delete_method = thd_make_lex_string( + thd, f_key_info.delete_method, method, methodLen, 1); + f_key_info.referenced_key_name= thd_make_lex_string(thd, 0, (char *)"", 1, 1); + FOREIGN_KEY_INFO *pf_key_info = (FOREIGN_KEY_INFO *) + thd_memdup(thd, &f_key_info, sizeof(FOREIGN_KEY_INFO)); + f_key_list->push_back(pf_key_info); + } + + /* Address the next constraint, if any. */ + + if ((i+1) < cstCnt) + { + tempPtr = (char*)cstHdr + cstHdr->CstLen; + cstHdr = (constraint_hdr_t*)(tempPtr); + } + } + } + + /* Cleanup and return. */ + + free_share(share); + DBUG_RETURN(0); +} + +/*********************************************************************** +Checks if the table is referenced by a foreign key. +Returns: 0 if not referenced (or error occurs), + > 0 if is referenced +***********************************************************************/ + +uint ha_ibmdb2i::referenced_by_foreign_key(void) +{ + DBUG_ENTER("ha_ibmdb2i::referenced_by_foreign_key"); + + int rc = 0; + FILE_HANDLE queryFile = 0; + uint32 resultRowLen; + uint32 count = 0; + + const char* libName = db2Table->getDB2LibName(db2i_table::ASCII_SQL); + const char* fileName = db2Table->getDB2TableName(db2i_table::ASCII_SQL); + + String query(128); + query.append(STRING_WITH_LEN(" SELECT COUNT(*) FROM SYSIBM.SQLFOREIGNKEYS WHERE PKTABLE_SCHEM = '")); + query.append(libName+1, strlen(libName)-2); // parent library name + query.append(STRING_WITH_LEN("' AND PKTABLE_NAME = '")); + query.append(fileName+1, strlen(fileName)-2); // parent file name + query.append(STRING_WITH_LEN("'")); + + SqlStatementStream sqlStream(query); + + rc = bridge()->prepOpen(sqlStream.getPtrToData(), + &queryFile, + &resultRowLen); + if (rc == 0) + { + IOReadBuffer rowBuffer(1, resultRowLen); + rc = bridge()->read(queryFile, rowBuffer.ptr(), QMY_READ_ONLY, QMY_NONE, QMY_FIRST); + if (!rc) count = *((uint32*)rowBuffer.getRowN(0)); + bridge()->deallocateFile(queryFile); + } + DBUG_RETURN(count); +} + + +bool ha_ibmdb2i::check_if_incompatible_data(HA_CREATE_INFO *info, + uint table_changes) +{ + DBUG_ENTER("ha_ibmdb2i::check_if_incompatible_data"); + uint i; + /* Check that auto_increment value and field definitions were + not changed. */ + if ((info->used_fields & HA_CREATE_USED_AUTO && + info->auto_increment_value != 0) || + table_changes != IS_EQUAL_YES) + DBUG_RETURN(COMPATIBLE_DATA_NO); + /* Check if any fields were renamed. */ + for (i= 0; i < table->s->fields; i++) + { + Field *field= table->field[i]; + if (field->flags & FIELD_IS_RENAMED) + { + DBUG_PRINT("info", ("Field has been renamed, copy table")); + DBUG_RETURN(COMPATIBLE_DATA_NO); + } + } + DBUG_RETURN(COMPATIBLE_DATA_YES); +} diff --git a/storage/ibmdb2i/db2i_conversion.cc b/storage/ibmdb2i/db2i_conversion.cc new file mode 100644 index 00000000000..229d84c3b40 --- /dev/null +++ b/storage/ibmdb2i/db2i_conversion.cc @@ -0,0 +1,1168 @@ +/* +Licensed Materials - Property of IBM +DB2 Storage Engine Enablement +Copyright IBM Corporation 2007,2008 +All rights reserved + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + (a) Redistributions of source code must retain this list of conditions, the + copyright notice in section {d} below, and the disclaimer following this + list of conditions. + (b) Redistributions in binary form must reproduce this list of conditions, the + copyright notice in section (d) below, and the disclaimer following this + list of conditions, in the documentation and/or other materials provided + with the distribution. + (c) The name of IBM may not be used to endorse or promote products derived from + this software without specific prior written permission. + (d) The text of the required copyright notice is: + Licensed Materials - Property of IBM + DB2 Storage Engine Enablement + Copyright IBM Corporation 2007,2008 + All rights reserved + +THIS SOFTWARE IS PROVIDED BY IBM CORPORATION "AS IS" AND ANY EXPRESS OR IMPLIED +WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT +SHALL IBM CORPORATION BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT +OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT INCLUDING NEGLIGENCE OR OTHERWISE) ARISING +IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY +OF SUCH DAMAGE. +*/ + + + +#include "db2i_ileBridge.h" +#include "mysql_priv.h" +#include "db2i_charsetSupport.h" +#include "ctype.h" +#include "ha_ibmdb2i.h" +#include "db2i_errors.h" +#include "wchar.h" + +/** + Put a BCD digit into a BCD string. + + @param[out] bcdString The BCD string to be modified + @param pos The position within the string to be updated. + @param val The value to be assigned into the string at pos. +*/ +static inline void bcdAssign(char* bcdString, uint pos, uint val) +{ + bcdString[pos/2] |= val << ((pos % 2) ? 0 : 4); +} + +/** + Read a BCD digit from a BCD string. + + @param[out] bcdString The BCD string to be read + @param pos The position within the string to be read. + + @return bcdGet The value of the BCD digit at pos. +*/ +static inline uint bcdGet(const char* bcdString, uint pos) +{ + return (bcdString[pos/2] >> ((pos % 2) ? 0 : 4)) & 0xf; +} + +/** + In-place convert a number in ASCII represenation to EBCDIC representation. + + @param string The string of ASCII characters + @param len The length of string +*/ +static inline void convertNumericToEbcdicFast(char* string, int len) +{ + for (int i = 0; i < len; ++i, ++string) + { + switch(*string) + { + case '-': + *string = 0x60; break; + case ':': + *string = 0x7A; break; + case '.': + *string = 0x4B; break; + default: + DBUG_ASSERT(isdigit(*string)); + *string += 0xF0 - '0'; + break; + } + } +} + + +/** + atoi()-like function for a 4-character EBCDIC string. + + @param string The EBCDIC string + @return a4toi_ebcdic The decimal value of the EBCDIC string +*/ +static inline uint16 a4toi_ebcdic(const uchar* string) +{ + return ((string[0]-0xF0) * 1000 + + (string[1]-0xF0) * 100 + + (string[2]-0xF0) * 10 + + (string[3]-0xF0)); +}; + + +/** + atoi()-like function for a 4-character EBCDIC string. + + @param string The EBCDIC string + @return a4toi_ebcdic The decimal value of the EBCDIC string +*/ +static inline uint8 a2toi_ebcdic(const uchar* string) +{ + return ((string[0]-0xF0) * 10 + + (string[1]-0xF0)); +}; + +/** + Perform character conversion for textual field data. +*/ +int ha_ibmdb2i::convertFieldChars(enum_conversionDirection direction, + uint16 fieldID, + const char* input, + char* output, + size_t ilen, + size_t olen, + size_t* outDataLen) +{ + DBUG_PRINT("ha_ibmdb2i::convertFieldChars",("Direction: %d; length = %d", direction, ilen)); + + if (unlikely(ilen == 0)) + { + if (outDataLen) *outDataLen = 0; + return (0); + } + + iconv_t& conversion = db2Table->getConversionDefinition(direction, fieldID); + + if (unlikely(conversion == (iconv_t)(-1))) + { + return (DB2I_ERR_ICONV_OPEN); + } + + size_t initOLen= olen; + ilen = min(ilen, olen); // Handle partial translation + size_t substitutedChars = 0; + int rc = iconv(conversion, (char**)&input, &ilen, &output, &olen, &substitutedChars ); + if (unlikely(rc < 0)) + { + int er = errno; + if (er == EILSEQ) + { + getErrTxt(DB2I_ERR_ILL_CHAR, table->field[fieldID]->field_name); + return (DB2I_ERR_ILL_CHAR); + } + else + { + getErrTxt(DB2I_ERR_ICONV,er); + return (DB2I_ERR_ICONV); + } + } + if (unlikely(substitutedChars)) + { + warning(ha_thd(), DB2I_ERR_SUB_CHARS, table->field[fieldID]->field_name); + } + + if (outDataLen) *outDataLen = initOLen - olen; + + return (0); +} + + +/** + Convert a MySQL field definition into its corresponding DB2 type. + + The result will be appended to mapping as a DB2 SQL phrase. + + @param field The MySQL field to be evaluated + @param[out] mapping The receiver for the DB2 SQL syntax + @param timeFormat The format to be used for mapping the TIME type +*/ +int ha_ibmdb2i::getFieldTypeMapping(Field* field, + String& mapping, + enum_TimeFormat timeFormat, + enum_BlobMapping blobMapping) +{ + char stringBuildBuffer[257]; + uint32 fieldLength; + + CHARSET_INFO* fieldCharSet = field->charset(); + switch (field->type()) + { + case MYSQL_TYPE_NEWDECIMAL: + { + uint precision= ((Field_new_decimal*)field)->precision; + uint scale= field->decimals(); + + if (precision <= MAX_DEC_PRECISION) + { + sprintf(stringBuildBuffer,"DECIMAL(%d, %d)",precision,scale); + } + else + { + if (scale > precision - MAX_DEC_PRECISION) + { + scale = scale - (precision - MAX_DEC_PRECISION); + precision = MAX_DEC_PRECISION; + sprintf(stringBuildBuffer,"DECIMAL(%d, %d)",precision,scale); + } + else + { + return HA_ERR_UNSUPPORTED; + } + warning(ha_thd(), DB2I_ERR_PRECISION); + } + + mapping.append(stringBuildBuffer); + } + break; + case MYSQL_TYPE_TINY: + mapping.append(STRING_WITH_LEN("SMALLINT")); + break; + case MYSQL_TYPE_SHORT: + if (((Field_num*)field)->unsigned_flag) + mapping.append(STRING_WITH_LEN("INT")); + else + mapping.append(STRING_WITH_LEN("SMALLINT")); + break; + case MYSQL_TYPE_LONG: + if (((Field_num*)field)->unsigned_flag) + mapping.append(STRING_WITH_LEN("BIGINT")); + else + mapping.append(STRING_WITH_LEN("INT")); + break; + case MYSQL_TYPE_FLOAT: + mapping.append(STRING_WITH_LEN("REAL")); + break; + case MYSQL_TYPE_DOUBLE: + mapping.append(STRING_WITH_LEN("DOUBLE")); + break; + case MYSQL_TYPE_LONGLONG: + if (((Field_num*)field)->unsigned_flag) + mapping.append(STRING_WITH_LEN("DECIMAL(20,0)")); + else + mapping.append(STRING_WITH_LEN("BIGINT")); + break; + case MYSQL_TYPE_INT24: + mapping.append(STRING_WITH_LEN("INTEGER")); + break; + case MYSQL_TYPE_DATE: + case MYSQL_TYPE_NEWDATE: + mapping.append(STRING_WITH_LEN("DATE")); + break; + case MYSQL_TYPE_TIME: + if (timeFormat == TIME_OF_DAY) + mapping.append(STRING_WITH_LEN("TIME")); + else + mapping.append(STRING_WITH_LEN("INTEGER")); + break; + case MYSQL_TYPE_TIMESTAMP: + case MYSQL_TYPE_DATETIME: + mapping.append(STRING_WITH_LEN("TIMESTAMP")); + break; + case MYSQL_TYPE_YEAR: + mapping.append(STRING_WITH_LEN("CHAR(4) CCSID 1208")); + break; + case MYSQL_TYPE_BIT: + sprintf(stringBuildBuffer, "BINARY(%d)", (field->max_display_length() / 8) + 1); + mapping.append(stringBuildBuffer); + break; + case MYSQL_TYPE_BLOB: + case MYSQL_TYPE_VARCHAR: + case MYSQL_TYPE_STRING: + { + if (field->real_type() == MYSQL_TYPE_ENUM || + field->real_type() == MYSQL_TYPE_SET) + { + mapping.append(STRING_WITH_LEN("BIGINT")); + } + else + { + fieldLength = field->max_display_length(); // Get field byte length + + if (fieldCharSet == &my_charset_bin) + { + if (field->type() == MYSQL_TYPE_STRING) + { + sprintf(stringBuildBuffer, "BINARY(%d)", max(fieldLength, 1)); + } + else + { + if (fieldLength <= MAX_VARCHAR_LENGTH) + { + sprintf(stringBuildBuffer, "VARBINARY(%d)", max(fieldLength, 1)); + } +/* else if (blobMapping == AS_VARCHAR && + get_blob_type_from_length(fieldLength) == MYSQL_TYPE_BLOB) + { + sprintf(stringBuildBuffer, "LONG VARBINARY ", max(fieldLength, 1)); + } +*/ + else + { + fieldLength = min(MAX_BLOB_LENGTH, fieldLength); + sprintf(stringBuildBuffer, "BLOB(%d)", max(fieldLength, 1)); + } + } + mapping.append(stringBuildBuffer); + } + else + { + uint16 db2Ccsid = 0; // No override CCSID + if (field->type() == MYSQL_TYPE_STRING) + { + if (fieldLength > MAX_CHAR_LENGTH) + return 1; + if (fieldCharSet->mbmaxlen > 1) + { + if (strncmp(fieldCharSet->name, "ucs2_", sizeof("ucs2_")) == 0 ) // UCS2 + { + sprintf(stringBuildBuffer, "GRAPHIC(%d)", max(fieldLength / fieldCharSet->mbmaxlen, 1)); // Number of characters + db2Ccsid = 13488; + } + else if (strncmp(fieldCharSet->name, "utf8_", sizeof("utf8_")) == 0 && + strcmp(fieldCharSet->name, "utf8_general_ci") != 0) + { + sprintf(stringBuildBuffer, "CHAR(%d)", max(fieldLength, 1)); // Number of bytes + db2Ccsid = 1208; + } + else + { + sprintf(stringBuildBuffer, "GRAPHIC(%d)", max(fieldLength / fieldCharSet->mbmaxlen, 1)); // Number of characters + db2Ccsid = 1200; + } + } + else + { + sprintf(stringBuildBuffer, "CHAR(%d)", max(fieldLength, 1)); + } + mapping.append(stringBuildBuffer); + } + else + { + if (fieldLength <= MAX_VARCHAR_LENGTH) + { + if (fieldCharSet->mbmaxlen > 1) + { + if (strncmp(fieldCharSet->name, "ucs2_", sizeof("ucs2_")) == 0 ) // UCS2 + { + sprintf(stringBuildBuffer, "VARGRAPHIC(%d)", max(fieldLength / fieldCharSet->mbmaxlen, 1)); // Number of characters + db2Ccsid = 13488; + } + else if (strncmp(fieldCharSet->name, "utf8_", sizeof("utf8_")) == 0 && + strcmp(fieldCharSet->name, "utf8_general_ci") != 0) + { + sprintf(stringBuildBuffer, "VARCHAR(%d)", max(fieldLength, 1)); // Number of bytes + db2Ccsid = 1208; + } + else + { + sprintf(stringBuildBuffer, "VARGRAPHIC(%d)", max(fieldLength / fieldCharSet->mbmaxlen, 1)); // Number of characters + db2Ccsid = 1200; + } + } + else + { + sprintf(stringBuildBuffer, "VARCHAR(%d)", max(fieldLength, 1)); + } + } + else if (blobMapping == AS_VARCHAR && + get_blob_type_from_length(fieldLength) == MYSQL_TYPE_BLOB) + { + if (fieldCharSet->mbmaxlen > 1) + { + if (strncmp(fieldCharSet->name, "ucs2_", sizeof("ucs2_")) == 0 ) // UCS2 + { + sprintf(stringBuildBuffer, "LONG VARGRAPHIC "); + db2Ccsid = 13488; + } + else if (strncmp(fieldCharSet->name, "utf8_", sizeof("utf8_")) == 0 && + strcmp(fieldCharSet->name, "utf8_general_ci") != 0) + { + sprintf(stringBuildBuffer, "LONG VARCHAR "); + db2Ccsid = 1208; + } + else + { + sprintf(stringBuildBuffer, "LONG VARGRAPHIC "); + db2Ccsid = 1200; + } + } + else + { + sprintf(stringBuildBuffer, "LONG VARCHAR "); + } + } + else + { + fieldLength = min(MAX_BLOB_LENGTH, fieldLength); + + if (fieldCharSet->mbmaxlen > 1) + { + if (strncmp(fieldCharSet->name, "ucs2_", sizeof("ucs2_")) == 0 ) // UCS2 + { + sprintf(stringBuildBuffer, "DBCLOB(%d)", max(fieldLength / fieldCharSet->mbmaxlen, 1)); // Number of characters + db2Ccsid = 13488; + } + else if (strncmp(fieldCharSet->name, "utf8_", sizeof("utf8_")) == 0 && + strcmp(fieldCharSet->name, "utf8_general_ci") != 0) + { + sprintf(stringBuildBuffer, "CLOB(%d)", max(fieldLength, 1)); // Number of bytes + db2Ccsid = 1208; + } + else + { + sprintf(stringBuildBuffer, "DBCLOB(%d)", max(fieldLength / fieldCharSet->mbmaxlen, 1)); // Number of characters + db2Ccsid = 1200; + } + } + else + { + sprintf(stringBuildBuffer, "CLOB(%d)", max(fieldLength, 1)); // Number of characters + } + } + + mapping.append(stringBuildBuffer); + } + if (db2Ccsid == 0) // If not overriding CCSID + { + int32 rtnCode = convertIANAToDb2Ccsid(fieldCharSet->csname, &db2Ccsid); + if (rtnCode) + return rtnCode; + } + sprintf(stringBuildBuffer, " CCSID %d ", db2Ccsid); + mapping.append(stringBuildBuffer); + } + } + } + break; + + } + + return 0; +} + + +/** + Convert MySQL field data into the equivalent DB2 format + + @param field The MySQL field to be converted + @param db2Field The corresponding DB2 field definition + @param db2Buf The buffer to receive the converted data + @param data NULL if field points to the correct data; otherwise, + the data to be converted (for use with keys) +*/ +int32 ha_ibmdb2i::convertMySQLtoDB2(Field* field, const DB2Field& db2Field, char* db2Buf, const uchar* data) +{ + enum_field_types fieldType = field->type(); + switch (fieldType) + { + case MYSQL_TYPE_NEWDECIMAL: + { + uint precision= ((Field_new_decimal*)field)->precision; + uint scale= field->decimals(); + uint db2Precision = min(precision, MAX_DEC_PRECISION); + uint truncationAmount = precision - db2Precision; + + if (scale >= truncationAmount) + { + String tempString(precision+2); + + if (data == NULL) + { + field->val_str((String*)&tempString, (String*)(NULL)); + } + else + { + field->val_str(&tempString, data); + } + const char* temp = tempString.ptr(); + char packed[32]; + memset(&packed, 0, sizeof(packed)); + + int bcdPos = db2Precision - (db2Precision % 2 ? 1 : 0); + bcdAssign(packed, bcdPos+1, (temp[0] == '-' ? 0xD : 0xF)); + + int strPos=tempString.length() - 1 - truncationAmount; + + for (;strPos >= 0 && bcdPos >= 0; strPos--) + { + if (my_isdigit(&my_charset_latin1, temp[strPos])) + { + bcdAssign(packed, bcdPos, temp[strPos]-'0'); + --bcdPos; + } + } + memcpy(db2Buf, &packed, (db2Precision/2)+1); + } + + } + break; + case MYSQL_TYPE_TINY: + { + int16 temp = (data == NULL ? field->val_int() : field->val_int(data)); + memcpy(db2Buf , &temp, sizeof(temp)); + } + break; + case MYSQL_TYPE_SHORT: + { + if (((Field_num*)field)->unsigned_flag) + { + memset(db2Buf, 0, 2); + memcpy(db2Buf+2, (data == NULL ? field->ptr : data), 2); + } + else + { + memcpy(db2Buf, (data == NULL ? field->ptr : data), 2); + } + } + break; + case MYSQL_TYPE_LONG: + { + if (((Field_num*)field)->unsigned_flag) + { + memset(db2Buf, 0, 4); + memcpy(db2Buf+4, (data == NULL ? field->ptr : data), 4); + } + else + { + memcpy(db2Buf, (data == NULL ? field->ptr : data), 4); + } + } + break; + case MYSQL_TYPE_FLOAT: + { + memcpy(db2Buf, (data == NULL ? field->ptr : data), 4); + } + break; + case MYSQL_TYPE_DOUBLE: + { + memcpy(db2Buf, (data == NULL ? field->ptr : data), 8); + } + break; + case MYSQL_TYPE_TIMESTAMP: + case MYSQL_TYPE_DATETIME: + { + String tempString(27); + const char* ZERO_VALUE = "0000-00-00 00:00:00"; + if (data == NULL) + { + field->val_str(&tempString, &tempString); + } + else + { + field->val_str(&tempString, data); + } + memset(db2Buf, '0', 26); + memcpy(db2Buf, tempString.ptr(), tempString.length()); + if (strncmp(db2Buf,ZERO_VALUE,strlen(ZERO_VALUE)) == 0) + { + getErrTxt(DB2I_ERR_INVALID_COL_VALUE,ZERO_VALUE,field->field_name); + return(DB2I_ERR_INVALID_COL_VALUE); + } + (db2Buf)[10] = '-'; + (db2Buf)[13] = (db2Buf)[16] = (db2Buf)[19] = '.'; + + convertNumericToEbcdicFast(db2Buf, 26); + } + break; + case MYSQL_TYPE_LONGLONG: + { + if (((Field_num*)field)->unsigned_flag) + { + char temp[23]; + String tempString(temp, sizeof(temp), &my_charset_latin1); + + if (data == NULL) + { + field->val_str((String*)&tempString, (String*)(NULL)); + } + else + { + field->val_str(&tempString, data); + } + char packed[11]; + memset(packed, 0, sizeof(packed)); + bcdAssign(packed, 21, (temp[0] == '-' ? 0xD : 0xF)); + int strPos=tempString.length()-1; + int bcdPos=20; + + for (;strPos >= 0; strPos--) + { + if (my_isdigit(&my_charset_latin1, temp[strPos])) + { + bcdAssign(packed, bcdPos, temp[strPos]-'0'); + --bcdPos; + } + } + memcpy(db2Buf, &packed, 11); + } + else + { + *(uint64*)db2Buf = *(uint64*)(data == NULL ? field->ptr : data); + } + } + break; + case MYSQL_TYPE_INT24: + { + int32 temp= (data == NULL ? field->val_int() : field->val_int(data)); + memcpy(db2Buf , &temp, sizeof(temp)); + } + break; + case MYSQL_TYPE_DATE: + case MYSQL_TYPE_NEWDATE: + { + const char* ZERO_VALUE = "0000-00-00"; + String tempString(11); + if (data == NULL) + { + field->val_str(&tempString, (String*)NULL); + } + else + { + field->val_str(&tempString, data); + } + memcpy(db2Buf, tempString.ptr(), 10); + if (strncmp(db2Buf,ZERO_VALUE,strlen(ZERO_VALUE)) == 0) + { + getErrTxt(DB2I_ERR_INVALID_COL_VALUE,ZERO_VALUE,field->field_name); + return(DB2I_ERR_INVALID_COL_VALUE); + } + + convertNumericToEbcdicFast(db2Buf,10); + } + break; + case MYSQL_TYPE_TIME: + { + if (db2Field.getType() == QMY_TIME) + { + String tempString(10); + if (data == NULL) + { + field->val_str(&tempString, (String*)NULL); + } + else + { + field->val_str(&tempString, data); + } + memcpy(db2Buf, tempString.ptr(), 8); + (db2Buf)[2]=(db2Buf)[5] = '.'; + + convertNumericToEbcdicFast(db2Buf, 8); + } + else + { + int32 temp = sint3korr(data == NULL ? field->ptr : data); + memcpy(db2Buf, &temp, sizeof(temp)); + } + } + break; + case MYSQL_TYPE_YEAR: + { + String tempString(5); + if (data == NULL) + { + field->val_str(&tempString, (String*)NULL); + } + else + { + field->val_str(&tempString, data); + } + memcpy(db2Buf, tempString.ptr(), 4); + } + break; + case MYSQL_TYPE_BIT: + { + int bytesToCopy = (db2Field.getByteLengthInRecord()-1) / 8 + 1; + + if (data == NULL) + { + uint64 temp = field->val_int(); + memcpy(db2Buf, + ((char*)&temp) + (sizeof(temp) - bytesToCopy), + bytesToCopy); + } + else + { + memcpy(db2Buf, + data, + bytesToCopy); + } + } + break; + case MYSQL_TYPE_VARCHAR: + case MYSQL_TYPE_STRING: + case MYSQL_TYPE_BLOB: + { + if (field->real_type() == MYSQL_TYPE_ENUM || + field->real_type() == MYSQL_TYPE_SET) + { + int64 temp= (data == NULL ? field->val_int() : field->val_int(data)); + *(int64*)db2Buf = temp; + } + else + { + const uchar* dataToStore; + uint32 bytesToStore; + uint32 bytesToPad = 0; + CHARSET_INFO* fieldCharSet = field->charset(); + uint32 maxDisplayLength = field->max_display_length(); + switch (fieldType) + { + case MYSQL_TYPE_STRING: + { + bytesToStore = maxDisplayLength; + if (data == NULL) + dataToStore = field->ptr; + else + dataToStore = data; + } + break; + case MYSQL_TYPE_VARCHAR: + { + + if (data == NULL) + { + bytesToStore = field->data_length(); + dataToStore = field->ptr + ((Field_varstring*)field)->length_bytes; + } + else + { + // Key lens are stored little-endian + bytesToStore = *(uint8*)data + ((*(uint8*)(data+1)) << 8); + dataToStore = data + 2; + } + bytesToPad = maxDisplayLength - bytesToStore; + } + break; + case MYSQL_TYPE_BLOB: + { + DBUG_ASSERT(data == NULL); + bytesToStore = ((Field_blob*)field)->get_length(); + bytesToPad = maxDisplayLength - bytesToStore; + ((Field_blob*)field)->get_ptr((uchar**)&dataToStore); + } + break; + } + + int32 rc; + uint16 db2FieldType = db2Field.getType(); + switch(db2FieldType) + { + case QMY_CHAR: + if (maxDisplayLength == 0) + bytesToPad = 1; + case QMY_VARCHAR: + if (db2FieldType == QMY_VARCHAR) + { + db2Buf += sizeof(uint16); + bytesToPad = 0; + } + + if (bytesToStore > db2Field.getDataLengthInRecord()) + { + bytesToStore = db2Field.getDataLengthInRecord(); + field->set_warning(MYSQL_ERROR::WARN_LEVEL_WARN, WARN_DATA_TRUNCATED, 1); + } + + if (fieldCharSet == &my_charset_bin) // If binary + { + if (bytesToStore) + memcpy(db2Buf, dataToStore, bytesToStore); + if (bytesToPad) + memset(db2Buf + bytesToStore, 0x00, bytesToPad); + } + else if (db2Field.getCCSID() == 1208) // utf8 + { + if (bytesToStore) + memcpy(db2Buf, dataToStore, bytesToStore); + if (bytesToPad) + memset(db2Buf + bytesToStore, ' ', bytesToPad); + } + else // single-byte ASCII to EBCDIC + { + DBUG_ASSERT(fieldCharSet->mbmaxlen == 1); + if (bytesToStore) + { + rc = convertFieldChars(toDB2, field->field_index, (char*)dataToStore, db2Buf, bytesToStore, bytesToStore, NULL); + if (rc) + return rc; + } + if (bytesToPad) + memset(db2Buf + bytesToStore, 0x40, bytesToPad); + } + + if (db2FieldType == QMY_VARCHAR) + *(uint16*)(db2Buf - sizeof(uint16)) = bytesToStore; + break; + case QMY_VARGRAPHIC: + db2Buf += sizeof(uint16); + bytesToPad = 0; + case QMY_GRAPHIC: + if (maxDisplayLength == 0 && db2FieldType == QMY_GRAPHIC) + bytesToPad = 2; + + if (db2Field.getCCSID() == 13488) + { + if (bytesToStore) + memcpy(db2Buf, dataToStore, bytesToStore); + if (bytesToPad) + wmemset((wchar_t*)(db2Buf + bytesToStore), 0x0020, bytesToPad/2); + } + else + { + size_t db2BytesToStore; + size_t maxDb2BytesToStore; + + if (maxDisplayLength == 0 && db2FieldType == QMY_GRAPHIC) + maxDb2BytesToStore = 2; + else + maxDb2BytesToStore = min(((bytesToStore * 2) / fieldCharSet->mbminlen), + ((maxDisplayLength * 2) / fieldCharSet->mbmaxlen)); + + if (bytesToStore == 0) + db2BytesToStore = 0; + else + { + rc = convertFieldChars(toDB2, field->field_index, (char*)dataToStore, db2Buf, bytesToStore, maxDb2BytesToStore, &db2BytesToStore); + if (rc) + return rc; + bytesToStore = db2BytesToStore; + } + if (db2BytesToStore < maxDb2BytesToStore) // If need to pad + wmemset((wchar_t*)(db2Buf + db2BytesToStore), 0x0020, (maxDb2BytesToStore - db2BytesToStore)/2); + } + + if (db2FieldType == QMY_VARGRAPHIC) + *(uint16*)(db2Buf-sizeof(uint16)) = bytesToStore/2; + break; + case QMY_BLOBCLOB: + case QMY_DBCLOB: + { + DBUG_ASSERT(data == NULL); + DB2LobField* lobField = (DB2LobField*)(db2Buf + db2Field.calcBlobPad()); + + if ((fieldCharSet == &my_charset_bin) || // binary or + (db2Field.getCCSID()==13488) || + (db2Field.getCCSID()==1208)) // binary UTF8 + { + } + else + { + char* temp; + int32 rc; + size_t db2BytesToStore; + if (fieldCharSet->mbmaxlen == 1) // single-byte ASCII to EBCDIC + { + temp = getCharacterConversionBuffer(field->field_index, bytesToStore); + rc = convertFieldChars(toDB2, field->field_index, (char*)dataToStore,temp,bytesToStore, bytesToStore, NULL); + if (rc) + return (rc); + } + else // Else Far East, special UTF8 or non-special UTF8/UCS2 + { + size_t maxDb2BytesToStore; + maxDb2BytesToStore = min(((bytesToStore * 2) / fieldCharSet->mbminlen), + ((maxDisplayLength * 2) / fieldCharSet->mbmaxlen)); + temp = getCharacterConversionBuffer(field->field_index, maxDb2BytesToStore); + rc = convertFieldChars(toDB2, field->field_index, (char*)dataToStore,temp,bytesToStore, maxDb2BytesToStore, &db2BytesToStore); + if (rc) + return (rc); + bytesToStore = db2BytesToStore; + } + dataToStore = (uchar*)temp; + } + + uint16 blobID = db2Table->getBlobIdFromField(field->field_index); + if (blobWriteBuffers[blobID] != (char*)dataToStore) + blobWriteBuffers[blobID].reassign((char*)dataToStore); + if ((void*)blobWriteBuffers[blobID]) + lobField->dataHandle = (ILEMemHandle)blobWriteBuffers[blobID]; + else + lobField->dataHandle = 0; + lobField->length = bytesToStore / (db2FieldType == QMY_DBCLOB ? 2 : 1); + } + break; + } + } + } + break; + default: + DBUG_ASSERT(0); + break; + } + + return (ha_thd()->is_error()); +} + + +/** + Convert DB2 field data into the equivalent MySQL format + + @param db2Field The DB2 field definition + @param field The MySQL field to receive the converted data + @param buf The DB2 data to be converted +*/ +int32 ha_ibmdb2i::convertDB2toMySQL(const DB2Field& db2Field, Field* field, const char* buf) +{ + int32 storeRC = 0; // Result of the field->store() operation + + const char* bufPtr = buf + db2Field.getBufferOffset(); + + switch (field->type()) + { + case MYSQL_TYPE_NEWDECIMAL: + { + uint precision= ((Field_new_decimal*)field)->precision; + uint scale= field->decimals(); + uint db2Precision = min(precision, MAX_DEC_PRECISION); + uint decimalPlace = precision-scale+1; + char temp[80]; + + if (precision <= MAX_DEC_PRECISION || + scale > precision - MAX_DEC_PRECISION) + { + uint numNibbles = db2Precision + (db2Precision % 2 ? 0 : 1); + + temp[0] = (bcdGet(bufPtr, numNibbles) == 0xD ? '-' : ' '); + int strPos=1; + int bcdPos=(db2Precision % 2 ? 0 : 1); + + for (;bcdPos < numNibbles; bcdPos++, strPos++) + { + if (strPos == decimalPlace) + { + temp[strPos] = '.'; + strPos++; + } + + temp[strPos] = bcdGet(bufPtr, bcdPos) + '0'; + } + + temp[strPos] = 0; + + storeRC = field->store(temp, strPos, &my_charset_latin1); + } + } + break; + case MYSQL_TYPE_TINY: + { + storeRC = field->store(*(int16*)bufPtr, ((Field_num*)field)->unsigned_flag); + } + break; + case MYSQL_TYPE_SHORT: + { + if (((Field_num*)field)->unsigned_flag) + { + storeRC = field->store(*(int32*)bufPtr, TRUE); + } + else + { + storeRC = field->store(*(int16*)bufPtr, FALSE); + } + } + break; + case MYSQL_TYPE_LONG: + { + if (((Field_num*)field)->unsigned_flag) + { + storeRC = field->store(*(int64*)bufPtr, TRUE); + } + else + { + storeRC = field->store(*(int32*)bufPtr, FALSE); + } + } + break; + case MYSQL_TYPE_FLOAT: + { + storeRC = field->store(*(float*)bufPtr); + } + break; + case MYSQL_TYPE_DOUBLE: + { + storeRC = field->store(*(double*)bufPtr); + } + break; + case MYSQL_TYPE_LONGLONG: + { + char temp[23]; + if (((Field_num*)field)->unsigned_flag) + { + temp[0] = (bcdGet(bufPtr, 21) == 0xD ? '-' : ' '); + int strPos=1; + int bcdPos=0; + + for (;bcdPos <= 20; bcdPos++, strPos++) + { + temp[strPos] = bcdGet(bufPtr, bcdPos) + '0'; + } + + temp[strPos] = 0; + + storeRC = field->store(temp, strPos, &my_charset_latin1); + } + else + { + storeRC = field->store(*(int64*)bufPtr, FALSE); + } + } + break; + case MYSQL_TYPE_INT24: + { + storeRC = field->store(*(int32*)bufPtr, ((Field_num*)field)->unsigned_flag); + } + break; + case MYSQL_TYPE_DATE: + case MYSQL_TYPE_NEWDATE: + { + longlong value= a4toi_ebcdic((uchar*)bufPtr) * 10000 + + a2toi_ebcdic((uchar*)bufPtr+5) * 100 + + a2toi_ebcdic((uchar*)bufPtr+8); + + storeRC = field->store(value); + } + break; + case MYSQL_TYPE_TIME: + { + if (db2Field.getType() == QMY_TIME) + { + longlong value= a2toi_ebcdic((uchar*)bufPtr) * 10000 + + a2toi_ebcdic((uchar*)bufPtr+3) * 100 + + a2toi_ebcdic((uchar*)bufPtr+6); + + storeRC = field->store(value); + } + else + storeRC = field->store(*((int32*)bufPtr)); + } + break; + case MYSQL_TYPE_TIMESTAMP: + case MYSQL_TYPE_DATETIME: + { + longlong value= (a4toi_ebcdic((uchar*)bufPtr) * 10000 + + a2toi_ebcdic((uchar*)bufPtr+5) * 100 + + a2toi_ebcdic((uchar*)bufPtr+8)) * 1000000LL + + (a2toi_ebcdic((uchar*)bufPtr+11) * 10000 + + a2toi_ebcdic((uchar*)bufPtr+14) * 100 + + a2toi_ebcdic((uchar*)bufPtr+17)); + + storeRC = field->store(value); + } + break; + case MYSQL_TYPE_YEAR: + { + storeRC = field->store(bufPtr, 4, &my_charset_bin); + } + break; + case MYSQL_TYPE_BIT: + { + uint64 temp= 0; + int bytesToCopy= (db2Field.getByteLengthInRecord()-1) / 8 + 1; + memcpy(((char*)&temp) + (sizeof(temp) - bytesToCopy), bufPtr, bytesToCopy); + storeRC = field->store(temp, TRUE); + } + break; + case MYSQL_TYPE_VARCHAR: + case MYSQL_TYPE_STRING: + case MYSQL_TYPE_BLOB: + { + if (field->real_type() == MYSQL_TYPE_ENUM || + field->real_type() == MYSQL_TYPE_SET) + { + storeRC = field->store(*(int64*)bufPtr); + } + else + { + + const char* dataToStore = NULL; + uint32 bytesToStore = 0; + CHARSET_INFO* fieldCharSet = field->charset(); + switch(db2Field.getType()) + { + case QMY_CHAR: + case QMY_GRAPHIC: + { + bytesToStore = db2Field.getByteLengthInRecord(); + if (bytesToStore == 0) + bytesToStore = 1; + dataToStore = bufPtr; + } + break; + case QMY_VARCHAR: + { + bytesToStore = *(uint16*)bufPtr; + dataToStore = bufPtr+sizeof(uint16); + } + break; + case QMY_VARGRAPHIC: + { + /* For VARGRAPHIC, convert the number of double-byte characters + to the number of bytes. */ + bytesToStore = (*(uint16*)bufPtr)*2; + dataToStore = bufPtr+sizeof(uint16); + } + break; + case QMY_DBCLOB: + case QMY_BLOBCLOB: + { + DB2LobField* lobField = (DB2LobField* )(bufPtr + db2Field.calcBlobPad()); + bytesToStore = lobField->length * (db2Field.getType() == QMY_DBCLOB ? 2 : 1); + dataToStore = (char*)blobReadBuffers->getBufferPtr(field->field_index); + } + break; + + } + + if ((fieldCharSet != &my_charset_bin) && // not binary & + (db2Field.getCCSID() != 13488) && // not UCS2 & + (db2Field.getCCSID() != 1208)) + { + char* temp; + size_t db2BytesToStore; + int rc; + if (fieldCharSet->mbmaxlen > 1) + { + size_t maxDb2BytesToStore = ((bytesToStore / 2) * fieldCharSet->mbmaxlen); // Worst case for number of bytes + temp = getCharacterConversionBuffer(field->field_index, maxDb2BytesToStore); + rc = convertFieldChars(toMySQL, field->field_index, dataToStore, temp, bytesToStore, maxDb2BytesToStore, &db2BytesToStore); + bytesToStore = db2BytesToStore; + } + else // single-byte ASCII to EBCDIC + { + temp = getCharacterConversionBuffer(field->field_index, bytesToStore); + rc = convertFieldChars(toMySQL, field->field_index, dataToStore, temp, bytesToStore, bytesToStore, NULL); + } + if (rc) + return (rc); + dataToStore = temp; + } + + if ((field)->flags & BLOB_FLAG) + ((Field_blob*)(field))->set_ptr(bytesToStore, (uchar*)dataToStore); + else + storeRC = field->store(dataToStore, bytesToStore, &my_charset_bin); + } + } + break; + default: + DBUG_ASSERT(0); + break; + + } + + if (storeRC) + { + invalidDataFound = true; + } + + return 0; +} diff --git a/storage/ibmdb2i/db2i_errors.cc b/storage/ibmdb2i/db2i_errors.cc new file mode 100644 index 00000000000..cb8b4986099 --- /dev/null +++ b/storage/ibmdb2i/db2i_errors.cc @@ -0,0 +1,296 @@ +/* +Licensed Materials - Property of IBM +DB2 Storage Engine Enablement +Copyright IBM Corporation 2007,2008 +All rights reserved + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + (a) Redistributions of source code must retain this list of conditions, the + copyright notice in section {d} below, and the disclaimer following this + list of conditions. + (b) Redistributions in binary form must reproduce this list of conditions, the + copyright notice in section (d) below, and the disclaimer following this + list of conditions, in the documentation and/or other materials provided + with the distribution. + (c) The name of IBM may not be used to endorse or promote products derived from + this software without specific prior written permission. + (d) The text of the required copyright notice is: + Licensed Materials - Property of IBM + DB2 Storage Engine Enablement + Copyright IBM Corporation 2007,2008 + All rights reserved + +THIS SOFTWARE IS PROVIDED BY IBM CORPORATION "AS IS" AND ANY EXPRESS OR IMPLIED +WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT +SHALL IBM CORPORATION BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT +OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT INCLUDING NEGLIGENCE OR OTHERWISE) ARISING +IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY +OF SUCH DAMAGE. +*/ + + +#include "db2i_errors.h" +#include "db2i_ileBridge.h" +#include "db2i_charsetSupport.h" +#include "mysql_priv.h" +#include "stdarg.h" + +#define MAX_MSGSTRING 109 + +/* + The following strings are associated with errors that can be produced + within the storage engine proper. +*/ +static const char* engineErrors[MAX_MSGSTRING] = +{ + {""}, + {"Error opening codeset conversion from %.64s to %.64s (errno = %d)"}, + {"Invalid %-.10s name '%-.128s'"}, + {"Unsupported move from '%-.128s' to '%-.128s' on RENAME TABLE statement"}, + {"Unsupported schema '%-.128s' specified on RENAME TABLE statement"}, + {"Auto_increment is not allowed for a partitioned table"}, + {"Character set conversion error due to unknown encoding scheme %d"}, + {""}, + {"Table '%-.128s' was not found by the storage engine"}, + {"Could not resolve to %-.128s in library %-.10s type %-.10s (errno = %d)"}, + {"Error on _PGMCALL for program %-.10s in library %-.10s (error = %d)"}, + {"Error on _ILECALL for API '%.128s' (error = %d)"}, + {"Error in iconv() function during character set conversion (errno = %d)"}, + {"Error from Get Encoding Scheme (QTQGESP) API: %d, %d, %d"}, + {"Error from Get Related Default CCSID (QTQGRDC) API: %d, %d, %d"}, + {"Invalid value '%-.128s' for column '%.192s'"}, + {"Schema name '%.128s' exceeds maximum length of %d characters"}, + {"Multiple collations not supported in a single index"}, + {"Sort sequence was not found"}, + {"One or more characters in column %.128s were substituted during conversion"}, + {"A decimal column exceeded the maximum precision. Data may be truncated."}, + {"Some data returned by DB2 for table %s could not be converted for MySQL"}, + {""}, + {"Column %.128s contains characters that cannot be converted"}, + {"An invalid name was specified for ibmdb2i_rdb_name."}, + {"A duplicate key was encountered for index '%.128s'"}, + {"A table with the same name exists but has incompatible column definitions."}, + {"The created table was discovered as an existing DB2 object."}, +}; + +/* + The following strings are associated with errors that can be returned + by the operating system via the QMY_* APIs. Most are very uncommon and + indicate a bug somewhere. +*/ +static const char* systemErrors[MAX_MSGSTRING] = +{ + {"Thread ID is too long"}, + {"Error creating a SPACE memory object"}, + {"Error creating a FILE memory object"}, + {"Error creating a SPACE synchronization token"}, + {"Error creating a FILE synchronization token"}, + {"See message %-.7s in joblog for job %-.6s/%-.10s/%-.10s."}, + {"Error unlocking a synchronization token when closing a connection"}, + {"Invalid action specified for an 'object lock' request"}, + {"Invalid action specified for a savepoint request"}, + {"Partial keys are not supported with an ICU sort sequence"}, + {"Error retrieving an ICU sort key"}, + {"Error converting single-byte sort sequence to UCS-2"}, + {"An unsupported collation was specified"}, + {"Validation failed for referenced table of foreign key constraint"}, + {"Error extracting table for constraint information"}, + {"Error extracting referenced table for constraint information"}, + {"Invalid action specified for a 'commitment control' request"}, + {"Invalid commitment control isolation level specified on 'open' request"}, + {"Invalid file handle"}, + {" "}, + {"Invalid option specified for returning data on 'read' request"}, + {"Invalid orientation specified for 'read' request"}, + {"Invalid option type specified for 'read' request"}, + {"Invalid isolation level for starting commitment control"}, + {"Error unlocking a synchronization token in module QMYALC"}, + {"Length of space for returned format is not long enough"}, + {"SQL XA transactions are currently unsupported by this interface"}, + {"The associated QSQSRVR job was killed or ended unexpectedly."}, + {"Error unlocking a synchronization token in module QMYSEI"}, + {"Error unlocking a synchronization token in module QMYSPO"}, + {"Error converting input CCSID from short form to long form"}, + {" "}, + {"Error getting associated CCSID for CCSID conversion"}, + {"Error converting a string from one CCSID to another"}, + {"Error unlocking a synchronization token"}, + {"Error destroying a synchronization token"}, + {"Error locking a synchronization token"}, + {"Error recreating a synchronization token"}, + {"A space handle was not specified for a constraint request"}, + {"An SQL cursor was specified for a delete request"}, + {" "}, + {"Error on delete request because current UFCB for connection is not open"}, + {"An SQL cursor was specified for an object initialization request"}, + {"An SQL cursor was specified for an object override request"}, + {"A space handle was not specified for an object override request"}, + {"An SQL cursor was specified for an information request"}, + {"An SQL cursor was specified for an object lock request"}, + {"An SQL cursor was specified for an optimize request"}, + {"A data handle was not specified for a read request"}, + {"A row number handle was not specified for a read request"}, + {"A key handle was not specified for a read request"}, + {"An SQL cursor was specified for an row estimation request"}, + {"A space handle was not specified for a row estimation request"}, + {"An SQL cursor was specified for a release record request"}, + {"A statement handle was not specified for an 'execute immediate' request"}, + {"A statement handle was not specified for a 'prepare open' request"}, + {"An SQL cursor was specified for an update request"}, + {"The UFCB was not open for read"}, + {"Error on update request because current UFCB for connection is not open"}, + {"A data handle was not specified for an update request"}, + {"An SQL cursor was specified for a write request"}, + {"A data handle was not specified for a write request"}, + {"An unknown function was specified on a process request"}, + {"A share definition was not specified for an 'allocate share' request"}, + {"A share handle was not specified for an 'allocate share' request"}, + {"A use count handle was not specified for an 'allocate share' request"}, + {"A 'records per key' handle was not specified for an information request"}, + {"Error resolving LOB addresss"}, + {"Length of a LOB space is too small"}, + {"An unknown function was specified for a server request"}, + {"Object authorization failed. See message %-.7s in joblog for job %-.6s/%-.10s/%-.10s. for more information."}, + {" "}, + {"Error locking mutex on server"}, + {"Error unlocking mutex on server"}, + {"Error checking for RDB name in RDB Directory"}, + {"Error creating mutex on server"}, + {"A table with that name already exists"}, + {" "}, + {"Error unlocking mutex"}, + {"Error connecting to server job"}, + {"Error connecting to server job"}, + {" "}, + {"Function check occurred while registering parameter spaces. See joblog."}, + {" "}, + {" "}, + {"End of block"}, + {"The file has changed and might not be compatible with the MySQL table definition"}, + {"Error giving pipe to server job"}, + {"There are open object locks when attempting to deallocate"}, + {"There is no open lock"}, + {" "}, + {" "}, + {"The maximum value for the auto_increment data type was exceeded"}, + {"Error occurred closing the pipe "}, + {"Error occurred taking a descriptor for the pipe"}, + {"Error writing to pipe "}, + {"Server was interrupted "}, + {"No pipe descriptor exists for reuse "}, + {"Error occurred during an SQL prepare statement "}, + {"Error occurred during an SQL open "}, + {" "}, + {" "}, + {" "}, + {" "}, + {" "}, + {" "}, + {"An unspecified error was returned from the system."}, + {" "} +}; + +/** + This function builds the text string for an error code, and substitutes + a variable number of replacement variables into the string. +*/ +void getErrTxt(int errCode, ...) +{ + va_list args; + va_start(args,errCode); + char* buffer = db2i_ileBridge::getBridgeForThread()->getErrorStorage(); + const char* msg; + + if (errCode >= QMY_ERR_MIN && errCode <= QMY_ERR_SQ_OPEN) + msg = systemErrors[errCode - QMY_ERR_MIN]; + else + { + DBUG_ASSERT(errCode >= DB2I_FIRST_ERR && errCode <= DB2I_LAST_ERR); + msg = engineErrors[errCode - DB2I_FIRST_ERR]; + } + + (void) my_vsnprintf (buffer, MYSQL_ERRMSG_SIZE, msg, args); + va_end(args); + fprintf(stderr,"ibmdb2i error %d: %s\n",errCode,buffer); + DBUG_PRINT("error", ("ibmdb2i error %d: %s",errCode,buffer)); +} + +static inline void trimSpace(char* str) +{ + char* end = strchr(str, ' '); + if (end) *end = 0; +} + + +/** + Generate the error text specific to an API error returned by a QMY_* API. + + @parm errCode The error value + @parm errInfo The structure containing the message and job identifiers. +*/ +void reportSystemAPIError(int errCode, const Qmy_Error_output *errInfo) +{ + if (errCode >= QMY_ERR_MIN && errCode <= QMY_ERR_SQ_OPEN) + { + switch(errCode) + { + case QMY_ERR_MSGID: + case QMY_ERR_NOT_AUTH: + { + DBUG_ASSERT(errInfo); + char jMsg[8]; // Error message ID + char jName[11]; // Job name + char jUser[11]; // Job user + char jNbr[7]; // Job number + memset(jMsg, 0, sizeof(jMsg)); + memset(jName, 0, sizeof(jMsg)); + memset(jUser, 0, sizeof(jMsg)); + memset(jMsg, 0, sizeof(jMsg)); + + convFromEbcdic(errInfo->MsgId,jMsg,sizeof(jMsg)-1); + convFromEbcdic(errInfo->JobName,jName,sizeof(jName)-1); + trimSpace(jName); + convFromEbcdic(errInfo->JobUser,jUser,sizeof(jUser)-1); + trimSpace(jUser); + convFromEbcdic(errInfo->JobNbr,jNbr,sizeof(jNbr)-1); + getErrTxt(errCode,jMsg,jNbr,jUser,jName); + } + break; + case QMY_ERR_RTNFMT: + { + getErrTxt(QMY_ERR_LVLID_MISMATCH); + } + break; + default: + getErrTxt(errCode); + break; + } + } +} + + +/** + Generate a warning for the specified error. +*/ +void warning(THD *thd, int errCode, ...) +{ + va_list args; + va_start(args,errCode); + char buffer[MYSQL_ERRMSG_SIZE]; + const char* msg; + + DBUG_ASSERT(errCode >= DB2I_FIRST_ERR && errCode <= DB2I_LAST_ERR); + msg = engineErrors[errCode - DB2I_FIRST_ERR]; + + (void) my_vsnprintf (buffer, MYSQL_ERRMSG_SIZE, msg, args); + va_end(args); + DBUG_PRINT("warning", ("ibmdb2i warning %d: %s",errCode,buffer)); + push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN, errCode, buffer); +} + + diff --git a/storage/ibmdb2i/db2i_errors.h b/storage/ibmdb2i/db2i_errors.h new file mode 100644 index 00000000000..9be2364a7b5 --- /dev/null +++ b/storage/ibmdb2i/db2i_errors.h @@ -0,0 +1,91 @@ +/* +Licensed Materials - Property of IBM +DB2 Storage Engine Enablement +Copyright IBM Corporation 2007,2008 +All rights reserved + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + (a) Redistributions of source code must retain this list of conditions, the + copyright notice in section {d} below, and the disclaimer following this + list of conditions. + (b) Redistributions in binary form must reproduce this list of conditions, the + copyright notice in section (d) below, and the disclaimer following this + list of conditions, in the documentation and/or other materials provided + with the distribution. + (c) The name of IBM may not be used to endorse or promote products derived from + this software without specific prior written permission. + (d) The text of the required copyright notice is: + Licensed Materials - Property of IBM + DB2 Storage Engine Enablement + Copyright IBM Corporation 2007,2008 + All rights reserved + +THIS SOFTWARE IS PROVIDED BY IBM CORPORATION "AS IS" AND ANY EXPRESS OR IMPLIED +WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT +SHALL IBM CORPORATION BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT +OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT INCLUDING NEGLIGENCE OR OTHERWISE) ARISING +IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY +OF SUCH DAMAGE. +*/ + + +#ifndef DB2I_ERRORS_H +#define DB2I_ERRORS_H + +#include "qmyse.h" +class THD; + +/** + @enum DB2I_errors + + @brief These are the errors that can be returned by the storage engine proper + and that are specific to the engine. Refer to db2i_errors.cc for text + descriptions of the errors. +*/ + +enum DB2I_errors +{ + DB2I_FIRST_ERR = 2500, + DB2I_ERR_ICONV_OPEN, + DB2I_ERR_INVALID_NAME, + DB2I_ERR_RENAME_MOVE, + DB2I_ERR_RENAME_QTEMP, + DB2I_ERR_PART_AUTOINC, + DB2I_ERR_UNKNOWN_ENCODING, + DB2I_ERR_RESERVED, + DB2I_ERR_TABLE_NOT_FOUND, + DB2I_ERR_RESOLVE_OBJ, + DB2I_ERR_PGMCALL, + DB2I_ERR_ILECALL, + DB2I_ERR_ICONV, + DB2I_ERR_QTQGESP, + DB2I_ERR_QTQGRDC, + DB2I_ERR_INVALID_COL_VALUE, + DB2I_ERR_TOO_LONG_SCHEMA, + DB2I_ERR_MIXED_COLLATIONS, + DB2I_ERR_SRTSEQ, + DB2I_ERR_SUB_CHARS, + DB2I_ERR_PRECISION, + DB2I_ERR_INVALID_DATA, + DB2I_ERR_RESERVED2, + DB2I_ERR_ILL_CHAR, + DB2I_ERR_BAD_RDB_NAME, + DB2I_ERR_UNKNOWN_IDX, + DB2I_ERR_DISCOVERY_MISMATCH, + DB2I_ERR_WARN_CREATE_DISCOVER, + DB2I_LAST_ERR = DB2I_ERR_WARN_CREATE_DISCOVER +}; + +void getErrTxt(int errcode, ...); +void reportSystemAPIError(int errCode, const Qmy_Error_output *errInfo); +void warning(THD *thd, int errCode, ...); + +const char* DB2I_SQL0350 = "\xE2\xD8\xD3\xF0\xF3\xF5\xF0"; // SQL0350 in EBCDIC + + +#endif diff --git a/storage/ibmdb2i/db2i_file.cc b/storage/ibmdb2i/db2i_file.cc new file mode 100644 index 00000000000..2ce78f18d21 --- /dev/null +++ b/storage/ibmdb2i/db2i_file.cc @@ -0,0 +1,513 @@ +/* +Licensed Materials - Property of IBM +DB2 Storage Engine Enablement +Copyright IBM Corporation 2007,2008 +All rights reserved + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + (a) Redistributions of source code must retain this list of conditions, the + copyright notice in section {d} below, and the disclaimer following this + list of conditions. + (b) Redistributions in binary form must reproduce this list of conditions, the + copyright notice in section (d) below, and the disclaimer following this + list of conditions, in the documentation and/or other materials provided + with the distribution. + (c) The name of IBM may not be used to endorse or promote products derived from + this software without specific prior written permission. + (d) The text of the required copyright notice is: + Licensed Materials - Property of IBM + DB2 Storage Engine Enablement + Copyright IBM Corporation 2007,2008 + All rights reserved + +THIS SOFTWARE IS PROVIDED BY IBM CORPORATION "AS IS" AND ANY EXPRESS OR IMPLIED +WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT +SHALL IBM CORPORATION BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT +OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT INCLUDING NEGLIGENCE OR OTHERWISE) ARISING +IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY +OF SUCH DAMAGE. +*/ + + + +#include "db2i_file.h" +#include "db2i_charsetSupport.h" +#include "db2i_collationSupport.h" +#include "db2i_misc.h" +#include "db2i_errors.h" +#include "my_dir.h" + +db2i_table::db2i_table(const TABLE_SHARE* myTable, const char* path) : + mysqlTable(myTable), + db2StartId(0), + blobFieldCount(0), + blobFields(NULL), + blobFieldActualSizes(NULL), + logicalFiles(NULL), + physicalFile(NULL), + db2TableNameSQLAscii(NULL), + db2LibNameSQLAscii(NULL) +{ + char asciiLibName[MAX_DB2_SCHEMANAME_LENGTH + 1]; + getDB2LibNameFromPath(path, asciiLibName, ASCII_NATIVE); + + char asciiFileName[MAX_DB2_FILENAME_LENGTH + 1]; + getDB2FileNameFromPath(path, asciiFileName, ASCII_NATIVE); + + size_t libNameLen = strlen(asciiLibName); + size_t fileNameLen = strlen(asciiFileName); + + db2LibNameEbcdic=(char *) + my_multi_malloc(MYF(MY_WME | MY_ZEROFILL), + &db2LibNameEbcdic, libNameLen+1, + &db2LibNameAscii, libNameLen+1, + &db2LibNameSQLAscii, libNameLen*2 + 1, + &db2TableNameEbcdic, fileNameLen+1, + &db2TableNameAscii, fileNameLen+1, + &db2TableNameSQLAscii, fileNameLen*2 + 1, + NullS); + + if (likely(db2LibNameEbcdic)) + { + memcpy(db2LibNameAscii, asciiLibName, libNameLen); + convertNativeToSQLName(db2LibNameAscii, db2LibNameSQLAscii); + convToEbcdic(db2LibNameAscii, db2LibNameEbcdic, libNameLen); + memcpy(db2TableNameAscii, asciiFileName, fileNameLen); + convertNativeToSQLName(db2TableNameAscii, db2TableNameSQLAscii); + convToEbcdic(db2TableNameAscii, db2TableNameEbcdic, fileNameLen); + } + + conversionDefinitions[toMySQL] = NULL; + conversionDefinitions[toDB2] = NULL; + + isTemporaryTable = (strstr(mysqlTable->path.str, mysql_tmpdir) == mysqlTable->path.str); +} + + +int32 db2i_table::initDB2Objects(const char* path) +{ + uint fileObjects = 1 + mysqlTable->keys; + ValidatedPointer fileDefnSpace(sizeof(ShrDef) * fileObjects); + + physicalFile = new db2i_file(this); + physicalFile->fillILEDefn(&fileDefnSpace[0], true); + + if (fileObjects > 1) + { + logicalFiles = new db2i_file*[fileObjects - 1]; + for (int k = 0; k < mysqlTable->keys; k++) + { + logicalFiles[k] = new db2i_file(this, k); + logicalFiles[k]->fillILEDefn(&fileDefnSpace[k+1], false); + } + } + + ValidatedPointer fileDefnHandles(sizeof(FILE_HANDLE) * fileObjects); + size_t formatSpaceLen = sizeof(format_hdr_t) + mysqlTable->fields * sizeof(DB2Field); + formatSpace.alloc(formatSpaceLen); + + int rc = db2i_ileBridge::getBridgeForThread()->allocateFileDefn(fileDefnSpace, + fileDefnHandles, + fileObjects, + db2LibNameEbcdic, + strlen(db2LibNameEbcdic), + formatSpace, + formatSpaceLen); + + if (rc) + return rc; + + convFromEbcdic(((format_hdr_t*)formatSpace)->FilLvlId, fileLevelID, sizeof(fileLevelID)); + + if (!doFileIDsMatch(path)) + { + getErrTxt(QMY_ERR_LVLID_MISMATCH); + return QMY_ERR_LVLID_MISMATCH; + } + + physicalFile->setMasterDefnHandle(fileDefnHandles[0]); + for (int k = 0; k < mysqlTable->keys; k++) + { + logicalFiles[k]->setMasterDefnHandle(fileDefnHandles[k+1]); + } + + db2StartId = (uint64)(((format_hdr_t*)formatSpace)->StartIdVal); + db2Fields = (DB2Field*)((char*)(void*)formatSpace + ((format_hdr_t*)formatSpace)->ColDefOff); + + uint fields = mysqlTable->fields; + for (int i = 0; i < fields; ++i) + { + if (db2Field(i).isBlob()) + { + blobFieldCount++; + } + } + + if (blobFieldCount) + { + blobFieldActualSizes = (uint*)my_multi_malloc(MYF(MY_WME | MY_ZEROFILL), + &blobFieldActualSizes, blobFieldCount * sizeof(uint), + &blobFields, blobFieldCount * sizeof(uint16), + NullS); + + int b = 0; + for (int i = 0; i < fields; ++i) + { + if (db2Field(i).isBlob()) + { + blobFields[b++] = i; + } + } + } + + my_multi_malloc(MYF(MY_WME), + &conversionDefinitions[toMySQL], fields * sizeof(iconv_t), + &conversionDefinitions[toDB2], fields * sizeof(iconv_t), + NullS); + for (int i = 0; i < fields; ++i) + { + conversionDefinitions[toMySQL][i] = (iconv_t)(-1); + conversionDefinitions[toDB2][i] = (iconv_t)(-1); + } + + return 0; +} + +int db2i_table::fastInitForCreate(const char* path) +{ + ValidatedPointer fileDefnSpace(sizeof(ShrDef)); + + physicalFile = new db2i_file(this); + physicalFile->fillILEDefn(fileDefnSpace, true); + + ValidatedPointer fileDefnHandles(sizeof(FILE_HANDLE)); + + size_t formatSpaceLen = sizeof(format_hdr_t) + + mysqlTable->fields * sizeof(DB2Field); + formatSpace.alloc(formatSpaceLen); + + int rc = db2i_ileBridge::getBridgeForThread()->allocateFileDefn(fileDefnSpace, + fileDefnHandles, + 1, + db2LibNameEbcdic, + strlen(db2LibNameEbcdic), + formatSpace, + formatSpaceLen); + + if (rc) + return rc; + + convFromEbcdic(((format_hdr_t*)formatSpace)->FilLvlId, fileLevelID, sizeof(fileLevelID)); + doFileIDsMatch(path); + + return 0; +} + +bool db2i_table::doFileIDsMatch(const char* path) +{ + char name_buff[FN_REFLEN]; + + fn_format(name_buff, path, "", FID_EXT, (MY_REPLACE_EXT | MY_UNPACK_FILENAME)); + + File fd = my_open(name_buff, O_RDONLY, MYF(0)); + + if (fd == -1) + { + if (errno == ENOENT) + { + fd = my_create(name_buff, 0, O_WRONLY, MYF(MY_WME)); + + if (fd == -1) + { + // TODO: Report errno here + return false; + } + my_write(fd, (uchar*)fileLevelID, sizeof(fileLevelID), MYF(MY_WME)); + my_close(fd, MYF(0)); + return true; + } + else + { + // TODO: Report errno here + return false; + } + } + + char diskFID[sizeof(fileLevelID)]; + + bool match = false; + + if (my_read(fd, (uchar*)diskFID, sizeof(diskFID), MYF(MY_WME)) == sizeof(diskFID) && + (memcmp(diskFID, fileLevelID, sizeof(diskFID)) == 0)) + match = true; + + my_close(fd, MYF(0)); + + return match; +} + +void db2i_table::deleteAssocFiles(const char* name) +{ + char name_buff[FN_REFLEN]; + fn_format(name_buff, name, "", FID_EXT, (MY_REPLACE_EXT | MY_UNPACK_FILENAME)); + my_delete(name_buff, MYF(0)); +} + +void db2i_table::renameAssocFiles(const char* from, const char* to) +{ + rename_file_ext(from, to, FID_EXT); +} + + +db2i_table::~db2i_table() +{ + if (blobFieldActualSizes) + my_free(blobFieldActualSizes, MYF(0)); + + if (conversionDefinitions[toMySQL]) + my_free(conversionDefinitions[toMySQL], MYF(0)); + + if (logicalFiles) + { + for (int k = 0; k < mysqlTable->keys; ++k) + { + delete logicalFiles[k]; + } + + delete[] logicalFiles; + } + delete physicalFile; + + my_free(db2LibNameEbcdic, 0); +} + +void db2i_table::getDB2QualifiedName(char* to) +{ + strcat(to, getDB2LibName(ASCII_SQL)); + strcat(to, "."); + strcat(to, getDB2TableName(ASCII_SQL)); +} + + +void db2i_table::getDB2QualifiedNameFromPath(const char* path, char* to) +{ + getDB2LibNameFromPath(path, to); + strcat(to, "."); + getDB2FileNameFromPath(path, strend(to)); +} + + +void db2i_table::filenameToTablename(const char* in, char* out, size_t outlen) +{ + if (strchr(in, '#') == NULL) + { + filename_to_tablename(in, out, outlen); + return; + } + + char* temp = (char*)sql_alloc(outlen); + + const char* part1, *part2, *part3, *part4; + part1 = in; + part2 = strstr(part1, "#P#"); + if (part2); + { + part3 = part2 + 3; + part4 = strchr(part3, '#'); + if (!part4) + part4 = strend(in); + } + + memcpy(temp, part1, min(outlen, part2 - part1)); + temp[min(outlen-1, part2-part1)] = 0; + + int32 accumLen = filename_to_tablename(temp, out, outlen); + + if (part2 && (accumLen + 4 < outlen)) + { + strcat(out, "#P#"); + accumLen += 4; + + memset(temp, 0, min(outlen, part2-part1)); + memcpy(temp, part3, min(outlen, part4-part3)); + temp[min(outlen-1, part4-part3)] = 0; + + accumLen += filename_to_tablename(temp, strend(out), outlen-accumLen); + + if (part4 && (accumLen + (strend(in) - part4 + 1) < outlen)) + { + strcat(out, part4); + } + } +} + +void db2i_table::getDB2LibNameFromPath(const char* path, char* lib, NameFormatFlags format) +{ + if (strstr(path, mysql_tmpdir) == path) + { + strcpy(lib, DB2I_TEMP_TABLE_SCHEMA); + } + else + { + const char* c = strend(path) - 1; + while (c > path && *c != '\\' && *c != '/') + --c; + + if (c != path) + { + const char* dbEnd = c; + do { + --c; + } while (c >= path && *c != '\\' && *c != '/'); + + if (c >= path) + { + const char* dbStart = c+1; + char fileName[FN_REFLEN]; + memcpy(fileName, dbStart, dbEnd - dbStart); + fileName[dbEnd-dbStart] = 0; + + char dbName[MAX_DB2_SCHEMANAME_LENGTH+1]; + filenameToTablename(fileName, dbName , sizeof(dbName)); + + convertMySQLNameToDB2Name(dbName, lib, sizeof(dbName), true, (format==ASCII_SQL) ); + } + else + DBUG_ASSERT(0); // This should never happen! + } + } +} + +void db2i_table::getDB2FileNameFromPath(const char* path, char* file, NameFormatFlags format) +{ + const char* fileEnd = strend(path); + const char* c = fileEnd; + while (c > path && *c != '\\' && *c != '/') + --c; + + if (c != path) + { + const char* fileStart = c+1; + char fileName[FN_REFLEN]; + memcpy(fileName, fileStart, fileEnd - fileStart); + fileName[fileEnd - fileStart] = 0; + char db2Name[MAX_DB2_FILENAME_LENGTH+1]; + filenameToTablename(fileName, db2Name, sizeof(db2Name)); + convertMySQLNameToDB2Name(db2Name, file, sizeof(db2Name), true, (format==ASCII_SQL) ); + } +} + +// Generates the DB2 index name when given the MySQL index and table names. +int32 db2i_table::appendQualifiedIndexFileName(const char* indexName, + const char* tableName, + String& to, + NameFormatFlags format, + enum_DB2I_INDEX_TYPE type) +{ + char generatedName[MAX_DB2_FILENAME_LENGTH+1]; + strncpy(generatedName, indexName, DB2I_INDEX_NAME_LENGTH_TO_PRESERVE); + generatedName[DB2I_INDEX_NAME_LENGTH_TO_PRESERVE] = 0; + char* endOfGeneratedName; + + if (type == typeDefault) + { + strcat(generatedName, DB2I_DEFAULT_INDEX_NAME_DELIMITER); + endOfGeneratedName = strend(generatedName); + } + else if (type != typeNone) + { + strcat(generatedName, DB2I_ADDL_INDEX_NAME_DELIMITER); + endOfGeneratedName = strend(generatedName); + *(endOfGeneratedName-2) = char(type); + } + + uint lenWithoutFile = endOfGeneratedName - generatedName; + + char strippedTableName[MAX_DB2_FILENAME_LENGTH+1]; + if (format == ASCII_SQL) + { + strcpy(strippedTableName, tableName); + stripExtraQuotes(strippedTableName+1, sizeof(strippedTableName)); + tableName = strippedTableName; + } + + if (strlen(tableName) > (MAX_DB2_FILENAME_LENGTH-lenWithoutFile)) + return -1; + + strncat(generatedName, + tableName+1, + min(strlen(tableName), (MAX_DB2_FILENAME_LENGTH-lenWithoutFile))-2 ); + + char finalName[MAX_DB2_FILENAME_LENGTH+1]; + convertMySQLNameToDB2Name(generatedName, finalName, sizeof(finalName), true, (format==ASCII_SQL)); + to.append(finalName); + + return 0; +} + + +void db2i_table::findConversionDefinition(enum_conversionDirection direction, uint16 fieldID) +{ + getConversion(direction, + mysqlTable->field[fieldID]->charset(), + db2Field(fieldID).getCCSID(), + conversionDefinitions[direction][fieldID]); +} + + +db2i_file::db2i_file(db2i_table* table) : db2Table(table) +{ + commonCtorInit(); + + DBUG_ASSERT(table->getMySQLTable()->table_name.length <= MAX_DB2_FILENAME_LENGTH-2); + + db2FileName = (char*)table->getDB2TableName(db2i_table::EBCDIC_NATIVE); +} + +db2i_file::db2i_file(db2i_table* table, int index) : db2Table(table) +{ + commonCtorInit(); + + if ((index == table->getMySQLTable()->primary_key) && !table->isTemporary()) + { + db2FileName = (char*)table->getDB2TableName(db2i_table::EBCDIC_NATIVE); + } + else + { + // Generate the index name (in index___table form); quote and EBCDICize it. + String qualifiedPath; + qualifiedPath.length(0); + + const char* asciiFileName = table->getDB2TableName(db2i_table::ASCII_NATIVE); + + db2i_table::appendQualifiedIndexFileName(table->getMySQLTable()->key_info[index].name, + asciiFileName, + qualifiedPath, + db2i_table::ASCII_NATIVE, + typeDefault); + + db2FileName = (char*)my_malloc(qualifiedPath.length()+1, MYF(MY_WME | MY_ZEROFILL)); + convToEbcdic(qualifiedPath.ptr(), db2FileName, qualifiedPath.length()); + } +} + +void db2i_file::commonCtorInit() +{ + masterDefn = 0; + memset(&formats, 0, maxRowFormats*sizeof(RowFormat)); +} + + +void db2i_file::fillILEDefn(ShrDef* defn, bool readInArrivalSeq) +{ + defn->ObjNamLen = strlen(db2FileName); + DBUG_ASSERT(defn->ObjNamLen <= sizeof(defn->ObjNam)); + memcpy(defn->ObjNam, db2FileName, defn->ObjNamLen); + defn->ArrSeq[0] = (readInArrivalSeq ? QMY_YES : QMY_NO); +} + diff --git a/storage/ibmdb2i/db2i_file.h b/storage/ibmdb2i/db2i_file.h new file mode 100644 index 00000000000..4be6558a95d --- /dev/null +++ b/storage/ibmdb2i/db2i_file.h @@ -0,0 +1,441 @@ +/* +Licensed Materials - Property of IBM +DB2 Storage Engine Enablement +Copyright IBM Corporation 2007,2008 +All rights reserved + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + (a) Redistributions of source code must retain this list of conditions, the + copyright notice in section {d} below, and the disclaimer following this + list of conditions. + (b) Redistributions in binary form must reproduce this list of conditions, the + copyright notice in section (d) below, and the disclaimer following this + list of conditions, in the documentation and/or other materials provided + with the distribution. + (c) The name of IBM may not be used to endorse or promote products derived from + this software without specific prior written permission. + (d) The text of the required copyright notice is: + Licensed Materials - Property of IBM + DB2 Storage Engine Enablement + Copyright IBM Corporation 2007,2008 + All rights reserved + +THIS SOFTWARE IS PROVIDED BY IBM CORPORATION "AS IS" AND ANY EXPRESS OR IMPLIED +WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT +SHALL IBM CORPORATION BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT +OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT INCLUDING NEGLIGENCE OR OTHERWISE) ARISING +IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY +OF SUCH DAMAGE. +*/ + + +#ifndef DB2I_FILE_H +#define DB2I_FILE_H + +#include "db2i_global.h" +#include "db2i_ileBridge.h" +#include "db2i_validatedPointer.h" +#include "my_atomic.h" +#include "db2i_iconv.h" +#include "db2i_charsetSupport.h" + +const char FID_EXT[] = ".FID"; + +class db2i_file; + +#pragma pack(1) +struct DB2LobField +{ + char reserved1; + uint32 length; + char reserved2[4]; + uint32 ordinal; + ILEMemHandle dataHandle; + char reserved3[8]; +}; +#pragma pack(pop) + +class DB2Field +{ + public: + uint16 getType() const { return *(uint16*)(&definition.ColType); } + uint16 getByteLengthInRecord() const { return definition.ColLen; } + uint16 getDataLengthInRecord() const + { + return (getType() == QMY_VARCHAR || getType() == QMY_VARGRAPHIC ? definition.ColLen - 2 : definition.ColLen); + } + uint16 getCCSID() const { return *(uint16*)(&definition.ColCCSID); } + bool isBlob() const + { + uint16 type = getType(); + return (type == QMY_BLOBCLOB || type == QMY_DBCLOB); + } + uint16 getBufferOffset() const { return definition.ColBufOff; } + uint16 calcBlobPad() const + { + DBUG_ASSERT(isBlob()); + return getByteLengthInRecord() - sizeof (DB2LobField); + } + DB2LobField* asBlobField(char* buf) const + { + DBUG_ASSERT(isBlob()); + return (DB2LobField*)(buf + getBufferOffset() + calcBlobPad()); + } + private: + col_def_t definition; +}; + + +/** + @class db2i_table + + @details + This class describes the logical SQL table provided by DB2. + It stores "table-scoped" information such as the name of the + DB2 schema, BLOB descriptions, and the corresponding MySQL table definition. + Only one instance exists per SQL table. +*/ +class db2i_table +{ + public: + enum NameFormatFlags + { + ASCII_SQL, + ASCII_NATIVE, + EBCDIC_NATIVE + }; + + db2i_table(const TABLE_SHARE* myTable, const char* path = NULL); + + ~db2i_table(); + + int32 initDB2Objects(const char* path); + + const TABLE_SHARE* getMySQLTable() const + { + return mysqlTable; + } + + uint64 getStartId() const + { + return db2StartId; + } + + void updateStartId(uint64 newStartId) + { + db2StartId = newStartId; + } + + bool hasBlobs() const + { + return (blobFieldCount > 0); + } + + uint16 getBlobCount() const + { + return blobFieldCount; + } + + uint getBlobFieldActualSize(uint fieldIndex) const + { + return blobFieldActualSizes[getBlobIdFromField(fieldIndex)]; + } + + void updateBlobFieldActualSize(uint fieldIndex, uint32 newSize) + { + // It's OK that this isn't threadsafe, since this is just an advisory + // value. If a race condition causes the lesser of two values to be stored, + // that's OK. + uint16 blobID = getBlobIdFromField(fieldIndex); + DBUG_ASSERT(blobID < blobFieldCount); + + if (blobFieldActualSizes[blobID] < newSize) + { + blobFieldActualSizes[blobID] = newSize; + } + } + + + + const char* getDB2LibName(NameFormatFlags format = EBCDIC_NATIVE) + { + switch (format) + { + case EBCDIC_NATIVE: + return db2LibNameEbcdic; break; + case ASCII_NATIVE: + return db2LibNameAscii; break; + case ASCII_SQL: + return db2LibNameSQLAscii; break; + default: + DBUG_ASSERT(0); + } + return NULL; + } + + const char* getDB2TableName(NameFormatFlags format = EBCDIC_NATIVE) const + { + switch (format) + { + case EBCDIC_NATIVE: + return db2TableNameEbcdic; break; + case ASCII_NATIVE: + return db2TableNameAscii; break; + case ASCII_SQL: + return db2TableNameAscii; break; + break; + default: + DBUG_ASSERT(0); + } + return NULL; + } + + DB2Field& db2Field(int fieldID) const { return db2Fields[fieldID]; } + DB2Field& db2Field(const Field* field) const { return db2Field(field->field_index); } + + void processFormatSpace(); + + void* getFormatSpace(size_t& spaceNeeded) + { + DBUG_ASSERT(formatSpace == NULL); + spaceNeeded = sizeof(format_hdr_t) + mysqlTable->fields * sizeof(DB2Field); + formatSpace.alloc(spaceNeeded); + return (void*)formatSpace; + } + + bool isTemporary() const + { + return isTemporaryTable; + } + + void getDB2QualifiedName(char* to); + static void getDB2LibNameFromPath(const char* path, char* lib, NameFormatFlags format=ASCII_SQL); + static void getDB2FileNameFromPath(const char* path, char* file, NameFormatFlags format=ASCII_SQL); + static void getDB2QualifiedNameFromPath(const char* path, char* to); + static int32 appendQualifiedIndexFileName(const char* indexName, + const char* tableName, + String& to, + NameFormatFlags format=ASCII_SQL, + enum_DB2I_INDEX_TYPE type=typeDefault); + + uint16 getBlobIdFromField(uint16 fieldID) const + { + for (int i = 0; i < blobFieldCount; ++i) + { + if (blobFields[i] == fieldID) + return i; + } + DBUG_ASSERT(0); + return 0; + } + + iconv_t& getConversionDefinition(enum_conversionDirection direction, + uint16 fieldID) + { + if (conversionDefinitions[direction][fieldID] == (iconv_t)(-1)) + findConversionDefinition(direction, fieldID); + + return conversionDefinitions[direction][fieldID]; + } + + const db2i_file* dataFile() const + { + return physicalFile; + } + + const db2i_file* indexFile(uint idx) const + { + return logicalFiles[idx]; + } + + const char* getFileLevelID() const + { + return fileLevelID; + } + + static void deleteAssocFiles(const char* name); + static void renameAssocFiles(const char* from, const char* to); + + int fastInitForCreate(const char* path); + int initDiscoveredTable(const char* path); + + uint16* blobFields; + +private: + + void findConversionDefinition(enum_conversionDirection direction, uint16 fieldID); + static void filenameToTablename(const char* in, char* out, size_t outlen); + void convertNativeToSQLName(const char* input, + char* output) + { + + output[0] = input[0]; + + uint o = 1; + uint i = 1; + do + { + output[o++] = input[i]; + if (input[i] == '"' && input[i+1]) + output[o++] = '"'; + } while (input[++i]); + + output[o] = 0; // This isn't the most user-friendly way to handle overflows, + // but at least its safe. + } + + bool doFileIDsMatch(const char* path); + + ValidatedPointer formatSpace; + DB2Field* db2Fields; + uint64 db2StartId; // Starting value for identity column + uint16 blobFieldCount; // Count of LOB fields in the DB2 table + uint* blobFieldActualSizes; // Array of LOB field lengths (actual vs. allocated). + // This is updated as LOBs are read and will contain + // the length of the longest known LOB in that field. + iconv_t* conversionDefinitions[2]; + + const TABLE_SHARE* mysqlTable; + char* db2LibNameEbcdic; // Quoted and in EBCDIC + char* db2LibNameAscii; + char* db2TableNameEbcdic; + char* db2TableNameAscii; + char* db2TableNameSQLAscii; + char* db2LibNameSQLAscii; + + db2i_file* physicalFile; + db2i_file** logicalFiles; + + bool isTemporaryTable; + char fileLevelID[13]; +}; + +/** + @class db2i_file + + @details This class describes a file object underlaying a particular SQL + table. Both "physical files" (data) and "logical files" (indices) are + described by this class. Only one instance of the class exists per DB2 file + object. The single instance is responsible for de/allocating the multiple + handles used by the handlers. +*/ +class db2i_file +{ + enum RowFormats + { + readOnly = 0, + readWrite, + maxRowFormats + }; + +public: + mutable struct RowFormat + { + uint16 readRowLen; + uint16 readRowNullOffset; + uint16 writeRowLen; + uint16 writeRowNullOffset; + char inited; + } formats[maxRowFormats]; + + // Construct an instance for a physical file. + db2i_file(db2i_table* table); + + // Construct an instance for a logical file. + db2i_file(db2i_table* table, int index); + + ~db2i_file() + { + if (masterDefn) + db2i_ileBridge::getBridgeForThread()->deallocateFile(masterDefn); + + if (db2FileName != (char*)db2Table->getDB2TableName(db2i_table::EBCDIC_NATIVE)) + my_free(db2FileName, MYF(0)); + } + + // This is roughly equivalent to an "open". It tells ILE to allocate a descriptor + // for the file. The associated handle is returned to the caller. + int allocateNewInstance(FILE_HANDLE* newHandle, ILEMemHandle inuseSpace) const + { + int rc; + + rc = db2i_ileBridge::getBridgeForThread()->allocateFileInstance(masterDefn, + inuseSpace, + newHandle); + + if (rc) *newHandle = 0; + + return rc; + } + + // This obtains the row layout associated with a particular access intent for + // an open instance of the file. + int useFile(FILE_HANDLE instanceHandle, + char intent, + char commitLevel, + const RowFormat** activeFormat) const + { + DBUG_ENTER("db2i_file::useFile"); + RowFormat* rowFormat; + + if (intent == QMY_UPDATABLE) + rowFormat = &(formats[readWrite]); + else if (intent == QMY_READ_ONLY) + rowFormat = &(formats[readOnly]); + else + DBUG_ASSERT(0); + + if (!rowFormat->inited) + { + int rc; + rc = db2i_ileBridge::getBridgeForThread()->initFileForIO(instanceHandle, + intent, + commitLevel, + &(rowFormat->writeRowLen), + &(rowFormat->writeRowNullOffset), + &(rowFormat->readRowLen), + &(rowFormat->readRowNullOffset)); + if (rc) DBUG_RETURN(rc); + rowFormat->inited = 1; + } + + *activeFormat = rowFormat; + DBUG_RETURN(0); + } + + const char* getDB2FileName() const + { + return db2FileName; + } + + void fillILEDefn(ShrDef* defn, bool readInArrivalSeq); + + void setMasterDefnHandle(FILE_HANDLE handle) + { + masterDefn = handle; + } + + FILE_HANDLE getMasterDefnHandle() const + { + return masterDefn; + } + +private: + void commonCtorInit(); + + char* db2FileName; // Quoted and in EBCDIC + + db2i_table* db2Table; // The logical SQL table contained by this file. + + bool db2CanSort; + + FILE_HANDLE masterDefn; +}; + + +#endif diff --git a/storage/ibmdb2i/db2i_global.h b/storage/ibmdb2i/db2i_global.h new file mode 100644 index 00000000000..d201fbd8124 --- /dev/null +++ b/storage/ibmdb2i/db2i_global.h @@ -0,0 +1,138 @@ +/* +Licensed Materials - Property of IBM +DB2 Storage Engine Enablement +Copyright IBM Corporation 2007,2008 +All rights reserved + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + (a) Redistributions of source code must retain this list of conditions, the + copyright notice in section {d} below, and the disclaimer following this + list of conditions. + (b) Redistributions in binary form must reproduce this list of conditions, the + copyright notice in section (d) below, and the disclaimer following this + list of conditions, in the documentation and/or other materials provided + with the distribution. + (c) The name of IBM may not be used to endorse or promote products derived from + this software without specific prior written permission. + (d) The text of the required copyright notice is: + Licensed Materials - Property of IBM + DB2 Storage Engine Enablement + Copyright IBM Corporation 2007,2008 + All rights reserved + +THIS SOFTWARE IS PROVIDED BY IBM CORPORATION "AS IS" AND ANY EXPRESS OR IMPLIED +WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT +SHALL IBM CORPORATION BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT +OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT INCLUDING NEGLIGENCE OR OTHERWISE) ARISING +IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY +OF SUCH DAMAGE. +*/ + + +#ifndef DB2I_GLOBAL_H +#define DB2I_GLOBAL_H + +#define MYSQL_SERVER 1 + +#include "my_global.h" +#include "my_sys.h" + +const uint MAX_DB2_KEY_PARTS=120; +const int MAX_DB2_V5R4_LIBNAME_LENGTH = 10; +const int MAX_DB2_V6R1_LIBNAME_LENGTH = 30; +const int MAX_DB2_SCHEMANAME_LENGTH=258; +const int MAX_DB2_FILENAME_LENGTH=258; +const int MAX_DB2_COLNAME_LENGTH=128; +const int MAX_DB2_SAVEPOINTNAME_LENGTH=128; +const int MAX_DB2_QUALIFIEDNAME_LENGTH=MAX_DB2_V6R1_LIBNAME_LENGTH + 1 + MAX_DB2_FILENAME_LENGTH; +const uint32 MAX_CHAR_LENGTH = 32765; +const uint32 MAX_VARCHAR_LENGTH = 32739; +const uint32 MAX_DEC_PRECISION = 63; +const uint32 MAX_BLOB_LENGTH = 2147483646; +const uint32 MAX_BINARY_LENGTH = MAX_CHAR_LENGTH; +const uint32 MAX_VARBINARY_LENGTH = MAX_VARCHAR_LENGTH; +const uint32 MAX_FULL_ALLOCATE_BLOB_LENGTH = 65536; +const uint32 MAX_FOREIGN_LEN = 64000; +const char* DB2I_TEMP_TABLE_SCHEMA = "QTEMP"; +const char DB2I_ADDL_INDEX_NAME_DELIMITER[5] = {'_','_','_','_','_'}; +const char DB2I_DEFAULT_INDEX_NAME_DELIMITER[3] = {'_','_','_'}; +const int DB2I_INDEX_NAME_LENGTH_TO_PRESERVE = 110; + +enum enum_DB2I_INDEX_TYPE +{ + typeNone = 0, + typeDefault = 'D', + typeHex = 'H', + typeAscii = 'A' +}; + +void* roundToQuadWordBdy(void* ptr) +{ + return (void*)(((uint64)(ptr)+0xf) & ~0xf); +} + +typedef uint64_t ILEMemHandle; + +struct OSVersion +{ + uint8 v; + uint8 r; +}; +extern OSVersion osVersion; + + +/** + Allocate 16-byte aligned space using the MySQL heap allocator + + @details Many of the spaces used by the QMY_* APIS are required to be + aligned on 16 byte boundaries. The standard system malloc will do this + alignment by default. However, in order to use the heap debug and tracking + features of the mysql allocator, we chose to implement an aligning wrapper + around my_malloc. Essentially, we overallocate the storage space, find the + first aligned address in the space, store a pointer to the true malloc + allocation in the bytes immediately preceding the aligned address, and return + the aligned address to the caller. + + @parm size The size of heap storage needed + + @return A 16-byte aligned pointer to the storage requested. +*/ +void* malloc_aligned(size_t size) +{ + char* p; + char* base; + base = (char*)my_malloc(size + sizeof(void*) + 15, MYF(MY_WME)); + if (likely(base)) + { + p = (char*)roundToQuadWordBdy(base + sizeof(void*)); + char** p2 = (char**)(p - sizeof(void*)); + *p2 = base; + } + else + p = NULL; + + return p; +} + +/** + Free a 16-byte aligned space alloced by malloc_aligned + + @details We know that a pointer to the true malloced storage immediately + precedes the aligned address, so we pull that out and call my_free(). + + @parm p A 16-byte aligned pointer generated by malloc_aligned +*/ +void free_aligned(void* p) +{ + if (likely(p)) + { + my_free(*(char**)((char*)p-sizeof(void*)), MYF(0)); + } +} + +#endif diff --git a/storage/ibmdb2i/db2i_iconv.h b/storage/ibmdb2i/db2i_iconv.h new file mode 100644 index 00000000000..9fc6e4ed636 --- /dev/null +++ b/storage/ibmdb2i/db2i_iconv.h @@ -0,0 +1,51 @@ +/* +Licensed Materials - Property of IBM +DB2 Storage Engine Enablement +Copyright IBM Corporation 2007,2008 +All rights reserved + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + (a) Redistributions of source code must retain this list of conditions, the + copyright notice in section {d} below, and the disclaimer following this + list of conditions. + (b) Redistributions in binary form must reproduce this list of conditions, the + copyright notice in section (d) below, and the disclaimer following this + list of conditions, in the documentation and/or other materials provided + with the distribution. + (c) The name of IBM may not be used to endorse or promote products derived from + this software without specific prior written permission. + (d) The text of the required copyright notice is: + Licensed Materials - Property of IBM + DB2 Storage Engine Enablement + Copyright IBM Corporation 2007,2008 + All rights reserved + +THIS SOFTWARE IS PROVIDED BY IBM CORPORATION "AS IS" AND ANY EXPRESS OR IMPLIED +WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT +SHALL IBM CORPORATION BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT +OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT INCLUDING NEGLIGENCE OR OTHERWISE) ARISING +IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY +OF SUCH DAMAGE. +*/ + +/** + @file + + @brief Used to redefine iconv symbols to the optimized "myconv" ones +*/ + +#ifndef DB2I_ICONV_H +#define DB2I_ICONV_H + +#include "db2i_myconv.h" +#define iconv_open(A, B) myconv_open(A, B, CONVERTER_DMAP) +#define iconv_close myconv_close +#define iconv myconv_dmap +#define iconv_t myconv_t + +#endif diff --git a/storage/ibmdb2i/db2i_ileBridge.cc b/storage/ibmdb2i/db2i_ileBridge.cc new file mode 100644 index 00000000000..356c837cd00 --- /dev/null +++ b/storage/ibmdb2i/db2i_ileBridge.cc @@ -0,0 +1,1331 @@ +/* +Licensed Materials - Property of IBM +DB2 Storage Engine Enablement +Copyright IBM Corporation 2007,2008 +All rights reserved + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + (a) Redistributions of source code must retain this list of conditions, the + copyright notice in section {d} below, and the disclaimer following this + list of conditions. + (b) Redistributions in binary form must reproduce this list of conditions, the + copyright notice in section (d) below, and the disclaimer following this + list of conditions, in the documentation and/or other materials provided + with the distribution. + (c) The name of IBM may not be used to endorse or promote products derived from + this software without specific prior written permission. + (d) The text of the required copyright notice is: + Licensed Materials - Property of IBM + DB2 Storage Engine Enablement + Copyright IBM Corporation 2007,2008 + All rights reserved + +THIS SOFTWARE IS PROVIDED BY IBM CORPORATION "AS IS" AND ANY EXPRESS OR IMPLIED +WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT +SHALL IBM CORPORATION BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT +OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT INCLUDING NEGLIGENCE OR OTHERWISE) ARISING +IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY +OF SUCH DAMAGE. +*/ + + + +#include "db2i_ileBridge.h" +#include "my_dbug.h" +#include "db2i_global.h" +#include "db2i_charsetSupport.h" +#include "db2i_errors.h" + + +// static class member data +ILEpointer* db2i_ileBridge::functionSymbols; +db2i_ileBridge* db2i_ileBridge::globalBridge; +#ifndef DBUG_OFF +uint32 db2i_ileBridge::registeredPtrs; +#endif + +pthread_key(IleParms*, THR_ILEPARMS); + +static void ileParmsDtor(void* parmsToFree) +{ + if (parmsToFree) + { + free_aligned(parmsToFree); + DBUG_PRINT("db2i_ileBridge", ("Freeing space for parms")); + } +} + + +/** + Convert a timestamp in ILE time format into a unix time_t +*/ +static inline time_t convertILEtime(const ILE_time_t& input) +{ + tm temp; + + temp.tm_sec = input.Second; + temp.tm_min = input.Minute; + temp.tm_hour = input.Hour; + temp.tm_mday = input.Day; + temp.tm_mon = input.Month-1; + temp.tm_year = input.Year - 1900; + temp.tm_isdst = -1; + + return mktime(&temp); +} + +/** + Allocate and intialize a new bridge structure +*/ +db2i_ileBridge* db2i_ileBridge::createNewBridge(CONNECTION_HANDLE connID) +{ + DBUG_PRINT("db2i_ileBridge::createNewBridge",("Building new bridge...")); + db2i_ileBridge* newBridge = (db2i_ileBridge*)my_malloc(sizeof(db2i_ileBridge), MYF(MY_WME)); + + if (unlikely(newBridge == NULL)) + return NULL; + + newBridge->stmtTxActive = false; + newBridge->connErrText = NULL; + newBridge->pendingLockedHandles.head = NULL; + newBridge->cachedConnectionID = connID; + + return newBridge; +} + + +void db2i_ileBridge::destroyBridge(db2i_ileBridge* bridge) +{ + bridge->freeErrorStorage(); + my_free(bridge, MYF(0)); +} + + +void db2i_ileBridge::destroyBridgeForThread(const THD* thd) +{ + void* thdData = *thd_ha_data(thd, ibmdb2i_hton); + if (thdData != NULL) + { + destroyBridge((db2i_ileBridge*)thdData); + } +} + + +void db2i_ileBridge::registerPtr(const void* ptr, ILEMemHandle* receiver) +{ + static const arg_type_t ileSignature[] = { ARG_MEMPTR, ARG_END }; + + if (unlikely(ptr == NULL)) + { + *receiver = 0; + return; + } + + struct ArgList + { + ILEarglist_base base; + ILEpointer ptr; + } *arguments; + + char argBuf[sizeof(ArgList)+15]; + arguments = (ArgList*)roundToQuadWordBdy(argBuf); + + arguments->ptr.s.addr = (address64_t)(ptr); + + _ILECALL(&functionSymbols[funcRegisterSpace], + &arguments->base, + ileSignature, + RESULT_INT64); + +#ifndef DBUG_OFF + uint32 truncHandle = arguments->base.result.r_uint64; + DBUG_PRINT("db2i_ileBridge::registerPtr",("Register 0x%p with handle %d", ptr, truncHandle)); + getBridgeForThread()->registeredPtrs++; +#endif + + *receiver = arguments->base.result.r_uint64; + return; +} + +void db2i_ileBridge::unregisterPtr(ILEMemHandle handle) +{ + static const arg_type_t ileSignature[] = { ARG_UINT64, ARG_END }; + + if (unlikely(handle == NULL)) + return; + + struct ArgList + { + ILEarglist_base base; + uint64 handle; + } *arguments; + + char argBuf[sizeof(ArgList)+15]; + arguments = (ArgList*)roundToQuadWordBdy(argBuf); + + arguments->handle = (uint64)(handle); + + _ILECALL(&functionSymbols[funcUnregisterSpace], + &arguments->base, + ileSignature, + RESULT_VOID); + +#ifndef DBUG_OFF + DBUG_PRINT("db2i_ileBridge::unregisterPtr",("Unregister handle %d", (uint32)handle)); + getBridgeForThread()->registeredPtrs--; +#endif +} + + + +/** + Initialize the bridge component + + @details Resolves srvpgm and function names of the APIs. If this fails, + the approrpiate operating system support (PTFs) is probably not installed. + + WARNING: + Must be called before any other functions in this class are used!!!! + Can only be called by a single thread! +*/ +int db2i_ileBridge::setup() +{ + static const char funcNames[db2i_ileBridge::funcListEnd][32] = + { + {"QmyRegisterParameterSpaces"}, + {"QmyRegisterSpace"}, + {"QmyUnregisterSpace"}, + {"QmyProcessRequest"} + }; + + DBUG_ENTER("db2i_ileBridge::setup"); + + int actmark = _ILELOAD("QSYS/QMYSE", ILELOAD_LIBOBJ); + if ( actmark == -1 ) + { + DBUG_PRINT("db2i_ileBridge::setup", ("srvpgm activation failed")); + DBUG_RETURN(1); + } + + functionSymbols = (ILEpointer*)malloc_aligned(sizeof(ILEpointer) * db2i_ileBridge::funcListEnd); + + for (int i = 0; i < db2i_ileBridge::funcListEnd; i++) + { + if (_ILESYM(&functionSymbols[i], actmark, funcNames[i]) == -1) + { + DBUG_PRINT("db2i_ileBridge::setup", + ("resolve of %s failed", funcNames[i])); + DBUG_RETURN(errno); + } + } + + pthread_key_create(&THR_ILEPARMS, &ileParmsDtor); + +#ifndef DBUG_OFF + registeredPtrs = 0; +#endif + + globalBridge = createNewBridge(0); + + DBUG_RETURN(0); +} + +/** + Cleanup any resources before shutting down plug-in +*/ +void db2i_ileBridge::takedown() +{ + if (globalBridge) + destroyBridge(globalBridge); + free_aligned(functionSymbols); +} + +/** + Call off to QmyProcessRequest to perform the API that the caller prepared +*/ +inline int32 db2i_ileBridge::doIt() +{ + static const arg_type_t ileSignature[] = {ARG_END}; + + struct ArgList + { + ILEarglist_base base; + } *arguments; + + char argBuf[sizeof(ArgList)+15]; + arguments = (ArgList*)roundToQuadWordBdy(argBuf); + + _ILECALL(&functionSymbols[funcProcessRequest], + &arguments->base, + ileSignature, + RESULT_INT32); + + return translateErrorCode(arguments->base.result.s_int32.r_int32); +} + +/** + Call off to QmyProcessRequest to perform the API that the caller prepared and + log any errors that may occur. +*/ +inline int32 db2i_ileBridge::doItWithLog() +{ + int32 rc = doIt(); + + if (unlikely(rc)) + { + // Only report errors that we weren't expecting + if (rc != tacitErrors[0] && + rc != tacitErrors[1] && + rc != QMY_ERR_END_OF_BLOCK) + reportSystemAPIError(rc, (Qmy_Error_output_t*)parms()->outParms); + } + memset(tacitErrors, 0, sizeof(tacitErrors)); + + return rc; +} + + +/** + Interface to QMY_ALLOCATE_SHARE API + + See QMY_ALLOCATE_SHARE documentation for more information about + parameters and return codes. +*/ +int32 db2i_ileBridge::allocateFileDefn(ILEMemHandle definitionSpace, + ILEMemHandle handleSpace, + uint16 fileCount, + const char* schemaName, + uint16 schemaNameLength, + ILEMemHandle formatSpace, + uint32 formatSpaceLen) +{ + DBUG_ASSERT(cachedStateIsCoherent()); + + IleParms* parmBlock = parms(); + Qmy_MAOS0100 *input = (Qmy_MAOS0100*)&(parmBlock->inParms); + memset(input, 0, sizeof(*input)); + + input->Format = QMY_ALLOCATE_SHARE; + input->ShrDefSpcHnd = definitionSpace; + input->ShrHndSpcHnd = handleSpace; + input->ShrDefCnt = fileCount; + input->FmtSpcHnd = formatSpace; + input->FmtSpcLen = formatSpaceLen; + + if (schemaNameLength > sizeof(input->SchNam)) + { + // This should never happen! + DBUG_ASSERT(0); + return HA_ERR_GENERIC; + } + + memcpy(input->SchNam, schemaName, schemaNameLength); + input->SchNamLen = schemaNameLength; + + input->CnnHnd = cachedConnectionID; + + int32 rc = doItWithLog(); + + return rc; +} + + +/** + Interface to QMY_ALLOCATE_INSTANCE API + + See QMY_ALLOCATE_INSTANCE documentation for more information about + parameters and return codes. +*/ +int32 db2i_ileBridge::allocateFileInstance(FILE_HANDLE defnHandle, + ILEMemHandle inuseSpace, + FILE_HANDLE* instance) +{ + DBUG_ASSERT(cachedStateIsCoherent()); + + IleParms* parmBlock = parms(); + Qmy_MAOI0100 *input = (Qmy_MAOI0100*)&(parmBlock->inParms); + memset(input, 0, sizeof(*input)); + + input->Format = QMY_ALLOCATE_INSTANCE; + input->ShrHnd = defnHandle; + input->CnnHnd = cachedConnectionID; + input->UseSpcHnd = inuseSpace; + + int32 rc = doItWithLog(); + + if (likely(rc == 0)) + { + Qmy_MAOI0100_output* output = (Qmy_MAOI0100_output*)parmBlock->outParms; + DBUG_ASSERT(instance); + *instance = output->ObjHnd; + } + + return rc; +} + + +/** + Interface to QMY_DEALLOCATE_OBJECT API + + See QMY_DEALLOCATE_OBJECT documentation for more information about + parameters and return codes. +*/ +int32 db2i_ileBridge::deallocateFile(FILE_HANDLE rfileHandle, + bool postDropTable) +{ + IleParms* parmBlock = parms(); + Qmy_MDLC0100 *input = (Qmy_MDLC0100*)&(parmBlock->inParms); + memset(input, 0, sizeof(*input)); + + input->Format = QMY_DEALLOCATE_OBJECT; + input->ObjHnd = rfileHandle; + input->ObjDrp[0] = (postDropTable ? QMY_YES : QMY_NO); + + DBUG_PRINT("db2i_ileBridge::deallocateFile", ("Deallocating %d", (uint32)rfileHandle)); + + int32 rc = doItWithLog(); + + return rc; +} + + +/** + Interface to QMY_OBJECT_INITIALIZATION API + + See QMY_OBJECT_INITIALIZATION documentation for more information about + parameters and return codes. +*/ +int32 db2i_ileBridge::initFileForIO(FILE_HANDLE rfileHandle, + char accessIntent, + char commitLevel, + uint16* inRecSize, + uint16* inRecNullOffset, + uint16* outRecSize, + uint16* outRecNullOffset) +{ + DBUG_ASSERT(cachedStateIsCoherent()); + IleParms* parmBlock = parms(); + Qmy_MOIX0100 *input = (Qmy_MOIX0100*)&(parmBlock->inParms); + memset(input, 0, sizeof(*input)); + + input->Format = QMY_OBJECT_INITIALIZATION; + input->CmtLvl[0] = commitLevel; + input->Intent[0] = accessIntent; + input->ObjHnd = rfileHandle; + input->CnnHnd = cachedConnectionID; + + int32 rc = doItWithLog(); + + if (likely(rc == 0)) + { + Qmy_MOIX0100_output* output = (Qmy_MOIX0100_output*)parmBlock->outParms; + *inRecSize = output->InNxtRowOff; + *inRecNullOffset = output->InNullMapOff; + *outRecSize = output->OutNxtRowOff; + *outRecNullOffset = output->OutNullMapOff; + } + + return rc; +} + + +/** + Interface to QMY_READ_ROWS API for reading a row with a specific RRN. + + See QMY_READ_ROWS documentation for more information about + parameters and return codes. +*/ +int32 db2i_ileBridge::readByRRN(FILE_HANDLE rfileHandle, + ILEMemHandle buf, + uint32 inRRN, + char accessIntent, + char commitLevel) +{ + DBUG_ASSERT(cachedStateIsCoherent()); + IleParms* parmBlock = parms(); + Qmy_MRDX0100 *input = (Qmy_MRDX0100*)&(parmBlock->inParms); + memset(input, 0, sizeof(*input)); + + input->Format = QMY_READ_ROWS; + input->CmtLvl[0] = commitLevel; + input->ObjHnd = rfileHandle; + input->Intent[0] = accessIntent; + input->OutSpcHnd = (uint64)buf; + input->RelRowNbr = inRRN; + input->CnnHnd = cachedConnectionID; + + int32 rc = doItWithLog(); + + if (rc == QMY_ERR_END_OF_BLOCK) + { + rc = 0; + DBUG_PRINT("db2i_ileBridge::readByRRN", ("End of block signalled")); + } + + return rc; +} + + +/** + Interface to QMY_WRITE_ROWS API. + + See QMY_WRITE_ROWS documentation for more information about + parameters and return codes. +*/ +int32 db2i_ileBridge::writeRows(FILE_HANDLE rfileHandle, + ILEMemHandle buf, + char commitLevel, + int64* outIdVal, + bool* outIdGen, + uint32* dupKeyRRN, + char** dupKeyName, + uint32* dupKeyNameLen, + uint32* outIdIncrement) +{ + DBUG_ASSERT(cachedStateIsCoherent()); + IleParms* parmBlock = parms(); + Qmy_MWRT0100 *input = (Qmy_MWRT0100*)&(parmBlock->inParms); + memset(input, 0, sizeof(*input)); + + input->Format = QMY_WRITE_ROWS; + input->CmtLvl[0] = commitLevel; + + input->ObjHnd = rfileHandle; + input->InSpcHnd = (uint64_t) buf; + input->CnnHnd = cachedConnectionID; + + int32 rc = doItWithLog(); + + Qmy_MWRT0100_output_t* output = (Qmy_MWRT0100_output_t*)parmBlock->outParms; + if (likely(rc == 0 || rc == HA_ERR_FOUND_DUPP_KEY)) + { + DBUG_ASSERT(dupKeyRRN && dupKeyName && dupKeyNameLen && outIdGen && outIdIncrement && outIdVal); + *dupKeyRRN = output->DupRRN; + *dupKeyName = (char*)parmBlock->outParms + output->DupObjNamOff; + *dupKeyNameLen = output->DupObjNamLen; + *outIdGen = (output->NewIdGen[0] == QMY_YES ? TRUE : FALSE); + if (*outIdGen == TRUE) + { + *outIdIncrement = output->IdIncrement; + *outIdVal = output->NewIdVal; + } + } + + return rc; + +} + +/** + Interface to QMY_EXECUTE_IMMEDIATE API. + + See QMY_EXECUTE_IMMEDIATE documentation for more information about + parameters and return codes. +*/ +uint32 db2i_ileBridge::execSQL(const char* statement, + uint32 statementCount, + uint8 commitLevel, + bool autoCreateSchema, + bool dropSchema, + bool noCommit, + FILE_HANDLE fileHandle) + +{ + IleParms* parmBlock = parms(); + Qmy_MSEI0100 *input = (Qmy_MSEI0100*)&(parmBlock->inParms); + memset(input, 0, sizeof(*input)); + + input->Format = QMY_EXECUTE_IMMEDIATE; + + registerPtr(statement, &input->StmtsSpcHnd); + + input->NbrStmts = statementCount; + *(uint16*)(&input->StmtCCSID) = 850; + input->AutoCrtSchema[0] = (autoCreateSchema == TRUE ? QMY_YES : QMY_NO); + input->DropSchema[0] = (dropSchema == TRUE ? QMY_YES : QMY_NO); + input->CmtLvl[0] = commitLevel; + if ((commitLevel == QMY_NONE && statementCount == 1) || noCommit) + { + input->CmtBefore[0] = QMY_NO; + input->CmtAfter[0] = QMY_NO; + } + else + { + input->CmtBefore[0] = QMY_YES; + input->CmtAfter[0] = QMY_YES; + } + input->CnnHnd = current_thd->thread_id; + input->ObjHnd = fileHandle; + + int32 rc = doItWithLog(); + + unregisterPtr(input->StmtsSpcHnd); + + return rc; +} + +/** + Interface to QMY_PREPARE_OPEN_CURSOR API. + + See QMY_PREPARE_OPEN_CURSOR documentation for more information about + parameters and return codes. +*/ +int32 db2i_ileBridge::prepOpen(const char* statement, + FILE_HANDLE* rfileHandle, + uint32* recLength) +{ + IleParms* parmBlock = parms(); + Qmy_MSPO0100 *input = (Qmy_MSPO0100*)&(parmBlock->inParms); + memset(input, 0, sizeof(*input)); + + input->Format = QMY_PREPARE_OPEN_CURSOR; + + registerPtr(statement, &input->StmtsSpcHnd ); + *(uint16*)(&input->StmtCCSID) = 850; + input->CnnHnd = current_thd->thread_id; + + int32 rc = doItWithLog(); + + if (likely(rc == 0)) + { + Qmy_MSPO0100_output* output = (Qmy_MSPO0100_output*)parmBlock->outParms; + *rfileHandle = output->ObjHnd; + *recLength = max(output->InNxtRowOff, output->OutNxtRowOff); + } + + + unregisterPtr(input->StmtsSpcHnd); + + return rc; +} + + +/** + Interface to QMY_DELETE_ROW API. + + See QMY_DELETE_ROW documentation for more information about + parameters and return codes. +*/ +int32 db2i_ileBridge::deleteRow(FILE_HANDLE rfileHandle, + uint32 rrn) +{ + DBUG_ASSERT(cachedStateIsCoherent()); + IleParms* parmBlock = parms(); + Qmy_MDLT0100 *input = (Qmy_MDLT0100*)&(parmBlock->inParms); + memset(input, 0, sizeof(*input)); + + input->Format = QMY_DELETE_ROW; + input->ObjHnd = rfileHandle; + input->RelRowNbr = rrn; + input->CnnHnd = cachedConnectionID; + + int32 rc = doItWithLog(); + + return rc; +} + + +/** + Interface to QMY_UPDATE_ROW API. + + See QMY_UPDATE_ROW documentation for more information about + parameters and return codes. +*/ +int32 db2i_ileBridge::updateRow(FILE_HANDLE rfileHandle, + uint32 rrn, + ILEMemHandle buf, + uint32* dupKeyRRN, + char** dupKeyName, + uint32* dupKeyNameLen) +{ + DBUG_ASSERT(cachedStateIsCoherent()); + IleParms* parmBlock = parms(); + Qmy_MUPD0100 *input = (Qmy_MUPD0100*)&(parmBlock->inParms); + memset(input, 0, sizeof(*input)); + + input->Format = QMY_UPDATE_ROW; + input->ObjHnd = rfileHandle; + input->InSpcHnd = (uint64)buf; + input->RelRowNbr = rrn; + input->CnnHnd = cachedConnectionID; + + int32 rc = doItWithLog(); + + if (rc == HA_ERR_FOUND_DUPP_KEY) + { + Qmy_MUPD0100_output* output = (Qmy_MUPD0100_output*)parmBlock->outParms; + DBUG_ASSERT(dupKeyRRN && dupKeyName && dupKeyNameLen); + *dupKeyRRN = output->DupRRN; + *dupKeyName = (char*)parmBlock->outParms + output->DupObjNamOff; + *dupKeyNameLen = output->DupObjNamLen; + } + + return rc; +} + +/** + Interface to QMY_DESCRIBE_RANGE API. + + See QMY_DESCRIBE_RANGE documentation for more information about + parameters and return codes. +*/ +int32 db2i_ileBridge::recordsInRange(FILE_HANDLE defnHandle, + ILEMemHandle inSpc, + uint32 inKeyCnt, + uint32 inLiteralCnt, + uint32 inBoundsOff, + uint32 inLitDefOff, + uint32 inLiteralsOff, + uint32 inCutoff, + uint32 inSpcLen, + uint16 inEndByte, + uint64* outRecCnt, + uint16* outRtnCode) +{ + DBUG_ASSERT(cachedStateIsCoherent()); + + IleParms* parmBlock = parms(); + Qmy_MDRG0100 *input = (Qmy_MDRG0100*)&(parmBlock->inParms); + memset(input, 0, sizeof(*input)); + + input->Format = QMY_DESCRIBE_RANGE; + input->ShrHnd = defnHandle; + input->SpcHnd = (uint64)inSpc; + input->KeyCnt = inKeyCnt; + input->LiteralCnt = inLiteralCnt; + input->BoundsOff = inBoundsOff; + input->LitDefOff = inLitDefOff; + input->LiteralsOff = inLiteralsOff; + input->Cutoff = inCutoff; + input->SpcLen = inSpcLen; + input->EndByte = inEndByte; + input->CnnHnd = cachedConnectionID; + + int rc = doItWithLog(); + + if (likely(rc == 0)) + { + Qmy_MDRG0100_output* output = (Qmy_MDRG0100_output*)parmBlock->outParms; + DBUG_ASSERT(outRecCnt && outRtnCode); + *outRecCnt = output->RecCnt; + *outRtnCode = output->RtnCode; + } + + return rc; +} + + +/** + Interface to QMY_RELEASE_ROW API. + + See QMY_RELEASE_ROW documentation for more information about + parameters and return codes. +*/ +int32 db2i_ileBridge::rrlslck(FILE_HANDLE rfileHandle, char accessIntent) +{ + DBUG_ASSERT(cachedStateIsCoherent()); + + IleParms* parmBlock = parms(); + Qmy_MRRX0100 *input = (Qmy_MRRX0100*)&(parmBlock->inParms); + memset(input, 0, sizeof(*input)); + + input->Format = QMY_RELEASE_ROW; + + input->ObjHnd = rfileHandle; + input->CnnHnd = cachedConnectionID; + input->Intent[0] = accessIntent; + + int32 rc = doItWithLog(); + + return rc; +} + +/** + Interface to QMY_LOCK_OBJECT API. + + See QMY_LOCK_OBJECT documentation for more information about + parameters and return codes. +*/ +int32 db2i_ileBridge::lockObj(FILE_HANDLE defnHandle, + uint64 lockVal, + char lockAction, + char lockType, + char lockTimeout) +{ + DBUG_ASSERT(cachedStateIsCoherent()); + IleParms* parmBlock = parms(); + Qmy_MOLX0100 *input = (Qmy_MOLX0100*)&(parmBlock->inParms); + memset(input, 0, sizeof(*input)); + + input->Format = QMY_LOCK_OBJECT; + input->ShrHnd = defnHandle; + input->LckTimeoutVal = lockVal; + input->Action[0] = lockAction; + input->LckTyp[0] = lockType; + input->LckTimeout[0] = lockTimeout; + input->CnnHnd = cachedConnectionID; + + int32 rc = doItWithLog(); + + return rc; +} + +/** + Interface to QMY_DESCRIBE_CONSTRAINTS API. + + See QMY_DESCRIBE_CONSTRAINTS documentation for more information about + parameters and return codes. +*/ +int32 db2i_ileBridge::constraints(FILE_HANDLE defnHandle, + ILEMemHandle inSpc, + uint32 inSpcLen, + uint32* outLen, + uint32* outCnt) +{ + DBUG_ASSERT(cachedStateIsCoherent()); + IleParms* parmBlock = parms(); + Qmy_MDCT0100 *input = (Qmy_MDCT0100*)&(parmBlock->inParms); + memset(input, 0, sizeof(*input)); + + input->Format = QMY_DESCRIBE_CONSTRAINTS; + input->ShrHnd = defnHandle; + input->CstSpcHnd = (uint64)inSpc; + input->CstSpcLen = inSpcLen; + input->CnnHnd = cachedConnectionID; + + int32 rc = doItWithLog(); + + if (likely(rc == 0)) + { + Qmy_MDCT0100_output* output = (Qmy_MDCT0100_output*)parmBlock->outParms; + DBUG_ASSERT(outLen && outCnt); + *outLen = output->NeededLen; + *outCnt = output->CstCnt; + } + + return rc; +} + + +/** + Interface to QMY_REORGANIZE_TABLE API. + + See QMY_REORGANIZE_TABLE documentation for more information about + parameters and return codes. +*/ +int32 db2i_ileBridge::optimizeTable(FILE_HANDLE defnHandle) +{ + DBUG_ASSERT(cachedStateIsCoherent()); + IleParms* parmBlock = parms(); + Qmy_MRGX0100 *input = (Qmy_MRGX0100*)&(parmBlock->inParms); + memset(input, 0, sizeof(*input)); + + input->Format = QMY_REORGANIZE_TABLE; + input->ShrHnd = defnHandle; + input->CnnHnd = cachedConnectionID; + + int32 rc = doItWithLog(); + + return rc; +} + + +/** + Interface to QMY_PROCESS_COMMITMENT_CONTROL API. + + See QMY_PROCESS_COMMITMENT_CONTROL documentation for more information about + parameters and return codes. +*/ +int32 db2i_ileBridge::commitmentControl(uint8 function) +{ + DBUG_ASSERT(cachedStateIsCoherent()); + IleParms* parmBlock = parms(); + Qmy_MCCX0100 *input = (Qmy_MCCX0100*)&(parmBlock->inParms); + memset(input, 0, sizeof(*input)); + + input->Format = QMY_PROCESS_COMMITMENT_CONTROL; + input->Function[0] = function; + input->CnnHnd = cachedConnectionID; + + int32 rc = doItWithLog(); + + return rc; +} + + +/** + Interface to QMY_PROCESS_SAVEPOINT API. + + See QMY_PROCESS_SAVEPOINT documentation for more information about parameters and + return codes. +*/ +int32 db2i_ileBridge::savepoint(uint8 function, + const char* savepointName) +{ + DBUG_ASSERT(cachedStateIsCoherent()); + DBUG_PRINT("db2i_ileBridge::savepoint",("%d %s", (uint32)function, savepointName)); + + IleParms* parmBlock = parms(); + Qmy_MSPX0100 *input = (Qmy_MSPX0100*)&(parmBlock->inParms); + memset(input, 0, sizeof(*input)); + + char* savPtNam = (char*)(input+1); + + input->Format = QMY_PROCESS_SAVEPOINT; + + if (strlen(savepointName) > MAX_DB2_SAVEPOINTNAME_LENGTH) + { + DBUG_ASSERT(0); + return HA_ERR_GENERIC; + } + strcpy(savPtNam, savepointName); + + input->Function[0] = function; + input->SavPtNamOff = savPtNam - (char*)(input); + input->SavPtNamLen = strlen(savepointName); + input->CnnHnd = cachedConnectionID; + + int32 rc = doItWithLog(); + + return rc; +} + +/** + Do initialization for the QMY_* APIs. + + @parm aspName The name of the relational database to use for all + connections. + + @return 0 if successful; error otherwise +*/ +int32 db2i_ileBridge::initILE(const char* aspName) +{ + // We forego the typical thread-based parms space because MySQL doesn't + // allow us to clean it up before checking for memory leaks. As a result + // we get a complaint about leaked memory on server shutdown. + int32 rc; + char inParms[db2i_ileBridge_MAX_INPARM_SIZE]; + char outParms[db2i_ileBridge_MAX_OUTPARM_SIZE]; + if (rc = registerParmSpace(inParms, outParms)) + { + reportSystemAPIError(rc, NULL); + return rc; + } + + struct ParmBlock + { + Qmy_MINI0100 parms; + } *parmBlock = (ParmBlock*)inParms; + + memset(inParms, 0, sizeof(ParmBlock)); + + parmBlock->parms.Format = QMY_INITIALIZATION; + + char paddedName[18]; + if (strlen(aspName) > sizeof(paddedName)) + { + getErrTxt(DB2I_ERR_BAD_RDB_NAME); + return DB2I_ERR_BAD_RDB_NAME; + } + + memset(paddedName, ' ', sizeof(paddedName)); + memcpy(paddedName, aspName, strlen(aspName)); + convToEbcdic(paddedName, parmBlock->parms.RDBName, strlen(paddedName)); + + rc = doIt(); + + if (rc) + { + reportSystemAPIError(rc, (Qmy_Error_output_t*)outParms); + } + + return rc; +} + +/** + Signal to the QMY_ APIs to perform any cleanup they need to do. +*/ +int32 db2i_ileBridge::exitILE() +{ + IleParms* parmBlock = parms(); + Qmy_MCLN0100 *input = (Qmy_MCLN0100*)&(parmBlock->inParms); + memset(input, 0, sizeof(*input)); + + input->Format = QMY_CLEANUP; + + int32 rc = doIt(); + + if (rc) + { + reportSystemAPIError(rc, (Qmy_Error_output_t*)parmBlock->outParms); + } + + DBUG_PRINT("db2i_ileBridge::exitILE", ("Registered ptrs remaining: %d", registeredPtrs)); +#ifndef DBUG_OFF + if (registeredPtrs != 0) + printf("Oh no! IBMDB2I left some pointers registered. Count was %d.\n", registeredPtrs); +#endif + + // This is needed to prevent SAFE_MALLOC from complaining at process termination. + my_pthread_setspecific_ptr(THR_ILEPARMS, NULL); + free_aligned(parmBlock); + + return rc; + +} + + +/** + Designate the specified addresses as parameter passing buffers. + + @parm in Input to the API will go here; format is defined by the individual API + @parm out Output from the API will be; format is defined by the individual API + + @return 0 if success; error otherwise +*/ +int db2i_ileBridge::registerParmSpace(char* in, char* out) +{ + static const arg_type_t ileSignature[] = { ARG_MEMPTR, ARG_MEMPTR, ARG_END }; + + struct ArgList + { + ILEarglist_base base; + ILEpointer input; + ILEpointer output; + } *arguments; + + char argBuf[sizeof(ArgList)+15]; + arguments = (ArgList*)roundToQuadWordBdy(argBuf); + + arguments->input.s.addr = (address64_t)(in); + arguments->output.s.addr = (address64_t)(out); + + _ILECALL(&functionSymbols[funcRegisterParameterSpaces], + &arguments->base, + ileSignature, + RESULT_INT32); + + return arguments->base.result.s_int32.r_int32; +} + + +/** + Interface to QMY_OBJECT_OVERRIDE API. + + See QMY_OBJECT_OVERRIDE documentation for more information about parameters and + return codes. +*/ +int32 db2i_ileBridge::objectOverride(FILE_HANDLE rfileHandle, + ILEMemHandle buf, + uint32 recordWidth) +{ + DBUG_ASSERT(cachedStateIsCoherent()); + IleParms* parmBlock = parms(); + Qmy_MOOX0100 *input = (Qmy_MOOX0100*)&(parmBlock->inParms); + memset(input, 0, sizeof(*input)); + + input->Format = QMY_OBJECT_OVERRIDE; + input->ObjHnd = rfileHandle; + input->OutSpcHnd = (uint64)buf; + input->NxtRowOff = recordWidth; + input->CnnHnd = cachedConnectionID; + + int32 rc = doItWithLog(); + + return rc; +} + +/** + Interface to QMY_DESCRIBE_OBJECT API for obtaining table stats. + + See QMY_DESCRIBE_OBJECT documentation for more information about parameters and + return codes. +*/ +int32 db2i_ileBridge::retrieveTableInfo(FILE_HANDLE defnHandle, + uint16 dataRequested, + ha_statistics& stats, + ILEMemHandle inSpc) +{ + DBUG_ASSERT(cachedStateIsCoherent()); + IleParms* parmBlock = parms(); + Qmy_MDSO0100 *input = (Qmy_MDSO0100*)&(parmBlock->inParms); + memset(input, 0, sizeof(*input)); + + input->Format = QMY_DESCRIBE_OBJECT; + input->ShrHnd = defnHandle; + input->CnnHnd = cachedConnectionID; + + if (dataRequested & objLength) + input->RtnObjLen[0] = QMY_YES; + if (dataRequested & rowCount) + input->RtnRowCnt[0] = QMY_YES; + if (dataRequested & deletedRowCount) + input->RtnDltRowCnt[0] = QMY_YES; + if (dataRequested & rowsPerKey) + { + input->RowKeyHnd = (uint64)inSpc; + input->RtnRowKey[0] = QMY_YES; + } + if (dataRequested & meanRowLen) + input->RtnMeanRowLen[0] = QMY_YES; + if (dataRequested & lastModTime) + input->RtnModTim[0] = QMY_YES; + if (dataRequested & createTime) + input->RtnCrtTim[0] = QMY_YES; + if (dataRequested & ioCount) + input->RtnEstIoCnt[0] = QMY_YES; + + int32 rc = doItWithLog(); + + if (likely(rc == 0)) + { + Qmy_MDSO0100_output* output = (Qmy_MDSO0100_output*)parmBlock->outParms; + if (dataRequested & objLength) + stats.data_file_length = output->ObjLen; + if (dataRequested & rowCount) + stats.records= output->RowCnt; + if (dataRequested & deletedRowCount) + stats.deleted = output->DltRowCnt; + if (dataRequested & meanRowLen) + stats.mean_rec_length = output->MeanRowLen; + if (dataRequested & lastModTime) + stats.update_time = convertILEtime(output->ModTim); + if (dataRequested & createTime) + stats.create_time = convertILEtime(output->CrtTim); + if (dataRequested & ioCount) + stats.data_file_length = output->EstIoCnt; + } + + return rc; +} + +/** + Interface to QMY_DESCRIBE_OBJECT API for finding index size. + + See QMY_DESCRIBE_OBJECT documentation for more information about parameters and + return codes. +*/ +int32 db2i_ileBridge::retrieveIndexInfo(FILE_HANDLE defnHandle, + uint64* outPageCnt) +{ + DBUG_ASSERT(cachedStateIsCoherent()); + IleParms* parmBlock = parms(); + Qmy_MDSO0100 *input = (Qmy_MDSO0100*)&(parmBlock->inParms); + memset(input, 0, sizeof(*input)); + + input->Format = QMY_DESCRIBE_OBJECT; + input->ShrHnd = defnHandle; + input->CnnHnd = cachedConnectionID; + input->RtnPageCnt[0] = QMY_YES; + + int32 rc = doItWithLog(); + + if (likely(rc == 0)) + { + Qmy_MDSO0100_output* output = (Qmy_MDSO0100_output*)parmBlock->outParms; + *outPageCnt = output->PageCnt; + } + + return rc; +} + + +/** + Interface to QMY_CLOSE_CONNECTION API + + See QMY_CLOSE_CONNECTION documentation for more information about parameters and + return codes. +*/ +int32 db2i_ileBridge::closeConnection(CONNECTION_HANDLE conn) +{ + IleParms* parmBlock = parms(); + Qmy_MCCN0100 *input = (Qmy_MCCN0100*)&(parmBlock->inParms); + memset(input, 0, sizeof(*input)); + + input->Format = QMY_CLOSE_CONNECTION; + input->CnnHnd = conn; + + int32 rc = doItWithLog(); + + return rc; +} + + +/** + Interface to QMY_INTERRUPT API + + See QMY_INTERRUPT documentation for more information about parameters and + return codes. +*/ +int32 db2i_ileBridge::readInterrupt(FILE_HANDLE fileHandle) +{ + DBUG_ASSERT(cachedStateIsCoherent()); + IleParms* parmBlock = parms(); + Qmy_MINT0100 *input = (Qmy_MINT0100*)&(parmBlock->inParms); + memset(input, 0, sizeof(*input)); + + input->Format = QMY_INTERRUPT; + input->CnnHnd = cachedConnectionID; + input->ObjHnd = fileHandle; + + int32 rc = doItWithLog(); + + if (rc == QMY_ERR_END_OF_BLOCK) + { + rc = 0; + DBUG_PRINT("db2i_ileBridge::readInterrupt", ("End of block signalled")); + } + + return rc; +} + +/** + Interface to QMY_READ_ROWS API + + See QMY_READ_ROWS documentation for more information about parameters and + return codes. +*/ +int32 db2i_ileBridge::read(FILE_HANDLE rfileHandle, + ILEMemHandle buf, + char accessIntent, + char commitLevel, + char orientation, + bool asyncRead, + ILEMemHandle rrn, + ILEMemHandle key, + uint32 keylen, + uint16 keyParts, + int pipeFD) +{ + DBUG_ASSERT(cachedStateIsCoherent()); + IleParms* parmBlock = parms(); + Qmy_MRDX0100 *input = (Qmy_MRDX0100*)&(parmBlock->inParms); + memset(input, 0, sizeof(*input)); + + input->Format = QMY_READ_ROWS; + input->CmtLvl[0] = commitLevel; + + input->ObjHnd = rfileHandle; + input->Intent[0] = accessIntent; + input->OutSpcHnd = (uint64)buf; + input->OutRRNSpcHnd = (uint64)rrn; + input->RtnData[0] = QMY_RETURN_DATA; + + if (key) + { + input->KeySpcHnd = (uint64)key; + input->KeyColsLen = keylen; + input->KeyColsNbr = keyParts; + } + + input->Async[0] = (asyncRead ? QMY_YES : QMY_NO); + input->PipeDesc = pipeFD; + input->Orientation[0] = orientation; + input->CnnHnd = cachedConnectionID; + + int32 rc = doItWithLog(); + + // QMY_ERR_END_OF_BLOCK is informational only, so we ignore it. + if (rc == QMY_ERR_END_OF_BLOCK) + { + rc = 0; + DBUG_PRINT("db2i_ileBridge::read", ("End of block signalled")); + } + + return rc; +} + + +/** + Interface to QMY_QUIESCE_OBJECT API + + See QMY_QUIESCE_OBJECT documentation for more information about parameters and + return codes. +*/ +int32 db2i_ileBridge::quiesceFileInstance(FILE_HANDLE rfileHandle) +{ + IleParms* parmBlock = parms(); + Qmy_MQSC0100 *input = (Qmy_MQSC0100*)&(parmBlock->inParms); + memset(input, 0, sizeof(*input)); + + input->Format = QMY_QUIESCE_OBJECT; + input->ObjHnd = rfileHandle; + + int32 rc = doItWithLog(); + +#ifndef DBUG_OFF + if (unlikely(rc)) + { + DBUG_ASSERT(0); + } +#endif + + return rc; +} + +void db2i_ileBridge::PreservedHandleList::add(const char* newname, FILE_HANDLE newhandle) +{ + NameHandlePair *newPair = (NameHandlePair*)my_malloc(sizeof(NameHandlePair), MYF(MY_WME)); + + newPair->next = head; + head = newPair; + + strcpy(newPair->name, newname); + newPair->handle = newhandle; + DBUG_PRINT("db2i_ileBridge", ("Added handle %d for %s", uint32(newhandle), newname)); +} + + +FILE_HANDLE db2i_ileBridge::PreservedHandleList::findAndRemove(const char* fileName) +{ + NameHandlePair* current = head; + NameHandlePair* prev = NULL; + + while (current) + { + NameHandlePair* next = current->next; + if (strcmp(fileName, current->name) == 0) + { + FILE_HANDLE tmp = current->handle; + if (prev) + prev->next = next; + if (current == head) + head = next; + my_free(current, MYF(0)); + DBUG_PRINT("db2i_ileBridge", ("Found handle %d for %s", uint32(tmp), fileName)); + return tmp; + } + prev = current; + current = next; + } + + return 0; +} + + +IleParms* db2i_ileBridge::initParmsForThread() +{ + + IleParms* p = (IleParms*)malloc_aligned(sizeof(IleParms)); + DBUG_ASSERT((uint64)(&(p->outParms))% 16 == 0); // Guarantee that outParms are aligned correctly + + if (likely(p)) + { + int32 rc = registerParmSpace((p->inParms), (p->outParms)); + if (likely(rc == 0)) + { + my_pthread_setspecific_ptr(THR_ILEPARMS, p); + DBUG_PRINT("db2i_ileBridge", ("Inited space for parms")); + return p; + } + else + reportSystemAPIError(rc, NULL); + } + + return NULL; +} + diff --git a/storage/ibmdb2i/db2i_ileBridge.h b/storage/ibmdb2i/db2i_ileBridge.h new file mode 100644 index 00000000000..7e4e8216cfc --- /dev/null +++ b/storage/ibmdb2i/db2i_ileBridge.h @@ -0,0 +1,488 @@ +/* +Licensed Materials - Property of IBM +DB2 Storage Engine Enablement +Copyright IBM Corporation 2007,2008 +All rights reserved + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + (a) Redistributions of source code must retain this list of conditions, the + copyright notice in section {d} below, and the disclaimer following this + list of conditions. + (b) Redistributions in binary form must reproduce this list of conditions, the + copyright notice in section (d) below, and the disclaimer following this + list of conditions, in the documentation and/or other materials provided + with the distribution. + (c) The name of IBM may not be used to endorse or promote products derived from + this software without specific prior written permission. + (d) The text of the required copyright notice is: + Licensed Materials - Property of IBM + DB2 Storage Engine Enablement + Copyright IBM Corporation 2007,2008 + All rights reserved + +THIS SOFTWARE IS PROVIDED BY IBM CORPORATION "AS IS" AND ANY EXPRESS OR IMPLIED +WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT +SHALL IBM CORPORATION BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT +OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT INCLUDING NEGLIGENCE OR OTHERWISE) ARISING +IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY +OF SUCH DAMAGE. +*/ + + +#ifndef DB2I_ILEBRIDGE_H +#define DB2I_ILEBRIDGE_H + +#include "db2i_global.h" +#include "mysql_priv.h" +#include "as400_types.h" +#include "as400_protos.h" +#include "qmyse.h" +#include "db2i_errors.h" + +typedef uint64_t FILE_HANDLE; +typedef my_thread_id CONNECTION_HANDLE; +const char SAVEPOINT_NAME[] = {0xD4,0xE2,0xD7,0xC9,0xD5,0xE3,0xC5,0xD9,0xD5,0x0}; +const uint32 TACIT_ERRORS_SIZE=2; + +enum db2i_InfoRequestSpec +{ + objLength = 1, + rowCount = 2, + deletedRowCount = 4, + rowsPerKey = 8, + meanRowLen = 16, + lastModTime = 32, + createTime = 64, + ioCount = 128 +}; + +extern handlerton *ibmdb2i_hton; + +const uint32 db2i_ileBridge_MAX_INPARM_SIZE = 512; +const uint32 db2i_ileBridge_MAX_OUTPARM_SIZE = 512; + +extern pthread_key(IleParms*, THR_ILEPARMS); +struct IleParms +{ + char inParms[db2i_ileBridge_MAX_INPARM_SIZE]; + char outParms[db2i_ileBridge_MAX_OUTPARM_SIZE]; +}; + +/** + @class db2i_ileBridge + + Implements a connection-based interface to the QMY_* APIs + + @details Each client connection that touches an IBMDB2I table has a "bridge" + associated with it. This bridge is constructed on first use and provides a + more C-like interface to the APIs. As well, it is reponsible for tracking + connection scoped information such as statement transaction state and error + message text. The bridge is destroyed when the connection ends. +*/ +class db2i_ileBridge +{ + enum ileFuncs + { + funcRegisterParameterSpaces, + funcRegisterSpace, + funcUnregisterSpace, + funcProcessRequest, + funcListEnd + }; + + static db2i_ileBridge* globalBridge; +public: + + + static int setup(); + static void takedown(); + + /** + Obtain a pointer to the bridge for the current connection. + + If a MySQL client connection is on the stack, we get the associated brideg. + Otherwise, we use the globalBridge. + */ + static db2i_ileBridge* getBridgeForThread() + { + THD* thd = current_thd; + if (likely(thd)) + return getBridgeForThread(thd); + + return globalBridge; + } + + /** + Obtain a pointer to the bridge for the specified connection. + + If a bridge exists already, we return it immediately. Otherwise, prepare + a new bridge for the connection. + */ + static db2i_ileBridge* getBridgeForThread(const THD* thd) + { + void* thdData = *thd_ha_data(thd, ibmdb2i_hton); + if (likely(thdData != NULL)) + return (db2i_ileBridge*)(thdData); + + db2i_ileBridge* newBridge = createNewBridge(thd->thread_id); + *thd_ha_data(thd, ibmdb2i_hton) = (void*)newBridge; + return newBridge; + } + + static void destroyBridgeForThread(const THD* thd); + static void registerPtr(const void* ptr, ILEMemHandle* receiver); + static void unregisterPtr(ILEMemHandle handle); + int32 allocateFileDefn(ILEMemHandle definitionSpace, + ILEMemHandle handleSpace, + uint16 fileCount, + const char* schemaName, + uint16 schemaNameLength, + ILEMemHandle formatSpace, + uint32 formatSpaceLen); + int32 allocateFileInstance(FILE_HANDLE defnHandle, + ILEMemHandle inuseSpace, + FILE_HANDLE* instance); + int32 deallocateFile(FILE_HANDLE fileHandle, + bool postDropTable=FALSE); + int32 read(FILE_HANDLE rfileHandle, + ILEMemHandle buf, + char accessIntent, + char commitLevel, + char orientation, + bool asyncRead = FALSE, + ILEMemHandle rrn = 0, + ILEMemHandle key = 0, + uint32 keylen = 0, + uint16 keyParts = 0, + int pipeFD = -1); + int32 readByRRN(FILE_HANDLE rfileHandle, + ILEMemHandle buf, + uint32 inRRN, + char accessIntent, + char commitLevel); + int32 writeRows(FILE_HANDLE rfileHandle, + ILEMemHandle buf, + char commitLevel, + int64* outIdVal, + bool* outIdGen, + uint32* dupKeyRRN, + char** dupKeyName, + uint32* dupKeyNameLen, + uint32* outIdIncrement); + uint32 execSQL(const char* statement, + uint32 statementCount, + uint8 commitLevel, + bool autoCreateSchema = FALSE, + bool dropSchema = FALSE, + bool noCommit = FALSE, + FILE_HANDLE fileHandle = 0); + int32 prepOpen(const char* statement, + FILE_HANDLE* rfileHandle, + uint32* recLength); + int32 deleteRow(FILE_HANDLE rfileHandle, + uint32 rrn); + int32 updateRow(FILE_HANDLE rfileHandle, + uint32 rrn, + ILEMemHandle buf, + uint32* dupKeyRRN, + char** dupKeyName, + uint32* dupKeyNameLen); + int32 commitmentControl(uint8 function); + int32 savepoint(uint8 function, + const char* savepointName); + int32 recordsInRange(FILE_HANDLE rfileHandle, + ILEMemHandle inSpc, + uint32 inKeyCnt, + uint32 inLiteralCnt, + uint32 inBoundsOff, + uint32 inLitDefOff, + uint32 inLiteralsOff, + uint32 inCutoff, + uint32 inSpcLen, + uint16 inEndByte, + uint64* outRecCnt, + uint16* outRtnCode); + int32 rrlslck(FILE_HANDLE rfileHandle, + char accessIntent); + int32 lockObj(FILE_HANDLE rfileHandle, + uint64 inTimeoutVal, + char inAction, + char inLockType, + char inTimeout); + int32 constraints(FILE_HANDLE rfileHandle, + ILEMemHandle inSpc, + uint32 inSpcLen, + uint32* outLen, + uint32* outCnt); + int32 optimizeTable(FILE_HANDLE rfileHandle); + static int32 initILE(const char* aspName); + int32 initFileForIO(FILE_HANDLE rfileHandle, + char accessIntent, + char commitLevel, + uint16* inRecSize, + uint16* inRecNullOffset, + uint16* outRecSize, + uint16* outRecNullOffset); + int32 readInterrupt(FILE_HANDLE fileHandle); + static int32 exitILE(); + + int32 objectOverride(FILE_HANDLE rfileHandle, + ILEMemHandle buf, + uint32 recordWidth = 0); + + int32 retrieveTableInfo(FILE_HANDLE rfileHandle, + uint16 dataRequested, + ha_statistics& stats, + ILEMemHandle inSpc = NULL); + + int32 retrieveIndexInfo(FILE_HANDLE rfileHandle, + uint64* outPageCnt); + + int32 closeConnection(CONNECTION_HANDLE conn); + int32 quiesceFileInstance(FILE_HANDLE rfileHandle); + + /** + Mark the beginning of a "statement transaction" + + @detail MySQL "statement transactions" (see sql/handler.cc) are implemented + as DB2 savepoints having a predefined name. + + @return 0 if successful; error otherwise + */ + uint32 beginStmtTx() + { + DBUG_ENTER("db2i_ileBridge::beginStmtTx"); + if (stmtTxActive) + DBUG_RETURN(0); + + stmtTxActive = true; + + DBUG_RETURN(savepoint(QMY_SET_SAVEPOINT, SAVEPOINT_NAME)); + } + + /** + Commit a "statement transaction" + + @return 0 if successful; error otherwise + */ + uint32 commitStmtTx() + { + DBUG_ENTER("db2i_ileBridge::commitStmtTx"); + DBUG_ASSERT(stmtTxActive); + stmtTxActive = false; + DBUG_RETURN(savepoint(QMY_RELEASE_SAVEPOINT, SAVEPOINT_NAME)); + } + + /** + Roll back a "statement transaction" + + @return 0 if successful; error otherwise + */ + uint32 rollbackStmtTx() + { + DBUG_ENTER("db2i_ileBridge::rollbackStmtTx"); + DBUG_ASSERT(stmtTxActive); + stmtTxActive = false; + DBUG_RETURN(savepoint(QMY_ROLLBACK_SAVEPOINT, SAVEPOINT_NAME)); + } + + + /** + Provide storage for generating error messages. + + This storage must persist until the error message is retrieved from the + handler instance. It is for this reason that we associate it with the bridge. + + @return Pointer to heap storage of MYSQL_ERRMSG_SIZE bytes + */ + char* getErrorStorage() + { + if (!connErrText) + { + connErrText = (char*)my_malloc(MYSQL_ERRMSG_SIZE, MYF(MY_WME)); + if (connErrText) connErrText[0] = 0; + } + + return connErrText; + } + + /** + Free storage for generating error messages. + */ + void freeErrorStorage() + { + if (likely(connErrText)) + { + my_free(connErrText, MYF(0)); + connErrText = NULL; + } + } + + + /** + Store a file handle for later retrieval. + + If deallocateFile encounters a lock when trying to perform its operation, + the file remains allocated but must be deallocated later. This function + provides a way for the connection to "remember" that this deallocation is + still needed. + + @param newname The name of the file to be added + @param newhandle The handle associated with newname + + */ + void preserveHandle(const char* newname, FILE_HANDLE newhandle) + { + pendingLockedHandles.add(newname, newhandle); + } + + /** + Retrieve a file handle stored by preserveHandle(). + + @param name The name of the file to be retrieved. + + @return The handle associated with name + */ + FILE_HANDLE findAndRemovePreservedHandle(const char* name) + { + return pendingLockedHandles.findAndRemove(name); + } + + /** + Indicate which error messages should be suppressed on the next API call + + These functions are useful for ensuring that the provided error numbers + are returned if a failure occurs but do not cause a spurious error message + to be returned. + + @return A pointer to this instance + */ + db2i_ileBridge* expectErrors(int32 er1) + { + tacitErrors[0]=er1; + return this; + } + + db2i_ileBridge* expectErrors(int32 er1, int32 er2) + { + tacitErrors[0]=er1; + tacitErrors[1]=er2; + return this; + } + + /** + Obtain the IBM i system message that accompanied the last API failure. + + @return A pointer to the 7 character message ID. + */ + const char* getErrorMsgID() + { + return ((Qmy_Error_output_t*)parms()->outParms)->MsgId; + } + + /** + Convert an API error code into the equivalent MySQL error code (if any) + + @param rc The QMYSE API error code + + @return If an equivalent exists, the MySQL error code; else rc + */ + static int32 translateErrorCode(int32 rc) + { + if (likely(rc == 0)) + return 0; + + switch (rc) + { + case QMY_ERR_KEY_NOT_FOUND: + return HA_ERR_KEY_NOT_FOUND; + case QMY_ERR_DUP_KEY: + return HA_ERR_FOUND_DUPP_KEY; + case QMY_ERR_END_OF_FILE: + return HA_ERR_END_OF_FILE; + case QMY_ERR_LOCK_TIMEOUT: + return HA_ERR_LOCK_WAIT_TIMEOUT; + case QMY_ERR_CST_VIOLATION: + return HA_ERR_NO_REFERENCED_ROW; + case QMY_ERR_TABLE_NOT_FOUND: + return HA_ERR_NO_SUCH_TABLE; + case QMY_ERR_NON_UNIQUE_KEY: + return ER_DUP_ENTRY; + } + return rc; + } + +private: + + static db2i_ileBridge* createNewBridge(CONNECTION_HANDLE connID); + static void destroyBridge(db2i_ileBridge* bridge); + static int registerParmSpace(char* in, char* out); + static int32 doIt(); + int32 doItWithLog(); + + static _ILEpointer *functionSymbols; ///< Array of ILE function pointers + CONNECTION_HANDLE cachedConnectionID; ///< The associated connection + bool stmtTxActive; ///< Inside statement transaction + char *connErrText; ///< Storage for error message + int32 tacitErrors[TACIT_ERRORS_SIZE]; ///< List of errors to be suppressed + + static IleParms* initParmsForThread(); + + /** + Get space for passing parameters to the QMY_* APIs + + @details A fixed-length parameter passing space is associated with each + pthread. This space is allocated and registered by initParmsForThread() + the first time a pthread works with a bridge. The space is cached away + and remains available until the pthread ends. It became necessary to + disassociate the parameter space from the bridge in order to support + future enhancements to MySQL that sever the one-to-one relationship between + pthreads and user connections. The QMY_* APIs scope a registered parameter + space to the thread that executes the register operation. + */ + static IleParms* parms() + { + IleParms* p = my_pthread_getspecific_ptr(IleParms*, THR_ILEPARMS); + if (likely(p)) + return p; + + return initParmsForThread(); + } + + class PreservedHandleList + { + friend db2i_ileBridge* db2i_ileBridge::createNewBridge(CONNECTION_HANDLE); + public: + void add(const char* newname, FILE_HANDLE newhandle); + FILE_HANDLE findAndRemove(const char* fileName); + + private: + struct NameHandlePair + { + char name[FN_REFLEN]; + FILE_HANDLE handle; + NameHandlePair* next; + }* head; + } pendingLockedHandles; + + +#ifndef DBUG_OFF + bool cachedStateIsCoherent() + { + return (current_thd->thread_id == cachedConnectionID); + } + + friend void db2i_ileBridge::unregisterPtr(ILEMemHandle); + friend void db2i_ileBridge::registerPtr(const void*, ILEMemHandle*); + static uint32 registeredPtrs; +#endif +}; + + + +#endif diff --git a/storage/ibmdb2i/db2i_ioBuffers.cc b/storage/ibmdb2i/db2i_ioBuffers.cc new file mode 100644 index 00000000000..e503bd0e9f1 --- /dev/null +++ b/storage/ibmdb2i/db2i_ioBuffers.cc @@ -0,0 +1,332 @@ +/* +Licensed Materials - Property of IBM +DB2 Storage Engine Enablement +Copyright IBM Corporation 2007,2008 +All rights reserved + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + (a) Redistributions of source code must retain this list of conditions, the + copyright notice in section {d} below, and the disclaimer following this + list of conditions. + (b) Redistributions in binary form must reproduce this list of conditions, the + copyright notice in section (d) below, and the disclaimer following this + list of conditions, in the documentation and/or other materials provided + with the distribution. + (c) The name of IBM may not be used to endorse or promote products derived from + this software without specific prior written permission. + (d) The text of the required copyright notice is: + Licensed Materials - Property of IBM + DB2 Storage Engine Enablement + Copyright IBM Corporation 2007,2008 + All rights reserved + +THIS SOFTWARE IS PROVIDED BY IBM CORPORATION "AS IS" AND ANY EXPRESS OR IMPLIED +WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT +SHALL IBM CORPORATION BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT +OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT INCLUDING NEGLIGENCE OR OTHERWISE) ARISING +IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY +OF SUCH DAMAGE. +*/ + + +#include "db2i_ioBuffers.h" + +/** + Request another block of rows + + Request the next set of rows from DB2. This must only be called after + newReadRequest(). + + @param orientation The direction to use when reading through the table. +*/ +void IOAsyncReadBuffer::loadNewRows(char orientation) +{ + rewind(); + maxRows() = rowsToBlock; + + DBUG_PRINT("db2i_ioBuffers::loadNewRows", ("Requesting %d rows, async = %d", rowsToBlock, readIsAsync)); + + rc = getBridge()->expectErrors(QMY_ERR_END_OF_BLOCK, QMY_ERR_LOB_SPACE_TOO_SMALL) + ->read(file, + ptr(), + accessIntent, + commitLevel, + orientation, + readIsAsync, + rrnList, + 0, + 0, + 0); + + DBUG_PRINT("db2i_ioBuffers::loadNewRows", ("recordsRead: %d, rc: %d", (uint32)rowCount(), rc)); + + + *releaseRowNeeded = true; + + if (rc == QMY_ERR_END_OF_BLOCK) + { + // This is really just an informational error, so we ignore it. + rc = 0; + DBUG_PRINT("db2i_ioBuffers::loadNewRows", ("End of block signalled")); + } + else if (rc == QMY_ERR_END_OF_FILE) + { + // If we reach EOF or end-of-key, DB2 guarantees that no rows will be locked. + rc = HA_ERR_END_OF_FILE; + *releaseRowNeeded = false; + } + else if (rc == QMY_ERR_KEY_NOT_FOUND) + { + rc = HA_ERR_KEY_NOT_FOUND; + *releaseRowNeeded = false; + } + + if (rc) closePipe(); +} + + +/** + Empty the message pipe to prepare for another read. +*/ +void IOAsyncReadBuffer::drainPipe() +{ + DBUG_ASSERT(pipeState == PendingFullBufferMsg); + PipeRpy_t msg[32]; + int bytes; + PipeRpy_t* lastMsg; + while ((bytes = read(msgPipe, msg, sizeof(msg))) > 0) + { + DBUG_PRINT("db2i_ioBuffers::drainPipe",("Pipe returned %d bytes", bytes)); + lastMsg = &msg[bytes / (sizeof(msg[0]))-1]; + if (lastMsg->CumRowCnt == maxRows() || + lastMsg->RtnCod != 0) + { + pipeState = ConsumedFullBufferMsg; + break; + } + + } + DBUG_PRINT("db2i_ioBuffers::drainPipe",("rc = %d, rows = %d, max = %d", lastMsg->RtnCod, lastMsg->CumRowCnt, (uint32)maxRows())); +} + + +/** + Poll the message pipe for async read messages + + Only valid in async + + @param orientation The direction to use when reading through the table. +*/ +void IOAsyncReadBuffer::pollNextRow(char orientation) +{ + DBUG_ASSERT(readIsAsync); + + // Handle the case in which the buffer is full. + if (rowCount() == maxRows()) + { + // If we haven't read to the end, exit here. + if (readCursor < rowCount()) + return; + + if (pipeState == PendingFullBufferMsg) + drainPipe(); + if (pipeState == ConsumedFullBufferMsg) + loadNewRows(orientation); + } + + if (!rc) + { + PipeRpy_t* lastMsg = NULL; + while (true) + { + PipeRpy_t msg[32]; + int bytes = read(msgPipe, msg, sizeof(msg)); + DBUG_PRINT("db2i_ioBuffers::pollNextRow",("Pipe returned %d bytes", bytes)); + + if (unlikely(bytes < 0)) + { + DBUG_PRINT("db2i_ioBuffers::pollNextRow", ("Error")); + rc = errno; + break; + } + else if (bytes == 0) + break; + + DBUG_ASSERT(bytes % sizeof(msg[0]) == 0); + lastMsg = &msg[bytes / (sizeof(msg[0]))-1]; + + if (lastMsg->RtnCod || (lastMsg->CumRowCnt == usedRows())) + { + rc = lastMsg->RtnCod; + break; + } + } + + *releaseRowNeeded = true; + + if (rc == QMY_ERR_END_OF_BLOCK) + rc = 0; + else if (rc == QMY_ERR_END_OF_FILE) + { + // If we reach EOF or end-of-key, DB2 guarantees that no rows will be locked. + rc = HA_ERR_END_OF_FILE; + *releaseRowNeeded = false; + } + else if (rc == QMY_ERR_KEY_NOT_FOUND) + { + rc = HA_ERR_KEY_NOT_FOUND; + *releaseRowNeeded = false; + } + + if (lastMsg) + DBUG_PRINT("db2i_ioBuffers::pollNextRow", ("Good data: rc=%d; rows=%d; usedRows=%d", lastMsg->RtnCod, lastMsg->CumRowCnt, (uint32)usedRows())); + if (lastMsg && likely(!rc)) + { + if (lastMsg->CumRowCnt < maxRows()) + pipeState = PendingFullBufferMsg; + else + pipeState = ConsumedFullBufferMsg; + + DBUG_ASSERT(lastMsg->CumRowCnt <= usedRows()); + + } + DBUG_ASSERT(rowCount() <= getRowCapacity()); + } + DBUG_PRINT("db2i_ioBuffers::pollNextRow", ("filledRows: %d, rc: %d", rowCount(), rc)); + if (rc) closePipe(); +} + + +/** + Prepare for the destruction of the row buffer storage. +*/ +void IOAsyncReadBuffer::prepForFree() +{ + interruptRead(); + rewind(); + IORowBuffer::prepForFree(); +} + + +/** + Initialize the newly allocated storage. + + @param sizeChanged Indicates whether the storage capacity is being changed. +*/ +void IOAsyncReadBuffer::initAfterAllocate(bool sizeChanged) +{ + rewind(); + + if (sizeChanged || ((void*)rrnList == NULL)) + rrnList.realloc(getRowCapacity() * sizeof(uint32)); +} + + +/** + Send an initial read request + + @param infile The file (table/index) being read from + @param orientation The orientation to use for this read request + @param rowsToBuffer The number of rows to request each time + @param useAsync Whether reads should be performed asynchronously. + @param key The key to use (if any) + @param keyLength The length of key (if any) + @param keyParts The number of columns in the key (if any) + +*/ +void IOAsyncReadBuffer::newReadRequest(FILE_HANDLE infile, + char orientation, + uint32 rowsToBuffer, + bool useAsync, + ILEMemHandle key, + int keyLength, + int keyParts) +{ + DBUG_ENTER("db2i_ioBuffers::newReadRequest"); + DBUG_ASSERT(rowsToBuffer <= getRowCapacity()); +#ifndef DBUG_OFF + if (readCursor < rowCount()) + DBUG_PRINT("PERF:",("Wasting %d buffered rows!\n", rowCount() - readCursor)); +#endif + + int fildes[2]; + int ileDescriptor = QMY_REUSE; + + closePipe(); + + if (likely(useAsync)) + { + if (rowsToBuffer == 1) + { + // Async provides little or no benefit for single row reads, so we turn it off + DBUG_PRINT("db2i_ioBuffers::newReadRequest", ("Disabling async")); + useAsync = false; + } + else + { + rc = pipe(fildes); + if (rc) DBUG_VOID_RETURN; + + // Translate the pipe write descriptor into the equivalent ILE descriptor + rc = fstatx(fildes[1], (struct stat*)&ileDescriptor, sizeof(ileDescriptor), STX_XPFFD_PASE); + if (rc) + { + close(fildes[0]); + close(fildes[1]); + DBUG_VOID_RETURN; + } + pipeState = Untouched; + msgPipe = fildes[0]; + + DBUG_PRINT("db2i_ioBuffers::newReadRequest", ("Opened pipe %d", fildes[0])); + } + } + + file = infile; + readIsAsync = useAsync; + rowsToBlock = rowsToBuffer; + + rewind(); + maxRows() = 1; + rc = getBridge()->expectErrors(QMY_ERR_END_OF_BLOCK, QMY_ERR_LOB_SPACE_TOO_SMALL) + ->read(file, + ptr(), + accessIntent, + commitLevel, + orientation, + useAsync, + rrnList, + key, + keyLength, + keyParts, + ileDescriptor); + + // Having shared the pipe with ILE, we relinquish our claim on the write end + // of the pipe. + if (useAsync) + close(fildes[1]); + + // If we reach EOF or end-of-key, DB2 guarantees that no rows will be locked. + if (rc == QMY_ERR_END_OF_FILE) + { + rc = HA_ERR_END_OF_FILE; + *releaseRowNeeded = false; + } + else if (rc == QMY_ERR_KEY_NOT_FOUND) + { + if (rowCount()) + rc = HA_ERR_END_OF_FILE; + else + rc = HA_ERR_KEY_NOT_FOUND; + *releaseRowNeeded = false; + } + else + *releaseRowNeeded = true; + + DBUG_VOID_RETURN; +} diff --git a/storage/ibmdb2i/db2i_ioBuffers.h b/storage/ibmdb2i/db2i_ioBuffers.h new file mode 100644 index 00000000000..40c88725ef9 --- /dev/null +++ b/storage/ibmdb2i/db2i_ioBuffers.h @@ -0,0 +1,411 @@ +/* +Licensed Materials - Property of IBM +DB2 Storage Engine Enablement +Copyright IBM Corporation 2007,2008 +All rights reserved + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + (a) Redistributions of source code must retain this list of conditions, the + copyright notice in section {d} below, and the disclaimer following this + list of conditions. + (b) Redistributions in binary form must reproduce this list of conditions, the + copyright notice in section (d) below, and the disclaimer following this + list of conditions, in the documentation and/or other materials provided + with the distribution. + (c) The name of IBM may not be used to endorse or promote products derived from + this software without specific prior written permission. + (d) The text of the required copyright notice is: + Licensed Materials - Property of IBM + DB2 Storage Engine Enablement + Copyright IBM Corporation 2007,2008 + All rights reserved + +THIS SOFTWARE IS PROVIDED BY IBM CORPORATION "AS IS" AND ANY EXPRESS OR IMPLIED +WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT +SHALL IBM CORPORATION BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT +OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT INCLUDING NEGLIGENCE OR OTHERWISE) ARISING +IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY +OF SUCH DAMAGE. +*/ + + +/** + @file db2i_ioBuffers.h + + @brief Buffer classes used for interacting with QMYSE read/write buffers. + +*/ + + +#include "db2i_validatedPointer.h" +#include "mysql_priv.h" +#include +#include +#include + +// Needed for compilers which do not include fstatx in standard headers. +extern "C" int fstatx(int, struct stat *, int, int); + +/** + Basic row buffer + + Provides the basic structure and methods needed for communicating + with QMYSE I/O APIs. + + @details All QMYSE I/O apis use a buffer that is structured as two integer + row counts (max and used) and storage for some number of rows. The row counts + are both input and output for the API, and their usage depends on the + particular API invoked. This class encapsulates that buffer definition. +*/ +class IORowBuffer +{ + public: + IORowBuffer() : allocSize(0), rowLength(0) {;} + ~IORowBuffer() { freeBuf(); } + ValidatedPointer& ptr() { return data; } + + /** + Sets up the buffer to hold the size indicated. + + @param rowLen length of the rows that will be stored in this buffer + @param size buffer size requested + */ + void allocBuf(uint32 rowLen, uint32 size) + { + uint32 newSize = size + sizeof(BufferHdr_t); + // If the internal structure of the row is changing, we need to + // remember this and notify the subclasses via initAfterAllocate(); + bool formatChanged = ((size/rowLen) != rowCapacity); + + if (newSize > allocSize) + { + this->freeBuf(); + data.alloc(newSize); + if (likely((void*)data)) + allocSize = newSize; + } + + if (likely((void*)data)) + { + DBUG_ASSERT((uint64)(void*)data % 16 == 0); + rowLength = rowLen; + rowCapacity = size / rowLength; + initAfterAllocate(formatChanged); + } + else + { + allocSize = 0; + rowCapacity = 0; + } + + DBUG_PRINT("db2i_ioBuffers::allocBuf",("rowCapacity = %d", rowCapacity)); + } + + void zeroBuf() + { + memset(data, 0, allocSize); + } + + void freeBuf() + { + if (likely(allocSize)) + { + prepForFree(); + DBUG_PRINT("IORowBuffer::freeBuf",("Freeing 0x%p", (char*)data)); + data.dealloc(); + } + } + + char* getRowN(uint32 n) + { + if (unlikely(n >= getRowCapacity())) + return NULL; + return (char*)data + sizeof(BufferHdr_t) + (rowLength * n); + }; + + uint32 getRowCapacity() const {return rowCapacity;} + + protected: + /** + Called prior to freeing buffer storage so that subclasses can do + any required cleanup + */ + virtual void prepForFree() + { + allocSize = 0; + rowCapacity = 0; + } + + /** + Called after buffer storage so that subclasses can do any required setup. + */ + virtual void initAfterAllocate(bool sizeChanged) { return;} + + ValidatedPointer data; + uint32 allocSize; + uint32 rowCapacity; + uint32 rowLength; + uint32& usedRows() const { return ((BufferHdr_t*)(char*)data)->UsedRowCnt; } + uint32& maxRows() const {return ((BufferHdr_t*)(char*)data)->MaxRowCnt; } +}; + + +/** + Write buffer + + Implements methods for inserting data into a row buffer for use with the + QMY_WRITE and QMY_UPDATE APIs. + + @details The max row count defines how many rows are in the buffer. The used + row count is updated by QMYSE to indicate how many rows have been + successfully written. +*/ +class IOWriteBuffer : public IORowBuffer +{ + public: + bool endOfBuffer() const {return (maxRows() == getRowCapacity());} + + char* addRow() + { + return getRowN(maxRows()++); + } + + void resetAfterWrite() + { + maxRows() = 0; + } + + void deleteRow() + { + --maxRows(); + } + + uint32 rowCount() const {return maxRows();} + + uint32 rowsWritten() const {return usedRows()-1;} + + private: + void initAfterAllocate(bool sizeChanged) {maxRows() = 0; usedRows() = 0;} +}; + + +/** + Read buffer + + Implements methods for reading data from and managing a row buffer for use + with the QMY_READ APIs. This is primarily for use with metainformation queries. +*/ +class IOReadBuffer : public IORowBuffer +{ + public: + + IOReadBuffer() {;} + IOReadBuffer(uint32 rows, uint32 rowLength) + { + allocBuf(rows, rows * rowLength); + maxRows() = rows; + } + + uint32 rowCount() {return usedRows();} + void setRowsToProcess(uint32 rows) { maxRows() = rows; } +}; + + +/** + Read buffer + + Implements methods for reading data from and managing a row buffer for use + with the QMY_READ APIs. + + @details This class supports both sync and async read modes. The max row + count defines the number of rows that are requested to be read. The used row + count defines how many rows have been read. Sync mode is reasonably + straightforward, but async mode has a complex system of communicating with + QMYSE that is optimized for low latency. In async mode, the used row count is + updated continuously by QMYSE as rows are read. At the same time, messages are + sent to the associated pipe indicating that a row has been read. As long as + the internal read cursor lags behind the used row count, the pipe is never + consulted. But if the internal read cursor "catches up to" the used row count, + then we block on the pipe until we find a message indicating that a new row + has been read or that an error has occurred. +*/ +class IOAsyncReadBuffer : public IOReadBuffer +{ + public: + IOAsyncReadBuffer() : + file(0), readIsAsync(false), msgPipe(QMY_REUSE), bridge(NULL) + { + } + + ~IOAsyncReadBuffer() + { + interruptRead(); + rrnList.dealloc(); + } + + + /** + Signal read operation complete + + Indicates that the storage engine requires no more data from the table. + Must be called between calls to newReadRequest(). + */ + void endRead() + { +#ifndef DBUG_OFF + if (readCursor < rowCount()) + DBUG_PRINT("PERF:",("Wasting %d buffered rows!\n", rowCount() - readCursor)); +#endif + interruptRead(); + + file = 0; + bridge = NULL; + } + + /** + Update data that may change on each read operation + */ + void update(char newAccessIntent, + bool* newReleaseRowNeeded, + char commitLvl) + { + accessIntent = newAccessIntent; + releaseRowNeeded = newReleaseRowNeeded; + commitLevel = commitLvl; + } + + /** + Read the next row in the table. + + Return a pointer to the next row in the table, where "next" is defined + by the orientation. + + @param orientaton + @param[out] rrn The relative record number of the row returned. Not reliable + if NULL is returned by this function. + + @return Pointer to the row. Null if no more rows are available or an error + occurred. + */ + char* readNextRow(char orientation, uint32& rrn) + { + DBUG_PRINT("db2i_ioBuffers::readNextRow", ("readCursor: %d, filledRows: %d, rc: %d", readCursor, rowCount(), rc)); + + while (readCursor >= rowCount() && !rc) + { + if (!readIsAsync) + loadNewRows(orientation); + else + pollNextRow(orientation); + } + + if (readCursor >= rowCount()) + return NULL; + + rrn = rrnList[readCursor]; + return getRowN(readCursor++); + } + + /** + Retrieve the return code generated by the last operation. + + @return The return code, translated to the appropriate HA_ERR_* + value if possible. + */ + int32 lastrc() + { + return db2i_ileBridge::translateErrorCode(rc); + } + + void rewind() + { + readCursor = 0; + rc = 0; + usedRows() = 0; + } + + bool reachedEOD() { return EOD; } + + void newReadRequest(FILE_HANDLE infile, + char orientation, + uint32 rowsToBuffer, + bool useAsync, + ILEMemHandle key, + int keyLength, + int keyParts); + + private: + + /** + End any running async read operation. + */ + void interruptRead() + { + closePipe(); + if (file && readIsAsync && (rc == 0) && (rowCount() < getRowCapacity())) + { + DBUG_PRINT("IOReadBuffer::interruptRead", ("PERF: Interrupting %d", (uint32)file)); + getBridge()->readInterrupt(file); + } + } + + void closePipe() + { + if (msgPipe != QMY_REUSE) + { + DBUG_PRINT("db2i_ioBuffers::closePipe", ("Closing pipe %d", msgPipe)); + close(msgPipe); + msgPipe = QMY_REUSE; + } + } + + /** + Get a pointer to the active ILE bridge. + + Getting the bridge pointer is (relatively) expensive, so we cache + it off for each operation. + */ + db2i_ileBridge* getBridge() + { + if (unlikely(bridge == NULL)) + { + bridge = db2i_ileBridge::getBridgeForThread(); + } + return bridge; + } + + void drainPipe(); + void pollNextRow(char orientation); + void prepForFree(); + void initAfterAllocate(bool sizeChanged); + void loadNewRows(char orientation); + + + uint32 readCursor; // Read position within buffer + int32 rc; // Last return code received + ValidatedPointer rrnList; // Receiver for list of rrns + char accessIntent; // The access intent for this read + char commitLevel; // What isolation level should be used + char EOD; // Whether end-of-data was hit + char readIsAsync; // Are reads to be done asynchronously? + bool* releaseRowNeeded; + /* Does the caller need to release the current row when finished reading */ + FILE_HANDLE file; // The file to be read + int msgPipe; + /* The read descriptor of the pipe used to pass messages during async reads */ + db2i_ileBridge* bridge; // Cached pointer to bridge + uint32 rowsToBlock; // Number of rows to request + enum + { + ConsumedFullBufferMsg, + PendingFullBufferMsg, + Untouched + } pipeState; + /* The state of the async read message pipe */ +}; + diff --git a/storage/ibmdb2i/db2i_misc.h b/storage/ibmdb2i/db2i_misc.h new file mode 100644 index 00000000000..1b6f0bc3968 --- /dev/null +++ b/storage/ibmdb2i/db2i_misc.h @@ -0,0 +1,95 @@ +/* +Licensed Materials - Property of IBM +DB2 Storage Engine Enablement +Copyright IBM Corporation 2007,2008 +All rights reserved + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + (a) Redistributions of source code must retain this list of conditions, the + copyright notice in section {d} below, and the disclaimer following this + list of conditions. + (b) Redistributions in binary form must reproduce this list of conditions, the + copyright notice in section (d) below, and the disclaimer following this + list of conditions, in the documentation and/or other materials provided + with the distribution. + (c) The name of IBM may not be used to endorse or promote products derived from + this software without specific prior written permission. + (d) The text of the required copyright notice is: + Licensed Materials - Property of IBM + DB2 Storage Engine Enablement + Copyright IBM Corporation 2007,2008 + All rights reserved + +THIS SOFTWARE IS PROVIDED BY IBM CORPORATION "AS IS" AND ANY EXPRESS OR IMPLIED +WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT +SHALL IBM CORPORATION BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT +OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT INCLUDING NEGLIGENCE OR OTHERWISE) ARISING +IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY +OF SUCH DAMAGE. +*/ + +#ifndef DB2I_MISC_H +#define DB2I_MISC_H + +/** + Undelimit quote-delimited DB2 names in-place +*/ +void stripExtraQuotes(char* name, uint maxLen) +{ + char* oldName = (char*)sql_strdup(name); + uint i = 0; + uint j = 0; + do + { + name[j] = oldName[i]; + if (oldName[i] == '"' && oldName[i+1] == '"') + ++i; + } while (++j < maxLen && oldName[++i]); + + if (j == maxLen) + --j; + name[j] = 0; +} + +/** + Convert a MySQL identifier name into a DB2 compatible format + + @parm input The MySQL name + @parm output The DB2 name + @parm outlen The amount of space allocated for output + @parm delimit Should delimiting quotes be placed around the converted name? + @parm delimitQuotes Should quotes in the MySQL be delimited with additional quotes? + + @return FALSE if output was too small and name was truncated; TRUE otherwise +*/ +bool convertMySQLNameToDB2Name(const char* input, + char* output, + size_t outlen, + bool delimit = true, + bool delimitQuotes = true) +{ + uint o = 0; + if (delimit) + output[o++] = '"'; + + uint i = 0; + do + { + output[o] = input[i]; + if (delimitQuotes && input[i] == '"') + output[++o] = '"'; + } while (++o < outlen-2 && input[++i]); + + if (delimit) + output[o++] = '"'; + output[min(o, outlen-1)] = 0; // This isn't the most user-friendly way to handle overflows, + // but at least its safe. + return (o <= outlen-1); +} + +#endif diff --git a/storage/ibmdb2i/db2i_myconv.cc b/storage/ibmdb2i/db2i_myconv.cc new file mode 100644 index 00000000000..7be6e1236cd --- /dev/null +++ b/storage/ibmdb2i/db2i_myconv.cc @@ -0,0 +1,1498 @@ +/* +Licensed Materials - Property of IBM +DB2 Storage Engine Enablement +Copyright IBM Corporation 2007,2008 +All rights reserved + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + (a) Redistributions of source code must retain this list of conditions, the + copyright notice in section {d} below, and the disclaimer following this + list of conditions. + (b) Redistributions in binary form must reproduce this list of conditions, the + copyright notice in section (d) below, and the disclaimer following this + list of conditions, in the documentation and/or other materials provided + with the distribution. + (c) The name of IBM may not be used to endorse or promote products derived from + this software without specific prior written permission. + (d) The text of the required copyright notice is: + Licensed Materials - Property of IBM + DB2 Storage Engine Enablement + Copyright IBM Corporation 2007,2008 + All rights reserved + +THIS SOFTWARE IS PROVIDED BY IBM CORPORATION "AS IS" AND ANY EXPRESS OR IMPLIED +WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT +SHALL IBM CORPORATION BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT +OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT INCLUDING NEGLIGENCE OR OTHERWISE) ARISING +IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY +OF SUCH DAMAGE. +*/ + +/** + @file + + @brief A direct map optimization of iconv and related functions + This was show to significantly reduce character conversion cost + for short strings when compared to calling iconv system code. +*/ + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "db2i_myconv.h" +#include "db2i_global.h" + +int32_t myconvDebug=0; + +static char szGetTimeString[20]; +static char * GetTimeString(time_t now) +{ + struct tm * tm; + + now = time(&now); + tm = (struct tm *) localtime(&now); + sprintf(szGetTimeString, "%04d/%02d/%02d %02d:%02d:%02d", + tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday, + tm->tm_hour, tm->tm_min, tm->tm_sec); + + return szGetTimeString; +} + +static MEM_ROOT dmapMemRoot; + +void initMyconv() +{ + init_alloc_root(&dmapMemRoot, 0x200, 0); +} + +void cleanupMyconv() +{ + free_root(&dmapMemRoot,0); +} + + +#ifdef DEBUG +/* type: */ +#define STDOUT_WITH_TIME -1 /* to stdout with time */ +#define STDERR_WITH_TIME -2 /* to stderr with time */ +#define STDOUT_WO_TIME 1 /* : to stdout */ +#define STDERR_WO_TIME 2 /* : to stderr */ + + +static void MyPrintf(long type, + char * fmt, ...) +{ + char StdoutFN[256]; + va_list ap; + char * p; + time_t now; + FILE * fd=stderr; + + if (type < 0) + { + now = time(&now); + fprintf(fd, "%s ", GetTimeString(now)); + } + va_start(ap, fmt); + vfprintf(fd, fmt, ap); + va_end(ap); +} +#endif + + + + +#define MAX_CONVERTER 128 + +mycstoccsid(const char* pname) +{ + if (strcmp(pname, "UTF-16")==0) + return 1200; + else if (strcmp(pname, "big5")==0) + return 950; + else + return cstoccsid(pname); +} +#define cstoccsid mycstoccsid + +static struct __myconv_rec myconv_rec [MAX_CONVERTER]; +static struct __dmap_rec dmap_rec [MAX_CONVERTER]; + +static int dmap_open(const char * to, + const char * from, + const int32_t idx) +{ + if (myconvIsSBCS(from) && myconvIsSBCS(to)) { + dmap_rec[idx].codingSchema = DMAP_S2S; + if ((dmap_rec[idx].dmapS2S = (uchar *) alloc_root(&dmapMemRoot, 0x100)) == NULL) { +#ifdef DEBUG + MyPrintf(STDERR_WITH_TIME, + "dmap_open(%s,%s,%d), CS=%d failed with malloc(), errno = %d in %s at %d\n", + to, from, idx, DMAP_S2S, errno, __FILE__,__LINE__); +#endif + return -1; + } + memset(dmap_rec[idx].dmapS2S, 0x00, 0x100); + myconv_rec[idx].allocatedSize=0x100; + + { + char dmapSrc[0x100]; + iconv_t cd; + int32_t i; + size_t inBytesLeft=0x100; + size_t outBytesLeft=0x100; + size_t len; + char * inBuf=dmapSrc; + char * outBuf=(char *) dmap_rec[idx].dmapS2S; + + if ((cd = iconv_open(to, from)) == (iconv_t) -1) { +#ifdef DEBUG + MyPrintf(STDERR_WITH_TIME, + "dmap_open(%s,%s,%d) failed with iconv_open(), errno = %d in %s at %d\n", + to, from, idx, errno, __FILE__,__LINE__); +#endif + return -1; + } + + inBytesLeft = 0x100; + for (i = 0; i < inBytesLeft; ++i) + dmapSrc[i]=i; + + do { + if ((len = iconv(cd, &inBuf, &inBytesLeft, &outBuf, &outBytesLeft)) != (size_t) 0) { +#ifdef DEBUG + if (myconvDebug) { + MyPrintf(STDERR_WITH_TIME, + "dmap_open(%s,%s,%d), CS=%d: iconv() returns %d, errno = %d in %s at %d\n", + to, from, idx, DMAP_S2S, len, errno, __FILE__,__LINE__); + MyPrintf(STDERR_WITH_TIME, + "inBytesLeft = %d, inBuf - dmapSrc = %d\n", inBytesLeft, inBuf-dmapSrc); + MyPrintf(STDERR_WITH_TIME, + "outBytesLeft = %d, outBuf - dmapS2S = %d\n", outBytesLeft, outBuf-(char *) dmap_rec[idx].dmapS2S); + } + if ((inBytesLeft == 86 || inBytesLeft == 64 || inBytesLeft == 1) && + memcmp(from, "IBM-1256", 9) == 0 && + memcmp(to, "IBM-420", 8) == 0) { + /* Known problem for IBM-1256_IBM-420 */ + --inBytesLeft; + ++inBuf; + *outBuf=0x00; + ++outBuf; + --outBytesLeft; + continue; + } else if ((inBytesLeft == 173 || inBytesLeft == 172 || + inBytesLeft == 74 || inBytesLeft == 73 || + inBytesLeft == 52 || inBytesLeft == 50 || + inBytesLeft == 31 || inBytesLeft == 20 || + inBytesLeft == 6) && + memcmp(to, "IBM-1256", 9) == 0 && + memcmp(from, "IBM-420", 8) == 0) { + /* Known problem for IBM-420_IBM-1256 */ + --inBytesLeft; + ++inBuf; + *outBuf=0x00; + ++outBuf; + --outBytesLeft; + continue; + } else if ((128 >= inBytesLeft) && + memcmp(to, "IBM-037", 8) == 0 && + memcmp(from, "IBM-367", 8) == 0) { + /* Known problem for IBM-367_IBM-037 */ + --inBytesLeft; + ++inBuf; + *outBuf=0x00; + ++outBuf; + --outBytesLeft; + continue; + } else if (((1 <= inBytesLeft && inBytesLeft <= 4) || (97 <= inBytesLeft && inBytesLeft <= 128)) && + memcmp(to, "IBM-838", 8) == 0 && + memcmp(from, "TIS-620", 8) == 0) { + /* Known problem for TIS-620_IBM-838 */ + --inBytesLeft; + ++inBuf; + *outBuf=0x00; + ++outBuf; + --outBytesLeft; + continue; + } + iconv_close(cd); + return -1; +#else + /* Tolerant to undefined conversions for any converter */ + --inBytesLeft; + ++inBuf; + *outBuf=0x00; + ++outBuf; + --outBytesLeft; + continue; +#endif + } + } while (inBytesLeft > 0); + + if (myconvIsISO(to)) + myconv_rec[idx].subS=0x1A; + else if (myconvIsASCII(to)) + myconv_rec[idx].subS=0x7F; + else if (myconvIsEBCDIC(to)) + myconv_rec[idx].subS=0x3F; + + if (myconvIsISO(from)) + myconv_rec[idx].srcSubS=0x1A; + else if (myconvIsASCII(from)) + myconv_rec[idx].srcSubS=0x7F; + else if (myconvIsEBCDIC(from)) + myconv_rec[idx].srcSubS=0x3F; + + iconv_close(cd); + } + } else if (((myconvIsSBCS(from) && myconvIsUnicode2(to)) && (dmap_rec[idx].codingSchema = DMAP_S2U)) || + ((myconvIsSBCS(from) && myconvIsUTF8(to)) && (dmap_rec[idx].codingSchema = DMAP_S28))) { + int i; + + /* single byte mapping */ + if ((dmap_rec[idx].dmapD12U = (UniChar *) alloc_root(&dmapMemRoot, 0x100 * 2)) == NULL) { +#ifdef DEBUG + MyPrintf(STDERR_WITH_TIME, + "dmap_open(%s,%s,%d), CS=%d failed with malloc(), errno = %d in %s at %d\n", + to, from, idx, DMAP_S2U, errno, __FILE__,__LINE__); +#endif + return -1; + } + memset(dmap_rec[idx].dmapD12U, 0x00, 0x100 * 2); + myconv_rec[idx].allocatedSize=0x100 * 2; + + + { + char dmapSrc[2]; + iconv_t cd; + int32_t i; + size_t inBytesLeft; + size_t outBytesLeft; + size_t len; + char * inBuf; + char * outBuf; + char SS=0x1A; +#ifdef support_surrogate + if ((cd = iconv_open("UTF-16", from)) == (iconv_t) -1) { +#else + if ((cd = iconv_open("UCS-2", from)) == (iconv_t) -1) { +#endif +#ifdef DEBUG + MyPrintf(STDERR_WITH_TIME, + "dmap_open(%s,%s,%d) failed with iconv_open(), errno = %d in %s at %d\n", + to, from, idx, errno, __FILE__,__LINE__); +#endif + return -1; + } + + for (i = 0; i < 0x100; ++i) { + dmapSrc[0]=i; + inBuf=dmapSrc; + inBytesLeft=1; + outBuf=(char *) &(dmap_rec[idx].dmapD12U[i]); + outBytesLeft=2; + if ((len = iconv(cd, &inBuf, &inBytesLeft, &outBuf, &outBytesLeft)) != (size_t) 0) { + if ((errno == EILSEQ || errno == EINVAL) && + inBytesLeft == 1 && + outBytesLeft == 2) { + continue; + } else { +#ifdef DEBUG + if (myconvDebug) { + MyPrintf(STDERR_WITH_TIME, + "dmap_open(%s,%s,%d) failed to initialize with iconv(cd,%02x,%d,%02x%02x,%d), errno = %d in %s at %d\n", + to, from, idx, dmapSrc[0], 1, + (&dmap_rec[idx].dmapD12U[i])[0],(&dmap_rec[idx].dmapD12U[i])[1], 2, + errno, __FILE__,__LINE__); + MyPrintf(STDERR_WITH_TIME, + "inBytesLeft=%d, outBytesLeft=%d, %02x%02x\n", + inBytesLeft, outBytesLeft, + (&dmap_rec[idx].dmapD12U[i])[0],(&dmap_rec[idx].dmapD12U[i])[1]); + } +#endif + iconv_close(cd); + return -1; + } + dmap_rec[idx].dmapD12U[i]=0x0000; + } + if (dmap_rec[idx].dmapE02U[i] == 0x001A && /* pick the first one */ + myconv_rec[idx].srcSubS == 0x00) { + myconv_rec[idx].srcSubS=i; + } + } + iconv_close(cd); + } + myconv_rec[idx].subS=0x1A; + myconv_rec[idx].subD=0xFFFD; + + + } else if (((myconvIsUCS2(from) && myconvIsSBCS(to)) && (dmap_rec[idx].codingSchema = DMAP_U2S)) || + ((myconvIsUTF16(from) && myconvIsSBCS(to)) && (dmap_rec[idx].codingSchema = DMAP_T2S)) || + ((myconvIsUTF8(from) && myconvIsSBCS(to)) && (dmap_rec[idx].codingSchema = DMAP_82S))) { + /* UTF-16 -> SBCS, the direct map a bit of waste of space, + * binary search may be reasonable alternative + */ + if ((dmap_rec[idx].dmapU2S = (uchar *) alloc_root(&dmapMemRoot, 0x10000 * 2)) == NULL) { +#ifdef DEBUG + MyPrintf(STDERR_WITH_TIME, + "dmap_open(%s,%s,%d), CS=%d failed with malloc(), errno = %d in %s at %d\n", + to, from, idx, DMAP_U2S, errno, __FILE__,__LINE__); +#endif + return -1; + } + memset(dmap_rec[idx].dmapU2S, 0x00, 0x10000); + myconv_rec[idx].allocatedSize=(0x10000 * 2); + + { + iconv_t cd; + int32_t i; + +#ifdef support_surrogate + if ((cd = iconv_open(to, "UTF-16")) == (iconv_t) -1) { +#else + if ((cd = iconv_open(to, "UCS-2")) == (iconv_t) -1) { +#endif +#ifdef DEBUG + MyPrintf(STDERR_WITH_TIME, + "dmap_open(%s,%s,%d) failed with iconv_open(), errno = %d in %s at %d\n", + to, from, idx, errno, __FILE__,__LINE__); +#endif + return -1; + } + + for (i = 0; i < 0x100; ++i) { + UniChar dmapSrc[0x100]; + int32_t j; + for (j = 0; j < 0x100; ++j) { + dmapSrc[j]=i * 0x100 + j; + } + char * inBuf=(char *) dmapSrc; + char * outBuf=(char *) &(dmap_rec[idx].dmapU2S[i*0x100]); + size_t inBytesLeft=sizeof(dmapSrc); + size_t outBytesLeft=0x100; + size_t len; + + if ((len = iconv(cd, &inBuf, &inBytesLeft, &outBuf, &outBytesLeft)) != (size_t) 0) { + if (inBytesLeft == 0 && outBytesLeft == 0) { /* a number of substitution returns */ + continue; + } +#ifdef DEBUG + if (myconvDebug) { + MyPrintf(STDERR_WITH_TIME, + "dmap_open(%s,%s,%d) failed to initialize with iconv(), errno = %d in %s at %d\n", + from, to, idx, errno, __FILE__,__LINE__); + MyPrintf(STDERR_WITH_TIME, + "iconv() retuns %d, errno=%d, InBytesLeft=%d, OutBytesLeft=%d\n", + len, errno, inBytesLeft, outBytesLeft, __FILE__,__LINE__); + } +#endif + iconv_close(cd); + return -1; + } + } + iconv_close(cd); + + myconv_rec[idx].subS = dmap_rec[idx].dmapU2S[0x1A]; + myconv_rec[idx].subD = dmap_rec[idx].dmapU2S[0xFFFD]; + myconv_rec[idx].srcSubS = 0x1A; + myconv_rec[idx].srcSubD = 0xFFFD; + } + + + + } else if (((myconvIsDBCS(from) && myconvIsUnicode2(to)) && (dmap_rec[idx].codingSchema = DMAP_D2U)) || + ((myconvIsDBCS(from) && myconvIsUTF8(to)) && (dmap_rec[idx].codingSchema = DMAP_D28))) { + int i; + /* single byte mapping */ + if ((dmap_rec[idx].dmapD12U = (UniChar *) alloc_root(&dmapMemRoot, 0x100 * 2)) == NULL) { +#ifdef DEBUG + MyPrintf(STDERR_WITH_TIME, + "dmap_open(%s,%s,%d), CS=%d failed with malloc(), errno = %d in %s at %d\n", + to, from, idx, DMAP_D2U, errno, __FILE__,__LINE__); +#endif + return -1; + } + memset(dmap_rec[idx].dmapD12U, 0x00, 0x100 * 2); + + /* double byte mapping, assume 7 bit ASCII is not use as the first byte of DBCS. */ + if ((dmap_rec[idx].dmapD22U = (UniChar *) alloc_root(&dmapMemRoot, 0x8000 * 2)) == NULL) { +#ifdef DEBUG + MyPrintf(STDERR_WITH_TIME, + "dmap_open(%s,%s,%d), CS=%d failed with malloc(), errno = %d in %s at %d\n", + to, from, idx, DMAP_D2U, errno, __FILE__,__LINE__); +#endif + return -1; + } + memset(dmap_rec[idx].dmapD22U, 0x00, 0x8000 * 2); + + myconv_rec[idx].allocatedSize=(0x100 + 0x8000) * 2; + + + { + char dmapSrc[2]; + iconv_t cd; + int32_t i; + size_t inBytesLeft; + size_t outBytesLeft; + size_t len; + char * inBuf; + char * outBuf; + char SS=0x1A; + +#ifdef support_surrogate + if ((cd = iconv_open("UTF-16", from)) == (iconv_t) -1) { +#else + if ((cd = iconv_open("UCS-2", from)) == (iconv_t) -1) { +#endif +#ifdef DEBUG + MyPrintf(STDERR_WITH_TIME, + "dmap_open(%s,%s,%d) failed with iconv_open(), errno = %d in %s at %d\n", + to, from, idx, errno, __FILE__,__LINE__); +#endif + return -1; + } + + for (i = 0; i < 0x100; ++i) { + dmapSrc[0]=i; + inBuf=dmapSrc; + inBytesLeft=1; + outBuf=(char *) (&dmap_rec[idx].dmapD12U[i]); + outBytesLeft=2; + if ((len = iconv(cd, &inBuf, &inBytesLeft, &outBuf, &outBytesLeft)) != (size_t) 0) { + if ((errno == EILSEQ || errno == EINVAL) && + inBytesLeft == 1 && + outBytesLeft == 2) { + continue; + } else { +#ifdef DEBUG + if (myconvDebug) { + MyPrintf(STDERR_WITH_TIME, + "dmap_open(%s,%s,%d) failed to initialize with iconv(cd,%02x,%d,%02x%02x,%d), errno = %d in %s at %d\n", + to, from, idx, dmapSrc[0], 1, + (&dmap_rec[idx].dmapD12U[i])[0],(&dmap_rec[idx].dmapD12U[i])[1], 2, + errno, __FILE__,__LINE__); + MyPrintf(STDERR_WITH_TIME, + "inBytesLeft=%d, outBytesLeft=%d, %02x%02x\n", + inBytesLeft, outBytesLeft, + (&dmap_rec[idx].dmapD12U[i])[0],(&dmap_rec[idx].dmapD12U[i])[1]); + } +#endif + iconv_close(cd); + return -1; + } + dmap_rec[idx].dmapD12U[i]=0x0000; + } + if (dmap_rec[idx].dmapD12U[i] == 0x001A && /* pick the first one */ + myconv_rec[idx].srcSubS == 0x00) { + myconv_rec[idx].srcSubS=i; + } + } + + + for (i = 0x80; i < 0x100; ++i) { + int j; + if (dmap_rec[idx].dmapD12U[i] != 0x0000) + continue; + for (j = 0x01; j < 0x100; ++j) { + dmapSrc[0]=i; + dmapSrc[1]=j; + int offset = i-0x80; + offset<<=8; + offset+=j; + + inBuf=dmapSrc; + inBytesLeft=2; + outBuf=(char *) &(dmap_rec[idx].dmapD22U[offset]); + outBytesLeft=2; + if ((len = iconv(cd, &inBuf, &inBytesLeft, &outBuf, &outBytesLeft)) != (size_t) 0) { + if (inBytesLeft == 2 && outBytesLeft == 2 && (errno == EILSEQ || errno == EINVAL)) { + ; /* invalid DBCS character, dmapDD2U[offset] remains 0x0000 */ + } else { +#ifdef DEBUG + if (myconvDebug) { + MyPrintf(STDERR_WITH_TIME, + "dmap_open(%s,%s,%d) failed to initialize with iconv(cd,%p,2,%p,2), errno = %d in %s at %d\n", + to, from, idx, + dmapSrc, &(dmap_rec[idx].dmapD22U[offset]), + errno, __FILE__,__LINE__); + MyPrintf(STDERR_WO_TIME, + "iconv(cd,0x%02x%02x,2,0x%04x,2) returns %d, inBytesLeft=%d, outBytesLeft=%d\n", + dmapSrc[0], dmapSrc[1], + dmap_rec[idx].dmapD22U[offset], + len, inBytesLeft, outBytesLeft); + } +#endif + iconv_close(cd); + return -1; + } + } else { +#ifdef TRACE_DMAP + if (myconvDebug) { + MyPrintf(STDERR_WITH_TIME, + "dmap_open(%s,%s,%d) failed to initialize with iconv(), rc=%d, errno=%d in %s at %d\n", + to, from, idx, len, errno, __FILE__,__LINE__); + MyPrintf(STDERR_WITH_TIME, + "%04X: src=%04X%04X, inBuf=0x%02X%02X, inBytesLeft=%d, outBuf=%02X%02X%02X, outBytesLeft=%d\n", + i, dmapSrc[0], dmapSrc[1], inBuf[0], inBuf[1], + inBytesLeft, outBuf[-2], outBuf[-1], outBuf[0], outBytesLeft); + MyPrintf(STDERR_WITH_TIME, + "&dmapSrc=%p, inBuf=%p, %p, outBuf=%p\n", + dmapSrc, inBuf, dmap_rec[idx].dmapU2M3 + (i - 0x80) * 2, outBuf); + } +#endif + } + } + if (dmap_rec[idx].dmapD12U[i] == 0xFFFD) { /* pick the last one */ + myconv_rec[idx].srcSubD=i* 0x100 + j; + } + } + iconv_close(cd); + } + + myconv_rec[idx].subS=0x1A; + myconv_rec[idx].subD=0xFFFD; + myconv_rec[idx].srcSubD=0xFCFC; + + + } else if (((myconvIsUCS2(from) && myconvIsDBCS(to)) && (dmap_rec[idx].codingSchema = DMAP_U2D)) || + ((myconvIsUTF16(from) && myconvIsDBCS(to)) && (dmap_rec[idx].codingSchema = DMAP_T2D)) || + ((myconvIsUTF8(from) && myconvIsDBCS(to)) && (dmap_rec[idx].codingSchema = DMAP_82D))) { + /* UTF-16 -> DBCS single/double byte */ + /* A single table will cover all characters, assuming no second byte is 0x00. */ + if ((dmap_rec[idx].dmapU2D = (uchar *) alloc_root(&dmapMemRoot, 0x10000 * 2)) == NULL) { +#ifdef DEBUG + MyPrintf(STDERR_WITH_TIME, + "dmap_open(%s,%s,%d), CS=%d failed with malloc(), errno = %d in %s at %d\n", + to, from, idx, DMAP_U2D, errno, __FILE__,__LINE__); +#endif + return -1; + } + + memset(dmap_rec[idx].dmapU2D, 0x00, 0x10000 * 2); + myconv_rec[idx].allocatedSize=(0x10000 * 2); + + { + UniChar dmapSrc[1]; + iconv_t cd; + int32_t i; + size_t inBytesLeft; + size_t outBytesLeft; + size_t len; + char * inBuf; + char * outBuf; + +#ifdef support_surrogate + if ((cd = iconv_open(to, "UTF-16")) == (iconv_t) -1) { +#else + if ((cd = iconv_open(to, "UCS-2")) == (iconv_t) -1) { +#endif +#ifdef DEBUG + MyPrintf(STDERR_WITH_TIME, + "dmap_open(%s,%s,%d) failed with iconv_open(), errno = %d in %s at %d\n", + to, from, idx, errno, __FILE__,__LINE__); +#endif + return -1; + } + + /* easy implementation, convert 1 Unicode character at one time. */ + /* If the open performance is an issue, convert a chunk such as 128 chracters. */ + /* if the converted length is not the same as the original, convert one by one. */ + (dmap_rec[idx].dmapU2D)[0x0000]=0x00; + for (i = 1; i < 0x10000; ++i) { + dmapSrc[0]=i; + inBuf=(char *) dmapSrc; + inBytesLeft=2; + outBuf=(char *) &((dmap_rec[idx].dmapU2D)[2*i]); + outBytesLeft=2; + do { + if ((len = iconv(cd, &inBuf, &inBytesLeft, &outBuf, &outBytesLeft)) != (size_t) 0) { + if (len == 1 && inBytesLeft == 0 && outBytesLeft == 1 && (dmap_rec[idx].dmapU2D)[2*i] == 0x1A) { + /* UCS-2_TIS-620:0x0080 => 0x1A, converted to SBCS replacement character */ + (dmap_rec[idx].dmapU2D)[2*i+1]=0x00; + break; + } else if (len == 1 && inBytesLeft == 0 && outBytesLeft == 0) { + break; + } + if (errno == EILSEQ || errno == EINVAL) { +#ifdef DEBUG + if (myconvDebug) { + MyPrintf(STDERR_WITH_TIME, + "dmap_open(%s,%s,%d) failed to initialize with iconv(), errno = %d in %s at %d\n", + to, from, idx, errno, __FILE__,__LINE__); + MyPrintf(STDERR_WO_TIME, + "iconv(cd,%04x,2,%02x%02x,2) returns inBytesLeft=%d, outBytesLeft=%d\n", + dmapSrc[0], + (dmap_rec[idx].dmapU2D)[2*i], (dmap_rec[idx].dmapU2D)[2*i+1], + inBytesLeft, outBytesLeft); + if (outBuf - (char *) dmap_rec[idx].dmapU2M2 > 1) + MyPrintf(STDERR_WO_TIME, "outBuf[-2..2]=%02X%02X%02X%02X%02X\n", outBuf[-2],outBuf[-1],outBuf[0],outBuf[1],outBuf[2]); + else + MyPrintf(STDERR_WO_TIME, "outBuf[0..2]=%02X%02X%02X\n", outBuf[0],outBuf[1],outBuf[2]); + } +#endif + inBuf+=2; + inBytesLeft-=2; + memcpy(outBuf, (char *) &(myconv_rec[idx].subD), 2); + outBuf+=2; + outBytesLeft-=2; + } else { +#ifdef DEBUG + MyPrintf(STDERR_WITH_TIME, + "[%d] dmap_open(%s,%s,%d) failed to initialize with iconv(), errno = %d in %s at %d\n", + i, to, from, idx, errno, __FILE__,__LINE__); + MyPrintf(STDERR_WO_TIME, + "iconv(cd,%04x,2,%02x%02x,2) returns %d inBytesLeft=%d, outBytesLeft=%d\n", + dmapSrc[0], + (dmap_rec[idx].dmapU2D)[2*i], + (dmap_rec[idx].dmapU2D)[2*i+1], + len, inBytesLeft,outBytesLeft); + if (i == 1) { + MyPrintf(STDERR_WO_TIME, + " inBuf [-1..2]=%02x%02x%02x%02x\n", + inBuf[-1],inBuf[0],inBuf[1],inBuf[2]); + MyPrintf(STDERR_WO_TIME, + " outBuf [-1..2]=%02x%02x%02x%02x\n", + outBuf[-1],outBuf[0],outBuf[1],outBuf[2]); + } else { + MyPrintf(STDERR_WO_TIME, + " inBuf [-2..2]=%02x%02x%02x%02x%02x\n", + inBuf[-2],inBuf[-1],inBuf[0],inBuf[1],inBuf[2]); + MyPrintf(STDERR_WO_TIME, + " outBuf [-2..2]=%02x%02x%02x%02x%02x\n", + outBuf[-2],outBuf[-1],outBuf[0],outBuf[1],outBuf[2]); + } +#endif + iconv_close(cd); + return -1; + } + if (len == 0 && inBytesLeft == 0 && outBytesLeft == 1) { /* converted to SBCS */ + (dmap_rec[idx].dmapU2D)[2*i+1]=0x00; + break; + } + } + } while (inBytesLeft > 0); + } + iconv_close(cd); + myconv_rec[idx].subS = dmap_rec[idx].dmapU2D[2*0x1A]; + myconv_rec[idx].subD = dmap_rec[idx].dmapU2D[2*0xFFFD] * 0x100 + + dmap_rec[idx].dmapU2D[2*0xFFFD+1]; + myconv_rec[idx].srcSubS = 0x1A; + myconv_rec[idx].srcSubD = 0xFFFD; + } + + + } else if (((myconvIsEUC(from) && myconvIsUnicode2(to)) && (dmap_rec[idx].codingSchema = DMAP_E2U)) || + ((myconvIsEUC(from) && myconvIsUTF8(to)) && (dmap_rec[idx].codingSchema = DMAP_E28))) { + int i; + /* S0: 0x00 - 0x7F */ + if ((dmap_rec[idx].dmapE02U = (UniChar *) alloc_root(&dmapMemRoot, 0x100 * 2)) == NULL) { +#ifdef DEBUG + MyPrintf(STDERR_WITH_TIME, + "dmap_open(%s,%s,%d), CS=%d failed with malloc(), errno = %d in %s at %d\n", + to, from, idx, DMAP_E2U, errno, __FILE__,__LINE__); +#endif + return -1; + } + memset(dmap_rec[idx].dmapE02U, 0x00, 0x100 * 2); + + /* S1: 0xA0 - 0xFF, 0xA0 - 0xFF */ + if ((dmap_rec[idx].dmapE12U = (UniChar *) alloc_root(&dmapMemRoot, 0x60 * 0x60 * 2)) == NULL) { +#ifdef DEBUG + MyPrintf(STDERR_WITH_TIME, + "dmap_open(%s,%s,%d), CS=%d failed with malloc(), errno = %d in %s at %d\n", + to, from, idx, DMAP_E2U, errno, __FILE__,__LINE__); +#endif + return -1; + } + memset(dmap_rec[idx].dmapE12U, 0x00, 0x60 * 0x60 * 2); + + /* SS2: 0x8E + 0xA0 - 0xFF, 0xA0 - 0xFF */ + if ((dmap_rec[idx].dmapE22U = (UniChar *) alloc_root(&dmapMemRoot, 0x60 * 0x61 * 2)) == NULL) { +#ifdef DEBUG + MyPrintf(STDERR_WITH_TIME, + "dmap_open(%s,%s,%d), CS=%d failed with malloc(), errno = %d in %s at %d\n", + to, from, idx, DMAP_E2U, errno, __FILE__,__LINE__); +#endif + return -1; + } + memset(dmap_rec[idx].dmapE22U, 0x00, 0x60 * 0x61 * 2); + + /* SS3: 0x8F + 0xA0 - 0xFF, 0xA0 - 0xFF */ + if ((dmap_rec[idx].dmapE32U = (UniChar *) alloc_root(&dmapMemRoot, 0x60 * 0x61 * 2)) == NULL) { +#ifdef DEBUG + MyPrintf(STDERR_WITH_TIME, + "dmap_open(%s,%s,%d), CS=%d failed with malloc(), errno = %d in %s at %d\n", + to, from, idx, DMAP_E2U, errno, __FILE__,__LINE__); +#endif + return -1; + } + memset(dmap_rec[idx].dmapE32U, 0x00, 0x60 * 0x61 * 2); + + myconv_rec[idx].allocatedSize=(0x100 + 0x60 * 0x60 + 0x60 * 0x61* 2) * 2; + + + { + char dmapSrc[0x60 * 0x60 * 3]; + iconv_t cd; + int32_t i; + size_t inBytesLeft; + size_t outBytesLeft; + size_t len; + char * inBuf; + char * outBuf; + char SS=0x8E; + +#ifdef support_surrogate + if ((cd = iconv_open("UTF-16", from)) == (iconv_t) -1) { +#else + if ((cd = iconv_open("UCS-2", from)) == (iconv_t) -1) { +#endif +#ifdef DEBUG + MyPrintf(STDERR_WITH_TIME, + "dmap_open(%s,%s,%d) failed with iconv_open(), errno = %d in %s at %d\n", + to, from, idx, errno, __FILE__,__LINE__); +#endif + return -1; + } + + for (i = 0; i < 0x100; ++i) { + dmapSrc[0]=i; + inBuf=dmapSrc; + inBytesLeft=1; + outBuf=(char *) (&dmap_rec[idx].dmapE02U[i]); + outBytesLeft=2; + if ((len = iconv(cd, &inBuf, &inBytesLeft, &outBuf, &outBytesLeft)) != (size_t) 0) { +#ifdef DEBUG + if (myconvDebug) { + MyPrintf(STDERR_WITH_TIME, + "dmap_open(%s,%s,%d) failed to initialize with iconv(), errno = %d in %s at %d\n", + to, from, idx, errno, __FILE__,__LINE__); + } +#endif + dmap_rec[idx].dmapE02U[i]=0x0000; + } + if (dmap_rec[idx].dmapE02U[i] == 0x001A && /* pick the first one */ + myconv_rec[idx].srcSubS == 0x00) { + myconv_rec[idx].srcSubS=i; + } + } + + + inBuf=dmapSrc; + for (i = 0; i < 0x60; ++i) { + int j; + for (j = 0; j < 0x60; ++j) { + *inBuf=i+0xA0; + ++inBuf; + *inBuf=j+0xA0; + ++inBuf; + } + } + inBuf=dmapSrc; + inBytesLeft=0x60 * 0x60 * 2; + outBuf=(char *) dmap_rec[idx].dmapE12U; + outBytesLeft=0x60 * 0x60 * 2; + do { + if ((len = iconv(cd, &inBuf, &inBytesLeft, &outBuf, &outBytesLeft)) != (size_t) 0) { + if (errno == EILSEQ) { +#ifdef DEBUG + if (myconvDebug) { + MyPrintf(STDERR_WITH_TIME, + "dmap_open(%s,%s,%d) failed to initialize with iconv(), errno = %d in %s at %d\n", + to, from, idx, errno, __FILE__,__LINE__); + MyPrintf(STDERR_WO_TIME, "inBytesLeft=%d, outBytesLeft=%d\n", inBytesLeft, outBytesLeft); + if (inBuf - dmapSrc > 1 && inBuf - dmapSrc <= sizeof(dmapSrc) - 2) + MyPrintf(STDERR_WO_TIME, "inBuf[-2..2]=%02X%02X%02X%02X%02X\n", inBuf[-2],inBuf[-1],inBuf[0],inBuf[1],inBuf[2]); + else + MyPrintf(STDERR_WO_TIME, "inBuf[0..2]=%02X%02X%02X\n", inBuf[0],inBuf[1],inBuf[2]); + if (outBuf - (char *) dmap_rec[idx].dmapE12U > 1) + MyPrintf(STDERR_WO_TIME, "outBuf[-2..2]=%02X%02X%02X%02X%02X\n", outBuf[-2],outBuf[-1],outBuf[0],outBuf[1],outBuf[2]); + else + MyPrintf(STDERR_WO_TIME, "outBuf[0..2]=%02X%02X%02X\n", outBuf[0],outBuf[1],outBuf[2]); + } +#endif + inBuf+=2; + inBytesLeft-=2; + outBuf[0]=0x00; + outBuf[1]=0x00; + outBuf+=2; + outBytesLeft-=2; + } else { +#ifdef DEBUG + MyPrintf(STDERR_WITH_TIME, + "dmap_open(%s,%s,%d) failed to initialize with iconv(), errno = %d in %s at %d\n", + to, from, idx, errno, __FILE__,__LINE__); +#endif + iconv_close(cd); + return -1; + } + } + } while (inBytesLeft > 0); + + /* SS2: 0x8E + 1 or 2 bytes */ + /* SS3: 0x8E + 1 or 2 bytes */ + while (SS != 0x00) { + int32_t numSuccess=0; + for (i = 0; i < 0x60; ++i) { + inBuf=dmapSrc; + inBuf[0]=SS; + inBuf[1]=i+0xA0; + inBytesLeft=2; + if (SS == 0x8E) + outBuf=(char *) &(dmap_rec[idx].dmapE22U[i]); + else + outBuf=(char *) &(dmap_rec[idx].dmapE32U[i]); + outBytesLeft=2; + if ((len = iconv(cd, &inBuf, &inBytesLeft, &outBuf, &outBytesLeft)) != (size_t) 0) { + if (SS == 0x8E) + dmap_rec[idx].dmapE22U[i]=0x0000; + else + dmap_rec[idx].dmapE32U[i]=0x0000; + } else { + ++numSuccess; + } + } + if (numSuccess == 0) { /* SS2 is 2 bytes */ + inBuf=dmapSrc; + for (i = 0; i < 0x60; ++i) { + int j; + for (j = 0; j < 0x60; ++j) { + *inBuf=SS; + ++inBuf; + *inBuf=i+0xA0; + ++inBuf; + *inBuf=j+0xA0; + ++inBuf; + } + } + inBuf=dmapSrc; + inBytesLeft=0x60 * 0x60 * 3; + if (SS == 0x8E) + outBuf=(char *) &(dmap_rec[idx].dmapE22U[0x60]); + else + outBuf=(char *) &(dmap_rec[idx].dmapE32U[0x60]); + outBytesLeft=0x60 * 0x60 * 2; + do { + if ((len = iconv(cd, &inBuf, &inBytesLeft, &outBuf, &outBytesLeft)) != (size_t) 0) { +#ifdef DEBUG + if (myconvDebug) { + MyPrintf(STDERR_WITH_TIME, + "%02X:dmap_open(%s,%s,%d) failed to initialize with iconv(), errno = %d in %s at %d\n", + SS, to, from, idx, errno, __FILE__,__LINE__); + MyPrintf(STDERR_WO_TIME, "inBytesLeft=%d, outBytesLeft=%d\n", inBytesLeft, outBytesLeft); + if (inBuf - dmapSrc > 1 && inBuf - dmapSrc <= sizeof(dmapSrc) - 2) + MyPrintf(STDERR_WO_TIME, "inBuf[-2..2]=%02X%02X%02X%02X%02X\n", inBuf[-2],inBuf[-1],inBuf[0],inBuf[1],inBuf[2]); + else + MyPrintf(STDERR_WO_TIME, "inBuf[0..2]=%02X%02X%02X\n", inBuf[0],inBuf[1],inBuf[2]); + } +#endif + if (errno == EILSEQ || errno == EINVAL) { + inBuf+=3; + inBytesLeft-=3; + outBuf[0]=0x00; + outBuf[1]=0x00; + outBuf+=2; + outBytesLeft-=2; + } else { +#ifdef DEBUG + MyPrintf(STDERR_WITH_TIME, + "%02X:dmap_open(%s,%s,%d) failed to initialize with iconv(), errno = %d in %s at %d\n", + SS, to, from, idx, errno, __FILE__,__LINE__); +#endif + iconv_close(cd); + return -1; + } + } + } while (inBytesLeft > 0); + } + if (SS == 0x8E) + SS=0x8F; + else + SS = 0x00; + } + iconv_close(cd); + + myconv_rec[idx].subS=0x1A; + myconv_rec[idx].subD=0xFFFD; + for (i = 0; i < 0x80; ++i) { + if (dmap_rec[idx].dmapE02U[i] == 0x001A) { + myconv_rec[idx].srcSubS=i; /* pick the first one */ + break; + } + } + + for (i = 0; i < 0x60 * 0x60; ++i) { + if (dmap_rec[idx].dmapE12U[i] == 0xFFFD) { + uchar byte1=i / 0x60; + uchar byte2=i % 0x60; + myconv_rec[idx].srcSubD=(byte1 + 0xA0) * 0x100 + (byte2 + 0xA0); /* pick the last one */ + } + } + + } + + } else if (((myconvIsUCS2(from) && myconvIsEUC(to)) && (dmap_rec[idx].codingSchema = DMAP_U2E)) || + ((myconvIsUTF16(from) && myconvIsEUC(to)) && (dmap_rec[idx].codingSchema = DMAP_T2E)) || + ((myconvIsUTF8(from) && myconvIsEUC(to)) && (dmap_rec[idx].codingSchema = DMAP_82E))) { + /* S0: 0x00 - 0xFF */ + if ((dmap_rec[idx].dmapU2S = (uchar *) alloc_root(&dmapMemRoot, 0x100)) == NULL) { +#ifdef DEBUG + MyPrintf(STDERR_WITH_TIME, + "dmap_open(%s,%s,%d), CS=%d failed with malloc(), errno = %d in %s at %d\n", + to, from, idx, DMAP_U2E, errno, __FILE__,__LINE__); +#endif + return -1; + } + memset(dmap_rec[idx].dmapU2S, 0x00, 0x100); + + /* U0080 - UFFFF -> S1: 0xA0 - 0xFF, 0xA0 - 0xFF */ + if ((dmap_rec[idx].dmapU2M2 = (uchar *) alloc_root(&dmapMemRoot, 0xFF80 * 2)) == NULL) { +#ifdef DEBUG + MyPrintf(STDERR_WITH_TIME, + "dmap_open(%s,%s,%d), CS=%d failed with malloc(), errno = %d in %s at %d\n", + to, from, idx, DMAP_U2E, errno, __FILE__,__LINE__); +#endif + return -1; + } + memset(dmap_rec[idx].dmapU2M2, 0x00, 0xFF80 * 2); + + /* U0080 - UFFFF -> SS2: 0x8E + 0xA0 - 0xFF, 0xA0 - 0xFF + * SS3: 0x8F + 0xA0 - 0xFF, 0xA0 - 0xFF */ + if ((dmap_rec[idx].dmapU2M3 = (uchar *) alloc_root(&dmapMemRoot, 0xFF80 * 3)) == NULL) { +#ifdef DEBUG + MyPrintf(STDERR_WITH_TIME, + "dmap_open(%s,%s,%d), CS=%d failed with malloc(), errno = %d in %s at %d\n", + to, from, idx, DMAP_U2E, errno, __FILE__,__LINE__); +#endif + return -1; + } + memset(dmap_rec[idx].dmapU2M3, 0x00, 0xFF80 * 3); + myconv_rec[idx].allocatedSize=(0x100 + 0xFF80 * 2 + 0xFF80 * 3); + + { + UniChar dmapSrc[0x80]; + iconv_t cd; + int32_t i; + size_t inBytesLeft; + size_t outBytesLeft; + size_t len; + char * inBuf; + char * outBuf; + +#ifdef support_surrogate + if ((cd = iconv_open(to, "UTF-16")) == (iconv_t) -1) { +#else + if ((cd = iconv_open(to, "UCS-2")) == (iconv_t) -1) { +#endif +#ifdef DEBUG + MyPrintf(STDERR_WITH_TIME, + "dmap_open(%s,%s,%d) failed with iconv_open(), errno = %d in %s at %d\n", + to, from, idx, errno, __FILE__,__LINE__); +#endif + return -1; + } + + for (i = 0; i < 0x80; ++i) + dmapSrc[i]=i; + inBuf=(char *) dmapSrc; + inBytesLeft=0x80 * 2; + outBuf=(char *) dmap_rec[idx].dmapU2S; + outBytesLeft=0x80; + do { + if ((len = iconv(cd, &inBuf, &inBytesLeft, &outBuf, &outBytesLeft)) != (size_t) 0) { +#ifdef DEBUG + MyPrintf(STDERR_WITH_TIME, + "dmap_open(%s,%s,%d) failed to initialize with iconv(), errno = %d in %s at %d\n", + to, from, idx, errno, __FILE__,__LINE__); +#endif + iconv_close(cd); + return -1; + } + } while (inBytesLeft > 0); + + myconv_rec[idx].srcSubS = 0x1A; + myconv_rec[idx].srcSubD = 0xFFFD; + myconv_rec[idx].subS = dmap_rec[idx].dmapU2S[0x1A]; + + outBuf=(char *) &(myconv_rec[idx].subD); + dmapSrc[0]=0xFFFD; + inBuf=(char *) dmapSrc; + inBytesLeft=2; + outBytesLeft=2; + if ((len = iconv(cd, &inBuf, &inBytesLeft, &outBuf, &outBytesLeft)) != (size_t) 0) { +#ifdef DEBUG + if (myconvDebug) { + MyPrintf(STDERR_WITH_TIME, + "dmap_open(%s,%s,%d) failed to initialize with iconv(), rc=%d, errno=%d in %s at %d\n", + to, from, idx, len, errno, __FILE__,__LINE__); + MyPrintf(STDERR_WO_TIME, "iconv(0x1A,1,%p,1) returns outBuf=%p, outBytesLeft=%d\n", + dmapSrc, outBuf, outBytesLeft); + } +#endif + if (outBytesLeft == 0) { + /* UCS-2_IBM-eucKR returns error. + myconv(iconv) rc=1, error=0, InBytesLeft=0, OutBytesLeft=18 + myconv(iconvRev) rc=-1, error=116, InBytesLeft=2, OutBytesLeft=20 + iconv: 0xFFFD => 0xAFFE => 0x rc=1,-1 sub=0,0 + */ + ; + } else { + iconv_close(cd); + return -1; + } + } + + for (i = 0x80; i < 0xFFFF; ++i) { + uchar eucBuf[3]; + dmapSrc[0]=i; + inBuf=(char *) dmapSrc; + inBytesLeft=2; + outBuf=(char *) eucBuf; + outBytesLeft=sizeof(eucBuf); + errno=0; + if ((len = iconv(cd, &inBuf, &inBytesLeft, &outBuf, &outBytesLeft)) != (size_t) 0) { + if (len == 1 && errno == 0 && inBytesLeft == 0 && outBytesLeft == 1) { /* substitution occurred. */ continue; + } + + if (errno == EILSEQ) { +#ifdef DEBUG + if (myconvDebug) { + MyPrintf(STDERR_WITH_TIME, + "dmap_open(%s,%s,%d) failed to initialize with iconv(), errno = %d in %s at %d\n", + to, from, idx, errno, __FILE__,__LINE__); + MyPrintf(STDERR_WO_TIME, "inBytesLeft=%d, outBytesLeft=%d\n", inBytesLeft, outBytesLeft); + if (inBuf - (char *) dmapSrc > 1 && inBuf - (char *) dmapSrc <= sizeof(dmapSrc) - 2) + MyPrintf(STDERR_WO_TIME, "inBuf[-2..2]=%02X%02X%02X%02X%02X\n", inBuf[-2],inBuf[-1],inBuf[0],inBuf[1],inBuf[2]); + else + MyPrintf(STDERR_WO_TIME, "inBuf[0..2]=%02X%02X%02X\n", inBuf[0],inBuf[1],inBuf[2]); + if (outBuf - (char *) dmap_rec[idx].dmapU2M2 > 1) + MyPrintf(STDERR_WO_TIME, "outBuf[-2..2]=%02X%02X%02X%02X%02X\n", outBuf[-2],outBuf[-1],outBuf[0],outBuf[1],outBuf[2]); + else + MyPrintf(STDERR_WO_TIME, "outBuf[0..2]=%02X%02X%02X\n", outBuf[0],outBuf[1],outBuf[2]); + } +#endif + inBuf+=2; + inBytesLeft-=2; + memcpy(outBuf, (char *) &(myconv_rec[idx].subD), 2); + outBuf+=2; + outBytesLeft-=2; + } else { +#ifdef DEBUG + if (myconvDebug) { + MyPrintf(STDERR_WITH_TIME, + "dmap_open(%s,%s,%d) failed to initialize with iconv(), rc = %d, errno = %d in %s at %d\n", + to, from, idx, len, errno, __FILE__,__LINE__); + MyPrintf(STDERR_WITH_TIME, + "%04X: src=%04X%04X, inBuf=0x%02X%02X, inBytesLeft=%d, outBuf[-2..0]=%02X%02X%02X, outBytesLeft=%d\n", + i, dmapSrc[0], dmapSrc[1], inBuf[0], inBuf[1], + inBytesLeft, outBuf[-2], outBuf[-1], outBuf[0], outBytesLeft); + MyPrintf(STDERR_WITH_TIME, + "&dmapSrc=%p, inBuf=%p, dmapU2M2 + %d = %p, outBuf=%p\n", + dmapSrc, inBuf, (i - 0x80) * 2, dmap_rec[idx].dmapU2M2 + (i - 0x80) * 2, outBuf); + } +#endif + iconv_close(cd); + return -1; + } + } + if (sizeof(eucBuf) - outBytesLeft == 1) { + if (i < 0x100) { + (dmap_rec[idx].dmapU2S)[i]=eucBuf[0]; + } else { + dmap_rec[idx].dmapU2M2[(i - 0x80) * 2] = eucBuf[0]; + dmap_rec[idx].dmapU2M2[(i - 0x80) * 2 + 1] = 0x00; + } + } else if (sizeof(eucBuf) - outBytesLeft == 2) { /* 2 bytes */ + dmap_rec[idx].dmapU2M2[(i - 0x80) * 2] = eucBuf[0]; + dmap_rec[idx].dmapU2M2[(i - 0x80) * 2 + 1] = eucBuf[1]; + } else if (sizeof(eucBuf) - outBytesLeft == 3) { /* 3 byte SS2/SS3 */ + dmap_rec[idx].dmapU2M3[(i - 0x80) * 3] = eucBuf[0]; + dmap_rec[idx].dmapU2M3[(i - 0x80) * 3 + 1] = eucBuf[1]; + dmap_rec[idx].dmapU2M3[(i - 0x80) * 3 + 2] = eucBuf[2]; + } else { +#ifdef DEBUG + if (myconvDebug) { + MyPrintf(STDERR_WITH_TIME, + "dmap_open(%s,%s,%d) failed to initialize with iconv(), rc=%d, errno=%d in %s at %d\n", + to, from, idx, len, errno, __FILE__,__LINE__); + MyPrintf(STDERR_WITH_TIME, + "%04X: src=%04X%04X, inBuf=0x%02X%02X, inBytesLeft=%d, outBuf=%02X%02X%02X, outBytesLeft=%d\n", + i, dmapSrc[0], dmapSrc[1], inBuf[0], inBuf[1], + inBytesLeft, outBuf[-2], outBuf[-1], outBuf[0], outBytesLeft); + MyPrintf(STDERR_WITH_TIME, + "&dmapSrc=%p, inBuf=%p, %p, outBuf=%p\n", + dmapSrc, inBuf, dmap_rec[idx].dmapU2M3 + (i - 0x80) * 2, outBuf); + } +#endif + return -1; + } + + } + iconv_close(cd); + } + + } else if (myconvIsUTF16(from) && myconvIsUTF8(to)) { + dmap_rec[idx].codingSchema = DMAP_T28; + + } else if (myconvIsUCS2(from) && myconvIsUTF8(to)) { + dmap_rec[idx].codingSchema = DMAP_U28; + + } else if (myconvIsUTF8(from) && myconvIsUnicode2(to)) { + dmap_rec[idx].codingSchema = DMAP_82U; + + } else if (myconvIsUnicode2(from) && myconvIsUnicode2(to)) { + dmap_rec[idx].codingSchema = DMAP_U2U; + + } else { + + return -1; + } + myconv_rec[idx].cnv_dmap=&(dmap_rec[idx]); + return 0; +} + + + +static int bins_open(const char * to, + const char * from, + const int32_t idx) +{ + return -1; +} + + + +static int32_t dmap_close(const int32_t idx) +{ + if (dmap_rec[idx].codingSchema == DMAP_S2S) { + if (dmap_rec[idx].dmapS2S != NULL) { + dmap_rec[idx].dmapS2S=NULL; + } + } else if (dmap_rec[idx].codingSchema = DMAP_E2U) { + if (dmap_rec[idx].dmapE02U != NULL) { + dmap_rec[idx].dmapE02U=NULL; + } + if (dmap_rec[idx].dmapE12U != NULL) { + dmap_rec[idx].dmapE12U=NULL; + } + if (dmap_rec[idx].dmapE22U != NULL) { + dmap_rec[idx].dmapE22U=NULL; + } + if (dmap_rec[idx].dmapE32U != NULL) { + dmap_rec[idx].dmapE32U=NULL; + } + } + + return 0; +} + + +static int32_t bins_close(const int32_t idx) +{ + return 0; +} + + +myconv_t myconv_open(const char * toCode, + const char * fromCode, + int32_t converter) +{ + int32 i; + for (i = 0; i < MAX_CONVERTER; ++i) { + if (myconv_rec[i].converterType == 0) + break; + } + if (i >= MAX_CONVERTER) + return ((myconv_t) -1); + + myconv_rec[i].converterType = converter; + myconv_rec[i].index=i; + myconv_rec[i].fromCcsid=cstoccsid(fromCode); + if (myconv_rec[i].fromCcsid == 0 && memcmp(fromCode, "big5",5) == 0) + myconv_rec[i].fromCcsid=950; + myconv_rec[i].toCcsid=cstoccsid(toCode); + if (myconv_rec[i].toCcsid == 0 && memcmp(toCode, "big5",5) == 0) + myconv_rec[i].toCcsid=950; + strncpy(myconv_rec[i].from, fromCode, sizeof(myconv_rec[i].from)-1); + strncpy(myconv_rec[i].to, toCode, sizeof(myconv_rec[i].to)-1); + + if (converter == CONVERTER_ICONV) { + if ((myconv_rec[i].cnv_iconv=iconv_open(toCode, fromCode)) == (iconv_t) -1) { + return ((myconv_t) -1); + } + myconv_rec[i].allocatedSize = -1; + myconv_rec[i].srcSubS=myconvGetSubS(fromCode); + myconv_rec[i].srcSubD=myconvGetSubD(fromCode); + myconv_rec[i].subS=myconvGetSubS(toCode); + myconv_rec[i].subD=myconvGetSubD(toCode); + return &(myconv_rec[i]); + } else if (converter == CONVERTER_DMAP && + dmap_open(toCode, fromCode, i) != -1) { + return &(myconv_rec[i]); + } + return ((myconv_t) -1); +} + + + +int32_t myconv_close(myconv_t cd) +{ + int32_t ret=0; + + if (cd->converterType == CONVERTER_ICONV) { + ret=iconv_close(cd->cnv_iconv); + } else if (cd->converterType == CONVERTER_DMAP) { + ret=dmap_close(cd->index); + } + memset(&(myconv_rec[cd->index]), 0x00, sizeof(myconv_rec[cd->index])); + return ret; +} + + + + +/* reference: http://www-306.ibm.com/software/globalization/other/es.jsp */ +/* systemCL would be expensive, and myconvIsXXXXX is called frequently. + need to cache entries */ +#define MAX_CCSID 256 +static int ccsidList [MAX_CCSID]; +static int esList [MAX_CCSID]; +int32 getEncodingScheme(const uint16 inCcsid, int32& outEncodingScheme); +EXTERN int myconvGetES(CCSID ccsid) +{ + /* call QtqValidateCCSID in ILE to get encoding schema */ + /* return QtqValidateCCSID(ccsid); */ + int i; + for (i = 0; i < MAX_CCSID; ++i) { + if (ccsidList[i] == ccsid) + return esList[i]; + if (ccsidList[i] == 0x00) + break; + } + + if (i >= MAX_CCSID) { + i=MAX_CCSID-1; + } + + { + ccsidList[i]=ccsid; + getEncodingScheme(ccsid, esList[i]); +#ifdef DEBUG_PASE + if (myconvDebug) { + fprintf(stderr, "CCSID=%d, ES=0x%04X\n", ccsid, esList[i]); + } +#endif + return esList[i]; + } + return 0; +} + + +EXTERN int myconvIsEBCDIC(const char * pName) +{ + int es = myconvGetES(cstoccsid(pName)); + if (es == 0x1100 || + es == 0x1200 || + es == 0x6100 || + es == 0x6200 || + es == 0x1301 ) { + return TRUE; + } + return FALSE; +} + + +EXTERN int myconvIsISO(const char * pName) +{ + int es = myconvGetES(cstoccsid(pName)); + if (es == 0x4100 || + es == 0x4105 || + es == 0x4155 || + es == 0x5100 || + es == 0x5150 || + es == 0x5200 || + es == 0x5404 || + es == 0x5409 || + es == 0x540A || + es == 0x5700) { + return TRUE; + } + return FALSE; +} + + +EXTERN int myconvIsASCII(const char * pName) +{ + int es = myconvGetES(cstoccsid(pName)); + if (es == 0x2100 || + es == 0x3100 || + es == 0x8100 || + es == 0x2200 || + es == 0x3200 || + es == 0x9200 || + es == 0x2300 || + es == 0x2305 || + es == 0x3300 || + es == 0x2900 || + es == 0x2A00) { + return TRUE; + } else if (memcmp(pName, "big5", 5) == 0) { + return TRUE; + } + return FALSE; +} + + + +EXTERN int myconvIsUCS2(const char * pName) +{ + if (cstoccsid(pName) == 13488) { + return TRUE; + } + return FALSE; +} + + +EXTERN int myconvIsUTF16(const char * pName) +{ + if (cstoccsid(pName) == 1200) { + return TRUE; + } + return FALSE; +} + + +EXTERN int myconvIsUnicode2(const char * pName) +{ + int es = myconvGetES(cstoccsid(pName)); + if (es == 0x7200 || + es == 0x720B || + es == 0x720F) { + return TRUE; + } + return FALSE; +} + + +EXTERN int myconvIsUTF8(const char * pName) +{ + int es = myconvGetES(cstoccsid(pName)); + if (es == 0x7807) { + return TRUE; + } + return FALSE; +} + + +EXTERN int myconvIsUnicode(const char * pName) +{ + int es = myconvGetES(cstoccsid(pName)); + if (es == 0x7200 || + es == 0x720B || + es == 0x720F || + es == 0x7807) { + return TRUE; + } + return FALSE; +} + + +EXTERN int myconvIsEUC(const char * pName) +{ + int es = myconvGetES(cstoccsid(pName)); + if (es == 0x4403) { + return TRUE; + } + return FALSE; +} + + +EXTERN int myconvIsDBCS(const char * pName) +{ + int es = myconvGetES(cstoccsid(pName)); + if (es == 0x1200 || + es == 0x2200 || + es == 0x2300 || + es == 0x2305 || + es == 0x2A00 || + es == 0x3200 || + es == 0x3300 || + es == 0x5200 || + es == 0x6200 || + es == 0x9200) { + return TRUE; + } else if (memcmp(pName, "big5", 5) == 0) { + return TRUE; + } + return FALSE; +} + + +EXTERN int myconvIsSBCS(const char * pName) +{ + int es = myconvGetES(cstoccsid(pName)); + if (es == 0x1100 || + es == 0x2100 || + es == 0x3100 || + es == 0x4100 || + es == 0x4105 || + es == 0x5100 || + es == 0x5150 || + es == 0x6100 || + es == 0x8100) { + return TRUE; + } + return FALSE; +} + + + +EXTERN char myconvGetSubS(const char * code) +{ + if (myconvIsEBCDIC(code)) { + return 0x3F; + } else if (myconvIsASCII(code)) { + return 0x1A; + } else if (myconvIsISO(code)) { + return 0x1A; + } else if (myconvIsEUC(code)) { + return 0x1A; + } else if (myconvIsUCS2(code)) { + return 0x00; + } else if (myconvIsUTF8(code)) { + return 0x1A; + } + return 0x00; +} + + +EXTERN UniChar myconvGetSubD(const char * code) +{ + if (myconvIsEBCDIC(code)) { + return 0xFDFD; + } else if (myconvIsASCII(code)) { + return 0xFCFC; + } else if (myconvIsISO(code)) { + return 0x00; + } else if (myconvIsEUC(code)) { + return 0x00; + } else if (myconvIsUCS2(code)) { + return 0xFFFD; + } else if (myconvIsUTF8(code)) { + return 0x00; + } + return 0x00; +} + diff --git a/storage/ibmdb2i/db2i_myconv.h b/storage/ibmdb2i/db2i_myconv.h new file mode 100644 index 00000000000..a9e87474505 --- /dev/null +++ b/storage/ibmdb2i/db2i_myconv.h @@ -0,0 +1,3200 @@ +/* +Licensed Materials - Property of IBM +DB2 Storage Engine Enablement +Copyright IBM Corporation 2007,2008 +All rights reserved + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + (a) Redistributions of source code must retain this list of conditions, the + copyright notice in section {d} below, and the disclaimer following this + list of conditions. + (b) Redistributions in binary form must reproduce this list of conditions, the + copyright notice in section (d) below, and the disclaimer following this + list of conditions, in the documentation and/or other materials provided + with the distribution. + (c) The name of IBM may not be used to endorse or promote products derived from + this software without specific prior written permission. + (d) The text of the required copyright notice is: + Licensed Materials - Property of IBM + DB2 Storage Engine Enablement + Copyright IBM Corporation 2007,2008 + All rights reserved + +THIS SOFTWARE IS PROVIDED BY IBM CORPORATION "AS IS" AND ANY EXPRESS OR IMPLIED +WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT +SHALL IBM CORPORATION BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT +OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT INCLUDING NEGLIGENCE OR OTHERWISE) ARISING +IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY +OF SUCH DAMAGE. +*/ + +/** + @file + + @brief A direct map optimization of iconv and related functions + This was show to significantly reduce character conversion cost + for short strings when compared to calling iconv system code. +*/ + +#ifndef DB2I_MYCONV_H +#define DB2I_MYCONV_H + + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#ifndef TRUE +#define TRUE 1 +#endif + +#ifndef FALSE +#define FALSE 0 +#endif + +#ifdef __cplusplus +#define INTERN inline +#define EXTERN extern "C" +#else +#define INTERN static +#define EXTERN extern +#endif + + +/* ANSI integer data types */ +#if defined(__OS400_TGTVRM__) +/* for DTAMDL(*P128), datamodel(P128): int/long/pointer=4/4/16 */ +/* LLP64:4/4/8 is used for teraspace ?? */ +typedef short int16_t; +typedef unsigned short uint16_t; +typedef int int32_t; +typedef unsigned int uint32_t; +typedef long long int64_t; +typedef unsigned long long uint64_t; +#elif defined(PASE) +/* PASE uses IPL32: int/long/pointer=4/4/4 + long long */ +#elif defined(__64BIT__) +/* AIX 64 bit uses LP64: int/long/pointer=4/8/8 */ +#endif + +#define CONVERTER_ICONV 1 +#define CONVERTER_DMAP 2 + +#define DMAP_S2S 10 +#define DMAP_S2U 20 +#define DMAP_D2U 30 +#define DMAP_E2U 40 +#define DMAP_U2S 120 +#define DMAP_T2S 125 +#define DMAP_U2D 130 +#define DMAP_T2D 135 +#define DMAP_U2E 140 +#define DMAP_T2E 145 +#define DMAP_S28 220 +#define DMAP_D28 230 +#define DMAP_E28 240 +#define DMAP_82S 310 +#define DMAP_82D 320 +#define DMAP_82E 330 +#define DMAP_U28 410 +#define DMAP_82U 420 +#define DMAP_T28 425 +#define DMAP_U2U 510 + + +typedef struct __dmap_rec *dmap_t; + +struct __dmap_rec +{ + uint32_t codingSchema; + unsigned char * dmapS2S; /* SBCS -> SBCS */ + /* The following conversion needs be followed by conversion from UCS-2/UTF-16 to UTF-8 */ + UniChar * dmapD12U; /* DBCS(non-EUC) -> UCS-2/UTF-16 */ + UniChar * dmapD22U; /* DBCS(non-EUC) -> UCS-2/UTF-16 */ + UniChar * dmapE02U; /* EUC/SS0 -> UCS-2/UTF-16 */ + UniChar * dmapE12U; /* EUC/SS1 -> UCS-2/UTF-16 */ + UniChar * dmapE22U; /* EUC/0x8E + SS2 -> UCS-2/UTF-16 */ + UniChar * dmapE32U; /* EUC/0x8F + SS3 -> UCS-2/UTF-16 */ + uchar * dmapU2D; /* UCS-2 -> DBCS */ + uchar * dmapU2S; /* UCS-2 -> EUC SS0 */ + uchar * dmapU2M2; /* UCS-2 -> EUC SS1 */ + uchar * dmapU2M3; /* UCS-2 -> EUC SS2/SS3 */ + /* All of these pointers/tables are not used at the same time. + * You may be able save some space if you consolidate them. + */ + uchar * dmapS28; /* SBCS -> UTF-8 */ + uchar * dmapD28; /* DBCS -> UTF-8 */ +}; + +typedef struct __myconv_rec *myconv_t; +struct __myconv_rec +{ + uint32_t converterType; + uint32_t index; /* for close */ + union { + iconv_t cnv_iconv; + dmap_t cnv_dmap; + }; + int32_t allocatedSize; + int32_t fromCcsid; + int32_t toCcsid; + UniChar subD; /* DBCS substitution char */ + char subS; /* SBCS substitution char */ + UniChar srcSubD; /* DBCS substitution char of src codepage */ + char srcSubS; /* SBCS substitution char of src codepage */ + char from [41+1]; /* codepage name is up to 41 bytes */ + char to [41+1]; /* codepage name is up to 41 bytes */ +#ifdef __64BIT__ + char reserved[10]; /* align 128 */ +#else + char reserved[14]; /* align 128 */ +#endif +}; + + +EXTERN int32_t myconvDebug; + + + +EXTERN int myconvGetES(CCSID); +EXTERN int myconvIsEBCDIC(const char *); +EXTERN int myconvIsASCII(const char *); +EXTERN int myconvIsUnicode(const char *); /* UTF-8, UTF-16, or UCS-2 */ +EXTERN int myconvIsUnicode2(const char *); /* 2 byte Unicode */ +EXTERN int myconvIsUCS2(const char *); +EXTERN int myconvIsUTF16(const char *); +EXTERN int myconvIsUTF8(const char *); +EXTERN int myconvIsEUC(const char *); +EXTERN int myconvIsISO(const char *); +EXTERN int myconvIsSBCS(const char *); +EXTERN int myconvIsDBCS(const char *); +EXTERN char myconvGetSubS(const char *); +EXTERN UniChar myconvGetSubD(const char *); + + +EXTERN myconv_t myconv_open(const char*, const char*, int32_t); +EXTERN int myconv_close(myconv_t); + +INTERN size_t myconv_iconv(myconv_t cd , + char** inBuf, + size_t* inBytesLeft, + char** outBuf, + size_t* outBytesLeft, + size_t* numSub) +{ + return iconv(cd->cnv_iconv, inBuf, inBytesLeft, outBuf, outBytesLeft); +} + +INTERN size_t myconv_dmap(myconv_t cd, + char** inBuf, + size_t* inBytesLeft, + char** outBuf, + size_t* outBytesLeft, + size_t* numSub) +{ + if (cd->cnv_dmap->codingSchema == DMAP_S2S) { + register unsigned char * dmapS2S=cd->cnv_dmap->dmapS2S; + register int inLen=*inBytesLeft; + register char * pOut=*outBuf; + register char * pIn=*inBuf; + register char * pLastOutBuf = *outBuf + *outBytesLeft - 1; + register char subS=cd->subS; + register size_t numS=0; + while (0 < inLen) { + if (pLastOutBuf < pOut) + break; + if (*pIn == 0x00) { + *pOut=0x00; + } else { + *pOut=dmapS2S[*pIn]; + if (*pOut == 0x00) { + *outBytesLeft-=(*inBytesLeft-inLen); + *inBytesLeft=inLen; + *outBuf=pOut; + *inBuf=pIn; + *numSub+=numS; + return -1; + } + if (*pOut == subS) { + if ((*pOut=dmapS2S[*pIn]) == subS) { + if (*pIn != cd->srcSubS) + ++numS; + } + } + } + ++pIn; + --inLen; + ++pOut; + } + *outBytesLeft-=(*inBytesLeft-inLen); + *inBytesLeft=inLen; + *outBuf=pOut; + *inBuf=pIn; + *numSub+=numS; + return 0; + + } else if (cd->cnv_dmap->codingSchema == DMAP_E2U) { + /* use uchar * instead of UniChar to avoid memcpy */ + register uchar * dmapE02U=(uchar *) (cd->cnv_dmap->dmapE02U); + register uchar * dmapE12U=(uchar *) (cd->cnv_dmap->dmapE12U); + register uchar * dmapE22U=(uchar *) (cd->cnv_dmap->dmapE22U); + register uchar * dmapE32U=(uchar *) (cd->cnv_dmap->dmapE32U); + register int inLen=*inBytesLeft; + register char * pOut=*outBuf; + register char * pIn=*inBuf; + register int offset; + register char * pLastOutBuf = *outBuf + *outBytesLeft - 1; + register size_t numS=0; + while (0 < inLen) { + if (pLastOutBuf < pOut) + break; + if (*pIn == 0x00) { + *pOut=0x00; + ++pOut; + *pOut=0x00; + ++pOut; + ++pIn; + --inLen; + } else { + if (*pIn == 0x8E) { /* SS2 */ + if (inLen < 2) { + if (cd->fromCcsid == 33722 || /* IBM-eucJP */ + cd->fromCcsid == 964) /* IBM-eucTW */ + errno=EINVAL; /* 22 */ + else + errno=EILSEQ; /* 116 */ + *outBytesLeft-=(pOut-*outBuf); + *inBytesLeft=inLen; + *outBuf=pOut; + *inBuf=pIn; + return -1; + } + ++pIn; + if (*pIn < 0xA0) { + if (cd->fromCcsid == 964) /* IBM-eucTW */ + errno=EINVAL; /* 22 */ + else + errno=EILSEQ; /* 116 */ + *outBytesLeft-=(pOut-*outBuf); + *inBytesLeft=inLen; + *outBuf=pOut; + *inBuf=pIn-1; + return -1; + } + offset=(*pIn - 0xA0); + offset<<=1; + if (dmapE22U[offset] == 0x00 && + dmapE22U[offset+1] == 0x00) { /* 2 bytes */ + if (inLen < 3) { + if (cd->fromCcsid == 964) /* IBM-eucTW */ + errno=EINVAL; /* 22 */ + else + errno=EILSEQ; /* 116 */ + *outBytesLeft-=(pOut-*outBuf); + *inBytesLeft=inLen; + *outBuf=pOut; + *inBuf=pIn-1; + return -1; + } + offset=(*pIn - 0xA0) * 0x60 + 0x60; + ++pIn; + if (*pIn < 0xA0) { + if (cd->fromCcsid == 964) /* IBM-eucTW */ + errno=EINVAL; /* 22 */ + else + errno=EILSEQ; /* 116 */ + *outBytesLeft-=(pOut-*outBuf); + *inBytesLeft=inLen; + *outBuf=pOut; + *inBuf=pIn-2; + return -1; + } + offset+=(*pIn - 0xA0); + offset<<=1; + if (dmapE22U[offset] == 0x00 && + dmapE22U[offset+1] == 0x00) { + if (cd->fromCcsid == 964) /* IBM-eucTW */ + errno=EINVAL; /* 22 */ + else + errno=EILSEQ; /* 116 */ + *outBytesLeft-=(pOut-*outBuf); + *inBytesLeft=inLen; + *outBuf=pOut; + *inBuf=pIn-2; + return -1; + } + *pOut=dmapE22U[offset]; + ++pOut; + *pOut=dmapE22U[offset+1]; + ++pOut; + if (dmapE22U[offset] == 0xFF && + dmapE22U[offset+1] == 0xFD) { + if (pIn[-2] * 0x100 + pIn[-1] != cd->srcSubD) + ++numS; + } + ++pIn; + inLen-=3; + } else { /* 1 bytes */ + *pOut=dmapE22U[offset]; + ++pOut; + *pOut=dmapE22U[offset+1]; + ++pOut; + ++pIn; + inLen-=2; + } + } else if (*pIn == 0x8F) { /* SS3 */ + if (inLen < 2) { + if (cd->fromCcsid == 33722) /* IBM-eucJP */ + errno=EINVAL; /* 22 */ + else + errno=EILSEQ; /* 116 */ + *outBytesLeft-=(pOut-*outBuf); + *inBytesLeft=inLen; + *outBuf=pOut; + *inBuf=pIn; + return -1; + } + ++pIn; + if (*pIn < 0xA0) { + if (cd->fromCcsid == 970 || /* IBM-eucKR */ + cd->fromCcsid == 964 || /* IBM-eucTW */ + cd->fromCcsid == 1383 || /* IBM-eucCN */ + (cd->fromCcsid == 33722 && 3 <= inLen)) /* IBM-eucJP */ + errno=EILSEQ; /* 116 */ + else + errno=EINVAL; /* 22 */ + *outBytesLeft-=(pOut-*outBuf); + *inBytesLeft=inLen; + *outBuf=pOut; + *inBuf=pIn-1; + return -1; + } + offset=(*pIn - 0xA0); + offset<<=1; + if (dmapE32U[offset] == 0x00 && + dmapE32U[offset+1] == 0x00) { /* 0x8F + 2 bytes */ + if (inLen < 3) { + if (cd->fromCcsid == 33722) + errno=EINVAL; /* 22 */ + else + errno=EILSEQ; /* 116 */ + *outBytesLeft-=(pOut-*outBuf); + *inBytesLeft=inLen; + *outBuf=pOut; + *inBuf=pIn-1; + return -1; + } + offset=(*pIn - 0xA0) * 0x60 + 0x60; + ++pIn; + if (*pIn < 0xA0) { + errno=EILSEQ; /* 116 */ + *outBytesLeft-=(pOut-*outBuf); + *inBytesLeft=inLen; + *outBuf=pOut; + *inBuf=pIn-2; + return -1; + } + offset+=(*pIn - 0xA0); + offset<<=1; + if (dmapE32U[offset] == 0x00 && + dmapE32U[offset+1] == 0x00) { + errno=EILSEQ; /* 116 */ + *outBytesLeft-=(pOut-*outBuf); + *inBytesLeft=inLen; + *outBuf=pOut; + *inBuf=pIn-2; + return -1; + } + *pOut=dmapE32U[offset]; + ++pOut; + *pOut=dmapE32U[offset+1]; + ++pOut; + if (dmapE32U[offset] == 0xFF && + dmapE32U[offset+1] == 0xFD) { + if (pIn[-2] * 0x100 + pIn[-1] != cd->srcSubD) + ++numS; + } + ++pIn; + inLen-=3; + } else { /* 0x8F + 1 bytes */ + *pOut=dmapE32U[offset]; + ++pOut; + *pOut=dmapE32U[offset+1]; + ++pOut; + ++pIn; + inLen-=2; + } + + } else { + offset=*pIn; + offset<<=1; + if (dmapE02U[offset] == 0x00 && + dmapE02U[offset+1] == 0x00) { /* SS1 */ + if (inLen < 2) { + if ((cd->fromCcsid == 33722 && (*pIn == 0xA0 || (0xA9 <= *pIn && *pIn <= 0xAF) || *pIn == 0xFF)) || + (cd->fromCcsid == 970 && (*pIn == 0xA0 || *pIn == 0xAD || *pIn == 0xAE || *pIn == 0xAF || *pIn == 0xFF)) || + (cd->fromCcsid == 964 && (*pIn == 0xA0 || (0xAA <= *pIn && *pIn <= 0xC1) || *pIn == 0xC3 || *pIn == 0xFE || *pIn == 0xFF)) || + (cd->fromCcsid == 1383 && (*pIn == 0xA0 || *pIn == 0xFF))) + errno=EILSEQ; /* 116 */ + else + errno=EINVAL; /* 22 */ + *outBytesLeft-=(pOut-*outBuf); + *inBytesLeft=inLen; + *outBuf=pOut; + *inBuf=pIn; + return -1; + } + if (*pIn < 0xA0) { + errno=EILSEQ; /* 116 */ + *outBytesLeft-=(pOut-*outBuf); + *inBytesLeft=inLen; + *outBuf=pOut; + *inBuf=pIn; + return -1; + } + offset=(*pIn - 0xA0) * 0x60; + ++pIn; + if (*pIn < 0xA0) { + errno=EILSEQ; /* 116 */ + *outBytesLeft-=(pOut-*outBuf); + *inBytesLeft=inLen; + *outBuf=pOut; + *inBuf=pIn-1; + return -1; + } + offset+=(*pIn - 0xA0); + offset<<=1; + if (dmapE12U[offset] == 0x00 && + dmapE12U[offset+1] == 0x00) { /* undefined mapping */ + errno=EILSEQ; /* 116 */ + *outBytesLeft-=(pOut-*outBuf); + *inBytesLeft=inLen; + *outBuf=pOut; + *inBuf=pIn-1; + return -1; + } + *pOut=dmapE12U[offset]; + ++pOut; + *pOut=dmapE12U[offset+1]; + ++pOut; + if (dmapE12U[offset] == 0xFF && + dmapE12U[offset+1] == 0xFD) { + if (pIn[-1] * 0x100 + pIn[0] != cd->srcSubD) + ++numS; + } + ++pIn; + inLen-=2; + } else { + *pOut=dmapE02U[offset]; + ++pOut; + *pOut=dmapE02U[offset+1]; + ++pOut; + if (dmapE02U[offset] == 0x00 && + dmapE02U[offset+1] == 0x1A) { + if (*pIn != cd->srcSubS) + ++numS; + } + ++pIn; + --inLen; + } + } + } + } + *outBytesLeft-=(pOut-*outBuf); + *inBytesLeft=inLen; + *outBuf=pOut; + *inBuf=pIn; + *numSub+=numS; + return 0; + + + } else if (cd->cnv_dmap->codingSchema == DMAP_E28) { + /* use uchar * instead of UniChar to avoid memcpy */ + register uchar * dmapE02U=(uchar *) (cd->cnv_dmap->dmapE02U); + register uchar * dmapE12U=(uchar *) (cd->cnv_dmap->dmapE12U); + register uchar * dmapE22U=(uchar *) (cd->cnv_dmap->dmapE22U); + register uchar * dmapE32U=(uchar *) (cd->cnv_dmap->dmapE32U); + register int inLen=*inBytesLeft; + register char * pOut=*outBuf; + register char * pIn=*inBuf; + register int offset; + register char * pLastOutBuf = *outBuf + *outBytesLeft - 1; + register size_t numS=0; + register UniChar in; /* copy part of U28 */ + register UniChar ucs2; + while (0 < inLen) { + if (pLastOutBuf < pOut) + break; + if (*pIn == 0x00) { + *pOut=0x00; + ++pOut; + ++pIn; + --inLen; + } else { + if (*pIn == 0x8E) { /* SS2 */ + if (inLen < 2) { + if (cd->fromCcsid == 33722 || /* IBM-eucJP */ + cd->fromCcsid == 964) /* IBM-eucTW */ + errno=EINVAL; /* 22 */ + else + errno=EILSEQ; /* 116 */ + *outBytesLeft-=(pOut-*outBuf); + *inBytesLeft=inLen; + *outBuf=pOut; + *inBuf=pIn; + return -1; + } + ++pIn; + if (*pIn < 0xA0) { + if (cd->fromCcsid == 964) /* IBM-eucTW */ + errno=EINVAL; /* 22 */ + else + errno=EILSEQ; /* 116 */ + *outBytesLeft-=(pOut-*outBuf); + *inBytesLeft=inLen; + *outBuf=pOut; + *inBuf=pIn-1; + return -1; + } + offset=(*pIn - 0xA0); + offset<<=1; + if (dmapE22U[offset] == 0x00 && + dmapE22U[offset+1] == 0x00) { /* 2 bytes */ + if (inLen < 3) { + if (cd->fromCcsid == 964) /* IBM-eucTW */ + errno=EINVAL; /* 22 */ + else + errno=EILSEQ; /* 116 */ + *outBytesLeft-=(pOut-*outBuf); + *inBytesLeft=inLen; + *outBuf=pOut; + *inBuf=pIn-1; + return -1; + } + offset=(*pIn - 0xA0) * 0x60 + 0x60; + ++pIn; + if (*pIn < 0xA0) { + if (cd->fromCcsid == 964) /* IBM-eucTW */ + errno=EINVAL; /* 22 */ + else + errno=EILSEQ; /* 116 */ + *outBytesLeft-=(pOut-*outBuf); + *inBytesLeft=inLen; + *outBuf=pOut; + *inBuf=pIn-2; + return -1; + } + offset+=(*pIn - 0xA0); + offset<<=1; + if (dmapE22U[offset] == 0x00 && + dmapE22U[offset+1] == 0x00) { + if (cd->fromCcsid == 964) /* IBM-eucTW */ + errno=EINVAL; /* 22 */ + else + errno=EILSEQ; /* 116 */ + *outBytesLeft-=(pOut-*outBuf); + *inBytesLeft=inLen; + *outBuf=pOut; + *inBuf=pIn-2; + return -1; + } + in=dmapE22U[offset]; + in<<=8; + in+=dmapE22U[offset+1]; + if (dmapE22U[offset] == 0xFF && + dmapE22U[offset+1] == 0xFD) { + if (pIn[-2] * 0x100 + pIn[-1] != cd->srcSubD) + ++numS; + } + ++pIn; + inLen-=3; + } else { /* 1 bytes */ + in=dmapE22U[offset]; + in<<=8; + in+=dmapE22U[offset+1]; + ++pIn; + inLen-=2; + } + } else if (*pIn == 0x8F) { /* SS3 */ + if (inLen < 2) { + if (cd->fromCcsid == 33722) /* IBM-eucJP */ + errno=EINVAL; /* 22 */ + else + errno=EILSEQ; /* 116 */ + *outBytesLeft-=(pOut-*outBuf); + *inBytesLeft=inLen; + *outBuf=pOut; + *inBuf=pIn; + return -1; + } + ++pIn; + if (*pIn < 0xA0) { + if (cd->fromCcsid == 970 || /* IBM-eucKR */ + cd->fromCcsid == 964 || /* IBM-eucTW */ + cd->fromCcsid == 1383 || /* IBM-eucCN */ + (cd->fromCcsid == 33722 && 3 <= inLen)) /* IBM-eucJP */ + errno=EILSEQ; /* 116 */ + else + errno=EINVAL; /* 22 */ + *outBytesLeft-=(pOut-*outBuf); + *inBytesLeft=inLen; + *outBuf=pOut; + *inBuf=pIn-1; + return -1; + } + offset=(*pIn - 0xA0); + offset<<=1; + if (dmapE32U[offset] == 0x00 && + dmapE32U[offset+1] == 0x00) { /* 0x8F + 2 bytes */ + if (inLen < 3) { + if (cd->fromCcsid == 33722) + errno=EINVAL; /* 22 */ + else + errno=EILSEQ; /* 116 */ + *outBytesLeft-=(pOut-*outBuf); + *inBytesLeft=inLen; + *outBuf=pOut; + *inBuf=pIn-1; + return -1; + } + offset=(*pIn - 0xA0) * 0x60 + 0x60; + ++pIn; + if (*pIn < 0xA0) { + errno=EILSEQ; /* 116 */ + *outBytesLeft-=(pOut-*outBuf); + *inBytesLeft=inLen; + *outBuf=pOut; + *inBuf=pIn-2; + return -1; + } + offset+=(*pIn - 0xA0); + offset<<=1; + if (dmapE32U[offset] == 0x00 && + dmapE32U[offset+1] == 0x00) { + errno=EILSEQ; /* 116 */ + *outBytesLeft-=(pOut-*outBuf); + *inBytesLeft=inLen; + *outBuf=pOut; + *inBuf=pIn-2; + return -1; + } + in=dmapE32U[offset]; + in<<=8; + in+=dmapE32U[offset+1]; + if (dmapE32U[offset] == 0xFF && + dmapE32U[offset+1] == 0xFD) { + if (pIn[-2] * 0x100 + pIn[-1] != cd->srcSubD) + ++numS; + } + ++pIn; + inLen-=3; + } else { /* 0x8F + 1 bytes */ + in=dmapE32U[offset]; + in<<=8; + in+=dmapE32U[offset+1]; + ++pIn; + inLen-=2; + } + + } else { + offset=*pIn; + offset<<=1; + if (dmapE02U[offset] == 0x00 && + dmapE02U[offset+1] == 0x00) { /* SS1 */ + if (inLen < 2) { + if ((cd->fromCcsid == 33722 && (*pIn == 0xA0 || (0xA9 <= *pIn && *pIn <= 0xAF) || *pIn == 0xFF)) || + (cd->fromCcsid == 970 && (*pIn == 0xA0 || *pIn == 0xAD || *pIn == 0xAE || *pIn == 0xAF || *pIn == 0xFF)) || + (cd->fromCcsid == 964 && (*pIn == 0xA0 || (0xAA <= *pIn && *pIn <= 0xC1) || *pIn == 0xC3 || *pIn == 0xFE || *pIn == 0xFF)) || + (cd->fromCcsid == 1383 && (*pIn == 0xA0 || *pIn == 0xFF))) + errno=EILSEQ; /* 116 */ + else + errno=EINVAL; /* 22 */ + *outBytesLeft-=(pOut-*outBuf); + *inBytesLeft=inLen; + *outBuf=pOut; + *inBuf=pIn; + return -1; + } + if (*pIn < 0xA0) { + errno=EILSEQ; /* 116 */ + *outBytesLeft-=(pOut-*outBuf); + *inBytesLeft=inLen; + *outBuf=pOut; + *inBuf=pIn; + return -1; + } + offset=(*pIn - 0xA0) * 0x60; + ++pIn; + if (*pIn < 0xA0) { + errno=EILSEQ; /* 116 */ + *outBytesLeft-=(pOut-*outBuf); + *inBytesLeft=inLen; + *outBuf=pOut; + *inBuf=pIn-1; + return -1; + } + offset+=(*pIn - 0xA0); + offset<<=1; + if (dmapE12U[offset] == 0x00 && + dmapE12U[offset+1] == 0x00) { /* undefined mapping */ + errno=EILSEQ; /* 116 */ + *outBytesLeft-=(pOut-*outBuf); + *inBytesLeft=inLen; + *outBuf=pOut; + *inBuf=pIn-1; + return -1; + } + in=dmapE12U[offset]; + in<<=8; + in+=dmapE12U[offset+1]; + if (dmapE12U[offset] == 0xFF && + dmapE12U[offset+1] == 0xFD) { + if (pIn[-1] * 0x100 + pIn[0] != cd->srcSubD) + ++numS; + } + ++pIn; + inLen-=2; + } else { + in=dmapE02U[offset]; + in<<=8; + in+=dmapE02U[offset+1]; + if (dmapE02U[offset] == 0x00 && + dmapE02U[offset+1] == 0x1A) { + if (*pIn != cd->srcSubS) + ++numS; + } + ++pIn; + --inLen; + } + } + ucs2=in; + if ((in & 0xFF80) == 0x0000) { /* U28: in & 0b1111111110000000 == 0x0000 */ + *pOut=in; + ++pOut; + } else if ((in & 0xF800) == 0x0000) { /* in & 0b1111100000000000 == 0x0000 */ + register uchar byte; + in>>=6; + in&=0x001F; /* 0b0000000000011111 */ + in|=0x00C0; /* 0b0000000011000000 */ + *pOut=in; + ++pOut; + byte=ucs2; /* dmapD12U[offset+1]; */ + byte&=0x3F; /* 0b00111111; */ + byte|=0x80; /* 0b10000000; */ + *pOut=byte; + ++pOut; + } else if ((in & 0xFC00) == 0xD800) { + *pOut=0xEF; + ++pOut; + *pOut=0xBF; + ++pOut; + *pOut=0xBD; + ++pOut; + } else { + register uchar byte; + register uchar work; + byte=(ucs2>>8); /* dmapD12U[offset]; */ + byte>>=4; + byte|=0xE0; /* 0b11100000; */ + *pOut=byte; + ++pOut; + + byte=(ucs2>>8); /* dmapD12U[offset]; */ + byte<<=2; + work=ucs2; /* dmapD12U[offset+1]; */ + work>>=6; + byte|=work; + byte&=0x3F; /* 0b00111111; */ + byte|=0x80; /* 0b10000000; */ + *pOut=byte; + ++pOut; + + byte=ucs2; /* dmapD12U[offset+1]; */ + byte&=0x3F; /* 0b00111111; */ + byte|=0x80; /* 0b10000000; */ + *pOut=byte; + ++pOut; + } + /* end of U28 */ + } + } + *outBytesLeft-=(pOut-*outBuf); + *inBytesLeft=inLen; + *outBuf=pOut; + *inBuf=pIn; + *numSub+=numS; + return 0; + + } else if (cd->cnv_dmap->codingSchema == DMAP_U2E) { + register uchar * dmapU2S=cd->cnv_dmap->dmapU2S; + register uchar * dmapU2M2=cd->cnv_dmap->dmapU2M2 - 0x80 * 2; + register uchar * dmapU2M3=cd->cnv_dmap->dmapU2M3 - 0x80 * 3; + register int inLen=*inBytesLeft; + register char * pOut=*outBuf; + register char * pIn=*inBuf; + register char * pLastOutBuf = *outBuf + *outBytesLeft - 1; + register char subS=cd->subS; + register char * pSubD=(char *) &(cd->subD); + register size_t numS=0; + register size_t rc=0; + while (0 < inLen) { + register uint32_t in; + if (inLen == 1) { + errno=EINVAL; /* 22 */ + *outBytesLeft-=(pOut-*outBuf); + *inBytesLeft=inLen; + *outBuf=pOut; + *inBuf=pIn; + return -1; + } + if (pLastOutBuf < pOut) + break; + in=pIn[0]; + in<<=8; + in+=pIn[1]; + if (in == 0x0000) { + *pOut=0x00; + ++pOut; + } else if (in < 0x100 && dmapU2S[in] != 0x0000) { + if ((*pOut=dmapU2S[in]) == subS) { + if (in != cd->srcSubS) + ++numS; + } + ++pOut; + } else { + in<<=1; + if (dmapU2M2[in] == 0x00) { /* not found in dmapU2M2 */ + in*=1.5; + if (dmapU2M3[in] == 0x00) { /* not found in dmapU2M3*/ + *pOut=pSubD[0]; + ++pOut; + *pOut=pSubD[1]; + ++pOut; + ++numS; + ++rc; + } else { + *pOut=dmapU2M3[in]; + ++pOut; + *pOut=dmapU2M3[1+in]; + ++pOut; + *pOut=dmapU2M3[2+in]; + ++pOut; + } + } else { + *pOut=dmapU2M2[in]; + ++pOut; + if (dmapU2M2[1+in] == 0x00) { + if (*pOut == subS) { + in>>=1; + if (in != cd->srcSubS) + ++numS; + } + } else { + *pOut=dmapU2M2[1+in]; + ++pOut; + if (memcmp(pOut-2, pSubD, 2) == 0) { + in>>=1; + if (in != cd->srcSubD) { + ++numS; + ++rc; + } + } + } + } + } + pIn+=2; + inLen-=2; + } + *outBytesLeft-=(pOut-*outBuf); + *inBytesLeft=inLen; + *outBuf=pOut; + *inBuf=pIn; + *numSub+=numS; + return rc; /* compatibility to iconv() */ + + } else if (cd->cnv_dmap->codingSchema == DMAP_T2E) { + register uchar * dmapU2S=cd->cnv_dmap->dmapU2S; + register uchar * dmapU2M2=cd->cnv_dmap->dmapU2M2 - 0x80 * 2; + register uchar * dmapU2M3=cd->cnv_dmap->dmapU2M3 - 0x80 * 3; + register int inLen=*inBytesLeft; + register char * pOut=*outBuf; + register char * pIn=*inBuf; + register char * pLastOutBuf = *outBuf + *outBytesLeft - 1; + register char subS=cd->subS; + register char * pSubD=(char *) &(cd->subD); + register size_t numS=0; + register size_t rc=0; + while (0 < inLen) { + register uint32_t in; + if (inLen == 1) { + errno=EINVAL; /* 22 */ + *outBytesLeft-=(pOut-*outBuf); + *inBytesLeft=inLen-1; + *outBuf=pOut; + *inBuf=pIn; + ++numS; + *numSub+=numS; + return 0; + } + if (pLastOutBuf < pOut) + break; + in=pIn[0]; + in<<=8; + in+=pIn[1]; + if (in == 0x0000) { + *pOut=0x00; + ++pOut; + } else if (0xD800 <= in && in <= 0xDBFF) { /* first byte of surrogate */ + errno=EINVAL; /* 22 */ + *inBytesLeft=inLen-2; + *outBytesLeft-=(pOut-*outBuf); + *outBuf=pOut; + *inBuf=pIn+2; + ++numS; + *numSub+=numS; + return -1; + + } else if (0xDC00 <= in && in <= 0xDFFF) { /* second byte of surrogate */ + errno=EINVAL; /* 22 */ + *inBytesLeft=inLen-1; + *outBytesLeft-=(pOut-*outBuf); + *outBuf=pOut; + *inBuf=pIn; + ++numS; + *numSub+=numS; + return -1; + + } else if (in < 0x100 && dmapU2S[in] != 0x0000) { + if ((*pOut=dmapU2S[in]) == subS) { + if (in != cd->srcSubS) + ++numS; + } + ++pOut; + } else { + in<<=1; + if (dmapU2M2[in] == 0x00) { /* not found in dmapU2M2 */ + in*=1.5; + if (dmapU2M3[in] == 0x00) { /* not found in dmapU2M3*/ + *pOut=pSubD[0]; + ++pOut; + *pOut=pSubD[1]; + ++pOut; + ++numS; + ++rc; + } else { + *pOut=dmapU2M3[in]; + ++pOut; + *pOut=dmapU2M3[1+in]; + ++pOut; + *pOut=dmapU2M3[2+in]; + ++pOut; + } + } else { + *pOut=dmapU2M2[in]; + ++pOut; + if (dmapU2M2[1+in] == 0x00) { + if (*pOut == subS) { + in>>=1; + if (in != cd->srcSubS) + ++numS; + } + } else { + *pOut=dmapU2M2[1+in]; + ++pOut; + if (memcmp(pOut-2, pSubD, 2) == 0) { + in>>=1; + if (in != cd->srcSubD) { + ++numS; + ++rc; + } + } + } + } + } + pIn+=2; + inLen-=2; + } + *outBytesLeft-=(pOut-*outBuf); + *inBytesLeft=inLen; + *outBuf=pOut; + *inBuf=pIn; + *numSub+=numS; + return 0; + + } else if (cd->cnv_dmap->codingSchema == DMAP_82E) { + register uchar * dmapU2S=cd->cnv_dmap->dmapU2S; + register uchar * dmapU2M2=cd->cnv_dmap->dmapU2M2 - 0x80 * 2; + register uchar * dmapU2M3=cd->cnv_dmap->dmapU2M3 - 0x80 * 3; + register int inLen=*inBytesLeft; + register char * pOut=*outBuf; + register char * pIn=*inBuf; + register char * pLastOutBuf = *outBuf + *outBytesLeft - 1; + register char subS=cd->subS; + register char * pSubD=(char *) &(cd->subD); + register size_t numS=0; + register size_t rc=0; + while (0 < inLen) { + register uint32_t in; + uint32_t in2; + if (pLastOutBuf < pOut) + break; + /* convert from UTF-8 to UCS-2 */ + if (*pIn == 0x00) { + in=0x0000; + ++pIn; + --inLen; + } else { /* 82U: */ + register uchar byte1=*pIn; + if ((byte1 & 0x80) == 0x00) { /* if (byte1 & 0b10000000 == 0b00000000) { */ + /* 1 bytes sequence: 0xxxxxxx => 00000000 0xxxxxxx*/ + in=byte1; + ++pIn; + --inLen; + } else if ((byte1 & 0xE0) == 0xC0) { /* (byte1 & 0b11100000 == 0b11000000) { */ + if (inLen < 2) { + errno=EINVAL; /* 22 */ + *outBytesLeft-=(pOut-*outBuf); + *inBytesLeft=inLen; + *outBuf=pOut; + *inBuf=pIn; + *numSub+=numS; + return -1; + } + if (byte1 == 0xC0 || byte1 == 0xC1) { /* invalid sequence */ + errno=EILSEQ; /* 116 */ + *outBytesLeft-=(pOut-*outBuf); + *inBytesLeft=inLen; + *outBuf=pOut; + *inBuf=pIn; + *numSub+=numS; + return -1; + } + /* 2 bytes sequence: + 110yyyyy 10xxxxxx => 00000yyy yyxxxxxx */ + register uchar byte2; + ++pIn; + byte2=*pIn; + if ((byte2 & 0xC0) == 0x80) { /* byte2 & 0b11000000 == 0b10000000) { */ + register uchar work=byte1; + work<<=6; + byte2&=0x3F; /* 0b00111111; */ + byte2|=work; + + byte1&=0x1F; /* 0b00011111; */ + byte1>>=2; + in=byte1; + in<<=8; + in+=byte2; + inLen-=2; + ++pIn; + } else { /* invalid sequence */ + errno=EILSEQ; /* 116 */ + *outBytesLeft-=(pOut-*outBuf); + *inBytesLeft=inLen; + *outBuf=pOut; + *inBuf=pIn-1; + *numSub+=numS; + return -1; + } + } else if ((byte1 & 0xF0) == 0xE0) { /* byte1 & 0b11110000 == 0b11100000 */ + /* 3 bytes sequence: + 1110zzzz 10yyyyyy 10xxxxxx => zzzzyyyy yyxxxxxx */ + register uchar byte2; + register uchar byte3; + if (inLen < 3) { + if (inLen == 2 && (pIn[1] & 0xC0) != 0x80) + errno=EILSEQ; /* 116 */ + else + errno=EINVAL; /* 22 */ + *outBytesLeft-=(pOut-*outBuf); + *inBytesLeft=inLen; + *outBuf=pOut; + *inBuf=pIn; + *numSub+=numS; + return -1; + } + ++pIn; + byte2=*pIn; + ++pIn; + byte3=*pIn; + if ((byte2 & 0xC0) != 0x80 || + (byte3 & 0xC0) != 0x80 || + (byte1 == 0xE0 && byte2 < 0xA0)) { /* invalid sequence, only 0xA0-0xBF allowed after 0xE0 */ + errno=EILSEQ; /* 116 */ + *outBytesLeft-=(pOut-*outBuf); + *inBytesLeft=inLen; + *outBuf=pOut; + *inBuf=pIn-2; + *numSub+=numS; + return -1; + } + { + register uchar work=byte2; + work<<=6; + byte3&=0x3F; /* 0b00111111; */ + byte3|=work; + + byte2&=0x3F; /* 0b00111111; */ + byte2>>=2; + + byte1<<=4; + in=byte1 | byte2;; + in<<=8; + in+=byte3; + inLen-=3; + ++pIn; + } + } else if ((0xF0 <= byte1 && byte1 <= 0xF4)) { /* (bytes1 & 11111000) == 0x1110000 */ + /* 4 bytes sequence + 11110uuu 10uuzzzz 10yyyyyy 10xxxxxx => 110110ww wwzzzzyy 110111yy yyxxxxxx + where uuuuu = wwww + 1 */ + register uchar byte2; + register uchar byte3; + register uchar byte4; + if (inLen < 4) { + if ((inLen >= 2 && (pIn[1] & 0xC0) != 0x80) || + (inLen >= 3 && (pIn[2] & 0xC0) != 0x80) || + (cd->toCcsid == 13488) ) + errno=EILSEQ; /* 116 */ + else + errno=EINVAL; /* 22 */ + *outBytesLeft-=(pOut-*outBuf); + *inBytesLeft=inLen; + *outBuf=pOut; + *inBuf=pIn; + *numSub+=numS; + return -1; + } + ++pIn; + byte2=*pIn; + ++pIn; + byte3=*pIn; + ++pIn; + byte4=*pIn; + if ((byte2 & 0xC0) == 0x80 && /* byte2 & 0b11000000 == 0b10000000 */ + (byte3 & 0xC0) == 0x80 && /* byte3 & 0b11000000 == 0b10000000 */ + (byte4 & 0xC0) == 0x80) { /* byte4 & 0b11000000 == 0b10000000 */ + register uchar work=byte2; + if (byte1 == 0xF0 && byte2 < 0x90) { + errno=EILSEQ; /* 116 */ + *outBytesLeft-=(pOut-*outBuf); + *inBytesLeft=inLen; + *outBuf=pOut; + *inBuf=pIn-3; + *numSub+=numS; + return -1; + /* iconv() returns 0 for 0xF4908080 and convert to 0x00 + } else if (byte1 == 0xF4 && byte2 > 0x8F) { + errno=EINVAL; + *outBytesLeft-=(pOut-*outBuf); + *inBytesLeft=inLen; + *outBuf=pOut; + *inBuf=pIn-3; + *numSub+=numS; + return -1; + */ + } + + work&=0x30; /* 0b00110000; */ + work>>=4; + byte1&=0x07; /* 0b00000111; */ + byte1<<=2; + byte1+=work; /* uuuuu */ + --byte1; /* wwww */ + + work=byte1 & 0x0F; + work>>=2; + work+=0xD8; /* 0b11011011; */ + in=work; + in<<=8; + + byte1<<=6; + byte2<<=2; + byte2&=0x3C; /* 0b00111100; */ + work=byte3; + work>>=4; + work&=0x03; /* 0b00000011; */ + work|=byte1; + work|=byte2; + in+=work; + + work=byte3; + work>>=2; + work&=0x03; /* 0b00000011; */ + work|=0xDC; /* 0b110111xx; */ + in2=work; + in2<<=8; + + byte3<<=6; + byte4&=0x3F; /* 0b00111111; */ + byte4|=byte3; + in2+=byte4; + inLen-=4; + ++pIn; +#ifdef match_with_GBK + if ((0xD800 == in && in2 < 0xDC80) || + (0xD840 == in && in2 < 0xDC80) || + (0xD880 == in && in2 < 0xDC80) || + (0xD8C0 == in && in2 < 0xDC80) || + (0xD900 == in && in2 < 0xDC80) || + (0xD940 == in && in2 < 0xDC80) || + (0xD980 == in && in2 < 0xDC80) || + (0xD9C0 == in && in2 < 0xDC80) || + (0xDA00 == in && in2 < 0xDC80) || + (0xDA40 == in && in2 < 0xDC80) || + (0xDA80 == in && in2 < 0xDC80) || + (0xDAC0 == in && in2 < 0xDC80) || + (0xDB00 == in && in2 < 0xDC80) || + (0xDB40 == in && in2 < 0xDC80) || + (0xDB80 == in && in2 < 0xDC80) || + (0xDBC0 == in && in2 < 0xDC80)) { +#else + if ((0xD800 <= in && in <= 0xDBFF) && + (0xDC00 <= in2 && in2 <= 0xDFFF)) { +#endif + *pOut=subS; + ++pOut; + ++numS; + continue; + } + } else { /* invalid sequence */ + errno=EILSEQ; /* 116 */ + *outBytesLeft-=(pOut-*outBuf); + *inBytesLeft=inLen; + *outBuf=pOut; + *inBuf=pIn-3; + *numSub+=numS; + return -1; + } + } else if (0xF5 <= byte1 && byte1 <= 0xFF) { /* minic iconv() behavior */ + if (inLen < 4 || + (inLen >= 4 && byte1 == 0xF8 && pIn[1] < 0x90) || + pIn[1] < 0x80 || 0xBF < pIn[1] || + pIn[2] < 0x80 || 0xBF < pIn[2] || + pIn[3] < 0x80 || 0xBF < pIn[3] ) { + if (inLen == 1) + errno=EINVAL; /* 22 */ + else if (inLen == 2 && (pIn[1] & 0xC0) != 0x80) + errno=EILSEQ; /* 116 */ + else if (inLen == 3 && ((pIn[1] & 0xC0) != 0x80 || (pIn[2] & 0xC0) != 0x80)) + errno=EILSEQ; /* 116 */ + else if (inLen >= 4 && (byte1 == 0xF8 || (pIn[1] & 0xC0) != 0x80 || (pIn[2] & 0xC0) != 0x80 || (pIn[3] & 0xC0) != 0x80)) + errno=EILSEQ; /* 116 */ + else + errno=EINVAL; /* 22 */ + + *outBytesLeft-=(pOut-*outBuf); + *inBytesLeft=inLen; + *outBuf=pOut; + *inBuf=pIn; + *numSub+=numS; + return -1; + } else if ((pIn[1] == 0x80 || pIn[1] == 0x90 || pIn[1] == 0xA0 || pIn[1] == 0xB0) && + pIn[2] < 0x82) { + *pOut=subS; /* Though returns replacement character, which iconv() does not return. */ + ++pOut; + ++numS; + pIn+=4; + inLen-=4; + continue; + } else { + *pOut=pSubD[0]; /* Though returns replacement character, which iconv() does not return. */ + ++pOut; + *pOut=pSubD[1]; + ++pOut; + ++numS; + pIn+=4; + inLen-=4; + continue; + /* iconv() returns 0 with strange 1 byte converted values */ + } + + } else { /* invalid sequence */ + errno=EILSEQ; /* 116 */ + *outBytesLeft-=(pOut-*outBuf); + *inBytesLeft=inLen; + *outBuf=pOut; + *inBuf=pIn; + *numSub+=numS; + return -1; + } + } + /* end of UTF-8 to UCS-2 */ + if (in == 0x0000) { + *pOut=0x00; + ++pOut; + } else if (in < 0x100 && dmapU2S[in] != 0x0000) { + if ((*pOut=dmapU2S[in]) == subS) { + if (in != cd->srcSubS) + ++numS; + } + ++pOut; + } else { + in<<=1; + if (dmapU2M2[in] == 0x00) { /* not found in dmapU2M2 */ + in*=1.5; + if (dmapU2M3[in] == 0x00) { /* not found in dmapU2M3*/ + *pOut=pSubD[0]; + ++pOut; + *pOut=pSubD[1]; + ++pOut; + ++numS; + ++rc; + } else { + *pOut=dmapU2M3[in]; + ++pOut; + *pOut=dmapU2M3[1+in]; + ++pOut; + *pOut=dmapU2M3[2+in]; + ++pOut; + } + } else { + *pOut=dmapU2M2[in]; + ++pOut; + if (dmapU2M2[1+in] == 0x00) { + if (*pOut == subS) { + in>>=1; + if (in != cd->srcSubS) + ++numS; + } + } else { + *pOut=dmapU2M2[1+in]; + ++pOut; + if (memcmp(pOut-2, pSubD, 2) == 0) { + in>>=1; + if (in != cd->srcSubD) { + ++numS; + ++rc; + } + } + } + } + } + } + *outBytesLeft-=(pOut-*outBuf); + *inBytesLeft=inLen; + *outBuf=pOut; + *inBuf=pIn; + *numSub+=numS; + return 0; + + } else if (cd->cnv_dmap->codingSchema == DMAP_S2U) { + /* use uchar * instead of UniChar to avoid memcpy */ + register uchar * dmapD12U=(uchar *) (cd->cnv_dmap->dmapD12U); + register int inLen=*inBytesLeft; + register char * pOut=*outBuf; + register char * pIn=*inBuf; + register int offset; + register char * pLastOutBuf = *outBuf + *outBytesLeft - 1; + register size_t numS=0; + while (0 < inLen) { + if (pLastOutBuf < pOut) + break; + if (*pIn == 0x00) { + *pOut=0x00; + ++pOut; + *pOut=0x00; + ++pOut; + ++pIn; + --inLen; + } else { + offset=*pIn; + offset<<=1; + *pOut=dmapD12U[offset]; + ++pOut; + *pOut=dmapD12U[offset+1]; + ++pOut; + if (dmapD12U[offset] == 0x00) { + if (dmapD12U[offset+1] == 0x1A) { + if (*pIn != cd->srcSubS) + ++numS; + } else if (dmapD12U[offset+1] == 0x00) { + pOut-=2; + *outBytesLeft-=(pOut-*outBuf); + *inBytesLeft=inLen; + *outBuf=pOut; + *inBuf=pIn; + *numSub+=numS; + return -1; + } + } + ++pIn; + --inLen; + } + } + *outBytesLeft-=(pOut-*outBuf); + *inBytesLeft=inLen; + *outBuf=pOut; + *inBuf=pIn; + *numSub+=numS; + return 0; + + } else if (cd->cnv_dmap->codingSchema == DMAP_S28) { + /* use uchar * instead of UniChar to avoid memcpy */ + register uchar * dmapD12U=(uchar *) (cd->cnv_dmap->dmapD12U); + register int inLen=*inBytesLeft; + register char * pOut=*outBuf; + register char * pIn=*inBuf; + register int offset; + register char * pLastOutBuf = *outBuf + *outBytesLeft - 1; + register size_t numS=0; + register UniChar in; /* copy part of U28 */ + while (0 < inLen) { + if (pLastOutBuf < pOut) + break; + if (*pIn == 0x00) { + *pOut=0x00; + ++pOut; + ++pIn; + --inLen; + } else { + offset=*pIn; + offset<<=1; + in=dmapD12U[offset]; + in<<=8; + in+=dmapD12U[offset+1]; + if ((in & 0xFF80) == 0x0000) { /* U28: in & 0b1111111110000000 == 0x0000 */ + if (in == 0x000) { + errno=EILSEQ; /* 116 */ + *outBytesLeft-=(pOut-*outBuf); + *inBytesLeft=inLen; + *outBuf=pOut; + *inBuf=pIn; + *numSub+=numS; + return -1; + } + *pOut=in; + ++pOut; + } else if ((in & 0xF800) == 0x0000) { /* in & 0b1111100000000000 == 0x0000 */ + register uchar byte; + in>>=6; + in&=0x001F; /* 0b0000000000011111 */ + in|=0x00C0; /* 0b0000000011000000 */ + *pOut=in; + ++pOut; + byte=dmapD12U[offset+1]; + byte&=0x3F; /* 0b00111111; */ + byte|=0x80; /* 0b10000000; */ + *pOut=byte; + ++pOut; + } else if ((in & 0xFC00) == 0xD800) { /* There should not be no surrogate character in SBCS. */ + *pOut=0xEF; + ++pOut; + *pOut=0xBF; + ++pOut; + *pOut=0xBD; + ++pOut; + } else { + register uchar byte; + register uchar work; + byte=dmapD12U[offset]; + byte>>=4; + byte|=0xE0; /* 0b11100000; */ + *pOut=byte; + ++pOut; + + byte=dmapD12U[offset]; + byte<<=2; + work=dmapD12U[offset+1]; + work>>=6; + byte|=work; + byte&=0x3F; /* 0b00111111; */ + byte|=0x80; /* 0b10000000; */ + *pOut=byte; + ++pOut; + + byte=dmapD12U[offset+1]; + byte&=0x3F; /* 0b00111111; */ + byte|=0x80; /* 0b10000000; */ + *pOut=byte; + ++pOut; + } + /* end of U28 */ + if (dmapD12U[offset] == 0x00) { + if (dmapD12U[offset+1] == 0x1A) { + if (*pIn != cd->srcSubS) + ++numS; + } + } + ++pIn; + --inLen; + } + } + *outBytesLeft-=(pOut-*outBuf); + *inBytesLeft=inLen; + *outBuf=pOut; + *inBuf=pIn; + *numSub+=numS; + return 0; + + } else if (cd->cnv_dmap->codingSchema == DMAP_U2S) { + register uchar * dmapU2S=cd->cnv_dmap->dmapU2S; + register int inLen=*inBytesLeft; + register char * pOut=*outBuf; + register char * pIn=*inBuf; + register char * pLastOutBuf = *outBuf + *outBytesLeft - 1; + register char subS=cd->subS; + register size_t numS=0; + while (0 < inLen) { + register uint32_t in; + if (inLen == 1) { + errno=EINVAL; /* 22 */ + + *inBytesLeft=inLen; + *outBytesLeft-=(pOut-*outBuf); + *outBuf=pOut; + *inBuf=pIn; + return -1; + } + if (pLastOutBuf < pOut) + break; + in=pIn[0]; + in<<=8; + in+=pIn[1]; + if (in == 0x0000) { + *pOut=0x00; + } else { + if ((*pOut=dmapU2S[in]) == 0x00) { + *pOut=subS; + ++numS; + errno=EINVAL; /* 22 */ + } else if (*pOut == subS) { + if (in != cd->srcSubS) + ++numS; + } + } + ++pOut; + pIn+=2; + inLen-=2; + } + *outBytesLeft-=(pOut-*outBuf); + *inBytesLeft=inLen; + *outBuf=pOut; + *inBuf=pIn; + *numSub+=numS; + return numS; + + } else if (cd->cnv_dmap->codingSchema == DMAP_T2S) { + register uchar * dmapU2S=cd->cnv_dmap->dmapU2S; + register int inLen=*inBytesLeft; + register char * pOut=*outBuf; + register char * pIn=*inBuf; + register char * pLastOutBuf = *outBuf + *outBytesLeft - 1; + register char subS=cd->subS; + register size_t numS=0; + while (0 < inLen) { + register uint32_t in; + if (inLen == 1) { + errno=EINVAL; /* 22 */ + + *inBytesLeft=inLen-1; + *outBytesLeft-=(pOut-*outBuf); + *outBuf=pOut; + *inBuf=pIn; + ++numS; + *numSub+=numS; + return 0; + } + if (pLastOutBuf < pOut) + break; + in=pIn[0]; + in<<=8; + in+=pIn[1]; + if (in == 0x0000) { + *pOut=0x00; + + } else if (0xD800 <= in && in <= 0xDFFF) { /* 0xD800-0xDFFF, surrogate first and second values */ + if (0xDC00 <= in ) { + errno=EINVAL; /* 22 */ + *inBytesLeft=inLen-1; + *outBytesLeft-=(pOut-*outBuf); + *outBuf=pOut; + *inBuf=pIn; + return -1; + + } else if (inLen < 4) { + errno=EINVAL; /* 22 */ + *inBytesLeft=inLen-2; + *outBytesLeft-=(pOut-*outBuf); + *outBuf=pOut; + *inBuf=pIn+2; + return -1; + + } else { + register uint32_t in2; + in2=pIn[2]; + in2<<=8; + in2+=pIn[3]; + if (0xDC00 <= in2 && in2 <= 0xDFFF) { /* second surrogate character =0xDC00 - 0xDFFF*/ + *pOut=subS; + ++numS; + pIn+=4; + } else { + errno=EINVAL; /* 22 */ + *inBytesLeft=inLen-1; + *outBytesLeft-=(pOut-*outBuf); + *outBuf=pOut; + *inBuf=pIn; + return -1; + } + } + } else { + if ((*pOut=dmapU2S[in]) == 0x00) { + *pOut=subS; + ++numS; + errno=EINVAL; /* 22 */ + } else if (*pOut == subS) { + if (in != cd->srcSubS) + ++numS; + } + } + ++pOut; + pIn+=2; + inLen-=2; + } + *outBytesLeft-=(pOut-*outBuf); + *inBytesLeft=inLen; + *outBuf=pOut; + *inBuf=pIn; + *numSub+=numS; + return 0; + + } else if (cd->cnv_dmap->codingSchema == DMAP_82S) { + register uchar * dmapU2S=cd->cnv_dmap->dmapU2S; + register int inLen=*inBytesLeft; + register char * pOut=*outBuf; + register char * pIn=*inBuf; + register char * pLastOutBuf = *outBuf + *outBytesLeft - 1; + register char subS=cd->subS; + register size_t numS=0; + while (0 < inLen) { + register uint32_t in; + uint32_t in2; /* The second surrogate value */ + if (pLastOutBuf < pOut) + break; + /* convert from UTF-8 to UCS-2 */ + if (*pIn == 0x00) { + in=0x0000; + ++pIn; + --inLen; + } else { /* 82U: */ + register uchar byte1=*pIn; + if ((byte1 & 0x80) == 0x00) { /* if (byte1 & 0b10000000 == 0b00000000) { */ + /* 1 bytes sequence: 0xxxxxxx => 00000000 0xxxxxxx*/ + in=byte1; + ++pIn; + --inLen; + } else if ((byte1 & 0xE0) == 0xC0) { /* (byte1 & 0b11100000 == 0b11000000) { */ + if (inLen < 2) { + errno=EINVAL; /* 22 */ + *outBytesLeft-=(pOut-*outBuf); + *inBytesLeft=inLen; + *outBuf=pOut; + *inBuf=pIn; + *numSub+=numS; + return -1; + } + if (byte1 == 0xC0 || byte1 == 0xC1) { /* invalid sequence */ + errno=EILSEQ; /* 116 */ + *outBytesLeft-=(pOut-*outBuf); + *inBytesLeft=inLen; + *outBuf=pOut; + *inBuf=pIn; + *numSub+=numS; + return -1; + } + /* 2 bytes sequence: + 110yyyyy 10xxxxxx => 00000yyy yyxxxxxx */ + register uchar byte2; + ++pIn; + byte2=*pIn; + if ((byte2 & 0xC0) == 0x80) { /* byte2 & 0b11000000 == 0b10000000) { */ + register uchar work=byte1; + work<<=6; + byte2&=0x3F; /* 0b00111111; */ + byte2|=work; + + byte1&=0x1F; /* 0b00011111; */ + byte1>>=2; + in=byte1; + in<<=8; + in+=byte2; + inLen-=2; + ++pIn; + } else { /* invalid sequence */ + errno=EILSEQ; /* 116 */ + *outBytesLeft-=(pOut-*outBuf); + *inBytesLeft=inLen; + *outBuf=pOut; + *inBuf=pIn-1; + *numSub+=numS; + return -1; + } + } else if ((byte1 & 0xF0) == 0xE0) { /* byte1 & 0b11110000 == 0b11100000 */ + /* 3 bytes sequence: + 1110zzzz 10yyyyyy 10xxxxxx => zzzzyyyy yyxxxxxx */ + register uchar byte2; + register uchar byte3; + if (inLen < 3) { + if (inLen == 2 && (pIn[1] & 0xC0) != 0x80) + errno=EILSEQ; /* 116 */ + else + errno=EINVAL; /* 22 */ + *outBytesLeft-=(pOut-*outBuf); + *inBytesLeft=inLen; + *outBuf=pOut; + *inBuf=pIn; + *numSub+=numS; + return -1; + } + ++pIn; + byte2=*pIn; + ++pIn; + byte3=*pIn; + if ((byte2 & 0xC0) != 0x80 || + (byte3 & 0xC0) != 0x80 || + (byte1 == 0xE0 && byte2 < 0xA0)) { /* invalid sequence, only 0xA0-0xBF allowed after 0xE0 */ + errno=EILSEQ; /* 116 */ + *outBytesLeft-=(pOut-*outBuf); + *inBytesLeft=inLen; + *outBuf=pOut; + *inBuf=pIn-2; + *numSub+=numS; + return -1; + } + { + register uchar work=byte2; + work<<=6; + byte3&=0x3F; /* 0b00111111; */ + byte3|=work; + + byte2&=0x3F; /* 0b00111111; */ + byte2>>=2; + + byte1<<=4; + in=byte1 | byte2;; + in<<=8; + in+=byte3; + inLen-=3; + ++pIn; + } + } else if ((0xF0 <= byte1 && byte1 <= 0xF4) || /* (bytes1 & 11111000) == 0x1110000 */ + ((byte1&=0xF7) && 0xF0 <= byte1 && byte1 <= 0xF4)) { /* minic iconv() behavior */ + /* 4 bytes sequence + 11110uuu 10uuzzzz 10yyyyyy 10xxxxxx => 110110ww wwzzzzyy 110111yy yyxxxxxx + where uuuuu = wwww + 1 */ + register uchar byte2; + register uchar byte3; + register uchar byte4; + if (inLen < 4) { + if ((inLen >= 2 && (pIn[1] & 0xC0) != 0x80) || + (inLen >= 3 && (pIn[2] & 0xC0) != 0x80) || + (cd->toCcsid == 13488) ) + errno=EILSEQ; /* 116 */ + else + errno=EINVAL; /* 22 */ + *outBytesLeft-=(pOut-*outBuf); + *inBytesLeft=inLen; + *outBuf=pOut; + *inBuf=pIn; + *numSub+=numS; + return -1; + } + ++pIn; + byte2=*pIn; + ++pIn; + byte3=*pIn; + ++pIn; + byte4=*pIn; + if ((byte2 & 0xC0) == 0x80 && /* byte2 & 0b11000000 == 0b10000000 */ + (byte3 & 0xC0) == 0x80 && /* byte3 & 0b11000000 == 0b10000000 */ + (byte4 & 0xC0) == 0x80) { /* byte4 & 0b11000000 == 0b10000000 */ + register uchar work=byte2; + if (byte1 == 0xF0 && byte2 < 0x90) { + errno=EILSEQ; /* 116 */ + *outBytesLeft-=(pOut-*outBuf); + *inBytesLeft=inLen; + *outBuf=pOut; + *inBuf=pIn-3; + *numSub+=numS; + return -1; + /* iconv() returns 0 for 0xF4908080 and convert to 0x00 + } else if (byte1 == 0xF4 && byte2 > 0x8F) { + errno=EINVAL; + *outBytesLeft-=(pOut-*outBuf); + *inBytesLeft=inLen; + *outBuf=pOut; + *inBuf=pIn-3; + *numSub+=numS; + return -1; + */ + } + + work&=0x30; /* 0b00110000; */ + work>>=4; + byte1&=0x07; /* 0b00000111; */ + byte1<<=2; + byte1+=work; /* uuuuu */ + --byte1; /* wwww */ + + work=byte1 & 0x0F; + work>>=2; + work+=0xD8; /* 0b11011011; */ + in=work; + in<<=8; + + byte1<<=6; + byte2<<=2; + byte2&=0x3C; /* 0b00111100; */ + work=byte3; + work>>=4; + work&=0x03; /* 0b00000011; */ + work|=byte1; + work|=byte2; + in+=work; + + work=byte3; + work>>=2; + work&=0x03; /* 0b00000011; */ + work|=0xDC; /* 0b110111xx; */ + in2=work; + in2<<=8; + + byte3<<=6; + byte4&=0x3F; /* 0b00111111; */ + byte4|=byte3; + in2+=byte4; + inLen-=4; + ++pIn; + } else { /* invalid sequence */ + errno=EILSEQ; /* 116 */ + *outBytesLeft-=(pOut-*outBuf); + *inBytesLeft=inLen; + *outBuf=pOut; + *inBuf=pIn-3; + *numSub+=numS; + return -1; + } + } else if ((byte1 & 0xF0) == 0xF0) { /* minic iconv() behavior */ + if (inLen < 4 || + pIn[1] < 0x80 || 0xBF < pIn[1] || + pIn[2] < 0x80 || 0xBF < pIn[2] || + pIn[3] < 0x80 || 0xBF < pIn[3] ) { + if (inLen == 1) + errno=EINVAL; /* 22 */ + else if (inLen == 2 && (pIn[1] & 0xC0) != 0x80) + errno=EILSEQ; /* 116 */ + else if (inLen == 3 && ((pIn[1] & 0xC0) != 0x80 || (pIn[2] & 0xC0) != 0x80)) + errno=EILSEQ; /* 116 */ + else if (inLen >= 4 && ((pIn[1] & 0xC0) != 0x80 || (pIn[2] & 0xC0) != 0x80 || (pIn[3] & 0xC0) != 0x80)) + errno=EILSEQ; /* 116 */ + else + errno=EINVAL; /* 22 */ + + *outBytesLeft-=(pOut-*outBuf); + *inBytesLeft=inLen; + *outBuf=pOut; + *inBuf=pIn; + *numSub+=numS; + return -1; + } else { + *pOut=subS; /* Though returns replacement character, which iconv() does not return. */ + ++pOut; + ++numS; + pIn+=4; + inLen-=4; + /* UTF-8_IBM-850 0xF0908080 : converted value does not match, iconv=0x00, dmap=0x7F + UTF-8_IBM-850 0xF0908081 : converted value does not match, iconv=0x01, dmap=0x7F + UTF-8_IBM-850 0xF0908082 : converted value does not match, iconv=0x02, dmap=0x7F + UTF-8_IBM-850 0xF0908083 : converted value does not match, iconv=0x03, dmap=0x7F + .... + UTF-8_IBM-850 0xF09081BE : converted value does not match, iconv=0x7E, dmap=0x7F + UTF-8_IBM-850 0xF09081BF : converted value does not match, iconv=0x1C, dmap=0x7F + UTF-8_IBM-850 0xF09082A0 : converted value does not match, iconv=0xFF, dmap=0x7F + UTF-8_IBM-850 0xF09082A1 : converted value does not match, iconv=0xAD, dmap=0x7F + .... + */ + continue; + /* iconv() returns 0 with strange 1 byte converted values */ + } + + } else { /* invalid sequence */ + errno=EILSEQ; /* 116 */ + *outBytesLeft-=(pOut-*outBuf); + *inBytesLeft=inLen; + *outBuf=pOut; + *inBuf=pIn; + *numSub+=numS; + return -1; + } + } + /* end of UTF-8 to UCS-2 */ + if (in == 0x0000) { + *pOut=0x00; + } else { + if ((*pOut=dmapU2S[in]) == 0x00) { + *pOut=subS; + ++numS; + errno=EINVAL; /* 22 */ + } else if (*pOut == subS) { + if (in != cd->srcSubS) { + ++numS; + } + } + } + ++pOut; + } + *outBytesLeft-=(pOut-*outBuf); + *inBytesLeft=inLen; + *outBuf=pOut; + *inBuf=pIn; + *numSub+=numS; + return 0; + + } else if (cd->cnv_dmap->codingSchema == DMAP_D2U) { + /* use uchar * instead of UniChar to avoid memcpy */ + register uchar * dmapD12U=(uchar *) (cd->cnv_dmap->dmapD12U); + register uchar * dmapD22U=(uchar *) (cd->cnv_dmap->dmapD22U); + register int inLen=*inBytesLeft; + register char * pOut=*outBuf; + register char * pIn=*inBuf; + register int offset; + register char * pLastOutBuf = *outBuf + *outBytesLeft - 1; + register size_t numS=0; + while (0 < inLen) { + if (pLastOutBuf < pOut) + break; + if (*pIn == 0x00) { + *pOut=0x00; + ++pOut; + *pOut=0x00; + ++pOut; + ++pIn; + --inLen; + } else { + offset=*pIn; + offset<<=1; + if (dmapD12U[offset] == 0x00 && + dmapD12U[offset+1] == 0x00) { /* DBCS */ + if (inLen < 2) { + if (*pIn == 0x80 || *pIn == 0xFF || + (cd->fromCcsid == 943 && (*pIn == 0x85 || *pIn == 0x86 || *pIn == 0xA0 || *pIn == 0xEB || *pIn == 0xEC || *pIn == 0xEF || *pIn == 0xFD || *pIn == 0xFE)) || + (cd->fromCcsid == 932 && (*pIn == 0x85 || *pIn == 0x86 || *pIn == 0x87 || *pIn == 0xEB || *pIn == 0xEC || *pIn == 0xED || *pIn == 0xEE || *pIn == 0xEF)) || + (cd->fromCcsid == 1381 && ((0x85 <= *pIn && *pIn <= 0x8B) || (0xAA <= *pIn && *pIn <= 0xAF) || (0xF8 <= *pIn && *pIn <= 0xFE)))) + errno=EILSEQ; /* 116 */ + else + errno=EINVAL; /* 22 */ + *outBytesLeft-=(pOut-*outBuf); + *inBytesLeft=inLen; + *outBuf=pOut; + *inBuf=pIn; + return -1; + } + offset-=0x100; + ++pIn; + offset<<=8; + offset+=(*pIn * 2); + if (dmapD22U[offset] == 0x00 && + dmapD22U[offset+1] == 0x00) { + errno=EILSEQ; /* 116 */ + *outBytesLeft-=(pOut-*outBuf); + *inBytesLeft=inLen; + *outBuf=pOut; + *inBuf=pIn-1; + return -1; + } + *pOut=dmapD22U[offset]; + ++pOut; + *pOut=dmapD22U[offset+1]; + ++pOut; + if (dmapD22U[offset] == 0xFF && + dmapD22U[offset+1] == 0xFD) { + if (pIn[-1] * 0x100 + pIn[0] != cd->srcSubD) + ++numS; + } + ++pIn; + inLen-=2; + } else { /* SBCS */ + *pOut=dmapD12U[offset]; + ++pOut; + *pOut=dmapD12U[offset+1]; + ++pOut; + if (dmapD12U[offset] == 0x00 && + dmapD12U[offset+1] == 0x1A) { + if (*pIn != cd->srcSubS) + ++numS; + } + ++pIn; + --inLen; + } + } + } + *outBytesLeft-=(pOut-*outBuf); + *inBytesLeft=inLen; + *outBuf=pOut; + *inBuf=pIn; + *numSub+=numS; + return 0; + + } else if (cd->cnv_dmap->codingSchema == DMAP_D28) { + /* use uchar * instead of UniChar to avoid memcpy */ + register uchar * dmapD12U=(uchar *) (cd->cnv_dmap->dmapD12U); + register uchar * dmapD22U=(uchar *) (cd->cnv_dmap->dmapD22U); + register int inLen=*inBytesLeft; + register char * pOut=*outBuf; + register char * pIn=*inBuf; + register int offset; + register char * pLastOutBuf = *outBuf + *outBytesLeft - 1; + register size_t numS=0; + register UniChar in; /* copy part of U28 */ + register UniChar ucs2; + while (0 < inLen) { + if (pLastOutBuf < pOut) + break; + if (*pIn == 0x00) { + *pOut=0x00; + ++pOut; + ++pIn; + --inLen; + } else { + offset=*pIn; + offset<<=1; + if (dmapD12U[offset] == 0x00 && + dmapD12U[offset+1] == 0x00) { /* DBCS */ + if (inLen < 2) { + if (*pIn == 0x80 || *pIn == 0xFF || + (cd->fromCcsid == 943 && (*pIn == 0x85 || *pIn == 0x86 || *pIn == 0xA0 || *pIn == 0xEB || *pIn == 0xEC || *pIn == 0xEF || *pIn == 0xFD || *pIn == 0xFE)) || + (cd->fromCcsid == 932 && (*pIn == 0x85 || *pIn == 0x86 || *pIn == 0x87 || *pIn == 0xEB || *pIn == 0xEC || *pIn == 0xED || *pIn == 0xEE || *pIn == 0xEF)) || + (cd->fromCcsid == 1381 && ((0x85 <= *pIn && *pIn <= 0x8B) || (0xAA <= *pIn && *pIn <= 0xAF) || (0xF8 <= *pIn && *pIn <= 0xFE)))) + errno=EILSEQ; /* 116 */ + else + errno=EINVAL; /* 22 */ + *outBytesLeft-=(pOut-*outBuf); + *inBytesLeft=inLen; + *outBuf=pOut; + *inBuf=pIn; + return -1; + } + offset-=0x100; + ++pIn; + offset<<=8; + offset+=(*pIn * 2); + if (dmapD22U[offset] == 0x00 && + dmapD22U[offset+1] == 0x00) { + errno=EILSEQ; /* 116 */ + *outBytesLeft-=(pOut-*outBuf); + *inBytesLeft=inLen; + *outBuf=pOut; + *inBuf=pIn-1; + return -1; + } + in=dmapD22U[offset]; + in<<=8; + in+=dmapD22U[offset+1]; + ucs2=in; + if (dmapD22U[offset] == 0xFF && + dmapD22U[offset+1] == 0xFD) { + if (in != cd->srcSubD) + ++numS; + } + ++pIn; + inLen-=2; + } else { /* SBCS */ + in=dmapD12U[offset]; + in<<=8; + in+=dmapD12U[offset+1]; + ucs2=in; + if (dmapD12U[offset] == 0x00 && + dmapD12U[offset+1] == 0x1A) { + if (in != cd->srcSubS) + ++numS; + } + ++pIn; + --inLen; + } + if ((in & 0xFF80) == 0x0000) { /* U28: in & 0b1111111110000000 == 0x0000 */ + *pOut=in; + ++pOut; + } else if ((in & 0xF800) == 0x0000) { /* in & 0b1111100000000000 == 0x0000 */ + register uchar byte; + in>>=6; + in&=0x001F; /* 0b0000000000011111 */ + in|=0x00C0; /* 0b0000000011000000 */ + *pOut=in; + ++pOut; + byte=ucs2; /* dmapD12U[offset+1]; */ + byte&=0x3F; /* 0b00111111; */ + byte|=0x80; /* 0b10000000; */ + *pOut=byte; + ++pOut; + } else if ((in & 0xFC00) == 0xD800) { /* There should not be no surrogate character in SBCS. */ + *pOut=0xEF; + ++pOut; + *pOut=0xBF; + ++pOut; + *pOut=0xBD; + ++pOut; + } else { + register uchar byte; + register uchar work; + byte=(ucs2>>8); /* dmapD12U[offset]; */ + byte>>=4; + byte|=0xE0; /* 0b11100000; */ + *pOut=byte; + ++pOut; + + byte=(ucs2>>8); /* dmapD12U[offset]; */ + byte<<=2; + work=ucs2; /* dmapD12U[offset+1]; */ + work>>=6; + byte|=work; + byte&=0x3F; /* 0b00111111; */ + byte|=0x80; /* 0b10000000; */ + *pOut=byte; + ++pOut; + + byte=ucs2; /* dmapD12U[offset+1]; */ + byte&=0x3F; /* 0b00111111; */ + byte|=0x80; /* 0b10000000; */ + *pOut=byte; + ++pOut; + } + /* end of U28 */ + } + } + *outBytesLeft-=(pOut-*outBuf); + *inBytesLeft=inLen; + *outBuf=pOut; + *inBuf=pIn; + *numSub+=numS; + return 0; + + } else if (cd->cnv_dmap->codingSchema == DMAP_U2D) { + register uchar * dmapU2D=cd->cnv_dmap->dmapU2D; + register int inLen=*inBytesLeft; + register char * pOut=*outBuf; + register char * pIn=*inBuf; + register char * pLastOutBuf = *outBuf + *outBytesLeft - 1; + register char subS=cd->subS; + register char * pSubD=(char *) &(cd->subD); + register size_t numS=0; + while (0 < inLen) { + register uint32_t in; + if (inLen == 1) { + errno=EINVAL; /* 22 */ + + *inBytesLeft=inLen; + *outBytesLeft-=(pOut-*outBuf); + *outBuf=pOut; + *inBuf=pIn; + return -1; + } + if (pLastOutBuf < pOut) + break; + in=pIn[0]; + in<<=8; + in+=pIn[1]; + if (in == 0x0000) { + *pOut=0x00; + ++pOut; + } else { + in<<=1; + *pOut=dmapU2D[in]; + ++pOut; + if (dmapU2D[in+1] == 0x00) { /* SBCS */ + if (*pOut == subS) { + if (in != cd->srcSubS) + ++numS; + } + } else { + *pOut=dmapU2D[in+1]; + ++pOut; + if (dmapU2D[in] == pSubD[0] && + dmapU2D[in+1] == pSubD[1]) { + in>>=1; + if (in != cd->srcSubD) + ++numS; + } + } + } + pIn+=2; + inLen-=2; + } + *outBytesLeft-=(pOut-*outBuf); + *inBytesLeft=inLen; + *outBuf=pOut; + *inBuf=pIn; + *numSub+=numS; + return numS; /* to minic iconv() behavior */ + + } else if (cd->cnv_dmap->codingSchema == DMAP_T2D) { + register uchar * dmapU2D=cd->cnv_dmap->dmapU2D; + register int inLen=*inBytesLeft; + register char * pOut=*outBuf; + register char * pIn=*inBuf; + register char * pLastOutBuf = *outBuf + *outBytesLeft - 1; + register char subS=cd->subS; + register char * pSubD=(char *) &(cd->subD); + register size_t numS=0; + while (0 < inLen) { + register uint32_t in; + if (inLen == 1) { + errno=EINVAL; /* 22 */ + *inBytesLeft=inLen-1; + *outBytesLeft-=(pOut-*outBuf); + *outBuf=pOut; + *inBuf=pIn; + ++numS; + *numSub+=numS; + return 0; + } + if (pLastOutBuf < pOut) + break; + in=pIn[0]; + in<<=8; + in+=pIn[1]; + if (in == 0x0000) { + *pOut=0x00; + ++pOut; + } else if (0xD800 <= in && in <= 0xDBFF) { /* first byte of surrogate */ + errno=EINVAL; /* 22 */ + *inBytesLeft=inLen-2; + *outBytesLeft-=(pOut-*outBuf); + *outBuf=pOut; + *inBuf=pIn+2; + ++numS; + *numSub+=numS; + return -1; + + } else if (0xDC00 <= in && in <= 0xDFFF) { /* second byte of surrogate */ + errno=EINVAL; /* 22 */ + *inBytesLeft=inLen-1; + *outBytesLeft-=(pOut-*outBuf); + *outBuf=pOut; + *inBuf=pIn; + ++numS; + *numSub+=numS; + return -1; + + } else { + in<<=1; + *pOut=dmapU2D[in]; + ++pOut; + if (dmapU2D[in+1] == 0x00) { /* SBCS */ + if (*pOut == subS) { + if (in != cd->srcSubS) + ++numS; + } + } else { + *pOut=dmapU2D[in+1]; + ++pOut; + if (dmapU2D[in] == pSubD[0] && + dmapU2D[in+1] == pSubD[1]) { + in>>=1; + if (in != cd->srcSubD) + ++numS; + } + } + } + pIn+=2; + inLen-=2; + } + *outBytesLeft-=(pOut-*outBuf); + *inBytesLeft=inLen; + *outBuf=pOut; + *inBuf=pIn; + *numSub+=numS; + return 0; /* to minic iconv() behavior */ + + } else if (cd->cnv_dmap->codingSchema == DMAP_82D) { + register uchar * dmapU2D=cd->cnv_dmap->dmapU2D; + register int inLen=*inBytesLeft; + register char * pOut=*outBuf; + register char * pIn=*inBuf; + register char * pLastOutBuf = *outBuf + *outBytesLeft - 1; + register char subS=cd->subS; + register char * pSubD=(char *) &(cd->subD); + register size_t numS=0; + while (0 < inLen) { + register uint32_t in; + uint32_t in2; + if (pLastOutBuf < pOut) + break; + /* convert from UTF-8 to UCS-2 */ + if (*pIn == 0x00) { + in=0x0000; + ++pIn; + --inLen; + } else { /* 82U: */ + register uchar byte1=*pIn; + if ((byte1 & 0x80) == 0x00) { /* if (byte1 & 0b10000000 == 0b00000000) { */ + /* 1 bytes sequence: 0xxxxxxx => 00000000 0xxxxxxx*/ + in=byte1; + ++pIn; + --inLen; + } else if ((byte1 & 0xE0) == 0xC0) { /* (byte1 & 0b11100000 == 0b11000000) { */ + if (inLen < 2) { + errno=EINVAL; /* 22 */ + *outBytesLeft-=(pOut-*outBuf); + *inBytesLeft=inLen; + *outBuf=pOut; + *inBuf=pIn; + *numSub+=numS; + return -1; + } + if (byte1 == 0xC0 || byte1 == 0xC1) { /* invalid sequence */ + errno=EILSEQ; /* 116 */ + *outBytesLeft-=(pOut-*outBuf); + *inBytesLeft=inLen; + *outBuf=pOut; + *inBuf=pIn; + *numSub+=numS; + return -1; + } + /* 2 bytes sequence: + 110yyyyy 10xxxxxx => 00000yyy yyxxxxxx */ + register uchar byte2; + ++pIn; + byte2=*pIn; + if ((byte2 & 0xC0) == 0x80) { /* byte2 & 0b11000000 == 0b10000000) { */ + register uchar work=byte1; + work<<=6; + byte2&=0x3F; /* 0b00111111; */ + byte2|=work; + + byte1&=0x1F; /* 0b00011111; */ + byte1>>=2; + in=byte1; + in<<=8; + in+=byte2; + inLen-=2; + ++pIn; + } else { /* invalid sequence */ + errno=EILSEQ; /* 116 */ + *outBytesLeft-=(pOut-*outBuf); + *inBytesLeft=inLen; + *outBuf=pOut; + *inBuf=pIn-1; + *numSub+=numS; + return -1; + } + } else if ((byte1 & 0xF0) == 0xE0) { /* byte1 & 0b11110000 == 0b11100000 */ + /* 3 bytes sequence: + 1110zzzz 10yyyyyy 10xxxxxx => zzzzyyyy yyxxxxxx */ + register uchar byte2; + register uchar byte3; + if (inLen < 3) { + if (inLen == 2 && (pIn[1] & 0xC0) != 0x80) + errno=EILSEQ; /* 116 */ + else + errno=EINVAL; /* 22 */ + *outBytesLeft-=(pOut-*outBuf); + *inBytesLeft=inLen; + *outBuf=pOut; + *inBuf=pIn; + *numSub+=numS; + return -1; + } + ++pIn; + byte2=*pIn; + ++pIn; + byte3=*pIn; + if ((byte2 & 0xC0) != 0x80 || + (byte3 & 0xC0) != 0x80 || + (byte1 == 0xE0 && byte2 < 0xA0)) { /* invalid sequence, only 0xA0-0xBF allowed after 0xE0 */ + errno=EILSEQ; /* 116 */ + *outBytesLeft-=(pOut-*outBuf); + *inBytesLeft=inLen; + *outBuf=pOut; + *inBuf=pIn-2; + *numSub+=numS; + return -1; + } + { + register uchar work=byte2; + work<<=6; + byte3&=0x3F; /* 0b00111111; */ + byte3|=work; + + byte2&=0x3F; /* 0b00111111; */ + byte2>>=2; + + byte1<<=4; + in=byte1 | byte2;; + in<<=8; + in+=byte3; + inLen-=3; + ++pIn; + } + } else if ((0xF0 <= byte1 && byte1 <= 0xF4)) { /* (bytes1 & 11111000) == 0x1110000 */ + /* 4 bytes sequence + 11110uuu 10uuzzzz 10yyyyyy 10xxxxxx => 110110ww wwzzzzyy 110111yy yyxxxxxx + where uuuuu = wwww + 1 */ + register uchar byte2; + register uchar byte3; + register uchar byte4; + if (inLen < 4) { + if ((inLen >= 2 && (pIn[1] & 0xC0) != 0x80) || + (inLen >= 3 && (pIn[2] & 0xC0) != 0x80) || + (cd->toCcsid == 13488) ) + errno=EILSEQ; /* 116 */ + else + errno=EINVAL; /* 22 */ + *outBytesLeft-=(pOut-*outBuf); + *inBytesLeft=inLen; + *outBuf=pOut; + *inBuf=pIn; + *numSub+=numS; + return -1; + } + ++pIn; + byte2=*pIn; + ++pIn; + byte3=*pIn; + ++pIn; + byte4=*pIn; + if ((byte2 & 0xC0) == 0x80 && /* byte2 & 0b11000000 == 0b10000000 */ + (byte3 & 0xC0) == 0x80 && /* byte3 & 0b11000000 == 0b10000000 */ + (byte4 & 0xC0) == 0x80) { /* byte4 & 0b11000000 == 0b10000000 */ + register uchar work=byte2; + if (byte1 == 0xF0 && byte2 < 0x90) { + errno=EILSEQ; /* 116 */ + *outBytesLeft-=(pOut-*outBuf); + *inBytesLeft=inLen; + *outBuf=pOut; + *inBuf=pIn-3; + *numSub+=numS; + return -1; + /* iconv() returns 0 for 0xF4908080 and convert to 0x00 + } else if (byte1 == 0xF4 && byte2 > 0x8F) { + errno=EINVAL; + *outBytesLeft-=(pOut-*outBuf); + *inBytesLeft=inLen; + *outBuf=pOut; + *inBuf=pIn-3; + *numSub+=numS; + return -1; + */ + } + + work&=0x30; /* 0b00110000; */ + work>>=4; + byte1&=0x07; /* 0b00000111; */ + byte1<<=2; + byte1+=work; /* uuuuu */ + --byte1; /* wwww */ + + work=byte1 & 0x0F; + work>>=2; + work+=0xD8; /* 0b11011011; */ + in=work; + in<<=8; + + byte1<<=6; + byte2<<=2; + byte2&=0x3C; /* 0b00111100; */ + work=byte3; + work>>=4; + work&=0x03; /* 0b00000011; */ + work|=byte1; + work|=byte2; + in+=work; + + work=byte3; + work>>=2; + work&=0x03; /* 0b00000011; */ + work|=0xDC; /* 0b110111xx; */ + in2=work; + in2<<=8; + + byte3<<=6; + byte4&=0x3F; /* 0b00111111; */ + byte4|=byte3; + in2+=byte4; + inLen-=4; + ++pIn; +#ifdef match_with_GBK + if ((0xD800 == in && in2 < 0xDC80) || + (0xD840 == in && in2 < 0xDC80) || + (0xD880 == in && in2 < 0xDC80) || + (0xD8C0 == in && in2 < 0xDC80) || + (0xD900 == in && in2 < 0xDC80) || + (0xD940 == in && in2 < 0xDC80) || + (0xD980 == in && in2 < 0xDC80) || + (0xD9C0 == in && in2 < 0xDC80) || + (0xDA00 == in && in2 < 0xDC80) || + (0xDA40 == in && in2 < 0xDC80) || + (0xDA80 == in && in2 < 0xDC80) || + (0xDAC0 == in && in2 < 0xDC80) || + (0xDB00 == in && in2 < 0xDC80) || + (0xDB40 == in && in2 < 0xDC80) || + (0xDB80 == in && in2 < 0xDC80) || + (0xDBC0 == in && in2 < 0xDC80)) { +#else + if ((0xD800 <= in && in <= 0xDBFF) && + (0xDC00 <= in2 && in2 <= 0xDFFF)) { +#endif + *pOut=subS; + ++pOut; + ++numS; + continue; + } + } else { /* invalid sequence */ + errno=EILSEQ; /* 116 */ + *outBytesLeft-=(pOut-*outBuf); + *inBytesLeft=inLen; + *outBuf=pOut; + *inBuf=pIn-3; + *numSub+=numS; + return -1; + } + } else if (0xF5 <= byte1 && byte1 <= 0xFF) { /* minic iconv() behavior */ + if (inLen < 4 || + (inLen >= 4 && byte1 == 0xF8 && pIn[1] < 0x90) || + pIn[1] < 0x80 || 0xBF < pIn[1] || + pIn[2] < 0x80 || 0xBF < pIn[2] || + pIn[3] < 0x80 || 0xBF < pIn[3] ) { + if (inLen == 1) + errno=EINVAL; /* 22 */ + else if (inLen == 2 && (pIn[1] & 0xC0) != 0x80) + errno=EILSEQ; /* 116 */ + else if (inLen == 3 && ((pIn[1] & 0xC0) != 0x80 || (pIn[2] & 0xC0) != 0x80)) + errno=EILSEQ; /* 116 */ + else if (inLen >= 4 && (byte1 == 0xF8 || (pIn[1] & 0xC0) != 0x80 || (pIn[2] & 0xC0) != 0x80 || (pIn[3] & 0xC0) != 0x80)) + errno=EILSEQ; /* 116 */ + else + errno=EINVAL; /* 22 */ + + *outBytesLeft-=(pOut-*outBuf); + *inBytesLeft=inLen; + *outBuf=pOut; + *inBuf=pIn; + *numSub+=numS; + return -1; + } else if ((pIn[1] == 0x80 || pIn[1] == 0x90 || pIn[1] == 0xA0 || pIn[1] == 0xB0) && + pIn[2] < 0x82) { + *pOut=subS; /* Though returns replacement character, which iconv() does not return. */ + ++pOut; + ++numS; + pIn+=4; + inLen-=4; + continue; + } else { + *pOut=pSubD[0]; /* Though returns replacement character, which iconv() does not return. */ + ++pOut; + *pOut=pSubD[1]; + ++pOut; + ++numS; + pIn+=4; + inLen-=4; + continue; + /* iconv() returns 0 with strange 1 byte converted values */ + } + + } else { /* invalid sequence */ + errno=EILSEQ; /* 116 */ + *outBytesLeft-=(pOut-*outBuf); + *inBytesLeft=inLen; + *outBuf=pOut; + *inBuf=pIn; + *numSub+=numS; + return -1; + } + } + /* end of UTF-8 to UCS-2 */ + if (in == 0x0000) { + *pOut=0x00; + ++pOut; + } else { + in<<=1; + *pOut=dmapU2D[in]; + ++pOut; + if (dmapU2D[in+1] == 0x00) { /* SBCS */ + if (dmapU2D[in] == subS) { + in>>=1; + if (in != cd->srcSubS) + ++numS; + } + } else { + *pOut=dmapU2D[in+1]; + ++pOut; + if (dmapU2D[in] == pSubD[0] && + dmapU2D[in+1] == pSubD[1]) { + in>>=1; + if (in != cd->srcSubD) + ++numS; + } + } + } + } + *outBytesLeft-=(pOut-*outBuf); + *inBytesLeft=inLen; + *outBuf=pOut; + *inBuf=pIn; + *numSub+=numS; + return 0; + + } else if (cd->cnv_dmap->codingSchema == DMAP_82U) { + /* See http://unicode.org/versions/corrigendum1.html */ + /* convert from UTF-8 to UTF-16 can cover all conversion from UTF-8 to UCS-2 */ + register int inLen=*inBytesLeft; + register char * pOut=*outBuf; + register char * pIn=*inBuf; + register char * pLastOutBuf = *outBuf + *outBytesLeft - 1; + register size_t numS=0; + while (0 < inLen) { + if (pLastOutBuf < pOut) + break; + if (*pIn == 0x00) { + *pOut=0x00; + ++pOut; + *pOut=0x00; + ++pOut; + ++pIn; + --inLen; + } else { /* 82U: */ + register uchar byte1=*pIn; + if ((byte1 & 0x80) == 0x00) { /* if (byte1 & 0b10000000 == 0b00000000) { */ + /* 1 bytes sequence: 0xxxxxxx => 00000000 0xxxxxxx*/ + *pOut=0x00; + ++pOut; + *pOut=byte1; + ++pOut; + ++pIn; + --inLen; + } else if ((byte1 & 0xE0) == 0xC0) { /* (byte1 & 0b11100000 == 0b11000000) { */ + if (inLen < 2) { + errno=EINVAL; /* 22 */ + *outBytesLeft-=(pOut-*outBuf); + *inBytesLeft=inLen; + *outBuf=pOut; + *inBuf=pIn; + *numSub+=numS; + return -1; + } + if (byte1 == 0xC0 || byte1 == 0xC1) { /* invalid sequence */ + errno=EILSEQ; /* 116 */ + *outBytesLeft-=(pOut-*outBuf); + *inBytesLeft=inLen; + *outBuf=pOut; + *inBuf=pIn; + *numSub+=numS; + return -1; + } + /* 2 bytes sequence: + 110yyyyy 10xxxxxx => 00000yyy yyxxxxxx */ + register uchar byte2; + ++pIn; + byte2=*pIn; + if ((byte2 & 0xC0) == 0x80) { /* byte2 & 0b11000000 == 0b10000000) { */ + register uchar work=byte1; + work<<=6; + byte2&=0x3F; /* 0b00111111; */ + byte2|=work; + + byte1&=0x1F; /* 0b00011111; */ + byte1>>=2; + *pOut=byte1; + ++pOut; + *pOut=byte2; + ++pOut; + inLen-=2; + ++pIn; + } else { /* invalid sequence */ + errno=EILSEQ; /* 116 */ + *outBytesLeft-=(pOut-*outBuf); + *inBytesLeft=inLen; + *outBuf=pOut; + *inBuf=pIn-1; + *numSub+=numS; + return -1; + } + } else if ((byte1 & 0xF0) == 0xE0) { /* byte1 & 0b11110000 == 0b11100000 */ + /* 3 bytes sequence: + 1110zzzz 10yyyyyy 10xxxxxx => zzzzyyyy yyxxxxxx */ + register uchar byte2; + register uchar byte3; + if (inLen < 3) { + if (inLen == 2 && (pIn[1] & 0xC0) != 0x80) + errno=EILSEQ; /* 116 */ + else + errno=EINVAL; /* 22 */ + *outBytesLeft-=(pOut-*outBuf); + *inBytesLeft=inLen; + *outBuf=pOut; + *inBuf=pIn; + *numSub+=numS; + return -1; + } + ++pIn; + byte2=*pIn; + ++pIn; + byte3=*pIn; + if ((byte2 & 0xC0) != 0x80 || + (byte3 & 0xC0) != 0x80 || + (byte1 == 0xE0 && byte2 < 0xA0)) { /* invalid sequence, only 0xA0-0xBF allowed after 0xE0 */ + errno=EILSEQ; /* 116 */ + *outBytesLeft-=(pOut-*outBuf); + *inBytesLeft=inLen; + *outBuf=pOut; + *inBuf=pIn-2; + *numSub+=numS; + return -1; + } + { + register uchar work=byte2; + work<<=6; + byte3&=0x3F; /* 0b00111111; */ + byte3|=work; + + byte2&=0x3F; /* 0b00111111; */ + byte2>>=2; + + byte1<<=4; + *pOut=byte1 | byte2;; + ++pOut; + *pOut=byte3; + ++pOut; + inLen-=3; + ++pIn; + } + } else if ((0xF0 <= byte1 && byte1 <= 0xF4) || /* (bytes1 & 11111000) == 0x1110000 */ + ((byte1&=0xF7) && 0xF0 <= byte1 && byte1 <= 0xF4)) { /* minic iconv() behavior */ + /* 4 bytes sequence + 11110uuu 10uuzzzz 10yyyyyy 10xxxxxx => 110110ww wwzzzzyy 110111yy yyxxxxxx + where uuuuu = wwww + 1 */ + register uchar byte2; + register uchar byte3; + register uchar byte4; + if (inLen < 4 || cd->toCcsid == 13488) { + if ((inLen >= 2 && (pIn[1] & 0xC0) != 0x80) || + (inLen >= 3 && (pIn[2] & 0xC0) != 0x80) || + (cd->toCcsid == 13488) ) + errno=EILSEQ; /* 116 */ + else + errno=EINVAL; /* 22 */ + *outBytesLeft-=(pOut-*outBuf); + *inBytesLeft=inLen; + *outBuf=pOut; + *inBuf=pIn; + *numSub+=numS; + return -1; + } + ++pIn; + byte2=*pIn; + ++pIn; + byte3=*pIn; + ++pIn; + byte4=*pIn; + if ((byte2 & 0xC0) == 0x80 && /* byte2 & 0b11000000 == 0b10000000 */ + (byte3 & 0xC0) == 0x80 && /* byte3 & 0b11000000 == 0b10000000 */ + (byte4 & 0xC0) == 0x80) { /* byte4 & 0b11000000 == 0b10000000 */ + register uchar work=byte2; + if (byte1 == 0xF0 && byte2 < 0x90) { + errno=EILSEQ; /* 116 */ + *outBytesLeft-=(pOut-*outBuf); + *inBytesLeft=inLen; + *outBuf=pOut; + *inBuf=pIn-3; + *numSub+=numS; + return -1; + } else if (byte1 == 0xF4 && byte2 > 0x8F) { + errno=EINVAL; /* 22 */ + *outBytesLeft-=(pOut-*outBuf); + *inBytesLeft=inLen; + *outBuf=pOut; + *inBuf=pIn-3; + *numSub+=numS; + return -1; + } + + work&=0x30; /* 0b00110000; */ + work>>=4; + byte1&=0x07; /* 0b00000111; */ + byte1<<=2; + byte1+=work; /* uuuuu */ + --byte1; /* wwww */ + + work=byte1 & 0x0F; + work>>=2; + work+=0xD8; /* 0b11011011; */ + *pOut=work; + ++pOut; + + byte1<<=6; + byte2<<=2; + byte2&=0x3C; /* 0b00111100; */ + work=byte3; + work>>=4; + work&=0x03; /* 0b00000011; */ + work|=byte1; + work|=byte2; + *pOut=work; + ++pOut; + + work=byte3; + work>>=2; + work&=0x03; /* 0b00000011; */ + work|=0xDC; /* 0b110111xx; */ + *pOut=work; + ++pOut; + + byte3<<=6; + byte4&=0x3F; /* 0b00111111; */ + byte4|=byte3; + *pOut=byte4; + ++pOut; + inLen-=4; + ++pIn; + } else { /* invalid sequence */ + errno=EILSEQ; /* 116 */ + *outBytesLeft-=(pOut-*outBuf); + *inBytesLeft=inLen; + *outBuf=pOut; + *inBuf=pIn-3; + *numSub+=numS; + return -1; + } + } else if ((byte1 & 0xF0) == 0xF0) { + if (cd->toCcsid == 13488) { + errno=EILSEQ; /* 116 */ + } else { + if (inLen == 1) + errno=EINVAL; /* 22 */ + else if (inLen == 2 && (pIn[1] & 0xC0) != 0x80) + errno=EILSEQ; /* 116 */ + else if (inLen == 3 && ((pIn[1] & 0xC0) != 0x80 || (pIn[2] & 0xC0) != 0x80)) + errno=EILSEQ; /* 116 */ + else if (inLen >= 4 && ((pIn[1] & 0xC0) != 0x80 || (pIn[2] & 0xC0) != 0x80 || (pIn[3] & 0xC0) != 0x80)) + errno=EILSEQ; /* 116 */ + else + errno=EINVAL; /* 22 */ + } + *outBytesLeft-=(pOut-*outBuf); + *inBytesLeft=inLen; + *outBuf=pOut; + *inBuf=pIn; + *numSub+=numS; + return -1; + + } else { /* invalid sequence */ + errno=EILSEQ; /* 116 */ + *outBytesLeft-=(pOut-*outBuf); + *inBytesLeft=inLen; + *outBuf=pOut; + *inBuf=pIn; + *numSub+=numS; + return -1; + } + } + } + *outBytesLeft-=(pOut-*outBuf); + *inBytesLeft=inLen; + *outBuf=pOut; + *inBuf=pIn; + *numSub+=numS; + return 0; + } else if (cd->cnv_dmap->codingSchema == DMAP_U28) { + /* See http://unicode.org/versions/corrigendum1.html */ + register int inLen=*inBytesLeft; + register char * pOut=*outBuf; + register char * pIn=*inBuf; + register char * pLastOutBuf = *outBuf + *outBytesLeft - 1; + // register size_t numS=0; + while (0 < inLen) { + register uint32_t in; + if (inLen == 1) { + errno=EINVAL; /* 22 */ + *inBytesLeft=inLen; + *outBytesLeft-=(pOut-*outBuf); + *outBuf=pOut; + *inBuf=pIn; + return -1; + } + if (pLastOutBuf < pOut) + break; + in=pIn[0]; + in<<=8; + in+=pIn[1]; + if (in == 0x0000) { + *pOut=0x00; + ++pOut; + } else if ((in & 0xFF80) == 0x0000) { /* U28: in & 0b1111111110000000 == 0x0000 */ + *pOut=in; + ++pOut; + } else if ((in & 0xF800) == 0x0000) { /* in & 0b1111100000000000 == 0x0000 */ + register uchar byte; + in>>=6; + in&=0x001F; /* 0b0000000000011111 */ + in|=0x00C0; /* 0b0000000011000000 */ + *pOut=in; + ++pOut; + byte=pIn[1]; + byte&=0x3F; /* 0b00111111; */ + byte|=0x80; /* 0b10000000; */ + *pOut=byte; + ++pOut; + } else { + register uchar byte; + register uchar work; + byte=pIn[0]; + byte>>=4; + byte|=0xE0; /* 0b11100000; */ + *pOut=byte; + ++pOut; + + byte=pIn[0]; + byte<<=2; + work=pIn[1]; + work>>=6; + byte|=work; + byte&=0x3F; /* 0b00111111; */ + byte|=0x80; /* 0b10000000; */ + *pOut=byte; + ++pOut; + + byte=pIn[1]; + byte&=0x3F; /* 0b00111111; */ + byte|=0x80; /* 0b10000000; */ + *pOut=byte; + ++pOut; + } + pIn+=2; + inLen-=2; + } + *outBytesLeft-=(pOut-*outBuf); + *inBytesLeft=inLen; + *outBuf=pOut; + *inBuf=pIn; + // *numSub+=numS; + return 0; + + } else if (cd->cnv_dmap->codingSchema == DMAP_T28) { /* UTF-16_UTF-8 */ + /* See http://unicode.org/versions/corrigendum1.html */ + register int inLen=*inBytesLeft; + register char * pOut=*outBuf; + register char * pIn=*inBuf; + register char * pLastOutBuf = *outBuf + *outBytesLeft - 1; + // register size_t numS=0; + while (0 < inLen) { + register uint32_t in; + if (inLen == 1) { + errno=EINVAL; /* 22 */ + *inBytesLeft=0; + *outBytesLeft-=(pOut-*outBuf); + *outBuf=pOut; + *inBuf=pIn; + return 0; + } + if (pLastOutBuf < pOut) + break; + in=pIn[0]; + in<<=8; + in+=pIn[1]; + if (in == 0x0000) { + *pOut=0x00; + ++pOut; + } else if ((in & 0xFF80) == 0x0000) { /* U28: in & 0b1111111110000000 == 0x0000 */ + *pOut=in; + ++pOut; + } else if ((in & 0xF800) == 0x0000) { /* in & 0b1111100000000000 == 0x0000 */ + register uchar byte; + in>>=6; + in&=0x001F; /* 0b0000000000011111 */ + in|=0x00C0; /* 0b0000000011000000 */ + *pOut=in; + ++pOut; + byte=pIn[1]; + byte&=0x3F; /* 0b00111111; */ + byte|=0x80; /* 0b10000000; */ + *pOut=byte; + ++pOut; + } else if ((in & 0xFC00) == 0xD800) { /* in & 0b1111110000000000 == 0b1101100000000000, first surrogate character */ + if (0xDC00 <= in ) { + errno=EINVAL; /* 22 */ + *inBytesLeft=inLen-1; + *outBytesLeft-=(pOut-*outBuf); + *outBuf=pOut; + *inBuf=pIn; + return -1; + + } else if (inLen < 4) { + errno=EINVAL; /* 22 */ + *inBytesLeft=inLen-2; + *outBytesLeft-=(pOut-*outBuf); + *outBuf=pOut; + *inBuf=pIn+2; + return -1; + + } else if ((pIn[2] & 0xFC) != 0xDC) { /* pIn[2] & 0b11111100 == 0b11011100, second surrogate character */ + errno=EINVAL; /* 22 */ + *inBytesLeft=inLen-2; + *outBytesLeft-=(pOut-*outBuf); + *outBuf=pOut; + *inBuf=pIn+2; + return -1; + + } else { + register uchar byte; + register uchar work; + in>>=6; + in&=0x000F; /* 0b0000000000001111 */ + byte=in; /* wwww */ + ++byte; /* uuuuu */ + work=byte; /* save uuuuu */ + byte>>=2; + byte|=0xF0; /* 0b11110000; */ + *pOut=byte; + ++pOut; + + byte=work; + byte&=0x03; /* 0b00000011; */ + byte<<=4; + byte|=0x80; /* 0b10000000; */ + work=pIn[1]; + work&=0x3C; /* 0b00111100; */ + work>>=2; + byte|=work; + *pOut=byte; + ++pOut; + + byte=pIn[1]; + byte&=0x03; /* 0b00000011; */ + byte<<=4; + byte|=0x80; /* 0b10000000; */ + work=pIn[2]; + work&=0x03; /* 0b00000011; */ + work<<=2; + byte|=work; + work=pIn[3]; + work>>=6; + byte|=work; + *pOut=byte; + ++pOut; + + byte=pIn[3]; + byte&=0x3F; /* 0b00111111; */ + byte|=0x80; /* 0b10000000; */ + *pOut=byte; + ++pOut; + pIn+=2; + inLen-=2; + } + } else if ((in & 0xFC00) == 0xDC00) { /* in & 0b11111100 == 0b11011100, second surrogate character */ + errno=EINVAL; /* 22 */ + *inBytesLeft=inLen-1; + *outBytesLeft-=(pOut-*outBuf); + *outBuf=pOut; + *inBuf=pIn; + return -1; + + } else { + register uchar byte; + register uchar work; + byte=pIn[0]; + byte>>=4; + byte|=0xE0; /* 0b11100000; */ + *pOut=byte; + ++pOut; + + byte=pIn[0]; + byte<<=2; + work=pIn[1]; + work>>=6; + byte|=work; + byte&=0x3F; /* 0b00111111; */ + byte|=0x80; /* 0b10000000; */ + *pOut=byte; + ++pOut; + + byte=pIn[1]; + byte&=0x3F; /* 0b00111111; */ + byte|=0x80; /* 0b10000000; */ + *pOut=byte; + ++pOut; + } + pIn+=2; + inLen-=2; + } + *outBytesLeft-=(pOut-*outBuf); + *inBytesLeft=inLen; + *outBuf=pOut; + *inBuf=pIn; + // *numSub+=numS; + return 0; + + } else if (cd->cnv_dmap->codingSchema == DMAP_U2U) { /* UTF-16_UCS-2 */ + register int inLen=*inBytesLeft; + register int outLen=*outBytesLeft; + if (inLen <= outLen) { + memcpy(*outBuf, *inBuf, inLen); + (*outBytesLeft)-=inLen; + (*inBuf)+=inLen; + (*outBuf)+=inLen; + *inBytesLeft=0; + return 0; + } + memcpy(*outBuf, *inBuf, outLen); + (*outBytesLeft)=0; + (*inBuf)+=outLen; + (*outBuf)+=outLen; + *inBytesLeft-=outLen; + return (*inBytesLeft); + + } else { + return -1; + } + return 0; +} + + +#ifdef DEBUG +inline size_t myconv(myconv_t cd , + char** inBuf, + size_t* inBytesLeft, + char** outBuf, + size_t* outBytesLeft, + size_t* numSub) +{ + if (cd->converterType == CONVERTER_ICONV) { + return myconv_iconv(cd,inBuf,inBytesLeft,outBuf,outBytesLeft,numSub); + } else if (cd->converterType == CONVERTER_DMAP) { + return myconv_dmap(cd,inBuf,inBytesLeft,outBuf,outBytesLeft,numSub); + } + return -1; +} + +inline char * converterName(int32_t type) +{ + if (type == CONVERTER_ICONV) + return "iconv"; + else if (type == CONVERTER_DMAP) + return "dmap"; + + return "?????"; +} +#else +#define myconv(a,b,c,d,e,f) \ +(((a)->converterType == CONVERTER_ICONV)? myconv_iconv((a),(b),(c),(d),(e),(f)): (((a)->converterType == CONVERTER_DMAP)? myconv_dmap((a),(b),(c),(d),(e),(f)): -1)) + + +#define converterName(a) \ +(((a) == CONVERTER_ICONV)? "iconv": ((a) == CONVERTER_DMAP)? "dmap": "?????") +#endif + +void initMyconv(); +void cleanupMyconv(); + +#endif diff --git a/storage/ibmdb2i/db2i_rir.cc b/storage/ibmdb2i/db2i_rir.cc new file mode 100644 index 00000000000..acae6da3085 --- /dev/null +++ b/storage/ibmdb2i/db2i_rir.cc @@ -0,0 +1,441 @@ +/* +Licensed Materials - Property of IBM +DB2 Storage Engine Enablement +Copyright IBM Corporation 2007,2008 +All rights reserved + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + (a) Redistributions of source code must retain this list of conditions, the + copyright notice in section {d} below, and the disclaimer following this + list of conditions. + (b) Redistributions in binary form must reproduce this list of conditions, the + copyright notice in section (d) below, and the disclaimer following this + list of conditions, in the documentation and/or other materials provided + with the distribution. + (c) The name of IBM may not be used to endorse or promote products derived from + this software without specific prior written permission. + (d) The text of the required copyright notice is: + Licensed Materials - Property of IBM + DB2 Storage Engine Enablement + Copyright IBM Corporation 2007,2008 + All rights reserved + +THIS SOFTWARE IS PROVIDED BY IBM CORPORATION "AS IS" AND ANY EXPRESS OR IMPLIED +WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT +SHALL IBM CORPORATION BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT +OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT INCLUDING NEGLIGENCE OR OTHERWISE) ARISING +IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY +OF SUCH DAMAGE. +*/ + + +#include "ha_ibmdb2i.h" + +/* Helper function for records_in_range. + Input: Bitmap of used key parts. + Output: Number of used key parts. */ + +static inline int getKeyCntFromMap(key_part_map keypart_map) +{ + int cnt = 0; + while (keypart_map) + { + keypart_map = keypart_map >> 1; + cnt++; + } + return (cnt); +} + + +/** + @brief + Given a starting key and an ending key, estimate the number of rows that + will exist between the two keys. + + INPUT + inx Index to use + min_key Min key. Is NULL if no min range + max_key Max key. Is NULL if no max range + + NOTES + min_key.flag can have one of the following values: + HA_READ_KEY_EXACT Include the key in the range + HA_READ_AFTER_KEY Don't include key in range + + max_key.flag can have one of the following values: + HA_READ_BEFORE_KEY Don't include key in range + HA_READ_AFTER_KEY Include all 'end_key' values in the range + + RETURN + HA_POS_ERROR Error or the storage engine cannot estimate the number of rows + 1 There are no matching keys in the given range + n > 0 There are approximately n rows in the range +*/ +ha_rows ha_ibmdb2i::records_in_range(uint inx, + key_range *min_key, + key_range *max_key) +{ + DBUG_ENTER("ha_ibmdb2i::records_in_range"); + int rc = 0; // Return code + ha_rows rows = 0; // Row count returned to caller of this method + uint32 spcLen; // Length of space passed to DB2 + uint32 keyCnt; // Number of fields in the key composite + uint32 literalCnt = 0; // Number of literals + uint32 boundsOff; // Offset from beginning of space to range bounds + uint32 litDefOff; // Offset from beginning of space to literal definitions + uint32 literalsOff; // Offset from beginning of space to literal values + uint32 cutoff = 0; // Early exit cutoff (currently not used) + uint64 recCnt; // Row count from DB2 + uint16 rtnCode; // Return code from DB2 + Bounds* boundsPtr; // Pointer to a pair of range bounds + Bound* boundPtr; // Pointer to a single (high or low) range bound + LitDef* litDefPtr; // Pointer to a literal definition + char* literalsPtr; // Pointer to the start of all literal values + char* literalPtr; // Pointer to the start of this literal value + char* tempPtr; // Temporary pointer + char* tempMinPtr; // Temporary pointer into min_key + int minKeyCnt = 0; // Number of fields in the min_key composite + int maxKeyCnt = 0; // Number of fields in the max_key composite + size_t tempLen = 0; // Temporary length + uint16 DB2FieldWidth = 0; // DB2 field width + uint32 workFieldLen = 0; // Length of workarea needed for CCSID conversions + bool overrideInclusion; // Indicator for inclusion/exclusion + char* endOfLiteralPtr; // Pointer to the end of this literal + char* endOfMinPtr; // Pointer to end of min_key + uint16 endByte = 0; // End byte of char or graphic literal (padding not included) + bool reuseLiteral; // Indicator that hi and lo bounds use same literal + char* minPtr = NULL; // Work pointer for traversing min_key + char* maxPtr = NULL; // Work pointer for traversing max_key + /* + Handle the special case of 'x < null' anywhere in the key range. There are + no values less than null, but return 1 so that MySQL does not assume + the empty set for the query. + */ + if (min_key != NULL && max_key != NULL && + min_key->flag == HA_READ_AFTER_KEY && max_key->flag == HA_READ_BEFORE_KEY && + min_key->length == max_key->length && + (memcmp((uchar*)min_key->key,(uchar*)max_key->key,min_key->length)==0)) + { + DBUG_PRINT("ha_ibmdb2i::records_in_range",("Estimate 1 row for key %d; special case: < null", inx)); + DBUG_RETURN((ha_rows) 1 ); + } + /* + Determine the number of fields in the key composite. + */ + + if (min_key) + { + minKeyCnt = getKeyCntFromMap(min_key->keypart_map); + minPtr = (char*)min_key->key; + } + if (max_key) + { + maxKeyCnt = getKeyCntFromMap(max_key->keypart_map); + maxPtr = (char*)max_key->key; + } + keyCnt = maxKeyCnt >= minKeyCnt ? maxKeyCnt : minKeyCnt; + + /* + Allocate the space needed to pass range information to DB2. The + space must be large enough to store the following: + - one pair of bounds (high and low) per field in the key composite + - one literal definition per literal value + - the literal values + - work area for literal CCSID conversions + Since we don't know yet how many of these structures are needed, + allocate enough space for the maximum that we will possibly need. + The workarea for the literal conversion must be big enough to hold the + largest of the DB2 key fields. + */ + KEY& curKey = table->key_info[inx]; + + for (int i = 0; i < keyCnt; i++) + { + DB2FieldWidth = + db2Table->db2Field(curKey.key_part[i].field->field_index).getByteLengthInRecord(); + if (DB2FieldWidth > workFieldLen) + workFieldLen = DB2FieldWidth; // Get length of largest DB2 field + tempLen = tempLen + DB2FieldWidth; // Tally the DB2 field lengths + } + spcLen = (sizeof(Bounds)*keyCnt) + (sizeof(LitDef)*keyCnt*2) + (tempLen*2) + workFieldLen; + + ValidatedPointer spcPtr(spcLen); // Pointer to space passed to DB2 + memset(spcPtr, 0, spcLen); // Clear the allocated space + /* + Set addressability to the various sections of the DB2 interface space. + */ + boundsOff = 0; // Range bounds are at the start of the space + litDefOff = sizeof(Bounds) * keyCnt; // Literal defs follow all the range bounds + literalsOff = litDefOff + (sizeof(LitDef) * keyCnt * 2); // Literal values are last + boundsPtr = (Bounds_t*)(void*)spcPtr; // Address first bounds structure + tempPtr = (char*)((char*)spcPtr + litDefOff); + litDefPtr = (LitDef_t*)tempPtr; // Address first literal definition + tempPtr = (char*)((char*)spcPtr + literalsOff); + literalsPtr = (char*)tempPtr; // Address start of literal values + literalPtr = literalsPtr; // Address first literal value + /* + For each key part, build the low (min) and high (max) DB2 range bounds. + If literals are specified in the MySQL range, build DB2 literal + definitions and store the literal values for access by DB2. + + If no value is specified for a key part, assume infinity. Negative + infinity will cause processing to start at the first index entry. + Positive infinity will cause processing to end at the last index entry. + When infinity is specified in a bound, inclusion/exclusion and position + are ignored, and there is no literal definition or literal value for + the bound. + + If the keypart value is null, the null indicator is set in the range + bound and the other fields in the bound are ignored. When the bound is + null, only index entries with the null value will be included in the + estimate. If one bound is null, both bounds must be null. When the bound + is not null, the data offset and length must be set, and the literal + value stored for access by DB2. + */ + + for (int partsInUse = 0; partsInUse < keyCnt; ++partsInUse) + { + Field *field= curKey.key_part[partsInUse].field; + overrideInclusion = false; + reuseLiteral = false; + endOfLiteralPtr = NULL; + /* + Build the low bound for the key range. + */ + if ((partsInUse + 1) > minKeyCnt) // if no min_key info for this part + boundsPtr->LoBound.Infinity[0] = QMY_NEG_INFINITY; // select...where 3 between x and y + else + { + if ((curKey.key_part[partsInUse].null_bit) && (char*)minPtr[0]) + { // min_key is null + if (max_key == NULL || + ((partsInUse + 1) > maxKeyCnt)) // select...where x='ab' and y=null and z != 'c' + boundsPtr->LoBound.Infinity[0] = QMY_NEG_INFINITY; // select...where x not null or + // select...where x > null + else // max_key is not null + { + if (min_key->flag == HA_READ_KEY_EXACT) + boundsPtr->LoBound.IsNull[0] = QMY_YES; // select...where x is null + else + { + if ((char*)maxPtr[0]) + boundsPtr->LoBound.IsNull[0] = QMY_YES; // select...where a = null and b < 5 (max-before) + // select...where a='a' and b is null and c !='a' (max-after) + else + boundsPtr->LoBound.Infinity[0] = QMY_NEG_INFINITY; // select...where x < y + } + } // end min_key is null + } + else // min_key is not null + { + if (literalCnt) litDefPtr = litDefPtr + 1; + literalCnt = literalCnt + 1; + boundsPtr->LoBound.Position = literalCnt; + /* + Determine inclusion or exclusion. + */ + if (min_key->flag == HA_READ_KEY_EXACT || //select...where a like 'this%' + + /* An example for the following conditions is 'select...where a = 5 and b > null'. */ + + (max_key && + (memcmp((uchar*)minPtr,(uchar*)maxPtr, + curKey.key_part[partsInUse].store_length)==0))) + + { + if ((min_key->flag != HA_READ_KEY_EXACT) || + (max_key && + (memcmp((uchar*)minPtr,(uchar*)maxPtr, + curKey.key_part[partsInUse].store_length)==0))) + overrideInclusion = true; // Need inclusion for both min and max + } + else + boundsPtr->LoBound.Embodiment[0] = QMY_EXCLUSION; + litDefPtr->FieldNbr = field->field_index + 1; + DB2Field& db2Field = db2Table->db2Field(field->field_index); + litDefPtr->DataType = db2Field.getType(); + /* + Convert the literal to DB2 format. + */ + rc = convertMySQLtoDB2(field, + db2Field, + literalPtr, + (uchar*)minPtr+((curKey.key_part[partsInUse].null_bit)? 1 : 0)); + if (rc != 0) break; + litDefPtr->Offset = (uint32_t)(literalPtr - literalsPtr); + litDefPtr->Length = db2Field.getByteLengthInRecord(); + tempLen = litDefPtr->Length; + /* + Do additional conversion of a character or graphic value. + */ + CHARSET_INFO* fieldCharSet = field->charset(); + if ((field->type() != MYSQL_TYPE_BIT) && // Don't do conversion on BIT data + (field->charset() != &my_charset_bin) && // Don't do conversion on BINARY data + (litDefPtr->DataType == QMY_CHAR || litDefPtr->DataType == QMY_VARCHAR || + litDefPtr->DataType == QMY_GRAPHIC || litDefPtr->DataType == QMY_VARGRAPHIC)) + { + if (litDefPtr->DataType == QMY_VARCHAR || + litDefPtr->DataType == QMY_VARGRAPHIC) + tempPtr = literalPtr + sizeof(uint16); + else + tempPtr = literalPtr; + /* The following code checks to determine if MySQL is passing a + partial key. DB2 will accept a partial field value, but only + in the last field position of the key composite (and only if + there is no ICU sort sequence on the index). */ + tempMinPtr = (char*)minPtr+((curKey.key_part[partsInUse].null_bit)? 1 : 0); + if (field->type() == MYSQL_TYPE_VARCHAR) + { + /* MySQL always stores key lengths as 2 bytes, little-endian. */ + tempLen = *(uint8*)tempMinPtr + ((*(uint8*)(tempMinPtr+1)) << 8); + tempMinPtr = (char*)((char*)tempMinPtr + 2); + } + else + tempLen = field->field_length; + + if (litDefPtr->DataType == QMY_CHAR || litDefPtr->DataType == QMY_VARCHAR || + (strncmp(fieldCharSet->csname, "utf8", sizeof("utf8")) == 0)) + { + endOfMinPtr = (char*)memchr(tempMinPtr,field->charset()->min_sort_char,tempLen); + if (endOfMinPtr) + endOfLiteralPtr = tempPtr + (((uint32_t)(endOfMinPtr - tempMinPtr)) * + (litDefPtr->DataType == QMY_CHAR || litDefPtr->DataType == QMY_VARCHAR ? 1 : 2)); + } + else + { + endOfMinPtr = (char*)wmemchr((wchar_t*)tempMinPtr,field->charset()->min_sort_char,tempLen/2); + if (endOfMinPtr) + endOfLiteralPtr = tempPtr + (endOfMinPtr - tempMinPtr); + } + /* Enforce here that a partial is only allowed on the last field position + of the key composite */ + if (endOfLiteralPtr) + { + if ((partsInUse + 1) < minKeyCnt) + { + rc = HA_POS_ERROR; + break; + } + endByte = endOfLiteralPtr - tempPtr; + /* We're making an assumption that if MySQL gives us a partial key, + the length of the partial is the same for both the min_key and max_key. */ + } + } + literalPtr = literalPtr + litDefPtr->Length; // Bump pointer for next literal + } + /* If there is a max_key value for this field, and if the max_key value is + the same as the min_key value, then the low bound literal can be reused + for the high bound literal. This eliminates the overhead of copying and + converting the same value twice. */ + if (max_key && ((partsInUse + 1) <= maxKeyCnt) && + (memcmp((uchar*)minPtr,(uchar*)maxPtr, + curKey.key_part[partsInUse].store_length)==0 || endOfLiteralPtr)) + reuseLiteral = true; + minPtr += curKey.key_part[partsInUse].store_length; + } + /* + Build the high bound for the key range. + */ + if (max_key == NULL || ((partsInUse + 1) > maxKeyCnt)) + boundsPtr->HiBound.Infinity[0] = QMY_POS_INFINITY; + else + { + if ((curKey.key_part[partsInUse].null_bit) && (char*)maxPtr[0]) + { + if (min_key == NULL) + boundsPtr->HiBound.Infinity[0] = QMY_POS_INFINITY; + else + boundsPtr->HiBound.IsNull[0] = QMY_YES; // select...where x is null + } + else // max_key field is not null + { + if (!reuseLiteral) + { + if (literalCnt) + litDefPtr = litDefPtr + 1; + literalCnt = literalCnt + 1; + litDefPtr->FieldNbr = field->field_index + 1; + DB2Field& db2Field = db2Table->db2Field(field->field_index); + litDefPtr->DataType = db2Field.getType(); + /* + Convert the literal to DB2 format + */ + rc = convertMySQLtoDB2(field, + db2Field, + literalPtr, + (uchar*)maxPtr+((curKey.key_part[partsInUse].null_bit)? 1 : 0)); + if (rc != 0) break; + litDefPtr->Offset = (uint32_t)(literalPtr - literalsPtr); + litDefPtr->Length = db2Field.getByteLengthInRecord(); + tempLen = litDefPtr->Length; + /* + Now convert a character or graphic value. + */ + if ((field->type() != MYSQL_TYPE_BIT) && + (litDefPtr->DataType == QMY_CHAR || litDefPtr->DataType == QMY_VARCHAR || + litDefPtr->DataType == QMY_GRAPHIC || litDefPtr->DataType == QMY_VARGRAPHIC)) + { + if (litDefPtr->DataType == QMY_VARCHAR || litDefPtr->DataType == QMY_VARGRAPHIC) + { + tempPtr = literalPtr + sizeof(uint16); + } + else + tempPtr = literalPtr; + } + literalPtr = literalPtr + litDefPtr->Length; // Bump pointer for next literal + } + boundsPtr->HiBound.Position = literalCnt; + if (max_key->flag == HA_READ_BEFORE_KEY && !overrideInclusion) + boundsPtr->HiBound.Embodiment[0] = QMY_EXCLUSION; + } + maxPtr += curKey.key_part[partsInUse].store_length; + } + /* + Bump to the next field in the key composite. + */ + + if ((partsInUse+1) < keyCnt) + boundsPtr = boundsPtr + 1; + } + + /* + Call DB2 to estimate the number of rows in the key range. + */ + if (rc == 0) + { + rc = db2i_ileBridge::getBridgeForThread()->recordsInRange((indexHandles[inx] ? indexHandles[inx] : db2Table->indexFile(inx)->getMasterDefnHandle()), + spcPtr, + keyCnt, + literalCnt, + boundsOff, + litDefOff, + literalsOff, + cutoff, + (uint32_t)(literalPtr - (char*)spcPtr), + endByte, + &recCnt, + &rtnCode); + } + /* + Set the row count and return. + Beware that if this method returns a zero row count, MySQL assumes the + result set for the query is zero; never return a zero row count. + */ + if ((rc == 0) && (rtnCode == QMY_SUCCESS || rtnCode == QMY_EARLY_EXIT)) + { + rows = recCnt ? (ha_rows)recCnt : 1; + } + + rows = (rows > 0 ? rows : HA_POS_ERROR); + + setIndexReadEstimate(inx, rows); + + DBUG_PRINT("ha_ibmdb2i::recordsInRange",("Estimate %d rows for key %d", uint32(rows), inx)); + + DBUG_RETURN(rows); +} diff --git a/storage/ibmdb2i/db2i_safeString.h b/storage/ibmdb2i/db2i_safeString.h new file mode 100644 index 00000000000..e353316c8fc --- /dev/null +++ b/storage/ibmdb2i/db2i_safeString.h @@ -0,0 +1,98 @@ +/* +Licensed Materials - Property of IBM +DB2 Storage Engine Enablement +Copyright IBM Corporation 2007,2008 +All rights reserved + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + (a) Redistributions of source code must retain this list of conditions, the + copyright notice in section {d} below, and the disclaimer following this + list of conditions. + (b) Redistributions in binary form must reproduce this list of conditions, the + copyright notice in section (d) below, and the disclaimer following this + list of conditions, in the documentation and/or other materials provided + with the distribution. + (c) The name of IBM may not be used to endorse or promote products derived from + this software without specific prior written permission. + (d) The text of the required copyright notice is: + Licensed Materials - Property of IBM + DB2 Storage Engine Enablement + Copyright IBM Corporation 2007,2008 + All rights reserved + +THIS SOFTWARE IS PROVIDED BY IBM CORPORATION "AS IS" AND ANY EXPRESS OR IMPLIED +WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT +SHALL IBM CORPORATION BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT +OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT INCLUDING NEGLIGENCE OR OTHERWISE) ARISING +IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY +OF SUCH DAMAGE. +*/ + + + +#ifndef DB2I_SAFESTRING_H +#define DB2I_SAFESTRING_H + + +#include +#include + +/** + @class SafeString + + This class was designed to provide safe, but lightweight, concatenation + operations C strings inside pre-allocated buffers. +*/ +class SafeString +{ +public: + SafeString(char* buffer, size_t size) : + allocSize(size), curPos(0), buf(buffer) + { + DBUG_ASSERT(size > 0); + buf[allocSize - 1] = 0xFF; // Set an overflow indicator + } + + char* ptr() { return buf; } + operator char*() { return buf; } + + SafeString& strcat(const char* str) + { + return this->strncat(str, strlen(str)); + } + + SafeString& strcat(char one) + { + if (curPos < allocSize - 2) + { + buf[curPos++] = one; + } + buf[curPos] = 0; + + return *this; + } + + SafeString& strncat(const char* str, size_t len) + { + uint64 amountToCopy = min((allocSize-1) - curPos, len); + memcpy(buf + curPos, str, amountToCopy); + curPos += amountToCopy; + buf[curPos] = 0; + return *this; + } + + bool overflowed() const { return (buf[allocSize - 1] == 0);} + +private: + char* buf; + uint64 curPos; + size_t allocSize; +}; + + +#endif diff --git a/storage/ibmdb2i/db2i_sqlStatementStream.cc b/storage/ibmdb2i/db2i_sqlStatementStream.cc new file mode 100644 index 00000000000..92a8b03fd00 --- /dev/null +++ b/storage/ibmdb2i/db2i_sqlStatementStream.cc @@ -0,0 +1,86 @@ +/* +Licensed Materials - Property of IBM +DB2 Storage Engine Enablement +Copyright IBM Corporation 2007,2008 +All rights reserved + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + (a) Redistributions of source code must retain this list of conditions, the + copyright notice in section {d} below, and the disclaimer following this + list of conditions. + (b) Redistributions in binary form must reproduce this list of conditions, the + copyright notice in section (d) below, and the disclaimer following this + list of conditions, in the documentation and/or other materials provided + with the distribution. + (c) The name of IBM may not be used to endorse or promote products derived from + this software without specific prior written permission. + (d) The text of the required copyright notice is: + Licensed Materials - Property of IBM + DB2 Storage Engine Enablement + Copyright IBM Corporation 2007,2008 + All rights reserved + +THIS SOFTWARE IS PROVIDED BY IBM CORPORATION "AS IS" AND ANY EXPRESS OR IMPLIED +WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT +SHALL IBM CORPORATION BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT +OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT INCLUDING NEGLIGENCE OR OTHERWISE) ARISING +IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY +OF SUCH DAMAGE. +*/ + + +#include "db2i_sqlStatementStream.h" +#include "as400_types.h" + +/** + Add a statement to the statement stream, allocating additional memory as needed. + + @parm stmt The statement text + @parm length The length of the statement text + @parm fileSortSequence The DB2 sort sequence identifier, in EBCDIC + @parm fileSortSequenceLibrary The DB2 sort sequence library, in EBCDIC + + @return Reference to this object +*/ +SqlStatementStream& SqlStatementStream::addStatementInternal(const char* stmt, + uint32 length, + const char* fileSortSequence, + const char* fileSortSequenceLibrary) +{ + uint32 storageNeeded = length + sizeof(StmtHdr_t); + storageNeeded = (storageNeeded + 3) & ~3; // We have to be 4-byte aligned. + if (storageNeeded > storageRemaining()) + { + // We overallocate new storage to reduce number of times reallocation is + // needed. + int newSize = curSize + 2 * storageNeeded; + DBUG_PRINT("SqlStatementStream::addStatementInternal", + ("PERF: Had to realloc! Old size=%d. New size=%d", curSize, newSize)); + char* old_space = block; + char* new_space = (char*)getNewSpace(newSize); + memcpy(new_space, old_space, curSize); + ptr = new_space + (ptr - old_space); + curSize = newSize; + } + + DBUG_ASSERT((address64_t)ptr % 4 == 0); + + memcpy(((StmtHdr_t*)ptr)->SrtSeqNam, + fileSortSequence, + sizeof(((StmtHdr_t*)ptr)->SrtSeqNam)); + memcpy(((StmtHdr_t*)ptr)->SrtSeqSch, + fileSortSequenceLibrary, + sizeof(((StmtHdr_t*)ptr)->SrtSeqSch)); + ((StmtHdr_t*)ptr)->Length = length; + memcpy(ptr + sizeof(StmtHdr_t), stmt, length); + + ptr += storageNeeded; + ++statements; + + return *this; +} diff --git a/storage/ibmdb2i/db2i_sqlStatementStream.h b/storage/ibmdb2i/db2i_sqlStatementStream.h new file mode 100644 index 00000000000..11db41a6c5d --- /dev/null +++ b/storage/ibmdb2i/db2i_sqlStatementStream.h @@ -0,0 +1,151 @@ +/* +Licensed Materials - Property of IBM +DB2 Storage Engine Enablement +Copyright IBM Corporation 2007,2008 +All rights reserved + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + (a) Redistributions of source code must retain this list of conditions, the + copyright notice in section {d} below, and the disclaimer following this + list of conditions. + (b) Redistributions in binary form must reproduce this list of conditions, the + copyright notice in section (d) below, and the disclaimer following this + list of conditions, in the documentation and/or other materials provided + with the distribution. + (c) The name of IBM may not be used to endorse or promote products derived from + this software without specific prior written permission. + (d) The text of the required copyright notice is: + Licensed Materials - Property of IBM + DB2 Storage Engine Enablement + Copyright IBM Corporation 2007,2008 + All rights reserved + +THIS SOFTWARE IS PROVIDED BY IBM CORPORATION "AS IS" AND ANY EXPRESS OR IMPLIED +WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT +SHALL IBM CORPORATION BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT +OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT INCLUDING NEGLIGENCE OR OTHERWISE) ARISING +IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY +OF SUCH DAMAGE. +*/ + + +#ifndef DB2I_SQLSTATEMENTSTREAM_H +#define DB2I_SQLSTATEMENTSTREAM_H + +#include "db2i_charsetSupport.h" +#include "qmyse.h" + +/** + @class SqlStatementStream + + This class handles building the stream of SQL statements expected by the + QMY_EXECUTE_IMMEDIATE and QMY_PREPARE_OPEN_CURSOR APIs. + Memory allocation is handled internally. +*/ +class SqlStatementStream +{ + public: + /** + ctor to be used when multiple strings may be appended. + */ + SqlStatementStream(uint32 firstStringSize) : statements(0) + { + curSize = firstStringSize + sizeof(StmtHdr_t); + curSize = (curSize + 3) & ~3; + ptr = (char*) getNewSpace(curSize); + if (ptr == NULL) + curSize = 0; + } + + /** + ctor to be used when only a single statement will be executed. + */ + SqlStatementStream(const String& statement) : statements(0), block(NULL), curSize(0), ptr(0) + { + addStatement(statement); + } + + /** + ctor to be used when only a single statement will be executed. + */ + SqlStatementStream(const char* statement) : statements(0), block(NULL), curSize(0), ptr(0) + { + addStatement(statement); + } + + /** + Append an SQL statement, specifiying the DB2 sort sequence under which + the statement should be executed. This is important for CREATE TABLE + and CREATE INDEX statements. + */ + SqlStatementStream& addStatement(const String& append, const char* fileSortSequence, const char* fileSortSequenceLibrary) + { + char sortSeqEbcdic[10]; + char sortSeqLibEbcdic[10]; + + DBUG_ASSERT(strlen(fileSortSequence) <= 10 && + strlen(fileSortSequenceLibrary) <= 10); + memset(sortSeqEbcdic, 0x40, 10); + memset(sortSeqLibEbcdic, 0x40, 10); + convToEbcdic(fileSortSequence, sortSeqEbcdic, strlen(fileSortSequence)); + convToEbcdic(fileSortSequenceLibrary, sortSeqLibEbcdic, strlen(fileSortSequenceLibrary)); + + return addStatementInternal(append.ptr(), append.length(), sortSeqEbcdic, sortSeqLibEbcdic); + } + + /** + Append an SQL statement using default (*HEX) sort sequence. + */ + SqlStatementStream& addStatement(const String& append) + { + const char splatHEX[] = {0x5C, 0xC8, 0xC5, 0xE7, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40}; // *HEX + const char blanks[] = {0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40}; // + + return addStatementInternal(append.ptr(), append.length(), splatHEX, blanks); + } + + /** + Append an SQL statement using default (*HEX) sort sequence. + */ + SqlStatementStream& addStatement(const char* stmt) + { + const char splatHEX[] = {0x5C, 0xC8, 0xC5, 0xE7, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40}; // *HEX + const char blanks[] = {0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40}; // + + return addStatementInternal(stmt, strlen(stmt), splatHEX, blanks); + } + + char* getPtrToData() const { return block; } + uint32 getStatementCount() const { return statements; } + private: + SqlStatementStream& addStatementInternal(const char* stmt, + uint32 length, + const char* fileSortSequence, + const char* fileSortSequenceLibrary); + + uint32 storageRemaining() const + { + return (block == NULL ? 0 : curSize - (ptr - block)); + } + + char* getNewSpace(size_t size) + { + allocBase = (char*)sql_alloc(size + 15); + block = (char*)roundToQuadWordBdy(allocBase); + return block; + } + + uint32 curSize; // The size of the usable memory. + char* allocBase; // The allocated memory (with padding for aligment) + char* block; // The usable memory chunck (aligned for ILE) + char* ptr; // The current position within block. + uint32 statements; // The number of statements that have been appended. +}; + +#endif + diff --git a/storage/ibmdb2i/db2i_validatedPointer.h b/storage/ibmdb2i/db2i_validatedPointer.h new file mode 100644 index 00000000000..c4e31d1f11b --- /dev/null +++ b/storage/ibmdb2i/db2i_validatedPointer.h @@ -0,0 +1,162 @@ +/* +Licensed Materials - Property of IBM +DB2 Storage Engine Enablement +Copyright IBM Corporation 2007,2008 +All rights reserved + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + (a) Redistributions of source code must retain this list of conditions, the + copyright notice in section {d} below, and the disclaimer following this + list of conditions. + (b) Redistributions in binary form must reproduce this list of conditions, the + copyright notice in section (d) below, and the disclaimer following this + list of conditions, in the documentation and/or other materials provided + with the distribution. + (c) The name of IBM may not be used to endorse or promote products derived from + this software without specific prior written permission. + (d) The text of the required copyright notice is: + Licensed Materials - Property of IBM + DB2 Storage Engine Enablement + Copyright IBM Corporation 2007,2008 + All rights reserved + +THIS SOFTWARE IS PROVIDED BY IBM CORPORATION "AS IS" AND ANY EXPRESS OR IMPLIED +WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT +SHALL IBM CORPORATION BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT +OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT INCLUDING NEGLIGENCE OR OTHERWISE) ARISING +IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY +OF SUCH DAMAGE. +*/ + +#ifndef DB2I_VALIDATEDPOINTER_H +#define DB2I_VALIDATEDPOINTER_H + +#include "db2i_ileBridge.h" + +/** + @class ValidatedPointer + @brief Encapsulates a pointer registered for usage by the QMYSE APIs + + @details As a performance optimization, to prevent pointer validation each + time a particular pointer is thunked across to ILE, QMYSE allows us to + "register" a pointer such that it is validated once and then subsequently + referenced on QMYSE APIs by means of a handle value. This class should be + used to manage memory allocation/registration/unregistration of these + pointers. Using the alloc function guarantees that the resulting storage is + 16-byte aligned, a requirement for many pointers passed to QMYSE. +*/ +template +class ValidatedPointer +{ +public: + ValidatedPointer() : address(NULL), handle(NULL) {;} + + ValidatedPointer(size_t size) + { + alloc(size); + } + + ValidatedPointer(T* ptr) + { + assign(ptr); + } + + operator T*() + { + return address; + }; + + operator T*() const + { + return address; + }; + + operator void*() + { + return address; + }; + + operator ILEMemHandle() + { + return handle; + } + + void alloc(size_t size) + { + address = (T*)malloc_aligned(size); + if (address) + db2i_ileBridge::registerPtr(address, &handle); + mallocedHere = 1; + } + + void assign(T* ptr) + { + address = ptr; + db2i_ileBridge::registerPtr((void*)ptr, &handle); + mallocedHere = 0; + } + + void realloc(size_t size) + { + dealloc(); + alloc(size); + } + + void reassign(T* ptr) + { + dealloc(); + assign(ptr); + } + + void dealloc() + { + if (address) + { + db2i_ileBridge::unregisterPtr(handle); + + if (mallocedHere) + free_aligned((void*)address); + } + address = NULL; + handle = 0; + } + + ~ValidatedPointer() + { + dealloc(); + } + +private: + // Disable copy ctor and assignment operator, as these would break + // the registration guarantees provided by the class. + ValidatedPointer& operator= (const ValidatedPointer newVal); + ValidatedPointer(ValidatedPointer& newCopy); + + ILEMemHandle handle; + T* address; + char mallocedHere; +}; + + +/** + @class ValidatedObject + @brief This class allows users to instantiate and register a particular + object in a single step. +*/ +template +class ValidatedObject : public ValidatedPointer +{ + public: + ValidatedObject() : ValidatedPointer(&value) {;} + + T& operator= (const T newVal) { value = newVal; return value; } + + private: + T value; +}; +#endif diff --git a/storage/ibmdb2i/ha_ibmdb2i.cc b/storage/ibmdb2i/ha_ibmdb2i.cc new file mode 100644 index 00000000000..9a65e41021b --- /dev/null +++ b/storage/ibmdb2i/ha_ibmdb2i.cc @@ -0,0 +1,3171 @@ +/* +Licensed Materials - Property of IBM +DB2 Storage Engine Enablement +Copyright IBM Corporation 2007,2008 +All rights reserved + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + (a) Redistributions of source code must retain this list of conditions, the + copyright notice in section {d} below, and the disclaimer following this + list of conditions. + (b) Redistributions in binary form must reproduce this list of conditions, the + copyright notice in section (d) below, and the disclaimer following this + list of conditions, in the documentation and/or other materials provided + with the distribution. + (c) The name of IBM may not be used to endorse or promote products derived from + this software without specific prior written permission. + (d) The text of the required copyright notice is: + Licensed Materials - Property of IBM + DB2 Storage Engine Enablement + Copyright IBM Corporation 2007,2008 + All rights reserved + +THIS SOFTWARE IS PROVIDED BY IBM CORPORATION "AS IS" AND ANY EXPRESS OR IMPLIED +WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT +SHALL IBM CORPORATION BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT +OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT INCLUDING NEGLIGENCE OR OTHERWISE) ARISING +IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY +OF SUCH DAMAGE. +*/ + + +/** + @file ha_ibmdb2i.cc + + @brief + The ha_ibmdb2i storage engine provides an interface from MySQL to IBM DB2 for i. + +*/ + +#ifdef USE_PRAGMA_IMPLEMENTATION +#pragma implementation // gcc: Class implementation +#endif + +#include "ha_ibmdb2i.h" +#include "mysql_priv.h" +#include +#include "db2i_ileBridge.h" +#include "db2i_charsetSupport.h" +#include +#include "db2i_safeString.h" + +static const char __NOT_NULL_VALUE_EBCDIC = 0xF0; // '0' +static const char __NULL_VALUE_EBCDIC = 0xF1; // '1' +static const char __DEFAULT_VALUE_EBCDIC = 0xC4; // 'D' +static const char BlankASPName[19] = " "; +static const int DEFAULT_MAX_ROWS_TO_BUFFER = 4096; + +static const char SAVEPOINT_PREFIX[] = {0xD4, 0xE8, 0xE2, 0xD7}; // MYSP (in EBCDIC) + +OSVersion osVersion; + + +// ================================================================ +// ================================================================ +// System variables +static char* ibmdb2i_rdb_name; +static MYSQL_SYSVAR_STR(rdb_name, ibmdb2i_rdb_name, + PLUGIN_VAR_MEMALLOC | PLUGIN_VAR_READONLY, + "The name of the RDB to use", + NULL, + NULL, + BlankASPName); + +static MYSQL_THDVAR_BOOL(transaction_unsafe, + 0, + "True auto-commit mode.", + NULL, + NULL, + FALSE); + +static MYSQL_THDVAR_UINT(lob_alloc_size, + 0, + "Baseline allocation for lob read buffer", + NULL, + NULL, + 2*1024*1024, + 64*1024, + 128*1024*1024, + 1); + +static MYSQL_THDVAR_UINT(max_read_buffer_size, + 0, + "Maximum size of buffers used for read-ahead.", + NULL, + NULL, + 1*1024*1024, + 32*1024, + 16*1024*1024, + 1); + +static MYSQL_THDVAR_UINT(max_write_buffer_size, + 0, + "Maximum size of buffers used for bulk writes.", + NULL, + NULL, + 8*1024*1024, + 32*1024, + 64*1024*1024, + 1); + +static MYSQL_THDVAR_BOOL(create_time_columns_as_TOD, + 0, + "Control how new TIME columns should be defined in DB2. 1=time-of-day (default), 0=duration.", + NULL, + NULL, + TRUE); + +static MYSQL_THDVAR_UINT(map_blob_to_varchar, + 0, + "Control how new TEXT columns should be defined in DB2. 0=CLOB (default), 1=VARCHAR", + NULL, + NULL, + 0, + 0, + 1, + 1); + +static my_bool ibmdb2i_assume_exclusive_use; +static MYSQL_SYSVAR_BOOL(assume_exclusive_use, ibmdb2i_assume_exclusive_use, + 0, + "Can MySQL assume that this process is the only one modifying the DB2 tables. ", + NULL, + NULL, + FALSE); + +static MYSQL_THDVAR_BOOL(async_enabled, + 0, + "Should reads be done asynchronously when possible", + NULL, + NULL, + TRUE); + +static MYSQL_THDVAR_UINT(create_index_option, + 0, + "Control whether additional indexes are created. 0=No (default), 1=Create additional *HEX-based index", + NULL, + NULL, + 0, + 0, + 1, + 1); + +static MYSQL_THDVAR_UINT(discovery_mode, + 0, + "Unsupported", + NULL, + NULL, + 0, + 0, + 1, + 1); + + +inline uint8 ha_ibmdb2i::getCommitLevel(THD* thd) +{ + if (!THDVAR(thd, transaction_unsafe)) + { + switch (thd_tx_isolation(thd)) + { + case ISO_READ_UNCOMMITTED: + return (accessIntent == QMY_READ_ONLY ? QMY_READ_UNCOMMITTED : QMY_REPEATABLE_READ); + case ISO_READ_COMMITTED: + return (accessIntent == QMY_READ_ONLY ? QMY_READ_COMMITTED : QMY_REPEATABLE_READ); + case ISO_REPEATABLE_READ: + return QMY_REPEATABLE_READ; + case ISO_SERIALIZABLE: + return QMY_SERIALIZABLE; + } + } + + return QMY_NONE; +} + +inline uint8 ha_ibmdb2i::getCommitLevel() +{ + return getCommitLevel(ha_thd()); +} + +//===================================================================== + +static handler *ibmdb2i_create_handler(handlerton *hton, + TABLE_SHARE *table, + MEM_ROOT *mem_root); +static void ibmdb2i_drop_database(handlerton *hton, char* path); +static int ibmdb2i_savepoint_set(handlerton *hton, THD* thd, void *sv); +static int ibmdb2i_savepoint_rollback(handlerton *hton, THD* thd, void *sv); +static int ibmdb2i_savepoint_release(handlerton *hton, THD* thd, void *sv); +static uint ibmdb2i_alter_table_flags(uint flags); + +handlerton *ibmdb2i_hton; +static bool was_ILE_inited; + +/* Tracks the number of open tables */ +static HASH ibmdb2i_open_tables; + +/* Mutex used to synchronize initialization of the hash */ +static pthread_mutex_t ibmdb2i_mutex; + + +/** + Create hash key for tracking open tables. +*/ + +static uchar* ibmdb2i_get_key(IBMDB2I_SHARE *share,size_t *length, + bool not_used __attribute__((unused))) +{ + *length=share->table_name_length; + return (uchar*) share->table_name; +} + + +int ibmdb2i_close_connection(handlerton* hton, THD *thd) +{ + DBUG_PRINT("ha_ibmdb2i::close_connection", ("Closing %d", thd->thread_id)); + db2i_ileBridge::getBridgeForThread(thd)->closeConnection(thd->thread_id); + db2i_ileBridge::destroyBridgeForThread(thd); + + return 0; +} + + +static int ibmdb2i_init_func(void *p) +{ + DBUG_ENTER("ibmdb2i_init_func"); + + utsname tempName; + uname(&tempName); + osVersion.v = atoi(tempName.version); + osVersion.r = atoi(tempName.release); + + was_ILE_inited = false; + ibmdb2i_hton= (handlerton *)p; + VOID(pthread_mutex_init(&ibmdb2i_mutex,MY_MUTEX_INIT_FAST)); + (void) hash_init(&ibmdb2i_open_tables,system_charset_info,32,0,0, + (hash_get_key) ibmdb2i_get_key,0,0); + + ibmdb2i_hton->state= SHOW_OPTION_YES; + ibmdb2i_hton->create= ibmdb2i_create_handler; + ibmdb2i_hton->drop_database= ibmdb2i_drop_database; + ibmdb2i_hton->commit= ha_ibmdb2i::doCommit; + ibmdb2i_hton->rollback= ha_ibmdb2i::doRollback; + ibmdb2i_hton->savepoint_offset= 0; + ibmdb2i_hton->savepoint_set= ibmdb2i_savepoint_set; + ibmdb2i_hton->savepoint_rollback= ibmdb2i_savepoint_rollback; + ibmdb2i_hton->savepoint_release= ibmdb2i_savepoint_release; + ibmdb2i_hton->alter_table_flags=ibmdb2i_alter_table_flags; + ibmdb2i_hton->close_connection=ibmdb2i_close_connection; + + int rc; + + rc = initCharsetSupport(); + + if (!rc) + rc = db2i_ileBridge::setup(); + + if (!rc) + { + int nameLen = strlen(ibmdb2i_rdb_name); + for (int i = 0; i < nameLen; ++i) + { + ibmdb2i_rdb_name[i] = my_toupper(system_charset_info, (uchar)ibmdb2i_rdb_name[i]); + } + + rc = db2i_ileBridge::initILE(ibmdb2i_rdb_name); + if (rc == 0) + { + was_ILE_inited = true; + } + } + + DBUG_RETURN(rc); +} + + +static int ibmdb2i_done_func(void *p) +{ + int error= 0; + DBUG_ENTER("ibmdb2i_done_func"); + + if (ibmdb2i_open_tables.records) + error= 1; + + if (was_ILE_inited) + db2i_ileBridge::exitILE(); + + db2i_ileBridge::takedown(); + + doneCharsetSupport(); + + hash_free(&ibmdb2i_open_tables); + pthread_mutex_destroy(&ibmdb2i_mutex); + + DBUG_RETURN(0); +} + + +IBMDB2I_SHARE *ha_ibmdb2i::get_share(const char *table_name, TABLE *table) +{ + IBMDB2I_SHARE *share; + uint length; + char *tmp_name; + + pthread_mutex_lock(&ibmdb2i_mutex); + length=(uint) strlen(table_name); + + if (!(share=(IBMDB2I_SHARE*) hash_search(&ibmdb2i_open_tables, + (uchar*)table_name, + length))) + { + if (!(share=(IBMDB2I_SHARE *) + my_multi_malloc(MYF(MY_WME | MY_ZEROFILL), + &share, sizeof(*share), + &tmp_name, length+1, + NullS))) + { + pthread_mutex_unlock(&ibmdb2i_mutex); + return NULL; + } + + share->use_count=0; + share->table_name_length=length; + share->table_name=tmp_name; + strmov(share->table_name,table_name); + if (my_hash_insert(&ibmdb2i_open_tables, (uchar*) share)) + goto error; + thr_lock_init(&share->lock); + pthread_mutexattr_t mutexattr = MY_MUTEX_INIT_FAST; + pthread_mutexattr_settype(&mutexattr, PTHREAD_MUTEX_RECURSIVE); + pthread_mutex_init(&share->mutex, &mutexattr); + + share->db2Table = new db2i_table(table->s, table_name); + int32 rc = share->db2Table->initDB2Objects(table_name); + + if (rc) + { + delete share->db2Table; + hash_delete(&ibmdb2i_open_tables, (uchar*) share); + thr_lock_delete(&share->lock); + my_errno = rc; + goto error; + } + + memset(&share->cachedStats, 0, sizeof(share->cachedStats)); + } + share->use_count++; + pthread_mutex_unlock(&ibmdb2i_mutex); + + db2Table = share->db2Table; + + return share; + +error: + pthread_mutex_destroy(&share->mutex); + my_free((uchar*) share, MYF(0)); + pthread_mutex_unlock(&ibmdb2i_mutex); + + return NULL; +} + + + +int ha_ibmdb2i::free_share(IBMDB2I_SHARE *share) +{ + pthread_mutex_lock(&ibmdb2i_mutex); + if (!--share->use_count) + { + delete share->db2Table; + db2Table = NULL; + + hash_delete(&ibmdb2i_open_tables, (uchar*) share); + thr_lock_delete(&share->lock); + pthread_mutex_destroy(&share->mutex); + my_free(share, MYF(0)); + } + pthread_mutex_unlock(&ibmdb2i_mutex); + + return 0; +} + +static handler* ibmdb2i_create_handler(handlerton *hton, + TABLE_SHARE *table, + MEM_ROOT *mem_root) +{ + return new (mem_root) ha_ibmdb2i(hton, table); +} + +static void ibmdb2i_drop_database(handlerton *hton, char* path) +{ + DBUG_ENTER("ha_ibmdb2i::ibmdb2i_drop_database"); + int rc = 0; + char queryBuffer[200]; + String query(queryBuffer, sizeof(queryBuffer), system_charset_info); + query.length(0); + query.append(STRING_WITH_LEN(" DROP SCHEMA \"")); + query.append(path+2, strchr(path+2, '/')-(path+2)); + query.append('"'); + + SqlStatementStream sqlStream(query); + + rc = db2i_ileBridge::getBridgeForThread()->execSQL(sqlStream.getPtrToData(), + sqlStream.getStatementCount(), + QMY_NONE, + FALSE, + TRUE); + DBUG_VOID_RETURN; +} + +inline static void genSavepointName(const void* sv, char* out) +{ + *(uint32*)out = *(uint32*)SAVEPOINT_PREFIX; + DBUG_ASSERT(sizeof(SAVEPOINT_PREFIX) == 4); + out += sizeof(SAVEPOINT_PREFIX); + + longlong2str((longlong)sv, out, 10); + while (*out) + { + out += 0xF0; + ++out; + } +} + + +/********************************************************************* +Sets a transaction savepoint. */ +static int ibmdb2i_savepoint_set(handlerton* hton, THD* thd, void* sv) +{ + DBUG_ENTER("ibmdb2i_savepoint_set"); + int rc = 0; + if (!THDVAR(thd ,transaction_unsafe)) + { + char name[64]; + genSavepointName(sv, name); + DBUG_PRINT("ibmdb2i_savepoint_set",("Setting %s", name)); + rc = ha_ibmdb2i::doSavepointSet(thd, name); + } + DBUG_RETURN(rc); +} + + +/********************************************************************* +Rollback a savepoint. */ +static int ibmdb2i_savepoint_rollback(handlerton* hton, THD* thd, void* sv) +{ + DBUG_ENTER("ibmdb2i_savepoint_rollback"); + int rc = 0; + if (!THDVAR(thd,transaction_unsafe)) + { + char name[64]; + genSavepointName(sv, name); + DBUG_PRINT("ibmdb2i_savepoint_rollback",("Rolling back %s", name)); + rc = ha_ibmdb2i::doSavepointRollback(thd, name); + } + DBUG_RETURN(rc); +} + + +/********************************************************************* +Release a savepoint. */ +static int ibmdb2i_savepoint_release(handlerton* hton, THD* thd, void* sv) +{ + DBUG_ENTER("ibmdb2i_savepoint_release"); + int rc = 0; + if (!THDVAR(thd,transaction_unsafe)) + { + char name[64]; + genSavepointName(sv, name); + DBUG_PRINT("ibmdb2i_savepoint_release",("Releasing %s", name)); + rc = ha_ibmdb2i::doSavepointRelease(thd, name); + } + DBUG_RETURN(rc); +} + +/* Thse flags allow for the online add and drop of an index via the CREATE INDEX, + DROP INDEX, and ALTER TABLE statements. These flags indicate that MySQL is not + required to lock the table before calling the storage engine to add or drop the + index(s). */ +static uint ibmdb2i_alter_table_flags(uint flags) +{ + return (HA_ONLINE_ADD_INDEX | HA_ONLINE_DROP_INDEX | + HA_ONLINE_ADD_UNIQUE_INDEX | HA_ONLINE_DROP_UNIQUE_INDEX | + HA_ONLINE_ADD_PK_INDEX | HA_ONLINE_DROP_PK_INDEX); +} + +ha_ibmdb2i::ha_ibmdb2i(handlerton *hton, TABLE_SHARE *table_arg) + :share(NULL), handler(hton, table_arg), + activeHandle(0), dataHandle(0), + activeReadBuf(NULL), activeWriteBuf(NULL), + blobReadBuffers(NULL), accessIntent(QMY_UPDATABLE), currentRRN(0), + releaseRowNeeded(FALSE), + indexReadSizeEstimates(NULL), + outstanding_start_bulk_insert(false), + last_rnd_init_rc(0), + last_index_init_rc(0), + last_start_bulk_insert_rc(0), + autoIncLockAcquired(false), + got_auto_inc_values(false), + next_identity_value(0), + indexHandles(0), + returnDupKeysImmediately(false), + onDupUpdate(false), + blobWriteBuffers(NULL), + forceSingleRowRead(false) + { + activeReferences = 0; + ref_length = sizeof(currentRRN); + if (table_share && table_share->keys > 0) + { + indexHandles = (FILE_HANDLE*)my_malloc(table_share->keys * sizeof(FILE_HANDLE), MYF(MY_WME | MY_ZEROFILL)); + } + clear_alloc_root(&conversionBufferMemroot); + } + + +ha_ibmdb2i::~ha_ibmdb2i() +{ + if (indexHandles) + my_free(indexHandles, MYF(0)); + if (indexReadSizeEstimates) + my_free(indexReadSizeEstimates, MYF(0)); + + cleanupBuffers(); +} + + +static const char *ha_ibmdb2i_exts[] = { + FID_EXT, + NullS +}; + +const char **ha_ibmdb2i::bas_ext() const +{ + return ha_ibmdb2i_exts; +} + + +int ha_ibmdb2i::open(const char *name, int mode, uint test_if_locked) +{ + DBUG_ENTER("ha_ibmdb2i::open"); + + initBridge(); + + if (!(share = get_share(name, table))) + DBUG_RETURN(my_errno); + thr_lock_data_init(&share->lock,&lock,NULL); + + info(HA_STATUS_NO_LOCK | HA_STATUS_CONST | HA_STATUS_VARIABLE); + + dataHandle = bridge()->findAndRemovePreservedHandle(name); + + DBUG_RETURN(0); +} + + + + +int ha_ibmdb2i::close(void) +{ + DBUG_ENTER("ha_ibmdb2i::close"); + int32 rc = 0; + + db2i_ileBridge* bridge = db2i_ileBridge::getBridgeForThread(); + + if (dataHandle) + { + if (bridge->expectErrors(QMY_ERR_PEND_LOCKS)->deallocateFile(dataHandle, FALSE) == QMY_ERR_PEND_LOCKS) + bridge->preserveHandle(share->table_name, dataHandle); + dataHandle = 0; + } + + for (int idx = 0; idx < table_share->keys; ++idx) + { + if (indexHandles[idx] != 0) + { + bridge->deallocateFile(indexHandles[idx], FALSE); + } + } + + cleanupBuffers(); + + free_share(share); + + DBUG_RETURN(rc); +} + + + +int ha_ibmdb2i::write_row(uchar * buf) +{ + + DBUG_ENTER("ha_ibmdb2i::write_row"); + + if (last_start_bulk_insert_rc) + DBUG_RETURN( last_start_bulk_insert_rc ); + + ha_statistic_increment(&SSV::ha_write_count); + int rc; + + bool fileHandleNeedsRelease = false; + + if (!activeHandle) + { + rc = useDataFile(QMY_UPDATABLE); + if (rc) DBUG_RETURN(rc); + fileHandleNeedsRelease = true; + } + + if (!outstanding_start_bulk_insert) + prepWriteBuffer(1); + + if (table->timestamp_field_type & TIMESTAMP_AUTO_SET_ON_INSERT) + table->timestamp_field->set_time(); + + char* writeBuffer = activeWriteBuf->addRow(); + rc = prepareRowForWrite(writeBuffer, + writeBuffer+activeFormat->writeRowNullOffset, + true); + if (rc == 0) + { + // If we are doing block inserts, if the MI is supposed to generate an auto_increment + // (i.e. identity column) value for this record, and if this is not the first record in + // the block, then store the value (that the MI will generate for the identity column) + // into the MySQL write buffer. We can predetermine the value because the file is locked. + + if ((autoIncLockAcquired) && (default_identity_value) && (got_auto_inc_values)) + { + if (unlikely((next_identity_value - 1) == + maxValueForField(table->next_number_field))) + { + rc = QMY_ERR_MAXVALUE; + } + else + { + rc = table->next_number_field->store((longlong) next_identity_value, TRUE); + next_identity_value = next_identity_value + incrementByValue; + } + } + // If the buffer is full, or if we locked the file and this is the first or last row + // of a blocked insert, then flush the buffer. + if (!rc && (activeWriteBuf->endOfBuffer()) || + ((autoIncLockAcquired) && + ((!got_auto_inc_values))) || + (returnDupKeysImmediately)) + rc = flushWrite(activeHandle, buf); + } + else + activeWriteBuf->deleteRow(); + + + if (fileHandleNeedsRelease) + releaseActiveHandle(); + + DBUG_RETURN(rc); +} + +/** + @brief + Helper function used by write_row and update_row to prepare the MySQL + row for insertion into DB2. +*/ +int ha_ibmdb2i::prepareRowForWrite(char* data, char* nulls, bool honorIdentCols) +{ + int rc = 0; + + // set null map all to non nulls + memset(nulls,__NOT_NULL_VALUE_EBCDIC, table->s->fields); + default_identity_value = FALSE; + + ulong sql_mode = ha_thd()->variables.sql_mode; + + my_bitmap_map *old_map= dbug_tmp_use_all_columns(table, table->read_set); + for (Field **field = table->field; *field && !rc; ++field) + { + int fieldIndex = (*field)->field_index; + if ((*field)->Field::is_null()) + { + nulls[fieldIndex] = __NULL_VALUE_EBCDIC; + } + if (honorIdentCols && ((*field)->flags & AUTO_INCREMENT_FLAG) && + *field == table->next_number_field) +// && ((!autoIncLockAcquired) || (!got_auto_inc_values))) + { + if (sql_mode & MODE_NO_AUTO_VALUE_ON_ZERO) + { + if (!table->auto_increment_field_not_null) + { + nulls[fieldIndex] = __DEFAULT_VALUE_EBCDIC; + default_identity_value = TRUE; + } + } + else if ((*field)->val_int() == 0) + { + nulls[fieldIndex] = __DEFAULT_VALUE_EBCDIC; + default_identity_value = TRUE; + } + } + + DB2Field& db2Field = db2Table->db2Field(fieldIndex); + if (nulls[fieldIndex] == __NOT_NULL_VALUE_EBCDIC || + db2Field.isBlob()) + { + rc = convertMySQLtoDB2(*field, db2Field, data + db2Field.getBufferOffset()); + } + } + + if (!rc && db2Table->hasBlobs()) + rc = db2i_ileBridge::getBridgeForThread()->objectOverride(activeHandle, + activeWriteBuf->ptr()); + + dbug_tmp_restore_column_map(table->read_set, old_map); + + return rc; +} + + + +int ha_ibmdb2i::update_row(const uchar * old_data, uchar * new_data) +{ + DBUG_ENTER("ha_ibmdb2i::update_row"); + ha_statistic_increment(&SSV::ha_update_count); + int rc; + + bool fileHandleNeedsRelease = false; + + if (!activeHandle) + { + rc = useFileByHandle(QMY_UPDATABLE, rrnAssocHandle); + if (rc) DBUG_RETURN(rc); + fileHandleNeedsRelease = true; + } + + if (table->timestamp_field_type & TIMESTAMP_AUTO_SET_ON_UPDATE) + table->timestamp_field->set_time(); + + char* writeBuf = activeWriteBuf->addRow(); + rc = prepareRowForWrite(writeBuf, + writeBuf+activeFormat->writeRowNullOffset, + onDupUpdate); + + char* lastDupKeyNamePtr = NULL; + uint32 lastDupKeyNameLen = 0; + + if (!rc) + { + rc = db2i_ileBridge::getBridgeForThread()->updateRow(activeHandle, + currentRRN, + activeWriteBuf->ptr(), + &lastDupKeyRRN, + &lastDupKeyNamePtr, + &lastDupKeyNameLen); + } + + if (lastDupKeyNameLen) + { + lastDupKeyID = getKeyFromName(lastDupKeyNamePtr, lastDupKeyNameLen); + rrnAssocHandle = activeHandle; + } + + if (fileHandleNeedsRelease) + releaseActiveHandle(); + + activeWriteBuf->resetAfterWrite(); + + DBUG_RETURN(rc); +} + + +int ha_ibmdb2i::delete_row(const uchar * buf) +{ + DBUG_ENTER("ha_ibmdb2i::delete_row"); + ha_statistic_increment(&SSV::ha_delete_count); + + bool needReleaseFile = false; + int rc = 0; + + if (!activeHandle) // In some circumstances, MySQL comes here after + { // closing the active handle. We need to re-open. + rc = useFileByHandle(QMY_UPDATABLE, rrnAssocHandle); + needReleaseFile = true; + } + + if (likely(!rc)) + { + rc = db2i_ileBridge::getBridgeForThread()->deleteRow(activeHandle, + currentRRN); + invalidateCachedStats(); + if (needReleaseFile) + releaseActiveHandle(); + } + + DBUG_RETURN(rc); +} + + + +int ha_ibmdb2i::index_init(uint idx, bool sorted) +{ + DBUG_ENTER("ha_ibmdb2i::index_init"); + + int& rc = last_index_init_rc; + rc = 0; + + invalidDataFound=false; + tweakReadSet(); + + active_index=idx; + + rc = useIndexFile(accessIntent, idx); + if (accessIntent != QMY_READ_ONLY) + prepWriteBuffer(1); + + DBUG_RETURN(rc); +} + + + +int ha_ibmdb2i::index_read(uchar * buf, const uchar * key, + uint key_len, + enum ha_rkey_function find_flag) +{ + DBUG_ENTER("ha_ibmdb2i::index_read"); + + if (unlikely(last_index_init_rc)) DBUG_RETURN(last_index_init_rc); + + int rc; + + ha_rows estimatedRows = getIndexReadEstimate(active_index); + rc = prepReadBuffer(estimatedRows); + if (unlikely(rc)) DBUG_RETURN(rc); + + DBUG_ASSERT(activeReadBuf); + + keyBuf.allocBuf(activeFormat->readRowLen, activeFormat->readRowLen); + keyBuf.zeroBuf(); + + char* db2KeyBufPtr = keyBuf.ptr(); + char* nullKeyMap = db2KeyBufPtr + activeFormat->readRowNullOffset; + + const uchar* keyBegin = key; + int partsInUse; + + KEY& curKey = table->key_info[active_index]; + + for (partsInUse = 0; partsInUse < curKey.key_parts, key - keyBegin < key_len; ++partsInUse) + { + Field* field = curKey.key_part[partsInUse].field; + if ((curKey.key_part[partsInUse].null_bit) && + (char*)key[0]) + { + if (field->flags & AUTO_INCREMENT_FLAG) + { + table->status = STATUS_NOT_FOUND; + DBUG_RETURN(HA_ERR_END_OF_FILE); + } + else + { + nullKeyMap[partsInUse] = __NULL_VALUE_EBCDIC; + } + } + else + { + nullKeyMap[partsInUse] = __NOT_NULL_VALUE_EBCDIC; + convertMySQLtoDB2(field, + db2Table->db2Field(field->field_index), + db2KeyBufPtr, + (uchar*)key+((curKey.key_part[partsInUse].null_bit)? 1 : 0) ); // + (curKey.key_parts+7) / 8); + } + + db2KeyBufPtr += db2Table->db2Field(field->field_index).getByteLengthInRecord(); + key += curKey.key_part[partsInUse].store_length; + } + + keyLen = db2KeyBufPtr - (char*)keyBuf.ptr(); + + DBUG_PRINT("ha_ibmdb2i::index_read", ("find_flag: %d", find_flag)); + + char readDirection = QMY_NEXT; + + switch (find_flag) + { + case HA_READ_AFTER_KEY: + doInitialRead(QMY_AFTER_EQUAL, estimatedRows, + keyBuf.ptr(), keyLen, partsInUse); + break; + case HA_READ_BEFORE_KEY: + doInitialRead(QMY_BEFORE_EQUAL, estimatedRows, + keyBuf.ptr(), keyLen, partsInUse); + break; + case HA_READ_KEY_OR_NEXT: + doInitialRead(QMY_AFTER_OR_EQUAL, estimatedRows, + keyBuf.ptr(), keyLen, partsInUse); + break; + case HA_READ_KEY_OR_PREV: + DBUG_ASSERT(0); // This function is unused + doInitialRead(QMY_BEFORE_OR_EQUAL, estimatedRows, + keyBuf.ptr(), keyLen, partsInUse); + break; + case HA_READ_PREFIX_LAST_OR_PREV: + doInitialRead(QMY_LAST_PREVIOUS, estimatedRows, + keyBuf.ptr(), keyLen, partsInUse); + readDirection = QMY_PREVIOUS; + break; + case HA_READ_PREFIX_LAST: + doInitialRead(QMY_PREFIX_LAST, estimatedRows, + keyBuf.ptr(), keyLen, partsInUse); + readDirection = QMY_PREVIOUS; + break; + case HA_READ_KEY_EXACT: + doInitialRead(QMY_EQUAL, estimatedRows, keyBuf.ptr(), keyLen, partsInUse); + break; + default: + DBUG_ASSERT(0); + return HA_ERR_GENERIC; + break; + } + + ha_statistic_increment(&SSV::ha_read_key_count); + rc = readFromBuffer(buf, readDirection); + + table->status= (rc ? STATUS_NOT_FOUND: 0); + DBUG_RETURN(rc); +} + + +int ha_ibmdb2i::index_next(uchar * buf) +{ + DBUG_ENTER("ha_ibmdb2i::index_next"); + ha_statistic_increment(&SSV::ha_read_next_count); + + int rc = readFromBuffer(buf, QMY_NEXT); + + table->status= (rc ? STATUS_NOT_FOUND: 0); + DBUG_RETURN(rc); +} + + +int ha_ibmdb2i::index_next_same(uchar *buf, const uchar *key, uint keylen) +{ + DBUG_ENTER("ha_ibmdb2i::index_next_same"); + ha_statistic_increment(&SSV::ha_read_next_count); + + int rc = readFromBuffer(buf, QMY_NEXT_EQUAL); + + if (rc == HA_ERR_KEY_NOT_FOUND) + { + rc = HA_ERR_END_OF_FILE; + } + + table->status= (rc ? STATUS_NOT_FOUND: 0); + DBUG_RETURN(rc); +} + +int ha_ibmdb2i::index_read_last(uchar * buf, const uchar * key, uint key_len) +{ + DBUG_ENTER("ha_ibmdb2i::index_read_last"); + DBUG_RETURN(index_read(buf, key, key_len, HA_READ_PREFIX_LAST)); +} + + + +int ha_ibmdb2i::index_prev(uchar * buf) +{ + DBUG_ENTER("ha_ibmdb2i::index_prev"); + ha_statistic_increment(&SSV::ha_read_prev_count); + + int rc = readFromBuffer(buf, QMY_PREVIOUS); + + table->status= (rc ? STATUS_NOT_FOUND: 0); + DBUG_RETURN(rc); +} + + +int ha_ibmdb2i::index_first(uchar * buf) +{ + DBUG_ENTER("ha_ibmdb2i::index_first"); + + if (unlikely(last_index_init_rc)) DBUG_RETURN(last_index_init_rc); + + int rc = prepReadBuffer(DEFAULT_MAX_ROWS_TO_BUFFER); + + if (rc == 0) + { + doInitialRead(QMY_FIRST, DEFAULT_MAX_ROWS_TO_BUFFER); + ha_statistic_increment(&SSV::ha_read_first_count); + rc = readFromBuffer(buf, QMY_NEXT); + } + + table->status= (rc ? STATUS_NOT_FOUND: 0); + DBUG_RETURN(rc); +} + + +int ha_ibmdb2i::index_last(uchar * buf) +{ + DBUG_ENTER("ha_ibmdb2i::index_last"); + + if (unlikely(last_index_init_rc)) DBUG_RETURN(last_index_init_rc); + + int rc = prepReadBuffer(DEFAULT_MAX_ROWS_TO_BUFFER); + + if (rc == 0) + { + doInitialRead(QMY_LAST, DEFAULT_MAX_ROWS_TO_BUFFER); + ha_statistic_increment(&SSV::ha_read_last_count); + rc = readFromBuffer(buf, QMY_PREVIOUS); + } + + table->status= (rc ? STATUS_NOT_FOUND: 0); + DBUG_RETURN(rc); +} + + +int ha_ibmdb2i::rnd_init(bool scan) +{ + DBUG_ENTER("ha_ibmdb2i::rnd_init"); + + int& rc = last_rnd_init_rc; + rc = 0; + + tweakReadSet(); + invalidDataFound=false; + + uint32 rowsToBlockOnRead; + + if (!scan) + { + rowsToBlockOnRead = 1; + } + else + { + rowsToBlockOnRead = DEFAULT_MAX_ROWS_TO_BUFFER; + } + + rc = useDataFile(accessIntent); + + if (rc == 0) + { + if (accessIntent != QMY_READ_ONLY) + prepWriteBuffer(1); + rc = prepReadBuffer(rowsToBlockOnRead); + + if (rc == 0 && scan) + { + doInitialRead(QMY_FIRST, rowsToBlockOnRead); + } + + if (rc) + releaseDataFile(); + } + + DBUG_RETURN(0); // MySQL sometimes does not check the return code, causing + // an assert in ha_rnd_end later on if we return a non-zero + // value here. +} + +int ha_ibmdb2i::rnd_end() +{ + DBUG_ENTER("ha_ibmdb2i::rnd_end"); + + warnIfInvalidData(); + if (likely(activeReadBuf)) + activeReadBuf->endRead(); + if (last_rnd_init_rc == 0) + releaseActiveHandle(); + last_rnd_init_rc = 0; + DBUG_RETURN(0); +} + + +int32 ha_ibmdb2i::mungeDB2row(uchar* record, const char* dataPtr, const char* nullMapPtr, bool skipLOBs) +{ + DBUG_ASSERT(dataPtr); + + my_bitmap_map *old_write_map= dbug_tmp_use_all_columns(table, table->write_set); + my_bitmap_map *old_read_map; + + if (unlikely(readAllColumns)) + old_read_map = tmp_use_all_columns(table, table->read_set); + + resetCharacterConversionBuffers(); + + my_ptrdiff_t old_ptr= (my_ptrdiff_t) (record - table->record[0]); + int fieldIndex = 0; + for (Field **field = table->field; *field; ++field, ++fieldIndex) + { + if (unlikely(old_ptr)) + (*field)->move_field_offset(old_ptr); + if (nullMapPtr[fieldIndex] == __NULL_VALUE_EBCDIC || + (!bitmap_is_set(table->read_set, fieldIndex)) || + (skipLOBs && db2Table->db2Field(fieldIndex).isBlob())) + { + (*field)->set_null(); + } + else + { + (*field)->set_notnull(); + convertDB2toMySQL(db2Table->db2Field(fieldIndex), *field, dataPtr); + } + if (unlikely(old_ptr)) + (*field)->move_field_offset(-old_ptr); + + } + + if (unlikely(readAllColumns)) + tmp_restore_column_map(table->read_set, old_read_map); + dbug_tmp_restore_column_map(table->write_set, old_write_map); + + return 0; +} + + +int ha_ibmdb2i::rnd_next(uchar *buf) +{ + DBUG_ENTER("ha_ibmdb2i::rnd_next"); + + if (unlikely(last_rnd_init_rc)) DBUG_RETURN(last_rnd_init_rc); + ha_statistic_increment(&SSV::ha_read_rnd_next_count); + + int rc; + + rc = readFromBuffer(buf, QMY_NEXT); + + table->status= (rc ? STATUS_NOT_FOUND: 0); + DBUG_RETURN(rc); +} + + +void ha_ibmdb2i::position(const uchar *record) +{ + DBUG_ENTER("ha_ibmdb2i::position"); + my_store_ptr(ref, ref_length, currentRRN); + DBUG_VOID_RETURN; +} + + +int ha_ibmdb2i::rnd_pos(uchar * buf, uchar *pos) +{ + DBUG_ENTER("ha_ibmdb2i::rnd_pos"); + if (unlikely(last_rnd_init_rc)) DBUG_RETURN( last_rnd_init_rc); + ha_statistic_increment(&SSV::ha_read_rnd_count); + + currentRRN = my_get_ptr(pos, ref_length); + + tweakReadSet(); + + int rc = 0; + + if (activeHandle != rrnAssocHandle) + { + if (activeHandle) releaseActiveHandle(); + rc = useFileByHandle(QMY_UPDATABLE, rrnAssocHandle); + } + + if (likely(rc == 0)) + { + rc = prepReadBuffer(1); + + if (likely(rc == 0)) + { + rc = db2i_ileBridge::getBridgeForThread()->readByRRN(activeHandle, + activeReadBuf->ptr(), + currentRRN, + accessIntent, + getCommitLevel()); + + if (likely(rc == 0)) + { + rrnAssocHandle = activeHandle; + const char* readBuf = activeReadBuf->getRowN(0); + rc = mungeDB2row(buf, readBuf, readBuf + activeFormat->readRowNullOffset, false); + releaseRowNeeded = TRUE; + } + } + } + + DBUG_RETURN(rc); +} + + +int ha_ibmdb2i::info(uint flag) +{ + DBUG_ENTER("ha_ibmdb2i::info"); + + uint16 infoRequested = 0; + ValidatedPointer rowKeySpcPtr; // Space pointer passed to DB2 + uint32 rowKeySpcLen; // Length of space passed to DB2 + THD* thd = ha_thd(); + int command = thd_sql_command(thd); + + if (flag & HA_STATUS_AUTO) + stats.auto_increment_value = (ulonglong) 0; + + if (flag & HA_STATUS_ERRKEY) + { + errkey = lastDupKeyID; + my_store_ptr(dup_ref, ref_length, lastDupKeyRRN); + } + + if (flag & HA_STATUS_TIME) + { + if ((flag & HA_STATUS_NO_LOCK) && + ibmdb2i_assume_exclusive_use && + share && + (share->cachedStats.isInited(lastModTime))) + stats.update_time = share->cachedStats.getUpdateTime(); + else + infoRequested |= lastModTime; + } + + if (flag & HA_STATUS_CONST) + { + stats.block_size=4096; + infoRequested |= createTime; + + if (table->s->keys) + { + infoRequested |= rowsPerKey; + rowKeySpcLen = (table->s->keys) * MAX_DB2_KEY_PARTS * sizeof(uint64); + rowKeySpcPtr.alloc(rowKeySpcLen); + memset(rowKeySpcPtr, 0, rowKeySpcLen); // Clear the allocated space + } + } + + if (flag & HA_STATUS_VARIABLE) + { + if ((flag & HA_STATUS_NO_LOCK) && + (command != SQLCOM_SHOW_TABLE_STATUS) && + ibmdb2i_assume_exclusive_use && + share && + (share->cachedStats.isInited(rowCount | deletedRowCount | meanRowLen | ioCount)) && + (share->cachedStats.getRowCount() >= 2)) + { + stats.records = share->cachedStats.getRowCount(); + stats.deleted = share->cachedStats.getDelRowCount(); + stats.mean_rec_length = share->cachedStats.getMeanLength(); + stats.data_file_length = share->cachedStats.getAugmentedDataLength(); + } + else + { + infoRequested |= rowCount | deletedRowCount | meanRowLen; + if (command == SQLCOM_SHOW_TABLE_STATUS) + infoRequested |= objLength; + else + infoRequested |= ioCount; + } + } + + int rc = 0; + + if (infoRequested) + { + DBUG_PRINT("ha_ibmdb2i::info",("Retrieving fresh stats %d", flag)); + + initBridge(thd); + rc = bridge()->retrieveTableInfo((dataHandle ? dataHandle : db2Table->dataFile()->getMasterDefnHandle()), + infoRequested, + stats, + rowKeySpcPtr); + + if (!rc) + { + if ((flag & HA_STATUS_VARIABLE) && + (command != SQLCOM_SHOW_TABLE_STATUS)) + stats.data_file_length = stats.data_file_length * IO_SIZE; + + if ((ibmdb2i_assume_exclusive_use) && + (share) && + (command != SQLCOM_SHOW_TABLE_STATUS)) + { + if (flag & HA_STATUS_VARIABLE) + { + share->cachedStats.cacheRowCount(stats.records); + share->cachedStats.cacheDelRowCount(stats.deleted); + share->cachedStats.cacheMeanLength(stats.mean_rec_length); + share->cachedStats.cacheAugmentedDataLength(stats.data_file_length); + } + + if (flag & HA_STATUS_TIME) + { + share->cachedStats.cacheUpdateTime(stats.update_time); + } + } + + if (flag & HA_STATUS_CONST) + { + ulong i; // Loop counter for indexes + ulong j; // Loop counter for key parts + RowKey* rowKeyPtr; // Pointer to 'number of unique rows' array for this index + + rowKeyPtr = (RowKey_t*)(void*)rowKeySpcPtr; // Address first array of DB2 row counts + for (i = 0; i < table->s->keys; i++) // Do for each index, including primary + { + for (j = 0; j < table->key_info[i].key_parts; j++) + { + table->key_info[i].rec_per_key[j]= rowKeyPtr->RowKeyArray[j]; + } + rowKeyPtr = rowKeyPtr + 1; // Address next array of DB2 row counts + } + } + } + else if (rc == HA_ERR_LOCK_WAIT_TIMEOUT && share) + { + // If we couldn't retrieve the info because the object was locked, + // we'll do our best by returning the most recently cached data. + if ((infoRequested & rowCount) && + share->cachedStats.isInited(rowCount)) + stats.records = share->cachedStats.getRowCount(); + if ((infoRequested & deletedRowCount) && + share->cachedStats.isInited(deletedRowCount)) + stats.deleted = share->cachedStats.getDelRowCount(); + if ((infoRequested & meanRowLen) && + share->cachedStats.isInited(meanRowLen)) + stats.mean_rec_length = share->cachedStats.getMeanLength(); + if ((infoRequested & lastModTime) && + share->cachedStats.isInited(lastModTime)) + stats.update_time = share->cachedStats.getUpdateTime(); + + rc = 0; + } + } + + DBUG_RETURN(rc); +} + + +ha_rows ha_ibmdb2i::records() +{ + DBUG_ENTER("ha_ibmdb2i::records"); + int rc; + rc = bridge()->retrieveTableInfo((dataHandle ? dataHandle : db2Table->dataFile()->getMasterDefnHandle()), + rowCount, + stats); + + if (unlikely(rc)) + { + if (rc == HA_ERR_LOCK_WAIT_TIMEOUT && + share && + (share->cachedStats.isInited(rowCount))) + DBUG_RETURN(share->cachedStats.getRowCount()); + else + DBUG_RETURN(HA_POS_ERROR); + } + else if (share) + { + share->cachedStats.cacheRowCount(stats.records); + } + + DBUG_RETURN(stats.records); +} + + +int ha_ibmdb2i::extra(enum ha_extra_function operation) +{ + DBUG_ENTER("ha_ibmdb2i::extra"); + + switch(operation) + { + // Can these first five flags be replaced by attending to HA_EXTRA_WRITE_CACHE? + case HA_EXTRA_NO_IGNORE_DUP_KEY: + case HA_EXTRA_WRITE_CANNOT_REPLACE: + { + returnDupKeysImmediately = false; + onDupUpdate = false; + } + break; + case HA_EXTRA_INSERT_WITH_UPDATE: + { + returnDupKeysImmediately = true; + onDupUpdate = true; + } + break; + case HA_EXTRA_IGNORE_DUP_KEY: + case HA_EXTRA_WRITE_CAN_REPLACE: + returnDupKeysImmediately = true; + break; + case HA_EXTRA_FLUSH_CACHE: + if (outstanding_start_bulk_insert) + finishBulkInsert(); + break; + } + + + DBUG_RETURN(0); +} + +/** + @brief + The DB2 storage engine will ignore a MySQL generated value and will generate + a new value in SLIC. We arbitrarily set first_value to 1, and set the + interval to infinity for better performance on multi-row inserts. +*/ +void ha_ibmdb2i::get_auto_increment(ulonglong offset, ulonglong increment, + ulonglong nb_desired_values, + ulonglong *first_value, + ulonglong *nb_reserved_values) +{ + DBUG_ENTER("ha_ibmdb2i::get_auto_increment"); + *first_value= 1; + *nb_reserved_values= ULONGLONG_MAX; +} + + + +void ha_ibmdb2i::update_create_info(HA_CREATE_INFO *create_info) +{ + DBUG_ENTER("ha_ibmdb2i::update_create_info"); + + if ((!(create_info->used_fields & HA_CREATE_USED_AUTO)) && + (table->found_next_number_field != NULL)) + { + initBridge(); + + create_info->auto_increment_value= 1; + + ha_rows rowCount = records(); + + if (rowCount == 0) + { + create_info->auto_increment_value = db2Table->getStartId(); + DBUG_VOID_RETURN; + } + else if (rowCount == HA_POS_ERROR) + { + DBUG_VOID_RETURN; + } + + getNextIdVal(&create_info->auto_increment_value); + } + DBUG_VOID_RETURN; +} + + +int ha_ibmdb2i::getNextIdVal(ulonglong *value) +{ + DBUG_ENTER("ha_ibmdb2i::getNextIdVal"); + + char queryBuffer[MAX_DB2_COLNAME_LENGTH + MAX_DB2_QUALIFIEDNAME_LENGTH + 64]; + strcpy(queryBuffer, " SELECT CAST(MAX( "); + convertMySQLNameToDB2Name(table->found_next_number_field->field_name, strend(queryBuffer), MAX_DB2_COLNAME_LENGTH+1); + strcat(queryBuffer, ") AS BIGINT) FROM "); + db2Table->getDB2QualifiedName(strend(queryBuffer)); + DBUG_ASSERT(strlen(queryBuffer) < sizeof(queryBuffer)); + + SqlStatementStream sqlStream(queryBuffer); + DBUG_PRINT("ha_ibmdb2i::getNextIdVal", ("Sent to DB2: %s",queryBuffer)); + + int rc = 0; + FILE_HANDLE fileHandle2; + uint32 db2RowDataLen2; + rc = bridge()->prepOpen(sqlStream.getPtrToData(), + &fileHandle2, + &db2RowDataLen2); + if (likely(rc == 0)) + { + IOReadBuffer rowBuffer(1, db2RowDataLen2); + rc = bridge()->read(fileHandle2, + rowBuffer.ptr(), + QMY_READ_ONLY, + QMY_NONE, + QMY_FIRST); + + if (likely(rc == 0)) + { + /* This check is here for the case where the table is not empty, + but the auto_increment starting value has been changed since + the last record was written. */ + + longlong maxIdVal = *(longlong*)(rowBuffer.getRowN(0)); + if ((maxIdVal + 1) > db2Table->getStartId()) + *value = maxIdVal + 1; + else + *value = db2Table->getStartId(); + } + + bridge()->deallocateFile(fileHandle2); + } + DBUG_RETURN(rc); +} + + +/* + Updates index cardinalities. +*/ +int ha_ibmdb2i::analyze(THD* thd, HA_CHECK_OPT *check_opt) +{ + DBUG_ENTER("ha_ibmdb2i::analyze"); + info(HA_STATUS_TIME | HA_STATUS_CONST | HA_STATUS_VARIABLE); + DBUG_RETURN(0); +} + +int ha_ibmdb2i::optimize(THD* thd, HA_CHECK_OPT *check_opt) +{ + DBUG_ENTER("ha_ibmdb2i::optimize"); + + initBridge(thd); + + if (unlikely(records() == 0)) + DBUG_RETURN(0); // DB2 doesn't like to reorganize a table with no data. + + quiesceAllFileHandles(); + + int32 rc = bridge()->optimizeTable(db2Table->dataFile()->getMasterDefnHandle()); + info(HA_STATUS_TIME | HA_STATUS_CONST | HA_STATUS_VARIABLE); + + DBUG_RETURN(rc); +} + + +/** + @brief + Determines if an ALTER TABLE is allowed to switch the storage engine + for this table. If the table has a foreign key or is referenced by a + foreign key, then it cannot be switched. +*/ +bool ha_ibmdb2i::can_switch_engines(void) +/*=================================*/ +{ + DBUG_ENTER("ha_ibmdb2i::can_switch_engines"); + + int rc = 0; + FILE_HANDLE queryFile = 0; + uint32 resultRowLen; + uint count = 0; + bool can_switch = FALSE; // 1 if changing storage engine is allowed + + const char* libName = db2Table->getDB2LibName(db2i_table::ASCII_SQL); + const char* fileName = db2Table->getDB2TableName(db2i_table::ASCII_SQL); + + String query(256); + query.append(STRING_WITH_LEN(" SELECT COUNT(*) FROM SYSIBM.SQLFOREIGNKEYS WHERE ((PKTABLE_SCHEM = '")); + query.append(libName+1, strlen(libName)-2); // Remove quotes from parent schema name + query.append(STRING_WITH_LEN("' AND PKTABLE_NAME = '")); + query.append(fileName+1,strlen(fileName)-2); // Remove quotes from file name + query.append(STRING_WITH_LEN("') OR (FKTABLE_SCHEM = '")); + query.append(libName+1,strlen(libName)-2); // Remove quotes from child schema + query.append(STRING_WITH_LEN("' AND FKTABLE_NAME = '")); + query.append(fileName+1,strlen(fileName)-2); // Remove quotes from child name + query.append(STRING_WITH_LEN("'))")); + + SqlStatementStream sqlStream(query); + + rc = bridge()->prepOpen(sqlStream.getPtrToData(), + &queryFile, + &resultRowLen); + if (rc == 0) + { + IOReadBuffer rowBuffer(1, resultRowLen); + + rc = bridge()->read(queryFile, + rowBuffer.ptr(), + QMY_READ_ONLY, + QMY_NONE, + QMY_FIRST); + if (!rc) + { + count = *(uint*)(rowBuffer.getRowN(0)); + if (count == 0) + can_switch = TRUE; + } + + bridge()->deallocateFile(queryFile); + } + DBUG_RETURN(can_switch); +} + + + +bool ha_ibmdb2i::check_if_incompatible_data(HA_CREATE_INFO *info, + uint table_changes) +{ + DBUG_ENTER("ha_ibmdb2i::check_if_incompatible_data"); + uint i; + /* Check that auto_increment value and field definitions were + not changed. */ + if ((info->used_fields & HA_CREATE_USED_AUTO && + info->auto_increment_value != 0) || + table_changes != IS_EQUAL_YES) + DBUG_RETURN(COMPATIBLE_DATA_NO); + /* Check if any fields were renamed. */ + for (i= 0; i < table->s->fields; i++) + { + Field *field= table->field[i]; + if (field->flags & FIELD_IS_RENAMED) + { + DBUG_PRINT("info", ("Field has been renamed, copy table")); + DBUG_RETURN(COMPATIBLE_DATA_NO); + } + } + DBUG_RETURN(COMPATIBLE_DATA_YES); +} + +int ha_ibmdb2i::reset_auto_increment(ulonglong value) + { + DBUG_ENTER("ha_ibmdb2i::reset_auto_increment"); + + int rc = 0; + + quiesceAllFileHandles(); + + const char* libName = db2Table->getDB2LibName(db2i_table::ASCII_SQL); + const char* fileName = db2Table->getDB2TableName(db2i_table::ASCII_SQL); + + String query(512); + query.append(STRING_WITH_LEN(" ALTER TABLE ")); + query.append(libName); + query.append('.'); + query.append(fileName); + query.append(STRING_WITH_LEN(" ALTER COLUMN ")); + char colName[MAX_DB2_COLNAME_LENGTH+1]; + convertMySQLNameToDB2Name(table->found_next_number_field->field_name, colName, sizeof(colName)); + query.append(colName); + + char restart_value[22]; + CHARSET_INFO *cs= &my_charset_bin; + uint len = (uint)(cs->cset->longlong10_to_str)(cs,restart_value,sizeof(restart_value), 10, value); + restart_value[len] = 0; + + query.append(STRING_WITH_LEN(" RESTART WITH ")); + query.append(restart_value); + + SqlStatementStream sqlStream(query); + DBUG_PRINT("ha_ibmdb2i::reset_auto_increment", ("Sent to DB2: %s",query.c_ptr())); + + rc = db2i_ileBridge::getBridgeForThread()->execSQL(sqlStream.getPtrToData(), + sqlStream.getStatementCount(), + getCommitLevel(), + FALSE, + FALSE, + FALSE, + dataHandle); + if (rc == 0) + db2Table->updateStartId(value); + + DBUG_RETURN(rc); +} + + +/** + @brief + This function receives an error code that was previously set by the handler. + It returns to MySQL the error string associated with that error. +*/ +bool ha_ibmdb2i::get_error_message(int error, String *buf) +{ + DBUG_ENTER("ha_ibmdb2i::get_error_message"); + if (error >= DB2I_FIRST_ERR && error <= DB2I_LAST_ERR) + { + db2i_ileBridge* bridge = db2i_ileBridge::getBridgeForThread(ha_thd()); + char* errMsg = bridge->getErrorStorage(); + buf->copy(errMsg, strlen(errMsg),system_charset_info); + bridge->freeErrorStorage(); + } + DBUG_RETURN(FALSE); +} + + +int ha_ibmdb2i::delete_all_rows() +{ + DBUG_ENTER("ha_ibmdb2i::delete_all_rows"); + int rc = 0; + char queryBuffer[MAX_DB2_QUALIFIEDNAME_LENGTH + 64]; + strcpy(queryBuffer, " DELETE FROM "); + db2Table->getDB2QualifiedName(strend(queryBuffer)); + DBUG_ASSERT(strlen(queryBuffer) < sizeof(queryBuffer)); + + SqlStatementStream sqlStream(queryBuffer); + DBUG_PRINT("ha_ibmdb2i::delete_all_rows", ("Sent to DB2: %s",queryBuffer)); + rc = bridge()->execSQL(sqlStream.getPtrToData(), + sqlStream.getStatementCount(), + getCommitLevel(), + false, + false, + true, + dataHandle); + + /* If this method was called on behalf of a TRUNCATE TABLE statement, and if */ + /* the table has an auto_increment field, then reset the starting value for */ + /* the auto_increment field to 1. + */ + if (rc == 0 && thd_sql_command(ha_thd()) == SQLCOM_TRUNCATE && + table->found_next_number_field ) + rc = reset_auto_increment(1); + + invalidateCachedStats(); + + DBUG_RETURN(rc); +} + + +int ha_ibmdb2i::external_lock(THD *thd, int lock_type) +{ + int rc = 0; + + DBUG_ENTER("ha_ibmdb2i::external_lock"); + DBUG_PRINT("ha_ibmdb2i::external_lock",("Lock type: %d", lock_type)); + + if (lock_type == F_RDLCK) + accessIntent = QMY_READ_ONLY; + else if (lock_type == F_WRLCK) + accessIntent = QMY_UPDATABLE; + + initBridge(thd); + int command = thd_sql_command(thd); + + if (!THDVAR(thd,transaction_unsafe)) + { + if (lock_type != F_UNLCK) + { + if (autoCommitIsOn(thd) == QMY_YES) + { + trans_register_ha(thd, FALSE, ibmdb2i_hton); + } + else + { + trans_register_ha(thd, TRUE, ibmdb2i_hton); + if (likely(command != SQLCOM_CREATE_TABLE)) + { + trans_register_ha(thd, FALSE, ibmdb2i_hton); + bridge()->beginStmtTx(); + } + } + } + } + + if (command == SQLCOM_LOCK_TABLES || + command == SQLCOM_ALTER_TABLE || + command == SQLCOM_UNLOCK_TABLES || + (accessIntent == QMY_UPDATABLE && + (command == SQLCOM_UPDATE || + command == SQLCOM_UPDATE_MULTI || + command == SQLCOM_DELETE || + command == SQLCOM_DELETE_MULTI || + command == SQLCOM_REPLACE || + command == SQLCOM_REPLACE_SELECT) && + getCommitLevel(thd) == QMY_NONE)) + { + char action; + char type; + if (lock_type == F_UNLCK) + { + action = QMY_UNLOCK; + type = accessIntent == QMY_READ_ONLY ? QMY_LSRD : QMY_LENR; + } + else + { + action = QMY_LOCK; + type = lock_type == F_RDLCK ? QMY_LSRD : QMY_LENR; + } + + DBUG_PRINT("ha_ibmdb2i::external_lock",("%socking table", action==QMY_LOCK ? "L" : "Unl")); + + if (!dataHandle) + rc = db2Table->dataFile()->allocateNewInstance(&dataHandle, curConnection); + + rc = bridge()->lockObj(dataHandle, + 0, + action, + type, + (command == SQLCOM_LOCK_TABLES ? QMY_NO : QMY_YES)); + + } + + + DBUG_RETURN(rc); +} + + +THR_LOCK_DATA **ha_ibmdb2i::store_lock(THD *thd, + THR_LOCK_DATA **to, + enum thr_lock_type lock_type) +{ + if (lock_type != TL_IGNORE && lock.type == TL_UNLOCK) + { + if ((lock_type >= TL_WRITE_CONCURRENT_INSERT && + lock_type <= TL_WRITE) && !(thd->in_lock_tables && thd_sql_command(thd) == SQLCOM_LOCK_TABLES)) + lock_type= TL_WRITE_ALLOW_WRITE; + lock.type=lock_type; + } + *to++= &lock; + return to; +} + + +int ha_ibmdb2i::delete_table(const char *name) +{ + DBUG_ENTER("ha_ibmdb2i::delete_table"); + THD* thd = ha_thd(); + db2i_ileBridge* bridge = db2i_ileBridge::getBridgeForThread(thd); + + char db2Name[MAX_DB2_QUALIFIEDNAME_LENGTH]; + db2i_table::getDB2QualifiedNameFromPath(name, db2Name); + + String query(128); + query.append(STRING_WITH_LEN(" DROP TABLE ")); + query.append(db2Name); + + if (thd_sql_command(thd) == SQLCOM_DROP_TABLE && + thd->lex->drop_mode == DROP_RESTRICT) + query.append(STRING_WITH_LEN(" RESTRICT ")); + DBUG_PRINT("ha_ibmdb2i::delete_table", ("Sent to DB2: %s",query.c_ptr())); + + SqlStatementStream sqlStream(query); + + db2i_table::getDB2LibNameFromPath(name, db2Name); + bool isTemporary = (strcmp(db2Name, DB2I_TEMP_TABLE_SCHEMA) == 0 ? TRUE : FALSE); + + int rc = bridge->execSQL(sqlStream.getPtrToData(), + sqlStream.getStatementCount(), + (isTemporary ? QMY_NONE : getCommitLevel(thd)), + FALSE, + FALSE, + isTemporary); + + if (rc == HA_ERR_NO_SUCH_TABLE) + { + warning(thd, DB2I_ERR_TABLE_NOT_FOUND, name); + rc = 0; + } + + if (rc == 0) + { + db2i_table::deleteAssocFiles(name); + FILE_HANDLE savedHandle = bridge->findAndRemovePreservedHandle(name); + if (savedHandle) + bridge->deallocateFile(savedHandle, TRUE); + } + + my_errno = rc; + DBUG_RETURN(rc); +} + + +int ha_ibmdb2i::rename_table(const char * from, const char * to) +{ + DBUG_ENTER("ha_ibmdb2i::rename_table "); + + char db2FromFileName[MAX_DB2_FILENAME_LENGTH + 1]; + char db2ToFileName[MAX_DB2_FILENAME_LENGTH+1]; + char db2FromLibName[MAX_DB2_SCHEMANAME_LENGTH+1]; + char db2ToLibName[MAX_DB2_SCHEMANAME_LENGTH+1]; + + db2i_table::getDB2LibNameFromPath(from, db2FromLibName); + db2i_table::getDB2LibNameFromPath(to, db2ToLibName); + + if (strcmp(db2FromLibName, db2ToLibName) != 0 ) + { + getErrTxt(DB2I_ERR_RENAME_MOVE,from,to); + DBUG_RETURN(DB2I_ERR_RENAME_MOVE); + } + + db2i_table::getDB2FileNameFromPath(from, db2FromFileName, db2i_table::ASCII_NATIVE); + db2i_table::getDB2FileNameFromPath(to, db2ToFileName); + + char escapedFromFileName[2 * MAX_DB2_FILENAME_LENGTH + 1]; + + uint o = 0; + uint i = 1; + do + { + escapedFromFileName[o++] = db2FromFileName[i]; + if (db2FromFileName[i] == '+') + escapedFromFileName[o++] = '+'; + } while (db2FromFileName[++i]); + escapedFromFileName[o-1] = 0; + + + int rc = 0; + + char queryBuffer[sizeof(db2FromLibName) + 2 * sizeof(db2FromFileName) + 256]; + SafeString selectQuery(queryBuffer, sizeof(queryBuffer)); + selectQuery.strncat(STRING_WITH_LEN("SELECT CAST(INDEX_NAME AS VARCHAR(128) CCSID 1208) FROM QSYS2.SYSINDEXES WHERE INDEX_NAME LIKE '%+_+_+_%")); + selectQuery.strcat(escapedFromFileName); + selectQuery.strncat(STRING_WITH_LEN("' ESCAPE '+' AND TABLE_NAME='")); + selectQuery.strncat(db2FromFileName+1, strlen(db2FromFileName)-2); + selectQuery.strncat(STRING_WITH_LEN("' AND TABLE_SCHEMA='")); + selectQuery.strncat(db2FromLibName+1, strlen(db2FromLibName)-2); + selectQuery.strcat('\''); + DBUG_ASSERT(!selectQuery.overflowed()); + + SqlStatementStream indexQuery(selectQuery.ptr()); + + FILE_HANDLE queryFile = 0; + uint32 resultRowLen; + + initBridge(); + rc = bridge()->prepOpen(indexQuery.getPtrToData(), + &queryFile, + &resultRowLen); + + if (unlikely(rc)) + DBUG_RETURN(rc); + + IOReadBuffer rowBuffer(1, resultRowLen); + + int tableNameLen = strlen(db2FromFileName) - 2; + + SqlStatementStream renameQuery(64); + String query; + while (rc == 0) + { + query.length(0); + + rc = bridge()->read(queryFile, + rowBuffer.ptr(), + QMY_READ_ONLY, + QMY_NONE, + QMY_NEXT); + + if (!rc) + { + const char* rowData = rowBuffer.getRowN(0); + char indexFileName[MAX_DB2_FILENAME_LENGTH]; + memset(indexFileName, 0, sizeof(indexFileName)); + + uint16 fileNameLen = *(uint16*)(rowData); + strncpy(indexFileName, rowData + sizeof(uint16), fileNameLen); + + int bytesToRetain = fileNameLen - tableNameLen; + if (bytesToRetain <= 0) + /* We can't handle index names in which the MySQL index name and + the table name together are longer than the max index name. */ + { + getErrTxt(DB2I_ERR_INVALID_NAME,"index","*generated*"); + DBUG_RETURN(DB2I_ERR_INVALID_NAME); + } + char indexName[MAX_DB2_FILENAME_LENGTH]; + memset(indexName, 0, sizeof(indexName)); + + strncpy(indexName, + indexFileName, + bytesToRetain); + + char db2IndexName[MAX_DB2_FILENAME_LENGTH+1]; + + convertMySQLNameToDB2Name(indexFileName, db2IndexName, sizeof(db2IndexName)); + + query.append(STRING_WITH_LEN("RENAME INDEX ")); + query.append(db2FromLibName); + query.append('.'); + query.append(db2IndexName); + query.append(STRING_WITH_LEN(" TO ")); + if (db2i_table::appendQualifiedIndexFileName(indexName, db2ToFileName, query, db2i_table::ASCII_SQL, typeNone) == -1) + { + getErrTxt(DB2I_ERR_INVALID_NAME,"index","*generated*"); + DBUG_RETURN(DB2I_ERR_INVALID_NAME ); + } + renameQuery.addStatement(query); + DBUG_PRINT("ha_ibmdb2i::rename_table", ("Sent to DB2: %s",query.c_ptr_safe())); + } + } + + + if (queryFile) + bridge()->deallocateFile(queryFile); + + if (rc != HA_ERR_END_OF_FILE) + DBUG_RETURN(rc); + + char db2Name[MAX_DB2_QUALIFIEDNAME_LENGTH]; + + /* Rename the table */ + query.length(0); + query.append(STRING_WITH_LEN(" RENAME TABLE ")); + db2i_table::getDB2QualifiedNameFromPath(from, db2Name); + query.append(db2Name); + query.append(STRING_WITH_LEN(" TO ")); + query.append(db2ToFileName); + DBUG_PRINT("ha_ibmdb2i::rename_table", ("Sent to DB2: %s",query.c_ptr_safe())); + renameQuery.addStatement(query); + rc = bridge()->execSQL(renameQuery.getPtrToData(), + renameQuery.getStatementCount(), + getCommitLevel()); + + if (!rc) + db2i_table::renameAssocFiles(from, to); + + DBUG_RETURN(rc); +} + + +int ha_ibmdb2i::create(const char *name, TABLE *table_arg, + HA_CREATE_INFO *create_info) +{ + DBUG_ENTER("ha_ibmdb2i::create"); + + int rc; + char fileSortSequence[11] = "*HEX"; + char fileSortSequenceLibrary[11] = ""; + char fileSortSequenceType = ' '; + char libName[MAX_DB2_SCHEMANAME_LENGTH+1]; + char fileName[MAX_DB2_FILENAME_LENGTH+1]; + char colName[MAX_DB2_COLNAME_LENGTH+1]; + bool isTemporary; + ulong auto_inc_value; + + db2i_table::getDB2LibNameFromPath(name, libName); + db2i_table::getDB2FileNameFromPath(name, fileName); + + if (osVersion.v < 6) + { + if (strlen(libName) > MAX_DB2_V5R4_LIBNAME_LENGTH) + { + getErrTxt(DB2I_ERR_TOO_LONG_SCHEMA,libName, MAX_DB2_V5R4_LIBNAME_LENGTH); + DBUG_RETURN(DB2I_ERR_TOO_LONG_SCHEMA); + } + } + else if (strlen(libName) > MAX_DB2_V6R1_LIBNAME_LENGTH) + { + getErrTxt(DB2I_ERR_TOO_LONG_SCHEMA,libName, MAX_DB2_V6R1_LIBNAME_LENGTH); + DBUG_RETURN(DB2I_ERR_TOO_LONG_SCHEMA); + } + + String query(256); + + if (strcmp(libName, DB2I_TEMP_TABLE_SCHEMA)) + { + query.append(STRING_WITH_LEN("CREATE TABLE ")); + query.append(libName); + query.append('.'); + query.append(fileName); + isTemporary = FALSE; + } + else + { + query.append(STRING_WITH_LEN("DECLARE GLOBAL TEMPORARY TABLE ")); + query.append(fileName); + isTemporary = TRUE; + } + query.append(STRING_WITH_LEN(" (")); + + THD* thd = ha_thd(); + enum_TimeFormat timeFormat = (THDVAR(thd, create_time_columns_as_TOD) ? TIME_OF_DAY : DURATION); + enum_BlobMapping blobMapping = (enum_BlobMapping)(THDVAR(thd, map_blob_to_varchar)); + + Field **field; + for (field= table_arg->field; *field; field++) + { + if ( field != table_arg->field ) // Not the first one + query.append(STRING_WITH_LEN(" , ")); + + if (!convertMySQLNameToDB2Name((*field)->field_name, colName, sizeof(colName))) + { + getErrTxt(DB2I_ERR_INVALID_NAME,"field",(*field)->field_name); + DBUG_RETURN(DB2I_ERR_INVALID_NAME ); + } + + query.append(colName); + query.append(' '); + + if (rc = getFieldTypeMapping(*field, query, timeFormat, blobMapping)) + DBUG_RETURN(rc); + + if ( (*field)->flags & NOT_NULL_FLAG ) + { + query.append(STRING_WITH_LEN(" NOT NULL ")); + } + if ( (*field)->flags & AUTO_INCREMENT_FLAG ) + { +#ifdef WITH_PARTITION_STORAGE_ENGINE + if (table_arg->part_info) + { + getErrTxt(DB2I_ERR_PART_AUTOINC); + DBUG_RETURN(DB2I_ERR_PART_AUTOINC); + } +#endif + query.append(STRING_WITH_LEN(" GENERATED BY DEFAULT AS IDENTITY ") ); + if (create_info->auto_increment_value != 0) + { + /* Query was ALTER TABLE...AUTO_INCREMENT = x; or + CREATE TABLE ...AUTO_INCREMENT = x; Set the starting + value for the auto_increment column. */ + char stringValue[22]; + CHARSET_INFO *cs= &my_charset_bin; + uint len = (uint)(cs->cset->longlong10_to_str)(cs,stringValue,sizeof(stringValue), 10, create_info->auto_increment_value); + stringValue[len] = 0; + query.append(STRING_WITH_LEN(" (START WITH ")); + query.append(stringValue); + + uint64 maxValue=maxValueForField(*field); + + if (maxValue) + { + len = (uint)(cs->cset->longlong10_to_str)(cs,stringValue,sizeof(stringValue), 10, maxValue); + stringValue[len] = 0; + query.append(STRING_WITH_LEN(" MAXVALUE ")); + query.append(stringValue); + } + + query.append(STRING_WITH_LEN(") ")); + } + + } + } + + String primaryKeyQuery; + primaryKeyQuery.length(0); + if (table_arg->s->primary_key != MAX_KEY && !isTemporary) + { + KEY& curKey = table_arg->key_info[table_arg->s->primary_key]; + primaryKeyQuery.append(STRING_WITH_LEN(" PRIMARY KEY( ")); + for (int j = 0; j < curKey.key_parts; ++j) + { + if (j != 0) + { + primaryKeyQuery.append( STRING_WITH_LEN(" , ") ); + } + Field* field = curKey.key_part[j].field; + convertMySQLNameToDB2Name(field->field_name, colName, sizeof(colName)); + primaryKeyQuery.append(colName); + rc = updateAssociatedSortSequence(field, + &fileSortSequenceType, + fileSortSequence, + fileSortSequenceLibrary); + if (rc) DBUG_RETURN (rc); + } + primaryKeyQuery.append(STRING_WITH_LEN(" ) ")); + } + + bool needAlterForPrimaryKey = FALSE; + if ((fileSortSequence[0] != '*') && (fileSortSequence[0] != 'Q')) // An ICU sort sequence + { + needAlterForPrimaryKey = TRUE; + } + else + { + if (primaryKeyQuery.length() > 0) + { + query.append(STRING_WITH_LEN(" , ")); + query.append(primaryKeyQuery); + } + } + + rc = buildDB2ConstraintString(thd->lex, + query, + name, + table_arg->field, + &fileSortSequenceType, + fileSortSequence, + fileSortSequenceLibrary); + if (rc) DBUG_RETURN (rc); + + query.append(STRING_WITH_LEN(" ) ")); + + if (isTemporary) + query.append(STRING_WITH_LEN(" ON COMMIT PRESERVE ROWS ")); + + DBUG_PRINT("ha_ibmdb2i::create", ("Sent to DB2: %s",query.c_ptr())); + SqlStatementStream sqlStream(query.length()); + sqlStream.addStatement(query,fileSortSequence,fileSortSequenceLibrary); + + + + if (needAlterForPrimaryKey == TRUE && !isTemporary) + { + rc = buildCreateIndexStatement(sqlStream, + table_arg->key_info[table_arg->s->primary_key], + true, + libName, + fileName); + if (rc) DBUG_RETURN (rc); + } + + uint i = 0; + + for (uint i = 0; i < table_arg->s->keys; ++i) + { + if (i != table_arg->s->primary_key || isTemporary) + { + rc = buildCreateIndexStatement(sqlStream, + table_arg->key_info[i], + false, + libName, + fileName); + if (rc) DBUG_RETURN (rc); + } + } + + bool noCommit = isTemporary || ((!autoCommitIsOn(thd)) && (thd_sql_command(thd) == SQLCOM_ALTER_TABLE)); + + initBridge(); + + if (THDVAR(thd, discovery_mode) == 1) + bridge()->expectErrors(QMY_ERR_TABLE_EXISTS); + + rc = bridge()->execSQL(sqlStream.getPtrToData(), + sqlStream.getStatementCount(), + (isTemporary ? QMY_NONE : getCommitLevel(thd)), + TRUE, + FALSE, + noCommit ); + + if (unlikely(rc == QMY_ERR_MSGID) && + memcmp(bridge()->getErrorMsgID(), DB2I_SQL0350, 7) == 0) + { + my_error(ER_BLOB_USED_AS_KEY, MYF(0), "*unknown*"); + rc = ER_BLOB_USED_AS_KEY; + } + else if (unlikely(rc == QMY_ERR_TABLE_EXISTS) && + THDVAR(thd, discovery_mode) == 1) + { + db2i_table* temp = new db2i_table(table_arg->s, name); + int32 rc = temp->fastInitForCreate(name); + delete temp; + + if (!rc) + warning(thd, DB2I_ERR_WARN_CREATE_DISCOVER); + + DBUG_RETURN(rc); + } + + if (!rc && !isTemporary) + { + db2i_table* temp = new db2i_table(table_arg->s, name); + int32 rc = temp->fastInitForCreate(name); + delete temp; + if (rc) + delete_table(name); + } + + DBUG_RETURN(rc); +} + + +/** + @brief + Add an index on-line to a table. This method is called on behalf of + a CREATE INDEX or ALTER TABLE statement. + It is implemented via a composed DDL statement passed to DB2. +*/ +int ha_ibmdb2i::add_index(TABLE *table_arg, + KEY *key_info, + uint num_of_keys) +{ + DBUG_ENTER("ha_ibmdb2i::add_index"); + + int rc; + SqlStatementStream sqlStream(256); + const char* libName = db2Table->getDB2LibName(db2i_table::ASCII_SQL); + const char* fileName = db2Table->getDB2TableName(db2i_table::ASCII_SQL); + + quiesceAllFileHandles(); + + uint primaryKey = MAX_KEY; + if (table_arg->s->primary_key >= MAX_KEY && !db2Table->isTemporary()) + { + for (int i = 0; i < num_of_keys; ++i) + { + if (strcmp(key_info[i].name, "PRIMARY") == 0) + { + primaryKey = i; + break; + } + else if (primaryKey == MAX_KEY && + key_info[i].flags & HA_NOSAME) + { + primaryKey = i; + for (int j=0 ; j < key_info[i].key_parts ;j++) + { + uint fieldnr= key_info[i].key_part[j].fieldnr; + if (table_arg->s->field[fieldnr]->null_ptr || + table_arg->s->field[fieldnr]->key_length() != + key_info[i].key_part[j].length) + { + primaryKey = MAX_KEY; + break; + } + } + } + } + } + + + for (int i = 0; i < num_of_keys; ++i) + { + KEY& curKey= key_info[i]; + rc = buildCreateIndexStatement(sqlStream, + curKey, + (i == primaryKey), + libName, + fileName); + if (rc) DBUG_RETURN (rc); + } + + rc = bridge()->execSQL(sqlStream.getPtrToData(), + sqlStream.getStatementCount(), + getCommitLevel(), + FALSE, + FALSE, + FALSE, + dataHandle); + + /* Handle the case where a unique index is being created but an error occurs + because the file contains duplicate key values. */ + if (rc == ER_DUP_ENTRY) + print_keydup_error(MAX_KEY,ER(ER_DUP_ENTRY_WITH_KEY_NAME)); + + DBUG_RETURN(rc); +} + +/** + @brief + Drop an index on-line from a table. This method is called on behalf of + a DROP INDEX or ALTER TABLE statement. + It is implemented via a composed DDL statement passed to DB2. +*/ +int ha_ibmdb2i::prepare_drop_index(TABLE *table_arg, + uint *key_num, uint num_of_keys) +{ + DBUG_ENTER("ha_ibmdb2i::prepare_drop_index"); + int rc; + int i = 0; + String query(64); + SqlStatementStream sqlStream(64 * num_of_keys); + SqlStatementStream shadowStream(64 * num_of_keys); + + quiesceAllFileHandles(); + + const char* libName = db2Table->getDB2LibName(db2i_table::ASCII_SQL); + const char* fileName = db2Table->getDB2TableName(db2i_table::ASCII_SQL); + + while (i < num_of_keys) + { + query.length(0); + DBUG_PRINT("info", ("ha_ibmdb2i::prepare_drop_index %u", key_num[i])); + KEY& curKey= table_arg->key_info[key_num[i]]; + if (key_num[i] == table->s->primary_key && !db2Table->isTemporary()) + { + query.append(STRING_WITH_LEN("ALTER TABLE ")); + query.append(libName); + query.append(STRING_WITH_LEN(".")); + query.append(fileName); + query.append(STRING_WITH_LEN(" DROP PRIMARY KEY")); + } + else + { + query.append(STRING_WITH_LEN("DROP INDEX ")); + query.append(libName); + query.append(STRING_WITH_LEN(".")); + db2i_table::appendQualifiedIndexFileName(curKey.name, fileName, query); + } + DBUG_PRINT("ha_ibmdb2i::prepare_drop_index", ("Sent to DB2: %s",query.c_ptr_safe())); + sqlStream.addStatement(query); + + query.length(0); + query.append(STRING_WITH_LEN("DROP INDEX ")); + query.append(libName); + query.append(STRING_WITH_LEN(".")); + db2i_table::appendQualifiedIndexFileName(curKey.name, fileName, query, db2i_table::ASCII_SQL, typeHex); + + DBUG_PRINT("ha_ibmdb2i::prepare_drop_index", ("Sent to DB2: %s",query.c_ptr_safe())); + shadowStream.addStatement(query); + + ++i; + } + + rc = bridge()->execSQL(sqlStream.getPtrToData(), + sqlStream.getStatementCount(), + getCommitLevel(), + FALSE, + FALSE, + FALSE, + dataHandle); + + if (rc == 0) + bridge()->execSQL(shadowStream.getPtrToData(), + shadowStream.getStatementCount(), + getCommitLevel()); + + DBUG_RETURN(rc); +} + + +void +ha_ibmdb2i::unlock_row() +{ + DBUG_ENTER("ha_ibmdb2i::unlock_row"); + DBUG_VOID_RETURN; +} + +int +ha_ibmdb2i::index_end() +{ + DBUG_ENTER("ha_ibmdb2i::index_end"); + warnIfInvalidData(); + last_index_init_rc = 0; + if (likely(activeReadBuf)) + activeReadBuf->endRead(); + if (likely(!last_index_init_rc)) + releaseIndexFile(active_index); + active_index= MAX_KEY; + DBUG_RETURN (0); +} + +int ha_ibmdb2i::doCommit(handlerton *hton, THD *thd, bool all) +{ + if (!THDVAR(thd, transaction_unsafe)) + { + if (all || autoCommitIsOn(thd)) + { + DBUG_PRINT("ha_ibmdb2i::doCommit",("Committing all")); + return (db2i_ileBridge::getBridgeForThread(thd)->commitmentControl(QMY_COMMIT)); + } + else + { + DBUG_PRINT("ha_ibmdb2i::doCommit",("Committing stmt")); + return (db2i_ileBridge::getBridgeForThread(thd)->commitStmtTx()); + } + } + + return (0); +} + + +int ha_ibmdb2i::doRollback(handlerton *hton, THD *thd, bool all) +{ + if (!THDVAR(thd,transaction_unsafe)) + { + if (all || autoCommitIsOn(thd)) + { + DBUG_PRINT("ha_ibmdb2i::doRollback",("Rolling back all")); + return ( db2i_ileBridge::getBridgeForThread(thd)->commitmentControl(QMY_ROLLBACK)); + } + else + { + DBUG_PRINT("ha_ibmdb2i::doRollback",("Rolling back stmt")); + return (db2i_ileBridge::getBridgeForThread(thd)->rollbackStmtTx()); + } + } + return (0); +} + + +void ha_ibmdb2i::start_bulk_insert(ha_rows rows) +{ + DBUG_ENTER("ha_ibmdb2i::start_bulk_insert"); + DBUG_PRINT("ha_ibmdb2i::start_bulk_insert",("Rows hinted %d", rows)); + int rc; + THD* thd = ha_thd(); + int command = thd_sql_command(thd); + + if (db2Table->hasBlobs() || + (command == SQLCOM_REPLACE || command == SQLCOM_REPLACE_SELECT)) + rows = 1; + else if (rows == 0) + rows = DEFAULT_MAX_ROWS_TO_BUFFER; // Shoot the moon + + // If we're doing a multi-row insert, binlogging is active, and the table has an + // auto_increment column, then we'll attempt to lock the file while we perform a 'fast path' blocked + // insert. If we can't get the lock, then we'll do a row-by-row 'slow path' insert instead. The reason is + // because the MI generates the auto_increment (identity value), and if we can't lock the file, + // then we can't predetermine what that value will be for insertion into the MySQL write buffer. + + if ((rows > 1) && // Multi-row insert + (thd->options & OPTION_BIN_LOG) && // Binlogging is on + (table->found_next_number_field)) // Table has an auto_increment column + { + if (!dataHandle) + rc = db2Table->dataFile()->allocateNewInstance(&dataHandle, curConnection); + + rc = bridge()->lockObj(dataHandle, 1, QMY_LOCK, QMY_LEAR, QMY_YES); + if (rc==0) // Got the lock + { + autoIncLockAcquired = TRUE; + got_auto_inc_values = FALSE; + } + else // Didn't get the lock + rows = 1; // No problem, but don't block inserts + } + + if (activeHandle == 0) + { + last_start_bulk_insert_rc = useDataFile(QMY_UPDATABLE); + if (last_start_bulk_insert_rc == 0) + prepWriteBuffer(rows); + } + + if (last_start_bulk_insert_rc == 0) + outstanding_start_bulk_insert = true; + else + { + if (autoIncLockAcquired == TRUE) + { + bridge()->lockObj(dataHandle, 0, QMY_UNLOCK, QMY_LEAR, QMY_YES); + autoIncLockAcquired = FALSE; + } + } + + DBUG_VOID_RETURN; +} + + +int ha_ibmdb2i::end_bulk_insert() +{ + DBUG_ENTER("ha_ibmdb2i::end_bulk_insert"); + int rc = 0; + + if (outstanding_start_bulk_insert) + { + rc = finishBulkInsert(); + } + + my_errno = rc; + + DBUG_RETURN(rc); +} + + +int ha_ibmdb2i::prepReadBuffer(ha_rows rowsToRead) +{ + DBUG_ENTER("ha_ibmdb2i::prepReadBuffer"); + DBUG_ASSERT((accessIntent == QMY_READ_ONLY || accessIntent == QMY_UPDATABLE) && rowsToRead > 0); + + int rc = 0; + + if (lobFieldsRequested()) + { + forceSingleRowRead = true; + rowsToRead = 1; + } + + rowsToRead = min(stats.records+1,min(rowsToRead, DEFAULT_MAX_ROWS_TO_BUFFER)); + + THD* thd = ha_thd(); + + uint bufSize = min((activeFormat->readRowLen * rowsToRead), THDVAR(thd, max_read_buffer_size)); + multiRowReadBuf.allocBuf(activeFormat->readRowLen, bufSize); + activeReadBuf = &multiRowReadBuf; + + if (db2Table->hasBlobs()) + { + if (!blobReadBuffers) + blobReadBuffers = new BlobCollection(db2Table, THDVAR(thd, lob_alloc_size)); + rc = prepareReadBufferForLobs(); + if (rc) DBUG_RETURN(rc); + } + activeReadBuf->update(accessIntent, &releaseRowNeeded, getCommitLevel(thd)); + + DBUG_RETURN(rc); +} + + +void ha_ibmdb2i::prepWriteBuffer(ha_rows rowsToWrite) +{ + DBUG_ENTER("ha_ibmdb2i::prepWriteBuffer"); + DBUG_ASSERT(accessIntent == QMY_UPDATABLE && rowsToWrite > 0); + + rowsToWrite = min(rowsToWrite, DEFAULT_MAX_ROWS_TO_BUFFER); + + uint bufSize = min((activeFormat->writeRowLen * rowsToWrite), THDVAR(ha_thd(), max_write_buffer_size)); + multiRowWriteBuf.allocBuf(activeFormat->writeRowLen, bufSize); + activeWriteBuf = &multiRowWriteBuf; + + if (!blobWriteBuffers && db2Table->hasBlobs()) + { + blobWriteBuffers = new ValidatedPointer[db2Table->getBlobCount()]; + } + DBUG_VOID_RETURN; +} + + +int ha_ibmdb2i::flushWrite(FILE_HANDLE fileHandle, uchar* buf ) +{ + DBUG_ENTER("ha_ibmdb2i::flushWrite"); + int rc; + int64 generatedIdValue = 0; + bool IdValueWasGenerated = FALSE; + char* lastDupKeyNamePtr = NULL; + uint32 lastDupKeyNameLen = 0; + int loopCnt = 0; + bool retry_dup = FALSE; + + while (loopCnt == 0 || retry_dup == TRUE) + { + rc = bridge()->writeRows(fileHandle, + activeWriteBuf->ptr(), + getCommitLevel(), + &generatedIdValue, + &IdValueWasGenerated, + &lastDupKeyRRN, + &lastDupKeyNamePtr, + &lastDupKeyNameLen, + &incrementByValue); + loopCnt++; + retry_dup = FALSE; + invalidateCachedStats(); + if (lastDupKeyNameLen) + { + rrnAssocHandle = fileHandle; + + int command = thd_sql_command(ha_thd()); + + if (command == SQLCOM_REPLACE || + command == SQLCOM_REPLACE_SELECT) + lastDupKeyID = 0; + else + { + lastDupKeyID = getKeyFromName(lastDupKeyNamePtr, lastDupKeyNameLen); + + if (likely(lastDupKeyID != MAX_KEY)) + { + uint16 failedRow = activeWriteBuf->rowsWritten()+1; + + if (buf && (failedRow != activeWriteBuf->rowCount())) + { + const char* badRow = activeWriteBuf->getRowN(failedRow-1); + bool savedReadAllColumns = readAllColumns; + readAllColumns = true; + mungeDB2row(buf, + badRow, + badRow + activeFormat->writeRowNullOffset, + true); + readAllColumns = savedReadAllColumns; + + if (table->found_next_number_field) + { + table->next_number_field->store(next_identity_value - (incrementByValue * (activeWriteBuf->rowCount() - (failedRow - 1)))); + } + } + + if (default_identity_value && // Table has ID colm and generating a value + (!autoIncLockAcquired || !got_auto_inc_values) && + // Writing first or only row in block + loopCnt == 1 && // Didn't already retry + lastDupKeyID == table->s->next_number_index) // Autoinc column is in failed index + { + if (alterStartWith() == 0) // Reset next Identity value to max+1 + retry_dup = TRUE; // Rtry the write operation + } + } + else + { + char unknownIndex[MAX_DB2_FILENAME_LENGTH+1]; + convFromEbcdic(lastDupKeyNamePtr, unknownIndex, min(lastDupKeyNameLen, MAX_DB2_FILENAME_LENGTH)); + unknownIndex[min(lastDupKeyNameLen, MAX_DB2_FILENAME_LENGTH)] = 0; + getErrTxt(DB2I_ERR_UNKNOWN_IDX, unknownIndex); + } + } + } + } + + if ((rc == 0 || rc == HA_ERR_FOUND_DUPP_KEY) + && default_identity_value && IdValueWasGenerated && + (!autoIncLockAcquired || !got_auto_inc_values)) + { + /* Save the generated identity value for the MySQL last_insert_id() function. */ + insert_id_for_cur_row = generatedIdValue; + + /* Store the value into MySQL's buf for row-based replication + or for an 'on duplicate key update' clause. */ + table->next_number_field->store((longlong) generatedIdValue, TRUE); + if (autoIncLockAcquired) + { + got_auto_inc_values = TRUE; + next_identity_value = generatedIdValue + incrementByValue; + } + } + else + { + if (!autoIncLockAcquired) // Don't overlay value for first row of a block + insert_id_for_cur_row = 0; + } + + + activeWriteBuf->resetAfterWrite(); + DBUG_RETURN(rc); +} + +int ha_ibmdb2i::alterStartWith() +{ + DBUG_ENTER("ha_ibmdb2i::alterStartWith"); + int rc = 0; + ulonglong nextIdVal; + if (!dataHandle) + rc = db2Table->dataFile()->allocateNewInstance(&dataHandle, curConnection); + if (!rc) {rc = bridge()->lockObj(dataHandle, 1, QMY_LOCK, QMY_LENR, QMY_YES);} + if (!rc) + { + rc = getNextIdVal(&nextIdVal); + if (!rc) {rc = reset_auto_increment(nextIdVal);} + bridge()->lockObj(dataHandle, 0, QMY_UNLOCK, QMY_LENR, QMY_YES); + } + DBUG_RETURN(rc); +} + +bool ha_ibmdb2i::lobFieldsRequested() +{ + if (!db2Table->hasBlobs()) + { + DBUG_PRINT("ha_ibmdb2i::lobFieldsRequested",("No LOBs")); + return (false); + } + + if (readAllColumns) + { + DBUG_PRINT("ha_ibmdb2i::lobFieldsRequested",("All cols requested")); + return (true); + } + + for (int i = 0; i < db2Table->getBlobCount(); ++i) + { + if (bitmap_is_set(table->read_set, db2Table->blobFields[i])) + { + DBUG_PRINT("ha_ibmdb2i::lobFieldsRequested",("LOB requested")); + return (true); + } + } + + DBUG_PRINT("ha_ibmdb2i::lobFieldsRequested",("No LOBs requested")); + return (false); +} + + +int ha_ibmdb2i::prepareReadBufferForLobs() +{ + DBUG_ENTER("ha_ibmdb2i::prepareReadBufferForLobs"); + DBUG_ASSERT(db2Table->hasBlobs()); + + uint32 activeLobFields = 0; + DB2LobField* lobField; + uint16 blobCount = db2Table->getBlobCount(); + + char* readBuf = activeReadBuf->getRowN(0); + + for (int i = 0; i < blobCount; ++i) + { + int fieldID = db2Table->blobFields[i]; + DB2Field& db2Field = db2Table->db2Field(fieldID); + lobField = db2Field.asBlobField(readBuf); + if (readAllColumns || + bitmap_is_set(table->read_set, fieldID)) + { + lobField->dataHandle = (ILEMemHandle)blobReadBuffers->getBufferPtr(fieldID); + activeLobFields++; + } + else + { + lobField->dataHandle = NULL; + } + } + + if (activeLobFields == 0) + { + for (int i = 0; i < blobCount; ++i) + { + DB2Field& db2Field = db2Table->db2Field(db2Table->blobFields[i]); + uint16 offset = db2Field.getBufferOffset() + db2Field.calcBlobPad(); + + for (int r = 1; r < activeReadBuf->getRowCapacity(); ++r) + { + lobField = (DB2LobField*)(activeReadBuf->getRowN(r) + offset); + lobField->dataHandle = NULL; + } + } + } + + activeReadBuf->setRowsToProcess((activeLobFields ? 1 : activeReadBuf->getRowCapacity())); + int rc = bridge()->objectOverride(activeHandle, + activeReadBuf->ptr(), + activeFormat->readRowLen); + DBUG_RETURN(rc); +} + + +uint32 ha_ibmdb2i::adjustLobBuffersForRead() +{ + DBUG_ENTER("ha_ibmdb2i::adjustLobBuffersForRead"); + + char* readBuf = activeReadBuf->getRowN(0); + + for (int i = 0; i < db2Table->getBlobCount(); ++i) + { + DB2Field& db2Field = db2Table->db2Field(db2Table->blobFields[i]); + DB2LobField* lobField = db2Field.asBlobField(readBuf); + if (readAllColumns || + bitmap_is_set(table->read_set, db2Table->blobFields[i])) + { + lobField->dataHandle = (ILEMemHandle)blobReadBuffers->reallocBuffer(db2Table->blobFields[i], lobField->length); + + if (lobField->dataHandle == NULL) + DBUG_RETURN(HA_ERR_OUT_OF_MEM); + } + else + { + lobField->dataHandle = 0; + } + } + + int32 rc = bridge()->objectOverride(activeHandle, + activeReadBuf->ptr()); + DBUG_RETURN(rc); +} + + + +int ha_ibmdb2i::reset() +{ + DBUG_ENTER("ha_ibmdb2i::reset"); + + if (outstanding_start_bulk_insert) + { + finishBulkInsert(); + } + + if (activeHandle != 0) + { + releaseActiveHandle(); + } + + cleanupBuffers(); + + db2i_ileBridge::getBridgeForThread(ha_thd())->freeErrorStorage(); + + last_rnd_init_rc = last_index_init_rc = last_start_bulk_insert_rc = 0; + + returnDupKeysImmediately = false; + onDupUpdate = false; + forceSingleRowRead = false; + +#ifndef DBUG_OFF + cachedBridge=NULL; +#endif + + DBUG_RETURN(0); +} + + +int32 ha_ibmdb2i::buildCreateIndexStatement(SqlStatementStream& sqlStream, + KEY& key, + bool isPrimary, + const char* db2LibName, + const char* db2FileName) +{ + DBUG_ENTER("ha_ibmdb2i::buildCreateIndexStatement"); + + char fileSortSequence[11] = "*HEX"; + char fileSortSequenceLibrary[11] = ""; + char fileSortSequenceType = ' '; + String query(256); + query.length(0); + int rc = 0; + + if (isPrimary) + { + query.append(STRING_WITH_LEN("ALTER TABLE ")); + query.append(db2LibName); + query.append('.'); + query.append(db2FileName); + query.append(STRING_WITH_LEN(" ADD PRIMARY KEY ")); + } + else + { + query.append(STRING_WITH_LEN("CREATE")); + + if (key.flags & HA_NOSAME) + query.append(STRING_WITH_LEN(" UNIQUE WHERE NOT NULL")); + + query.append(STRING_WITH_LEN(" INDEX ")); + + query.append(db2LibName); + query.append('.'); + if (db2i_table::appendQualifiedIndexFileName(key.name, db2FileName, query)) + { + getErrTxt(DB2I_ERR_INVALID_NAME,"index","*generated*"); + DBUG_RETURN(DB2I_ERR_INVALID_NAME ); + } + + query.append(STRING_WITH_LEN(" ON ")); + + query.append(db2LibName); + query.append('.'); + query.append(db2FileName); + } + + String fieldDefinition(128); + fieldDefinition.length(0); + fieldDefinition.append(STRING_WITH_LEN(" ( ")); + for (int j = 0; j < key.key_parts; ++j) + { + char colName[MAX_DB2_COLNAME_LENGTH+1]; + if (j != 0) + { + fieldDefinition.append(STRING_WITH_LEN(" , ")); + } + Field* field = key.key_part[j].field; + convertMySQLNameToDB2Name(field->field_name, colName, sizeof(colName)); + fieldDefinition.append(colName); + rc = updateAssociatedSortSequence(field,&fileSortSequenceType,fileSortSequence,fileSortSequenceLibrary); + if (rc) DBUG_RETURN (rc); + } + fieldDefinition.append(STRING_WITH_LEN(" ) ")); + + query.append(fieldDefinition); + + if ((THDVAR(ha_thd(), create_index_option)==1) && + (fileSortSequenceType != 'B')) + { + String shadowQuery(256); + shadowQuery.length(0); + + shadowQuery.append(STRING_WITH_LEN("CREATE INDEX ")); + + shadowQuery.append(db2LibName); + shadowQuery.append('.'); + if (db2i_table::appendQualifiedIndexFileName(key.name, db2FileName, shadowQuery, db2i_table::ASCII_SQL, typeHex)) + { + getErrTxt(DB2I_ERR_INVALID_NAME,"index","*generated*"); + DBUG_RETURN(DB2I_ERR_INVALID_NAME ); + } + + shadowQuery.append(STRING_WITH_LEN(" ON ")); + + shadowQuery.append(db2LibName); + shadowQuery.append('.'); + shadowQuery.append(db2FileName); + shadowQuery.append(fieldDefinition); + DBUG_PRINT("ha_ibmdb2i::buildCreateIndexStatement", ("Sent to DB2: %s",shadowQuery.c_ptr_safe())); + sqlStream.addStatement(shadowQuery,"*HEX","QSYS"); + } + + DBUG_PRINT("ha_ibmdb2i::buildCreateIndexStatement", ("Sent to DB2: %s",query.c_ptr_safe())); + sqlStream.addStatement(query,fileSortSequence,fileSortSequenceLibrary); + + DBUG_RETURN(0); +} + + +void ha_ibmdb2i::doInitialRead(char orientation, + uint32 rowsToBuffer, + ILEMemHandle key, + int keyLength, + int keyParts) +{ + DBUG_ENTER("ha_ibmdb2i::doInitialRead"); + + if (forceSingleRowRead) + rowsToBuffer = 1; + else + rowsToBuffer = min(rowsToBuffer, activeReadBuf->getRowCapacity()); + + activeReadBuf->newReadRequest(activeHandle, + orientation, + rowsToBuffer, + THDVAR(ha_thd(), async_enabled), + key, + keyLength, + keyParts); + DBUG_VOID_RETURN; +} + + +int ha_ibmdb2i::start_stmt(THD *thd, thr_lock_type lock_type) +{ + DBUG_ENTER("ha_ibmdb2i::start_stmt"); + initBridge(thd); + if (!THDVAR(thd, transaction_unsafe)) + { + trans_register_ha(thd, FALSE, ibmdb2i_hton); + + if (!autoCommitIsOn(thd)) + { + bridge()->beginStmtTx(); + } + } + + DBUG_RETURN(0); +} + +int32 ha_ibmdb2i::handleLOBReadOverflow() +{ + DBUG_ENTER("ha_ibmdb2i::handleLOBReadOverflow"); + DBUG_ASSERT(db2Table->hasBlobs() && (activeReadBuf->getRowCapacity() == 1)); + + int32 rc = adjustLobBuffersForRead(); + + if (!rc) + { + activeReadBuf->rewind(); + rc = bridge()->expectErrors(QMY_ERR_END_OF_BLOCK) + ->read(activeHandle, + activeReadBuf->ptr(), + accessIntent, + getCommitLevel(), + QMY_SAME); + releaseRowNeeded = TRUE; + + } + DBUG_RETURN(rc); +} + + +int32 ha_ibmdb2i::finishBulkInsert() +{ + int32 rc = 0; + + if (activeWriteBuf->rowCount() && activeHandle) + rc = flushWrite(activeHandle, table->record[0]); + + if (activeHandle) + releaseActiveHandle(); + + if (autoIncLockAcquired == TRUE) + { + // We could check the return code on the unlock, but beware not + // to overlay the return code from the flushwrite or we will mask + // duplicate key errors.. + bridge()->lockObj(dataHandle, 0, QMY_UNLOCK, QMY_LEAR, QMY_YES); + autoIncLockAcquired = FALSE; + } + outstanding_start_bulk_insert = false; + multiRowWriteBuf.freeBuf(); + last_start_bulk_insert_rc = 0; + + resetCharacterConversionBuffers(); + + return rc; +} + +int ha_ibmdb2i::getKeyFromName(const char* name, size_t len) +{ + for (int i = 0; i < table_share->keys; ++i) + { + const char* indexName = db2Table->indexFile(i)->getDB2FileName(); + if ((strncmp(name, indexName, len) == 0) && + (strlen(indexName) == len)) + { + return i; + } + } + return MAX_KEY; +} + +/* +Determine the number of I/O's it takes to read through the table. + */ +double ha_ibmdb2i::scan_time() + { + DBUG_ENTER("ha_ibmdb2i::scan_time"); + DBUG_RETURN(ulonglong2double((stats.data_file_length)/IO_SIZE)); + } + + +/** + Estimate the number of I/O's it takes to read a set of ranges through + an index. + + @param index + @param ranges + @param rows + + @return The estimate number of I/Os +*/ + +double ha_ibmdb2i::read_time(uint index, uint ranges, ha_rows rows) +{ + DBUG_ENTER("ha_ibmdb2i::read_time"); + int rc; + uint64 idxPageCnt = 0; + double cost; + + if (unlikely(rows == HA_POS_ERROR)) + DBUG_RETURN(double(rows) + ranges); + + rc = bridge()->retrieveIndexInfo(db2Table->indexFile(index)->getMasterDefnHandle(), + &idxPageCnt); + if (!rc) + { + if ((idxPageCnt == 1) || // Retrieving rows in requested order or + (ranges == rows)) // 'Sweep' full records retrieval + cost = idxPageCnt/4; + else + { + uint64 totalRecords = stats.records + 1; + double dataPageCount = stats.data_file_length/IO_SIZE; + + cost = (rows * dataPageCount / totalRecords) + + min(idxPageCnt, (log_2(idxPageCnt) * ranges + + rows * (log_2(idxPageCnt) + log_2(rows) - log_2(totalRecords)))); + } + } + else + { + cost = rows2double(ranges+rows); // Use default costing + } + DBUG_RETURN(cost); +} + +int ha_ibmdb2i::useIndexFile(char intent, int idx) +{ + DBUG_ENTER("ha_ibmdb2i::useIndexFile"); + + if (activeHandle) + releaseActiveHandle(); + + int rc = 0; + + if (!indexHandles[idx]) + rc = db2Table->indexFile(idx)->allocateNewInstance(&indexHandles[idx], curConnection); + + if (rc == 0) + { + rc = db2Table->indexFile(idx)->useFile(indexHandles[idx], + intent, + getCommitLevel(), + &activeFormat); + + if (rc == 0) + { + activeHandle = indexHandles[idx]; + bumpInUseCounter(1); + } + } + + DBUG_RETURN(rc); +} + + +ulong ha_ibmdb2i::index_flags(uint inx, uint part, bool all_parts) const +{ + return HA_READ_NEXT | HA_READ_PREV | HA_KEYREAD_ONLY | HA_READ_ORDER | HA_READ_RANGE; +} + + +static struct st_mysql_sys_var* ibmdb2i_system_variables[] = { + MYSQL_SYSVAR(rdb_name), + MYSQL_SYSVAR(transaction_unsafe), + MYSQL_SYSVAR(lob_alloc_size), + MYSQL_SYSVAR(max_read_buffer_size), + MYSQL_SYSVAR(max_write_buffer_size), + MYSQL_SYSVAR(async_enabled), + MYSQL_SYSVAR(create_time_columns_as_TOD), + MYSQL_SYSVAR(assume_exclusive_use), + MYSQL_SYSVAR(map_blob_to_varchar), + MYSQL_SYSVAR(create_index_option), + MYSQL_SYSVAR(discovery_mode), + NULL +}; + + +struct st_mysql_storage_engine ibmdb2i_storage_engine= +{ MYSQL_HANDLERTON_INTERFACE_VERSION }; + +mysql_declare_plugin(ibmdb2i) +{ + MYSQL_STORAGE_ENGINE_PLUGIN, + &ibmdb2i_storage_engine, + "IBMDB2I", + "The IBM development team in Rochester, Minnesota", + "IBM DB2 for i Storage Engine", + PLUGIN_LICENSE_PROPRIETARY, + ibmdb2i_init_func, /* Plugin Init */ + ibmdb2i_done_func, /* Plugin Deinit */ + 0x0100 /* 1.0 */, + NULL, /* status variables */ + ibmdb2i_system_variables, /* system variables */ + NULL /* config options */ +} +mysql_declare_plugin_end; diff --git a/storage/ibmdb2i/ha_ibmdb2i.h b/storage/ibmdb2i/ha_ibmdb2i.h new file mode 100644 index 00000000000..321951bfe3c --- /dev/null +++ b/storage/ibmdb2i/ha_ibmdb2i.h @@ -0,0 +1,727 @@ +/* +Licensed Materials - Property of IBM +DB2 Storage Engine Enablement +Copyright IBM Corporation 2007,2008 +All rights reserved + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + (a) Redistributions of source code must retain this list of conditions, the + copyright notice in section {d} below, and the disclaimer following this + list of conditions. + (b) Redistributions in binary form must reproduce this list of conditions, the + copyright notice in section (d) below, and the disclaimer following this + list of conditions, in the documentation and/or other materials provided + with the distribution. + (c) The name of IBM may not be used to endorse or promote products derived from + this software without specific prior written permission. + (d) The text of the required copyright notice is: + Licensed Materials - Property of IBM + DB2 Storage Engine Enablement + Copyright IBM Corporation 2007,2008 + All rights reserved + +THIS SOFTWARE IS PROVIDED BY IBM CORPORATION "AS IS" AND ANY EXPRESS OR IMPLIED +WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT +SHALL IBM CORPORATION BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT +OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT INCLUDING NEGLIGENCE OR OTHERWISE) ARISING +IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY +OF SUCH DAMAGE. +*/ + +/** @file ha_ibmdb2i.h + + @brief + + @note + + @see +*/ + +#ifdef USE_PRAGMA_INTERFACE +#pragma interface /* gcc class implementation */ +#endif + +#include "as400_types.h" +#include "as400_protos.h" +#include "db2i_global.h" +#include "db2i_ileBridge.h" +#include "builtins.h" +#include "db2i_misc.h" +#include "db2i_file.h" +#include "db2i_blobCollection.h" +#include "db2i_collationSupport.h" +#include "db2i_validatedPointer.h" +#include "db2i_ioBuffers.h" +#include "db2i_errors.h" +#include "db2i_sqlStatementStream.h" + +/** @brief + IBMDB2I_SHARE is a structure that will be shared among all open handlers. + It is used to describe the underlying table definition, and it caches + table statistics. +*/ +typedef struct st_ibmdb2i_share { + char *table_name; + uint table_name_length,use_count; + pthread_mutex_t mutex; + THR_LOCK lock; + + db2i_table* db2Table; + + class CStats + { + public: + void cacheUpdateTime(time_t time) + {update_time = time; initFlag |= lastModTime;} + time_t getUpdateTime() const + {return update_time;} + void cacheRowCount(ha_rows rows) + {records = rows; initFlag |= rowCount;} + ha_rows getRowCount() const + {return records;} + void cacheDelRowCount(ha_rows rows) + {deleted = rows; initFlag |= deletedRowCount;} + ha_rows getDelRowCount() const + {return deleted;} + void cacheMeanLength(ulong len) + {mean_rec_length = len; initFlag |= meanRowLen;} + ulong getMeanLength() + {return mean_rec_length;} + void cacheAugmentedDataLength(ulong len) + {data_file_length = len; initFlag |= ioCount;} + ulong getAugmentedDataLength() + {return data_file_length;} + bool isInited(uint flags) + {return initFlag & flags;} + void invalidate(uint flags) + {initFlag &= ~flags;} + + private: + uint initFlag; + time_t update_time; + ha_rows records; + ha_rows deleted; + ulong mean_rec_length; + ulong data_file_length; + } cachedStats; + +} IBMDB2I_SHARE; + +class ha_ibmdb2i: public handler +{ + THR_LOCK_DATA lock; ///< MySQL lock + IBMDB2I_SHARE *share; ///< Shared lock info + + // The record we are positioned on, together with the handle used to get + // i. + uint32 currentRRN; + uint32 rrnAssocHandle; + + // Dup key values needed by info() + uint32 lastDupKeyRRN; + uint32 lastDupKeyID; + + bool returnDupKeysImmediately; + + // Dup key value need by update() + bool onDupUpdate; + + + db2i_table* db2Table; + + // The file handle of the PF or LF being accessed by the current operation. + FILE_HANDLE activeHandle; + + // The file handle of the underlying PF + FILE_HANDLE dataHandle; + + // Array of file handles belonging to the underlying LFs + FILE_HANDLE* indexHandles; + + // Pointer to a definition of the layout of the row buffer for the file + // described by activeHandle + const db2i_file::RowFormat* activeFormat; + + // Flag to indicate whether a call needs to be made to unlock a row when + // a read operation has ended. DB2 will handle row unlocking as we move + // through rows, but if an operation ends before we reach the end of a file, + // DB2 needs to know to unlock the last row read. + bool releaseRowNeeded; + + + IORowBuffer keyBuf; + uint32 keyLen; + + IOWriteBuffer multiRowWriteBuf; + IOAsyncReadBuffer multiRowReadBuf; + + IOAsyncReadBuffer* activeReadBuf; + IOWriteBuffer* activeWriteBuf; + + BlobCollection* blobReadBuffers; // Dynamically allocated per query and used + // to manage the buffers used for reading LOBs + ValidatedPointer* blobWriteBuffers; + + // Return codes are not used/honored by rnd_init and start_bulk_insert + // so we need a way to signal the failure "downstream" to subsequent + // functions. + int last_rnd_init_rc; + int last_index_init_rc; + int last_start_bulk_insert_rc; + + // end_bulk_insert may get called twice for a single start_bulk_insert + // This is our way to do cleanup only once. + bool outstanding_start_bulk_insert; + + // Auto_increment 'increment by' value needed by write_row() + uint32 incrementByValue; + bool default_identity_value; + + // Flags and values used during write operations for auto_increment processing + bool autoIncLockAcquired; + bool got_auto_inc_values; + uint64 next_identity_value; + + // The access intent indicated by the last external_locks() call. + // May be either QMY_READ or QMY_UPDATABLE + char accessIntent; + + ha_rows* indexReadSizeEstimates; + + MEM_ROOT conversionBufferMemroot; + + bool forceSingleRowRead; + + bool readAllColumns; + + bool invalidDataFound; + + db2i_ileBridge* cachedBridge; + + ValidatedObject curConnection; + uint16 activeReferences; + +public: + + ha_ibmdb2i(handlerton *hton, TABLE_SHARE *table_arg); + ~ha_ibmdb2i(); + + const char *table_type() const { return "IBMDB2I"; } + const char *index_type(uint inx) { return "RADIX"; } + const key_map *keys_to_use_for_scanning() { return &key_map_full; } + const char **bas_ext() const; + + ulonglong table_flags() const + { + return HA_NULL_IN_KEY | HA_REC_NOT_IN_SEQ | HA_AUTO_PART_KEY | + HA_PARTIAL_COLUMN_READ | + HA_DUPLICATE_POS | HA_NO_PREFIX_CHAR_KEYS | + HA_HAS_RECORDS | HA_BINLOG_ROW_CAPABLE | HA_REQUIRES_KEY_COLUMNS_FOR_DELETE | + HA_CAN_INDEX_BLOBS; + } + + ulong index_flags(uint inx, uint part, bool all_parts) const; + +// Note that we do not implement max_supported_record_length. +// We'll let create fail accordingly if the row is +// too long. This allows us to hide the fact that varchars > 32K are being +// implemented as DB2 LOBs. + + uint max_supported_keys() const { return 4000; } + uint max_supported_key_parts() const { return MAX_DB2_KEY_PARTS; } + uint max_supported_key_length() const { return 32767; } + uint max_supported_key_part_length() const { return 32767; } + double read_time(uint index, uint ranges, ha_rows rows); + double scan_time(); + int open(const char *name, int mode, uint test_if_locked); + int close(void); + int write_row(uchar * buf); + int update_row(const uchar * old_data, uchar * new_data); + int delete_row(const uchar * buf); + int index_init(uint idx, bool sorted); + int index_read(uchar * buf, const uchar * key, + uint key_len, enum ha_rkey_function find_flag); + int index_next(uchar * buf); + int index_read_last(uchar * buf, const uchar * key, uint key_len); + int index_next_same(uchar *buf, const uchar *key, uint keylen); + int index_prev(uchar * buf); + int index_first(uchar * buf); + int index_last(uchar * buf); + int rnd_init(bool scan); + int rnd_end(); + int rnd_next(uchar *buf); + int rnd_pos(uchar * buf, uchar *pos); + void position(const uchar *record); + int info(uint); + ha_rows records(); + int extra(enum ha_extra_function operation); + int external_lock(THD *thd, int lock_type); + int delete_all_rows(void); + ha_rows records_in_range(uint inx, key_range *min_key, + key_range *max_key); + int delete_table(const char *from); + int rename_table(const char * from, const char * to); + int create(const char *name, TABLE *form, + HA_CREATE_INFO *create_info); + int updateFrm(TABLE *table_def, File file); + int openTableDef(TABLE *table_def); + int add_index(TABLE *table_arg, KEY *key_info, uint num_of_keys); + int prepare_drop_index(TABLE *table_arg, uint *key_num, uint num_of_keys); + int final_drop_index(TABLE *table_arg) {return 0;} + void get_auto_increment(ulonglong offset, ulonglong increment, + ulonglong nb_desired_values, + ulonglong *first_value, + ulonglong *nb_reserved_values); + int reset_auto_increment(ulonglong value); + void restore_auto_increment(ulonglong prev_insert_id) {return;} + void update_create_info(HA_CREATE_INFO *create_info); + int getNextIdVal(ulonglong *value); + int analyze(THD* thd,HA_CHECK_OPT* check_opt); + int optimize(THD* thd, HA_CHECK_OPT* check_opt); + bool can_switch_engines(); + void free_foreign_key_create_info(char* str); + char* get_foreign_key_create_info(); + int get_foreign_key_list(THD *thd, List *f_key_list); + uint referenced_by_foreign_key(); + bool check_if_incompatible_data(HA_CREATE_INFO *info, uint table_changes); + virtual bool get_error_message(int error, String *buf); + + THR_LOCK_DATA **store_lock(THD *thd, THR_LOCK_DATA **to, + enum thr_lock_type lock_type); + + bool low_byte_first() const { return 0; } + void unlock_row(); + int index_end(); + int reset(); + static int doCommit(handlerton *hton, THD *thd, bool all); + static int doRollback(handlerton *hton, THD *thd, bool all); + void start_bulk_insert(ha_rows rows); + int end_bulk_insert(); + int start_stmt(THD *thd, thr_lock_type lock_type); + + void initBridge(THD* thd = NULL) + { + if (thd == NULL) thd = ha_thd(); + DBUG_PRINT("ha_ibmdb2i::initBridge",("Initing bridge. Conn ID=%d", thd->thread_id)); + cachedBridge = db2i_ileBridge::getBridgeForThread(thd); + } + + db2i_ileBridge* bridge() {DBUG_ASSERT(cachedBridge); return cachedBridge;} + + static uint8 autoCommitIsOn(THD* thd) + { return (thd_test_options(thd, OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN) ? QMY_NO : QMY_YES); } + + uint8 getCommitLevel(); + uint8 getCommitLevel(THD* thd); + + static int doSavepointSet(THD* thd, char* name) + { + return db2i_ileBridge::getBridgeForThread(thd)->savepoint(QMY_SET_SAVEPOINT, + name); + } + + static int doSavepointRollback(THD* thd, char* name) + { + return db2i_ileBridge::getBridgeForThread(thd)->savepoint(QMY_ROLLBACK_SAVEPOINT, + name); + } + + static int doSavepointRelease(THD* thd, char* name) + { + return db2i_ileBridge::getBridgeForThread(thd)->savepoint(QMY_RELEASE_SAVEPOINT, + name); + } + + // We can't guarantee that the rows we know about when this is called + // will be the same number of rows that read returns (since DB2 activity + // may insert additional rows). Therefore, we do as the Federated SE and + // return the max possible. + ha_rows estimate_rows_upper_bound() + { + return HA_POS_ERROR; + } + + +private: + + enum enum_TimeFormat + { + TIME_OF_DAY, + DURATION + }; + + enum enum_BlobMapping + { + AS_BLOB, + AS_VARCHAR + }; + + IBMDB2I_SHARE *get_share(const char *table_name, TABLE *table); + int free_share(IBMDB2I_SHARE *share); + int32 mungeDB2row(uchar* record, const char* dataPtr, const char* nullMapPtr, bool skipLOBs); + int prepareRowForWrite(char* data, char* nulls, bool honorIdentCols); + int prepareReadBufferForLobs(); + int32 prepareWriteBufferForLobs(); + uint32 adjustLobBuffersForRead(); + bool lobFieldsRequested(); + int convertFieldChars(enum_conversionDirection direction, uint16 fieldID, const char* input, char* output, size_t ilen, size_t olen, size_t* outDataLen); + + /** + Fast integer log2 function + */ + uint64 log_2(uint64 val) + { + uint64 exp = 0; + while( (val >> exp) != 0) + { + exp++; + } + DBUG_ASSERT(exp-1 == (uint64)log2(val)); + return exp-1; + } + + void bumpInUseCounter(uint16 amount) + { + activeReferences += amount; + DBUG_PRINT("ha_ibmdb2i::bumpInUseCounter", ("activeReferences = %d", activeReferences)); + if (activeReferences) + curConnection = (uint32)(ha_thd()->thread_id); + else + curConnection = 0; + } + + + int useDataFile(char intent) + { + DBUG_ENTER("ha_ibmdb2i::useDataFile"); + DBUG_PRINT("ha_ibmdb2i::useDataFile", ("Intent: %d", intent)); + + int rc = 0; + if (!dataHandle) + rc = db2Table->dataFile()->allocateNewInstance(&dataHandle, curConnection); + else if (activeHandle == dataHandle) + DBUG_RETURN(0); + + DBUG_ASSERT(activeHandle == 0); + + + if (likely(rc == 0)) + { + rc = db2Table->dataFile()->useFile(dataHandle, + intent, + getCommitLevel(), + &activeFormat); + + if (likely(rc == 0)) + { + activeHandle = dataHandle; + bumpInUseCounter(1); + } + } + + DBUG_RETURN(rc); + } + + void releaseAnyLockedRows() + { + if (releaseRowNeeded) + { + DBUG_PRINT("ha_ibmdb2i::releaseAnyLockedRows", ("Releasing rows")); + db2i_ileBridge::getBridgeForThread()->rrlslck(activeHandle, accessIntent); + releaseRowNeeded = FALSE; + } + } + + + void releaseDataFile() + { + DBUG_ENTER("ha_ibmdb2i::releaseDataFile"); + releaseAnyLockedRows(); + bumpInUseCounter(-1); + DBUG_ASSERT((volatile int)activeReferences >= 0); + activeHandle = 0; + DBUG_VOID_RETURN; + } + + int useIndexFile(char intent, int idx); + + void releaseIndexFile(int idx) + { + DBUG_ENTER("ha_ibmdb2i::releaseIndexFile"); + releaseAnyLockedRows(); + bumpInUseCounter(-1); + DBUG_ASSERT((volatile int)activeReferences >= 0); + activeHandle = 0; + DBUG_VOID_RETURN; + } + + FILE_HANDLE allocateFileHandle(char* database, char* table, int* activityReference, bool hasBlobs); + + int updateBuffers(const db2i_file::RowFormat* format, uint rowsToRead, uint rowsToWrite); + + int flushWrite(FILE_HANDLE fileHandle, uchar* buf = NULL); + + int alterStartWith(); + + int buildDB2ConstraintString(LEX* lex, + String& appendHere, + const char* database, + Field** fields, + char* fileSortSequenceType, + char* fileSortSequence, + char* fileSortSequenceLibrary); + + void releaseWriteBuffer(); + + void setIndexReadEstimate(uint index, ha_rows rows) + { + if (!indexReadSizeEstimates) + { + indexReadSizeEstimates = (ha_rows*)my_malloc(sizeof(ha_rows) * table->s->keys, MYF(MY_WME | MY_ZEROFILL)); + } + indexReadSizeEstimates[index] = rows; + } + + ha_rows getIndexReadEstimate(uint index) + { + if (indexReadSizeEstimates) + return max(indexReadSizeEstimates[index], 1); + + return 10000; // Assume index scan if no estimate exists. + } + + + void quiesceAllFileHandles() + { + db2i_ileBridge* bridge = db2i_ileBridge::getBridgeForThread(); + if (dataHandle) + { + bridge->quiesceFileInstance(dataHandle); + } + + for (int idx = 0; idx < table_share->keys; ++idx) + { + if (indexHandles[idx] != 0) + { + bridge->quiesceFileInstance(indexHandles[idx]); + } + } + } + + int32 buildCreateIndexStatement(SqlStatementStream& sqlStream, + KEY& key, + bool isPrimary, + const char* db2LibName, + const char* db2FileName); + + // Specify NULL for data when using the data pointed to by field + int32 convertMySQLtoDB2(Field* field, const DB2Field& db2Field, char* db2Buf, const uchar* data = NULL); + + int32 convertDB2toMySQL(const DB2Field& db2Field, Field* field, const char* buf); + int getFieldTypeMapping(Field* field, + String& mapping, + enum_TimeFormat timeFormate, + enum_BlobMapping blobMapping); + + int getKeyFromName(const char* name, size_t len); + + void releaseActiveHandle() + { + if (activeHandle == dataHandle) + releaseDataFile(); + else + releaseIndexFile(active_index); + } + + + int32 finishBulkInsert(); + + void doInitialRead(char orientation, + uint32 rowsToBuffer, + ILEMemHandle key = 0, + int keyLength = 0, + int keyParts = 0); + + + int32 readFromBuffer(uchar* destination, char orientation) + { + char* row; + int32 rc = 0; + row = activeReadBuf->readNextRow(orientation, currentRRN); + + if (unlikely(!row)) + { + rc = activeReadBuf->lastrc(); + if (rc == QMY_ERR_LOB_SPACE_TOO_SMALL) + { + rc = handleLOBReadOverflow(); + if (rc == 0) + { + DBUG_ASSERT(activeReadBuf->rowCount() == 1); + row = activeReadBuf->readNextRow(orientation, currentRRN); + } + } + } + + if (likely(rc == 0)) + { + rrnAssocHandle = activeHandle; + rc = mungeDB2row(destination, row, row+activeFormat->readRowNullOffset, false); + } + return rc; + } + + int32 handleLOBReadOverflow(); + + char* getCharacterConversionBuffer(int fieldId, int length) + { + if (unlikely(!alloc_root_inited(&conversionBufferMemroot))) + init_alloc_root(&conversionBufferMemroot, 8192, 0); + + return (char*)alloc_root(&conversionBufferMemroot, length);; + } + + void resetCharacterConversionBuffers() + { + if (alloc_root_inited(&conversionBufferMemroot)) + { + free_root(&conversionBufferMemroot, MYF(MY_MARK_BLOCKS_FREE)); + } + } + + void tweakReadSet() + { + THD* thd = ha_thd(); + int command = thd_sql_command(thd); + if ((command == SQLCOM_UPDATE || + command == SQLCOM_UPDATE_MULTI) || + ((command == SQLCOM_DELETE || + command == SQLCOM_DELETE_MULTI) && + thd->options & OPTION_BIN_LOG)) + readAllColumns = TRUE; + else + readAllColumns = FALSE; + } + + /** + + */ + int useFileByHandle(char intent, + FILE_HANDLE handle) + { + DBUG_ENTER("ha_ibmdb2i::useFileByHandle"); + + const db2i_file* file; + if (handle == dataHandle) + file = db2Table->dataFile(); + else + { + for (uint i = 0; i < table_share->keys; ++i) + { + if (indexHandles[i] == handle) + { + file = db2Table->indexFile(i); + active_index = i; + } + } + } + + int rc = file->useFile(handle, intent, getCommitLevel(), &activeFormat); + if (likely(rc == 0)) + { + activeHandle = handle; + bumpInUseCounter(1); + } + + DBUG_RETURN(rc); + } + + int prepReadBuffer(ha_rows rowsToRead); + void prepWriteBuffer(ha_rows rowsToWrite); + + void invalidateCachedStats() + { + share->cachedStats.invalidate(rowCount | deletedRowCount | objLength | meanRowLen | ioCount); + } + + void warnIfInvalidData() + { + if (unlikely(invalidDataFound)) + { + warning(ha_thd(), DB2I_ERR_INVALID_DATA, table->alias); + } + } + + /** + Calculate the maximum value that a particular field can hold. + + This is used to anticipate overflows in the auto_increment processing. + + @param field The Field to be analyzed + + @return The maximum value + */ + static uint64 maxValueForField(const Field* field) + { + uint64 maxValue=0; + switch (field->type()) + { + case MYSQL_TYPE_TINY: + if (((const Field_num*)field)->unsigned_flag) + maxValue = (1 << 8) - 1; + else + maxValue = (1 << 7) - 1; + break; + case MYSQL_TYPE_SHORT: + if (((const Field_num*)field)->unsigned_flag) + maxValue = (1 << 16) - 1; + else + maxValue = (1 << 15) - 1; + break; + case MYSQL_TYPE_INT24: + if (((const Field_num*)field)->unsigned_flag) + maxValue = (1 << 24) - 1; + else + maxValue = (1 << 23) - 1; + break; + case MYSQL_TYPE_LONG: + if (((const Field_num*)field)->unsigned_flag) + maxValue = (1LL << 32) - 1; + else + maxValue = (1 << 31) - 1; + break; + case MYSQL_TYPE_LONGLONG: + if (((const Field_num*)field)->unsigned_flag) + maxValue = ~(0LL); + else + maxValue = 1 << 63 - 1; + break; + } + + return maxValue; + } + + void cleanupBuffers() + { + if (blobReadBuffers) + { + delete blobReadBuffers; + blobReadBuffers = NULL; + } + if (blobWriteBuffers) + { + delete[] blobWriteBuffers; + blobWriteBuffers = NULL; + } + if (alloc_root_inited(&conversionBufferMemroot)) + { + free_root(&conversionBufferMemroot, MYF(0)); + } + } + +}; diff --git a/storage/ibmdb2i/plug.in b/storage/ibmdb2i/plug.in new file mode 100644 index 00000000000..0913d72aabf --- /dev/null +++ b/storage/ibmdb2i/plug.in @@ -0,0 +1,12 @@ +MYSQL_STORAGE_ENGINE([ibmdb2i], [], [IBM DB2 for i Storage Engine], + [IBM DB2 for i Storage Engine], [max,max-no-ndb]) +MYSQL_PLUGIN_DYNAMIC([ibmdb2i], [ha_ibmdb2i.la]) + +AC_CHECK_HEADER([qlgusr.h], + # qlgusr.h is just one of the headers from the i5/OS PASE environment; the + # EBCDIC headers are in /QIBM/include, and have to be converted to ASCII + # before cpp gets to them + [:], + # Missing PASE environment, can't build this engine + [mysql_plugin_ibmdb2i=no + with_plugin_ibmdb2i=no]) From ec8de22f9f6671b512c1da365146a0fd04df7b57 Mon Sep 17 00:00:00 2001 From: "Tatiana A. Nurnberg" Date: Mon, 16 Feb 2009 15:38:18 +0100 Subject: [PATCH 015/132] Bug#42027: Incorrect parsing of debug and verbose options for mysqldumpslow Options got normalised to long rather than short options since we gave primary name and alias in wrong order. Consequently querying for the option using the short options (the correct primary name) didn't work, rendering the options in question inaccessible. We restore the right order of the universe, or at least the alii for --debug and --verbose. scripts/mysqldumpslow.sh: Normalise --verbose/-v and --debug/-d to short options, not long options. --- scripts/mysqldumpslow.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/mysqldumpslow.sh b/scripts/mysqldumpslow.sh index f05761bb837..009745fd896 100644 --- a/scripts/mysqldumpslow.sh +++ b/scripts/mysqldumpslow.sh @@ -17,9 +17,9 @@ my %opt = ( ); GetOptions(\%opt, - 'verbose|v+',# verbose + 'v|verbose+',# verbose 'help+', # write usage info - 'debug|d+', # debug + 'd|debug+', # debug 's=s', # what to sort by (t, at, l, al, r, ar etc) 'r!', # reverse the sort order (largest last instead of first) 't=i', # just show the top n queries From 1d0b5cc9dbc338df3a9698bfc25b591ee5becd60 Mon Sep 17 00:00:00 2001 From: "Tatiana A. Nurnberg" Date: Thu, 19 Feb 2009 04:58:10 +0100 Subject: [PATCH 016/132] Bug#37400: mysql: Bad help message for charset command Typo existed in help-text for command "charset" in mysql client, making the parameter-name different for long and short forms of the command for no good reason. Fixed. client/mysql.cc: Make parameter-name in help-text the same for long and short forms, for consistency. --- client/mysql.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/mysql.cc b/client/mysql.cc index 2ecfd637453..d1d36d79565 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -2832,7 +2832,7 @@ com_charset(String *buffer __attribute__((unused)), char *line) param= get_arg(buff, 0); if (!param || !*param) { - return put_info("Usage: \\C char_setname | charset charset_name", + return put_info("Usage: \\C charset_name | charset charset_name", INFO_ERROR, 0); } new_cs= get_charset_by_csname(param, MY_CS_PRIMARY, MYF(MY_WME)); From 4712e6b9b8e61e468ee94ec65105e61881f77421 Mon Sep 17 00:00:00 2001 From: Andrei Elkin Date: Fri, 20 Feb 2009 13:55:43 +0200 Subject: [PATCH 017/132] Bug #37313 BINLOG Contains Incorrect server id Signed integer format specifier forced to print the binlog header with server_id negative if the unsigned value sets the sign-bit ON. Fixed with correcting the specifier to correspond to typeof(server_id) == ulong. mysql-test/r/mysqlbinlog.result: results changed. mysql-test/t/mysqlbinlog.test: displaying the expected unsignedly formatted server_id value, bug#37313. sql/log_event.cc: Format specifier is corrected to correspond to typeof(server_id). --- mysql-test/r/mysqlbinlog.result | 10 ++++++++++ mysql-test/t/mysqlbinlog.test | 20 ++++++++++++++++++++ sql/log_event.cc | 2 +- 3 files changed, 31 insertions(+), 1 deletion(-) diff --git a/mysql-test/r/mysqlbinlog.result b/mysql-test/r/mysqlbinlog.result index 4fd87861ded..b5ac22437cd 100644 --- a/mysql-test/r/mysqlbinlog.result +++ b/mysql-test/r/mysqlbinlog.result @@ -362,4 +362,14 @@ drop table t1; 1 drop table t1; shell> mysqlbinlog std_data/corrupt-relay-bin.000624 > var/tmp/bug31793.sql +set @@global.server_id= 4294967295; +reset master; +select +(@a:=load_file("MYSQLTEST_VARDIR/tmp/mysqlbinlog_bug37313.binlog")) +is not null; +(@a:=load_file("MYSQLTEST_VARDIR/tmp/mysqlbinlog_bug37313.binlog")) +is not null +1 +*** Unsigned server_id 4294967295 is found: 1 *** +set @@global.server_id= 1; End of 5.0 tests diff --git a/mysql-test/t/mysqlbinlog.test b/mysql-test/t/mysqlbinlog.test index 5b4a43c8fe8..cf4bc1523df 100644 --- a/mysql-test/t/mysqlbinlog.test +++ b/mysql-test/t/mysqlbinlog.test @@ -253,4 +253,24 @@ echo shell> mysqlbinlog std_data/corrupt-relay-bin.000624 > var/tmp/bug31793.sql error 1; exec $MYSQL_BINLOG $MYSQL_TEST_DIR/std_data/corrupt-relay-bin.000624 > $MYSQLTEST_VARDIR/tmp/bug31793.sql; +# +# Bug #37313 BINLOG Contains Incorrect server id +# + +let $save_server_id= `select @@global.server_id`; +let $s_id_max=`select (1 << 32) - 1`; +eval set @@global.server_id= $s_id_max; + +reset master; +--exec $MYSQL_BINLOG $MYSQLTEST_VARDIR/log/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/mysqlbinlog_bug37313.binlog +--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR +eval select +(@a:=load_file("$MYSQLTEST_VARDIR/tmp/mysqlbinlog_bug37313.binlog")) +is not null; +let $s_id_unsigned= `select @a like "%server id $s_id_max%" /* must return 1 */`; +echo *** Unsigned server_id $s_id_max is found: $s_id_unsigned ***; + +eval set @@global.server_id= $save_server_id; +--remove_file $MYSQLTEST_VARDIR/tmp/mysqlbinlog_bug37313.binlog + --echo End of 5.0 tests diff --git a/sql/log_event.cc b/sql/log_event.cc index ef419aaee40..90805877502 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -976,7 +976,7 @@ void Log_event::print_header(FILE* file, PRINT_EVENT_INFO* print_event_info) fputc('#', file); print_timestamp(file); - fprintf(file, " server id %d end_log_pos %s ", server_id, + fprintf(file, " server id %lu end_log_pos %s ", server_id, llstr(log_pos,llbuff)); /* mysqlbinlog --hexdump */ From 61d706a4f04906632e461aa6a2756429b1be9c2c Mon Sep 17 00:00:00 2001 From: Leonard Zhou Date: Mon, 23 Feb 2009 11:26:38 +0800 Subject: [PATCH 018/132] Bug#40013 mixed replication: row based format could lead to stale tmp tables on the slave. In mixed mode, if we create a temporary table and do some update which switch to ROW format, the format will keep in ROW format until the session ends or the table is dropped explicitly. When the session ends, the temp table is dropped automaticly at cleanup time. but it checks only current binlog format and so skip insertion of DROP TABLE instructions into binlog. So the temp table can't be dropped correctly at slave. Our solution is that when closing temp tables at cleanup time we check both binlog format and binlog mode, and we could write DROP TABLE instructions into binlog if current binlog format is ROW but in MIX mode. mysql-test/suite/rpl/r/rpl_temp_table_mix_row.result: Test result file. mysql-test/suite/rpl/t/rpl_temp_table_mix_row.test: Test file. sql/sql_base.cc: Didn't do binloging when both current format and default format are ROW. --- .../suite/rpl/r/rpl_temp_table_mix_row.result | 26 ++++++++++ .../suite/rpl/t/rpl_temp_table_mix_row.test | 49 +++++++++++++++++++ sql/sql_base.cc | 3 +- 3 files changed, 77 insertions(+), 1 deletion(-) create mode 100644 mysql-test/suite/rpl/r/rpl_temp_table_mix_row.result create mode 100644 mysql-test/suite/rpl/t/rpl_temp_table_mix_row.test diff --git a/mysql-test/suite/rpl/r/rpl_temp_table_mix_row.result b/mysql-test/suite/rpl/r/rpl_temp_table_mix_row.result new file mode 100644 index 00000000000..feffefc9dad --- /dev/null +++ b/mysql-test/suite/rpl/r/rpl_temp_table_mix_row.result @@ -0,0 +1,26 @@ +stop slave; +drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; +reset master; +reset slave; +drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; +start slave; +==== Initialize ==== +[on master] +CREATE TABLE t1 (a CHAR(48)); +CREATE TEMPORARY TABLE t1_tmp1(a INT); +INSERT INTO t1 VALUES (UUID()); +[on slave] +==== Verify results on slave ==== +SHOW STATUS LIKE "Slave_open_temp_tables"; +Variable_name Value +Slave_open_temp_tables 1 +[on master] +[on slave] +==== Verify results on slave ==== +SHOW STATUS LIKE "Slave_open_temp_tables"; +Variable_name Value +Slave_open_temp_tables 0 +==== Clean up ==== +[on master] +DROP TABLE t1; +[on slave] diff --git a/mysql-test/suite/rpl/t/rpl_temp_table_mix_row.test b/mysql-test/suite/rpl/t/rpl_temp_table_mix_row.test new file mode 100644 index 00000000000..1fe484b7c27 --- /dev/null +++ b/mysql-test/suite/rpl/t/rpl_temp_table_mix_row.test @@ -0,0 +1,49 @@ +# ==== Purpose ==== +# +# Test that temporary tables are correctly replicated after switching to ROW format in MIX mode. +# This test case will test the condition of the bug#40013. +# The test step is: +# 1: create temp table on connection 'master'; +# 2: switch to ROW format using 'INSERT INTO t1 VALUES (UUID());' +# 3: disconnect 'master' and connect to a new connection 'master1'; +# 4: sync to slave and check the number of temp tables on slave. +# + +source include/master-slave.inc; +source include/have_binlog_format_mixed.inc; + +--echo ==== Initialize ==== + +--echo [on master] +--connection master + +CREATE TABLE t1 (a CHAR(48)); +CREATE TEMPORARY TABLE t1_tmp1(a INT); +INSERT INTO t1 VALUES (UUID()); + +--echo [on slave] +sync_slave_with_master; + +--echo ==== Verify results on slave ==== +SHOW STATUS LIKE "Slave_open_temp_tables"; + +--echo [on master] +--connection master + +disconnect master; +--connection master1 + +--echo [on slave] +sync_slave_with_master; + +--echo ==== Verify results on slave ==== +SHOW STATUS LIKE "Slave_open_temp_tables"; + +--echo ==== Clean up ==== + +--echo [on master] +--connection master1 +DROP TABLE t1; + +--echo [on slave] +sync_slave_with_master; diff --git a/sql/sql_base.cc b/sql/sql_base.cc index 6db9f1df0f2..7602b1187aa 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -1440,7 +1440,8 @@ void close_temporary_tables(THD *thd) if (!thd->temporary_tables) return; - if (!mysql_bin_log.is_open() || thd->current_stmt_binlog_row_based) + if (!mysql_bin_log.is_open() || + (thd->current_stmt_binlog_row_based && thd->variables.binlog_format == BINLOG_FORMAT_ROW)) { TABLE *tmp_next; for (table= thd->temporary_tables; table; table= tmp_next) From 9fc083bd9ade238ed53f82978b5588f687b033c6 Mon Sep 17 00:00:00 2001 From: Davi Arnaut Date: Mon, 23 Feb 2009 09:03:31 +0100 Subject: [PATCH 019/132] Post-merge fix: test depends on feature not available under embedded. mysql-test/t/query_cache_28249.test: Test depends on process state (not updated under embedded) --- mysql-test/t/query_cache_28249.test | 1 + 1 file changed, 1 insertion(+) diff --git a/mysql-test/t/query_cache_28249.test b/mysql-test/t/query_cache_28249.test index 3cf6c89369e..390a1ce6e3d 100644 --- a/mysql-test/t/query_cache_28249.test +++ b/mysql-test/t/query_cache_28249.test @@ -11,6 +11,7 @@ # --source include/have_query_cache.inc +--source include/not_embedded.inc SET @query_cache_type= @@global.query_cache_type; SET @query_cache_limit= @@global.query_cache_limit; From 0e62c9aa6301de71164496ec7c81c871d78ce8cd Mon Sep 17 00:00:00 2001 From: Alexey Kopytov Date: Mon, 23 Feb 2009 14:28:26 +0200 Subject: [PATCH 020/132] Fix for bug #15936: "round" differs on Windows to Unix Both of our own implementations of rint(3) were inconsistent with the most common behavior of rint() on those platforms that have it: round to nearest, break ties by rounding to nearest even. Fixed by leaving just one implementation of rint() in our source tree, and changing its behavior to match the most common native implementations on other platforms. configure.in: Added checks for fenv.h and fesetround(). include/config-win.h: Removed the incorrect implementation of rint() for Windows. include/my_global.h: Added an rint() implementation for platforms that do not have it. mysql-test/r/func_math.result: Added a test case for bug #15936. mysql-test/t/func_math.test: Added a test case for bug #15936. sql/mysqld.cc: Explicitly set the FPU rounding mode with fesetround(). --- configure.in | 4 +-- include/config-win.h | 9 ------ include/my_global.h | 35 +++++++++++++++++++++-- mysql-test/r/func_math.result | 30 ++++++++++++++++++++ mysql-test/t/func_math.test | 20 +++++++++++++ sql/mysqld.cc | 53 +++++++++++++++++++---------------- 6 files changed, 114 insertions(+), 37 deletions(-) diff --git a/configure.in b/configure.in index 9591b5bbc5a..8c2c4a9cf79 100644 --- a/configure.in +++ b/configure.in @@ -825,7 +825,7 @@ AC_TYPE_SIZE_T AC_HEADER_DIRENT AC_HEADER_STDC AC_HEADER_SYS_WAIT -AC_CHECK_HEADERS(fcntl.h float.h floatingpoint.h ieeefp.h limits.h \ +AC_CHECK_HEADERS(fcntl.h fenv.h float.h floatingpoint.h ieeefp.h limits.h \ memory.h pwd.h select.h \ stdlib.h stddef.h \ strings.h string.h synch.h sys/mman.h sys/socket.h netinet/in.h arpa/inet.h \ @@ -2060,7 +2060,7 @@ AC_FUNC_UTIME_NULL AC_FUNC_VPRINTF AC_CHECK_FUNCS(alarm bcmp bfill bmove bzero chsize cuserid fchmod fcntl \ - fconvert fdatasync finite fpresetsticky fpsetmask fsync ftruncate \ + fconvert fdatasync fesetround finite fpresetsticky fpsetmask fsync ftruncate \ getcwd gethostbyaddr_r gethostbyname_r getpass getpassphrase getpwnam \ getpwuid getrlimit getrusage getwd gmtime_r index initgroups isnan \ localtime_r locking longjmp lrand48 madvise mallinfo memcpy memmove \ diff --git a/include/config-win.h b/include/config-win.h index eba699159c7..ab463a7c142 100644 --- a/include/config-win.h +++ b/include/config-win.h @@ -31,7 +31,6 @@ functions */ #include #include -#include /* Because of rint() */ #include #include #include @@ -223,13 +222,6 @@ typedef uint rf_SetTimer; #define inline __inline #endif /* __cplusplus */ -inline double rint(double nr) -{ - double f = floor(nr); - double c = ceil(nr); - return (((c-nr) >= (nr-f)) ? f :c); -} - #ifdef _WIN64 #define ulonglong2double(A) ((double) (ulonglong) (A)) #define my_off_t2double(A) ((double) (my_off_t) (A)) @@ -281,7 +273,6 @@ inline ulonglong double2ulonglong(double d) #define HAVE_FLOAT_H #define HAVE_LIMITS_H #define HAVE_STDDEF_H -#define HAVE_RINT /* defined in this file */ #define NO_FCNTL_NONBLOCK /* No FCNTL */ #define HAVE_ALLOCA #define HAVE_STRPBRK diff --git a/include/my_global.h b/include/my_global.h index 845ae042a42..3f872bfc855 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -484,8 +484,39 @@ typedef unsigned short ushort; #define set_bits(type, bit_count) (sizeof(type)*8 <= (bit_count) ? ~(type) 0 : ((((type) 1) << (bit_count)) - (type) 1)) #define array_elements(A) ((uint) (sizeof(A)/sizeof(A[0]))) #ifndef HAVE_RINT -#define rint(A) floor((A)+(((A) < 0)? -0.5 : 0.5)) -#endif +/** + All integers up to this number can be represented exactly as double precision + values (DBL_MANT_DIG == 53 for IEEE 754 hardware). +*/ +#define MAX_EXACT_INTEGER ((1LL << DBL_MANT_DIG) - 1) + +/** + rint(3) implementation for platforms that do not have it. + Always rounds to the nearest integer with ties being rounded to the nearest + even integer to mimic glibc's rint() behavior in the "round-to-nearest" + FPU mode. Hardware-specific optimizations are possible (frndint on x86). + Unlike this implementation, hardware will also honor the FPU rounding mode. +*/ + +static inline double rint(double x) +{ + double f, i; + f = modf(x, &i); + /* + All doubles with absolute values > MAX_EXACT_INTEGER are even anyway, + no need to check it. + */ + if (x > 0.0) + i += (double) ((f > 0.5) || (f == 0.5 && + i <= (double) MAX_EXACT_INTEGER && + (longlong) i % 2)); + else + i -= (double) ((f < -0.5) || (f == -0.5 && + i >= (double) -MAX_EXACT_INTEGER && + (longlong) i % 2)); + return i; +} +#endif /* HAVE_RINT */ /* Define some general constants */ #ifndef TRUE diff --git a/mysql-test/r/func_math.result b/mysql-test/r/func_math.result index 0d7adbbba5e..87cfb5b86a5 100644 --- a/mysql-test/r/func_math.result +++ b/mysql-test/r/func_math.result @@ -360,4 +360,34 @@ SELECT a DIV 2 FROM t1 UNION SELECT a DIV 2 FROM t1; a DIV 2 0 DROP TABLE t1; +CREATE TABLE t1 (a DOUBLE); +INSERT INTO t1 VALUES (-1.1), (1.1), +(-1.5), (1.5), +(-1.9), (1.9), +(-2.1), (2.1), +(-2.5), (2.5), +(-2.9), (2.9), +# Check numbers with absolute values > 2^53 - 1 +# (see comments for MAX_EXACT_INTEGER) +(-1e16 - 0.5), (1e16 + 0.5), +(-1e16 - 1.5), (1e16 + 1.5); +SELECT a, ROUND(a) FROM t1; +a ROUND(a) +-1.1 -1 +1.1 1 +-1.5 -2 +1.5 2 +-1.9 -2 +1.9 2 +-2.1 -2 +2.1 2 +-2.5 -2 +2.5 2 +-2.9 -3 +2.9 3 +-1e+16 -10000000000000000 +1e+16 10000000000000000 +-1e+16 -10000000000000002 +1e+16 10000000000000002 +DROP TABLE t1; End of 5.0 tests diff --git a/mysql-test/t/func_math.test b/mysql-test/t/func_math.test index 9f12fdd696e..593cfe90c1b 100644 --- a/mysql-test/t/func_math.test +++ b/mysql-test/t/func_math.test @@ -229,5 +229,25 @@ INSERT INTO t1 VALUES ('a'); SELECT a DIV 2 FROM t1 UNION SELECT a DIV 2 FROM t1; DROP TABLE t1; +# +# Bug #15936: "round" differs on Windows to Unix +# + +CREATE TABLE t1 (a DOUBLE); + +INSERT INTO t1 VALUES (-1.1), (1.1), + (-1.5), (1.5), + (-1.9), (1.9), + (-2.1), (2.1), + (-2.5), (2.5), + (-2.9), (2.9), +# Check numbers with absolute values > 2^53 - 1 +# (see comments for MAX_EXACT_INTEGER) + (-1e16 - 0.5), (1e16 + 0.5), + (-1e16 - 1.5), (1e16 + 1.5); + +SELECT a, ROUND(a) FROM t1; + +DROP TABLE t1; --echo End of 5.0 tests diff --git a/sql/mysqld.cc b/sql/mysqld.cc index ca68976d939..7856309b095 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -186,39 +186,44 @@ int initgroups(const char *,unsigned int); #ifdef HAVE_FP_EXCEPT // Fix type conflict typedef fp_except fp_except_t; #endif +#endif /* __FreeBSD__ && HAVE_IEEEFP_H */ +#ifdef HAVE_FENV_H +#include +#endif +#ifdef HAVE_SYS_FPU_H +/* for IRIX to use set_fpc_csr() */ +#include +#endif +inline void setup_fpu() +{ +#if defined(__FreeBSD__) && defined(HAVE_IEEEFP_H) /* We can't handle floating point exceptions with threads, so disable this on freebsd + Don't fall for overflow, underflow,divide-by-zero or loss of precision */ - -inline void set_proper_floating_point_mode() -{ - /* Don't fall for overflow, underflow,divide-by-zero or loss of precision */ #if defined(__i386__) fpsetmask(~(FP_X_INV | FP_X_DNML | FP_X_OFL | FP_X_UFL | FP_X_DZ | FP_X_IMP)); #else - fpsetmask(~(FP_X_INV | FP_X_OFL | FP_X_UFL | FP_X_DZ | - FP_X_IMP)); + fpsetmask(~(FP_X_INV | FP_X_OFL | FP_X_UFL | FP_X_DZ | + FP_X_IMP)); +#endif /* __i386__ */ +#endif /* __FreeBSD__ && HAVE_IEEEFP_H */ + +#ifdef HAVE_FESETROUND + /* Set FPU rounding mode to "round-to-nearest" */ + fesetround(FE_TONEAREST); +#endif /* HAVE_FESETROUND */ + +#if defined(__sgi) && defined(HAVE_SYS_FPU_H) + /* Enable denormalized DOUBLE values support for IRIX */ + union fpc_csr n; + n.fc_word = get_fpc_csr(); + n.fc_struct.flush = 0; + set_fpc_csr(n.fc_word); #endif } -#elif defined(__sgi) -/* for IRIX to use set_fpc_csr() */ -#include - -inline void set_proper_floating_point_mode() -{ - /* Enable denormalized DOUBLE values support for IRIX */ - { - union fpc_csr n; - n.fc_word = get_fpc_csr(); - n.fc_struct.flush = 0; - set_fpc_csr(n.fc_word); - } -} -#else -#define set_proper_floating_point_mode() -#endif /* __FreeBSD__ && HAVE_IEEEFP_H */ } /* cplusplus */ @@ -3279,7 +3284,7 @@ static int init_server_components() query_cache_init(); query_cache_resize(query_cache_size); randominit(&sql_rand,(ulong) server_start_time,(ulong) server_start_time/2); - set_proper_floating_point_mode(); + setup_fpu(); init_thr_lock(); #ifdef HAVE_REPLICATION init_slave_list(); From c7d0de370679c65b663c7bddcc8081d7c3c85842 Mon Sep 17 00:00:00 2001 From: Magnus Svensson Date: Mon, 23 Feb 2009 15:52:23 +0100 Subject: [PATCH 021/132] Bug#43112 mtr.pl --embedded fails to stop cluster processes --- mysql-test/mysql-test-run.pl | 6 ------ 1 file changed, 6 deletions(-) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index ba426446075..82ed1ff67fc 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -4090,12 +4090,6 @@ sub server_need_restart { return 0; } - if ( $opt_embedded_server ) - { - mtr_verbose_restart($server, "no start or restart for embedded server"); - return 0; - } - if ( $tinfo->{'force_restart'} ) { mtr_verbose_restart($server, "forced in .opt file"); return 1; From 11b20f27affcdaeb528feb2d08c920771bd875ef Mon Sep 17 00:00:00 2001 From: Davi Arnaut Date: Tue, 24 Feb 2009 10:15:21 +0100 Subject: [PATCH 022/132] Bug#41110: crash with handler command when used concurrently with alter table Bug#41112: crash in mysql_ha_close_table/get_lock_data with alter table The problem is that the server wasn't handling robustly failures to re-open a table during a HANDLER .. READ statement. If the table needed to be re-opened due to it's storage engine being altered to one that doesn't support HANDLER, a reference (dangling pointer) to a closed table could be left in place and accessed in later attempts to fetch from the table using the handler. Also, if the server failed to set a error message if the re-open failed. These problems could lead to server crashes or hangs. The solution is to remove any references to a closed table and to set a error if reopening a table during a HANDLER .. READ statement fails. There is no test case in this change set as the test depends on a testing feature only available on 5.1 and later. sql/sql_handler.cc: Remove redundant reopen check. Set errors even if reopening table. Reset TABLE_LIST::table reference when the table is closed. --- sql/sql_handler.cc | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/sql/sql_handler.cc b/sql/sql_handler.cc index 822f2b2c419..f58a4ec4921 100644 --- a/sql/sql_handler.cc +++ b/sql/sql_handler.cc @@ -151,6 +151,9 @@ static void mysql_ha_close_table(THD *thd, TABLE_LIST *tables) } VOID(pthread_mutex_unlock(&LOCK_open)); } + + /* Mark table as closed, ready for re-open if necessary. */ + tables->table= NULL; } /* @@ -168,8 +171,7 @@ static void mysql_ha_close_table(THD *thd, TABLE_LIST *tables) 'reopen' is set when a handler table is to be re-opened. In this case, 'tables' is the pointer to the hashed TABLE_LIST object which has been saved on the original open. - 'reopen' is also used to suppress the sending of an 'ok' message or - error messages. + 'reopen' is also used to suppress the sending of an 'ok' message. RETURN FALSE OK @@ -205,8 +207,7 @@ bool mysql_ha_open(THD *thd, TABLE_LIST *tables, bool reopen) strlen(tables->alias) + 1)) { DBUG_PRINT("info",("duplicate '%s'", tables->alias)); - if (! reopen) - my_error(ER_NONUNIQ_TABLE, MYF(0), tables->alias); + my_error(ER_NONUNIQ_TABLE, MYF(0), tables->alias); goto err; } } @@ -251,8 +252,7 @@ bool mysql_ha_open(THD *thd, TABLE_LIST *tables, bool reopen) /* There can be only one table in '*tables'. */ if (! (tables->table->file->table_flags() & HA_CAN_SQL_HANDLER)) { - if (! reopen) - my_error(ER_ILLEGAL_HA, MYF(0), tables->alias); + my_error(ER_ILLEGAL_HA, MYF(0), tables->alias); goto err; } @@ -464,8 +464,7 @@ retry: if (need_reopen) { - mysql_ha_close_table(thd, tables); - hash_tables->table= NULL; + mysql_ha_close_table(thd, hash_tables); /* The lock might have been aborted, we need to manually reset thd->some_tables_deleted because handler's tables are closed From 00aa5ad58a5dab3a9108e9c6ead5880664c7bef5 Mon Sep 17 00:00:00 2001 From: Chad MILLER Date: Tue, 24 Feb 2009 12:05:37 +0200 Subject: [PATCH 023/132] Bug#39370: wrong output for error code 153 Add all HA error numbers and descriptions to perror. Add reminder to header. This is already fixed in smarter ways in future codebases, and this codebase is unlikely to change, since new development is forbidden here. --- extra/perror.c | 11 +++++++++++ include/my_base.h | 1 + 2 files changed, 12 insertions(+) diff --git a/extra/perror.c b/extra/perror.c index 37d6b45c8dd..ba638aca819 100644 --- a/extra/perror.c +++ b/extra/perror.c @@ -97,6 +97,17 @@ static HA_ERRORS ha_errlist[]= { 150,"Foreign key constraint is incorrectly formed"}, { 151,"Cannot add a child row"}, { 152,"Cannot delete a parent row"}, + { 153,"No savepoint with that name"}, + { 154,"Non unique key block size"}, + { 155,"The table does not exist in engine"}, + { 156,"The table existed in storage engine"}, + { 157,"Could not connect to storage engine"}, + { 158,"NULLs are not supported in spatial index"}, + { 159,"The table changed in storage engine"}, + { 160,"The table changed in storage engine"}, + { 161,"The table is not writable"}, + { 162,"Failed to get the next autoinc value"}, + { 163,"Failed to set the row autoinc value"}, { -30999, "DB_INCOMPLETE: Sync didn't finish"}, { -30998, "DB_KEYEMPTY: Key/data deleted or never created"}, { -30997, "DB_KEYEXIST: The key/data pair already exists"}, diff --git a/include/my_base.h b/include/my_base.h index 9240b01a9f1..e45a73d68ed 100644 --- a/include/my_base.h +++ b/include/my_base.h @@ -377,6 +377,7 @@ enum ha_base_keytype { #define HA_ERR_TABLE_READONLY 161 /* The table is not writable */ #define HA_ERR_AUTOINC_READ_FAILED 162/* Failed to get the next autoinc value */ #define HA_ERR_AUTOINC_ERANGE 163 /* Failed to set the row autoinc value */ +/* You must also add numbers and description to extra/perror.c ! */ #define HA_ERR_LAST 163 /*Copy last error nr.*/ /* Add error numbers before HA_ERR_LAST and change it accordingly. */ From 54d05087f7fb1514584f04f9bb89a55930c7fdcb Mon Sep 17 00:00:00 2001 From: Daniel Fischer Date: Tue, 24 Feb 2009 11:42:11 +0100 Subject: [PATCH 024/132] bug#42888: Add collections of test runs to make it both configurable and transparent what kinds of tests we run during integration testing. --- mysql-test/collections/README | 30 +++++++++++++++++++++++++++ mysql-test/collections/default.daily | 0 mysql-test/collections/default.push | 2 ++ mysql-test/collections/default.weekly | 0 4 files changed, 32 insertions(+) create mode 100644 mysql-test/collections/README create mode 100644 mysql-test/collections/default.daily create mode 100644 mysql-test/collections/default.push create mode 100644 mysql-test/collections/default.weekly diff --git a/mysql-test/collections/README b/mysql-test/collections/README new file mode 100644 index 00000000000..9af84646a40 --- /dev/null +++ b/mysql-test/collections/README @@ -0,0 +1,30 @@ +This directory contains collections of test runs that we run during our +integration and release testing. Each file contains zero or more lines, +with one invocation of mysql-test-run.pl on each. These invocations are +written so that, with the assumption that perl is in your search path, +any collection can run as a shell script or a batch file, with the parent +mysql-test directory being the current working directory. + +During integration testing, we choose the collection to run by following +these steps: + +1) We choose the extension to look for, based on these rules: + - If we're running a per-push test, we choose ".push" as the extension. + - If we're running a daily test, we choose ".daily" as the extension. + - If we're running a weekly test, we choose ".weekly" as the extension. + +2) If there is a collection that has the same name as the branch we're + testing plus the extension as determined in step 1, we choose that + collection. + +3) If the branch is unknown or we have removed all characters from it + and still not found a matching collection, we choose the name "default" + plus the extension determined in step 1. If there is no such file, + we give up and don't test anything at all. + +4) If we haven't found a collection yet, we remove the last character from + the branch name and go back to step 2. + +5) The commands from the collection are run line by line via execv() or + similar system calls. They are not run as a shell script. Shell + expansions are not guaranteed to work and most likely won't. diff --git a/mysql-test/collections/default.daily b/mysql-test/collections/default.daily new file mode 100644 index 00000000000..e69de29bb2d diff --git a/mysql-test/collections/default.push b/mysql-test/collections/default.push new file mode 100644 index 00000000000..0f4115c8565 --- /dev/null +++ b/mysql-test/collections/default.push @@ -0,0 +1,2 @@ +perl mysql-test-run.pl --timer --force --comment=n_stm +perl mysql-test-run.pl --timer --force --comment=ps_stm --ps-protocol diff --git a/mysql-test/collections/default.weekly b/mysql-test/collections/default.weekly new file mode 100644 index 00000000000..e69de29bb2d From 85ea3740ffa44454d7d3cb03f90857bfa43d2aad Mon Sep 17 00:00:00 2001 From: Georgi Kodinov Date: Tue, 24 Feb 2009 15:06:28 +0200 Subject: [PATCH 025/132] Bug #31060: MySQL CLI parser bug 2 There was a problem when a DELIMITER COMMAND is not the first command on the line. I this case an extra line feed was added to the glob buffer and this was causing subsequent attempts to enter this delimiter to fail. Fixed by not adding a new line to the glob buffer if the command being added is a DELIMITER client/mysql.cc: Bug #31060: Don't add a new line if DELIMTER is added to the glob buffer mysql-test/r/mysql.result: Bug #31060: test case mysql-test/t/mysql.test: Bug #31060: test case --- client/mysql.cc | 16 +++++++++++++++- mysql-test/r/mysql.result | 4 ++++ mysql-test/t/mysql.test | 17 +++++++++++++++++ 3 files changed, 36 insertions(+), 1 deletion(-) diff --git a/client/mysql.cc b/client/mysql.cc index d1d36d79565..1a025345190 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -2222,8 +2222,22 @@ static bool add_line(String &buffer,char *line,char *in_string, } if (out != line || !buffer.is_empty()) { - *out++='\n'; uint length=(uint) (out-line); + + if (length < 9 || + my_strnncoll (charset_info, + (uchar *)line, 9, (const uchar *) "delimiter", 9)) + { + /* + Don't add a new line in case there's a DELIMITER command to be + added to the glob buffer (e.g. on processing a line like + ";DELIMITER ") : similar to how a new line is + not added in the case when the DELIMITER is the first command + entered with an empty glob buffer. + */ + *out++='\n'; + length++; + } if (buffer.length() + length >= buffer.alloced_length()) buffer.realloc(buffer.length()+length+IO_SIZE); if ((!*ml_comment || preserve_comments) && buffer.append(line, length)) diff --git a/mysql-test/r/mysql.result b/mysql-test/r/mysql.result index 9bad3b9f791..10537f6da16 100644 --- a/mysql-test/r/mysql.result +++ b/mysql-test/r/mysql.result @@ -188,4 +188,8 @@ delimiter 2 @z:='1' @z=database() 1 NULL +1 +1 +1 +1 End of 5.0 tests diff --git a/mysql-test/t/mysql.test b/mysql-test/t/mysql.test index 68a01a309d4..594d10e46a5 100644 --- a/mysql-test/t/mysql.test +++ b/mysql-test/t/mysql.test @@ -314,4 +314,21 @@ remove_file $MYSQLTEST_VARDIR/tmp/bug38158.sql; # --exec $MYSQL -e "select @z:='1',@z=database()" + +# +# Bug #31060: MySQL CLI parser bug 2 +# + +--write_file $MYSQLTEST_VARDIR/tmp/bug31060.sql +;DELIMITER DELIMITER +; +SELECT 1DELIMITER +DELIMITER ; +SELECT 1; +EOF + +--exec $MYSQL < $MYSQLTEST_VARDIR/tmp/bug31060.sql 2>&1 + +remove_file $MYSQLTEST_VARDIR/tmp/bug31060.sql; + --echo End of 5.0 tests From 4b05db5cfdfa9d56c7185a8c03ddfaaf4333c963 Mon Sep 17 00:00:00 2001 From: Georgi Kodinov Date: Tue, 24 Feb 2009 15:06:28 +0200 Subject: [PATCH 026/132] Bug #31060: MySQL CLI parser bug 2 There was a problem when a DELIMITER COMMAND is not the first command on the line. I this case an extra line feed was added to the glob buffer and this was causing subsequent attempts to enter this delimiter to fail. Fixed by not adding a new line to the glob buffer if the command being added is a DELIMITER client/mysql.cc: Bug #31060: Don't add a new line if DELIMTER is added to the glob buffer mysql-test/r/mysql.result: Bug #31060: test case mysql-test/t/mysql.test: Bug #31060: test case --- client/mysql.cc | 16 +++++++++++++++- mysql-test/r/mysql.result | 4 ++++ mysql-test/t/mysql.test | 17 +++++++++++++++++ 3 files changed, 36 insertions(+), 1 deletion(-) diff --git a/client/mysql.cc b/client/mysql.cc index d1d36d79565..1a025345190 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -2222,8 +2222,22 @@ static bool add_line(String &buffer,char *line,char *in_string, } if (out != line || !buffer.is_empty()) { - *out++='\n'; uint length=(uint) (out-line); + + if (length < 9 || + my_strnncoll (charset_info, + (uchar *)line, 9, (const uchar *) "delimiter", 9)) + { + /* + Don't add a new line in case there's a DELIMITER command to be + added to the glob buffer (e.g. on processing a line like + ";DELIMITER ") : similar to how a new line is + not added in the case when the DELIMITER is the first command + entered with an empty glob buffer. + */ + *out++='\n'; + length++; + } if (buffer.length() + length >= buffer.alloced_length()) buffer.realloc(buffer.length()+length+IO_SIZE); if ((!*ml_comment || preserve_comments) && buffer.append(line, length)) diff --git a/mysql-test/r/mysql.result b/mysql-test/r/mysql.result index 9bad3b9f791..10537f6da16 100644 --- a/mysql-test/r/mysql.result +++ b/mysql-test/r/mysql.result @@ -188,4 +188,8 @@ delimiter 2 @z:='1' @z=database() 1 NULL +1 +1 +1 +1 End of 5.0 tests diff --git a/mysql-test/t/mysql.test b/mysql-test/t/mysql.test index 68a01a309d4..594d10e46a5 100644 --- a/mysql-test/t/mysql.test +++ b/mysql-test/t/mysql.test @@ -314,4 +314,21 @@ remove_file $MYSQLTEST_VARDIR/tmp/bug38158.sql; # --exec $MYSQL -e "select @z:='1',@z=database()" + +# +# Bug #31060: MySQL CLI parser bug 2 +# + +--write_file $MYSQLTEST_VARDIR/tmp/bug31060.sql +;DELIMITER DELIMITER +; +SELECT 1DELIMITER +DELIMITER ; +SELECT 1; +EOF + +--exec $MYSQL < $MYSQLTEST_VARDIR/tmp/bug31060.sql 2>&1 + +remove_file $MYSQLTEST_VARDIR/tmp/bug31060.sql; + --echo End of 5.0 tests From aa9646c8bc25a19b312e663e0a81726bfa83c00d Mon Sep 17 00:00:00 2001 From: Daniel Fischer Date: Tue, 24 Feb 2009 14:54:04 +0100 Subject: [PATCH 027/132] include collections in dist --- mysql-test/Makefile.am | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mysql-test/Makefile.am b/mysql-test/Makefile.am index 0c4a708dd14..cdb2d9fd598 100644 --- a/mysql-test/Makefile.am +++ b/mysql-test/Makefile.am @@ -33,7 +33,7 @@ endif benchdir_root= $(prefix) testdir = $(benchdir_root)/mysql-test EXTRA_SCRIPTS = mysql-test-run-shell.sh install_test_db.sh valgrind.supp $(PRESCRIPTS) -EXTRA_DIST = $(EXTRA_SCRIPTS) suite +EXTRA_DIST = $(EXTRA_SCRIPTS) suite collections GENSCRIPTS = mysql-test-run-shell mysql-test-run install_test_db mtr PRESCRIPTS = mysql-test-run.pl mysql-stress-test.pl test_SCRIPTS = $(GENSCRIPTS) $(PRESCRIPTS) @@ -80,6 +80,7 @@ install-data-local: $(DESTDIR)$(testdir)/std_data/ndb_backup50_data_be \ $(DESTDIR)$(testdir)/std_data/ndb_backup50_data_le \ $(DESTDIR)$(testdir)/lib \ + $(DESTDIR)$(testdir)/collections \ $(DESTDIR)$(testdir)/std_data/funcs_1 $(INSTALL_DATA) $(srcdir)/README $(DESTDIR)$(testdir) -$(INSTALL_DATA) $(srcdir)/t/*.def $(DESTDIR)$(testdir)/t From d091deaf89a09881a34ef67335d042354da75c11 Mon Sep 17 00:00:00 2001 From: Andrei Elkin Date: Tue, 24 Feb 2009 16:17:34 +0200 Subject: [PATCH 028/132] fixing compilation warning and adding flush logs to test of bug#37313 --- mysql-test/r/mysqlbinlog.result | 1 + mysql-test/t/mysqlbinlog.test | 1 + sql/log_event.cc | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/mysql-test/r/mysqlbinlog.result b/mysql-test/r/mysqlbinlog.result index b5ac22437cd..dbbf49e7920 100644 --- a/mysql-test/r/mysqlbinlog.result +++ b/mysql-test/r/mysqlbinlog.result @@ -364,6 +364,7 @@ drop table t1; shell> mysqlbinlog std_data/corrupt-relay-bin.000624 > var/tmp/bug31793.sql set @@global.server_id= 4294967295; reset master; +flush logs; select (@a:=load_file("MYSQLTEST_VARDIR/tmp/mysqlbinlog_bug37313.binlog")) is not null; diff --git a/mysql-test/t/mysqlbinlog.test b/mysql-test/t/mysqlbinlog.test index cf4bc1523df..d88ca7d0504 100644 --- a/mysql-test/t/mysqlbinlog.test +++ b/mysql-test/t/mysqlbinlog.test @@ -262,6 +262,7 @@ let $s_id_max=`select (1 << 32) - 1`; eval set @@global.server_id= $s_id_max; reset master; +flush logs; --exec $MYSQL_BINLOG $MYSQLTEST_VARDIR/log/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/mysqlbinlog_bug37313.binlog --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR eval select diff --git a/sql/log_event.cc b/sql/log_event.cc index 90805877502..b74b38e55b2 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -976,7 +976,7 @@ void Log_event::print_header(FILE* file, PRINT_EVENT_INFO* print_event_info) fputc('#', file); print_timestamp(file); - fprintf(file, " server id %lu end_log_pos %s ", server_id, + fprintf(file, " server id %lu end_log_pos %s ", (ulong) server_id, llstr(log_pos,llbuff)); /* mysqlbinlog --hexdump */ From df09ddaced71af470a23f882dc03621490810e1b Mon Sep 17 00:00:00 2001 From: Patrick Crews Date: Tue, 24 Feb 2009 16:20:00 +0200 Subject: [PATCH 029/132] Bug#40178: Test main.completion_type_func does not clean up / needs to be rewritten Revised the test to include a test of completion_type = 1 as well as making the test more readable / worthwhile Removed the master.opt file as it was redundant / unnecessary. mysql-test/suite/sys_vars/t/completion_type_func-master.opt: Removed as redundant. Test uses include/have_innodb.inc. --- .../sys_vars/r/completion_type_func.result | 161 +++++++++++++++--- .../t/completion_type_func-master.opt | 1 - .../sys_vars/t/completion_type_func.test | 144 ++++++++++++---- 3 files changed, 243 insertions(+), 63 deletions(-) delete mode 100644 mysql-test/suite/sys_vars/t/completion_type_func-master.opt diff --git a/mysql-test/suite/sys_vars/r/completion_type_func.result b/mysql-test/suite/sys_vars/r/completion_type_func.result index daee738c10d..f3ddcd287b6 100644 --- a/mysql-test/suite/sys_vars/r/completion_type_func.result +++ b/mysql-test/suite/sys_vars/r/completion_type_func.result @@ -2,76 +2,187 @@ DROP TABLE IF EXISTS t1; ## Creating new table ## CREATE TABLE t1 ( -id INT NOT NULL AUTO_INCREMENT, +id INT NOT NULL, PRIMARY KEY (id), name VARCHAR(30) ) ENGINE = INNODB; -'#--------------------FN_DYNVARS_017_01-------------------------#' -## Creating new connection ## -INSERT INTO t1(name) VALUES('Record_1'); -SET @@autocommit = 0; +## Creating new connections test_con1, test_con2 ## +######################################################### +# Setting initial value of completion_type to zero # +######################################################### +INSERT INTO t1 VALUES(1,'Record_1'); SELECT * FROM t1; id name 1 Record_1 ## Setting value of variable to 0 ## SET @@session.completion_type = 0; ## Here commit & rollback should work normally ## +## test commit ## START TRANSACTION; -SELECT * FROM t1; -id name -1 Record_1 -INSERT INTO t1(name) VALUES('Record_2'); -INSERT INTO t1(name) VALUES('Record_3'); +INSERT INTO t1 VALUES(2,'Record_2'); +INSERT INTO t1 VALUES(3,'Record_3'); SELECT * FROM t1; id name 1 Record_1 2 Record_2 3 Record_3 -DELETE FROM t1 WHERE id = 2; +Switching to connection test_con1 +## Don't expect to see id's 2 and 3 in the table w/o COMMIT ## SELECT * FROM t1; id name 1 Record_1 +Switching to default connection +COMMIT; +## test rollback ## +START TRANSACTION; +INSERT INTO t1 VALUES(4,'Record_4'); +INSERT INTO t1 VALUES(5,'Record_5'); +SELECT * FROM t1; +id name +1 Record_1 +2 Record_2 3 Record_3 +4 Record_4 +5 Record_5 +Switching to connection test_con1 +## Don't expect to see id's 4 and 5 here ## +## Expect to see 3, Record_3 ## +SELECT * FROM t1; +id name +1 Record_1 +2 Record_2 +3 Record_3 +Switching to connection default; +ROLLBACK; +## Don't expect to see id's 4 and 5 now ## +SELECT * FROM t1; +id name +1 Record_1 +2 Record_2 +3 Record_3 + +######################################################### +# Setting initial value of completion_type to one # +######################################################### +Switching to connection test_con1; +SET @@session.completion_type = 1; START TRANSACTION; SELECT * FROM t1; id name 1 Record_1 +2 Record_2 3 Record_3 -INSERT INTO t1(name) VALUES('Record_4'); -INSERT INTO t1(name) VALUES('Record_5'); +INSERT INTO t1 VALUES(6,'Record_6'); +INSERT INTO t1 VALUES(7,'Record_7'); COMMIT; -'#--------------------FN_DYNVARS_017_02-------------------------#' +## Expect to immediately have a new transaction ## +INSERT INTO t1 VALUES(8,'Record_8'); +SELECT * FROM t1; +id name +1 Record_1 +2 Record_2 +3 Record_3 +6 Record_6 +7 Record_7 +8 Record_8 +switching to test_con2 +## Do not expect to see 8, Record_8 as no COMMIT has occurred ## +SELECT * FROM t1; +id name +1 Record_1 +2 Record_2 +3 Record_3 +6 Record_6 +7 Record_7 +switch to connection test_con1 +## Testing ROLLBACK behavior +START TRANSACTION; +INSERT INTO t1 VALUES(9, 'Record_9'); +INSERT INTO t1 VALUES(10, 'Record_10'); +## Expect to see id's 8, 9, 10 here ## +## 8, Record_8 COMMITted with the start of this transaction ## +SELECT * FROM t1; +id name +1 Record_1 +2 Record_2 +3 Record_3 +6 Record_6 +7 Record_7 +8 Record_8 +9 Record_9 +10 Record_10 +ROLLBACK; +## id's 9 and 10 are gone now due to ROLLBACK ## +SELECT * FROM t1; +id name +1 Record_1 +2 Record_2 +3 Record_3 +6 Record_6 +7 Record_7 +8 Record_8 +## Expect a new transaction ## +INSERT INTO t1 VALUES(9, 'Record_9'); +Switching to connection test_con2 +## Don't expect to see 9, Record_9 due to no COMMIT yet ## +SELECT * FROM t1; +id name +1 Record_1 +2 Record_2 +3 Record_3 +6 Record_6 +7 Record_7 +8 Record_8 +Switching to connection test_con1 +ROLLBACK; +## Don't expect to see 9, Record_9 +SELECT * FROM t1; +id name +1 Record_1 +2 Record_2 +3 Record_3 +6 Record_6 +7 Record_7 +8 Record_8 +######################################################### +# Setting initial value of completion_type to 2 # +######################################################### SET @@session.completion_type = 2; ## Here commit should work as COMMIT RELEASE ## START TRANSACTION; SELECT * FROM t1; id name 1 Record_1 +2 Record_2 3 Record_3 -4 Record_4 -5 Record_5 -INSERT INTO t1(name) VALUES('Record_6'); -INSERT INTO t1(name) VALUES('Record_7'); +6 Record_6 +7 Record_7 +8 Record_8 +INSERT INTO t1 VALUES(9,'Record_9'); +INSERT INTO t1 VALUES(10,'Record_10'); COMMIT; ## Inserting rows should give error here because connection should ## ## disconnect after using COMMIT ## -INSERT INTO t1(name) VALUES('Record_4'); +INSERT INTO t1 VALUES(4,'Record_4'); Got one of the listed errors -## Creating new connection test_con2 ## +switch to connection test_con2 SET @@session.completion_type = 2; ## Inserting rows and using Rollback which should Rollback & release ## START TRANSACTION; SELECT * FROM t1; id name 1 Record_1 +2 Record_2 3 Record_3 -4 Record_4 -5 Record_5 6 Record_6 7 Record_7 -INSERT INTO t1(name) VALUES('Record_8'); -INSERT INTO t1(name) VALUES('Record_9'); +8 Record_8 +9 Record_9 +10 Record_10 +INSERT INTO t1 VALUES(11,'Record_11'); +INSERT INTO t1 VALUES(12,'Record_12'); ROLLBACK; -INSERT INTO t1(name) VALUES('Record_4'); +## Expect a failure due to COMMIT/ROLLBACK AND RELEASE behavior ## +INSERT INTO t1 VALUES(4,'Record_4'); Got one of the listed errors DROP TABLE t1; diff --git a/mysql-test/suite/sys_vars/t/completion_type_func-master.opt b/mysql-test/suite/sys_vars/t/completion_type_func-master.opt deleted file mode 100644 index 627becdbfb5..00000000000 --- a/mysql-test/suite/sys_vars/t/completion_type_func-master.opt +++ /dev/null @@ -1 +0,0 @@ ---innodb diff --git a/mysql-test/suite/sys_vars/t/completion_type_func.test b/mysql-test/suite/sys_vars/t/completion_type_func.test index ed0f04c37b4..8e363ed2a7d 100644 --- a/mysql-test/suite/sys_vars/t/completion_type_func.test +++ b/mysql-test/suite/sys_vars/t/completion_type_func.test @@ -1,4 +1,4 @@ -############## mysql-test\t\completion_type_func.test ########################## +############## mysql-test/suite/sys_vars/t/completion_type_func.test ########### # # # Variable Name: completion_type # # Scope: GLOBAL & SESSION # @@ -25,84 +25,154 @@ DROP TABLE IF EXISTS t1; --enable_warnings -######################### -# Creating new table # -######################### +############################## +# Setup: Table + connections # +############################## --echo ## Creating new table ## CREATE TABLE t1 ( -id INT NOT NULL AUTO_INCREMENT, +id INT NOT NULL, PRIMARY KEY (id), name VARCHAR(30) ) ENGINE = INNODB; ---echo '#--------------------FN_DYNVARS_017_01-------------------------#' -######################################################### -# Setting initial value of completion_type to zero # -######################################################### - ---echo ## Creating new connection ## +--echo ## Creating new connections test_con1, test_con2 ## connect (test_con1,localhost,root,,); -connection test_con1; +connect (test_con2,localhost,root,,); -INSERT INTO t1(name) VALUES('Record_1'); -SET @@autocommit = 0; +connection default; + +--echo ######################################################### +--echo # Setting initial value of completion_type to zero # +--echo ######################################################### + +INSERT INTO t1 VALUES(1,'Record_1'); SELECT * FROM t1; --echo ## Setting value of variable to 0 ## SET @@session.completion_type = 0; --echo ## Here commit & rollback should work normally ## +--echo ## test commit ## START TRANSACTION; -SELECT * FROM t1; -INSERT INTO t1(name) VALUES('Record_2'); -INSERT INTO t1(name) VALUES('Record_3'); -SELECT * FROM t1; -DELETE FROM t1 WHERE id = 2; +INSERT INTO t1 VALUES(2,'Record_2'); +INSERT INTO t1 VALUES(3,'Record_3'); SELECT * FROM t1; - -START TRANSACTION; +--echo Switching to connection test_con1 +connection test_con1; +--echo ## Don't expect to see id's 2 and 3 in the table w/o COMMIT ## SELECT * FROM t1; -INSERT INTO t1(name) VALUES('Record_4'); -INSERT INTO t1(name) VALUES('Record_5'); + +--echo Switching to default connection +connection default; COMMIT; +--echo ## test rollback ## +START TRANSACTION; +INSERT INTO t1 VALUES(4,'Record_4'); +INSERT INTO t1 VALUES(5,'Record_5'); +SELECT * FROM t1; ---echo '#--------------------FN_DYNVARS_017_02-------------------------#' -######################################################### -# Setting initial value of completion_type to 2 # -######################################################### +--echo Switching to connection test_con1 +connection test_con1; +--echo ## Don't expect to see id's 4 and 5 here ## +--echo ## Expect to see 3, Record_3 ## +SELECT * FROM t1; + +--echo Switching to connection default; +connection default; + + +ROLLBACK; +--echo ## Don't expect to see id's 4 and 5 now ## +SELECT * FROM t1; + +--echo +--echo ######################################################### +--echo # Setting initial value of completion_type to one # +--echo ######################################################### + +--echo Switching to connection test_con1; +connection test_con1; +SET @@session.completion_type = 1; + +START TRANSACTION; +SELECT * FROM t1; +INSERT INTO t1 VALUES(6,'Record_6'); +INSERT INTO t1 VALUES(7,'Record_7'); +COMMIT; + +--echo ## Expect to immediately have a new transaction ## +INSERT INTO t1 VALUES(8,'Record_8'); +SELECT * FROM t1; + +connection test_con2; +--echo switching to test_con2 +--echo ## Do not expect to see 8, Record_8 as no COMMIT has occurred ## +SELECT * FROM t1; + +--echo switch to connection test_con1 +connection test_con1; + +--echo ## Testing ROLLBACK behavior +START TRANSACTION; +INSERT INTO t1 VALUES(9, 'Record_9'); +INSERT INTO t1 VALUES(10, 'Record_10'); +--echo ## Expect to see id's 8, 9, 10 here ## +--echo ## 8, Record_8 COMMITted with the start of this transaction ## +SELECT * FROM t1; +ROLLBACK; +--echo ## id's 9 and 10 are gone now due to ROLLBACK ## +SELECT * FROM t1; + +--echo ## Expect a new transaction ## +INSERT INTO t1 VALUES(9, 'Record_9'); + +--echo Switching to connection test_con2 +connection test_con2; +--echo ## Don't expect to see 9, Record_9 due to no COMMIT yet ## +SELECT * FROM t1; + +--echo Switching to connection test_con1 +connection test_con1; +ROLLBACK; +--echo ## Don't expect to see 9, Record_9 +SELECT * FROM t1; + +--echo ######################################################### +--echo # Setting initial value of completion_type to 2 # +--echo ######################################################### SET @@session.completion_type = 2; --echo ## Here commit should work as COMMIT RELEASE ## START TRANSACTION; SELECT * FROM t1; -INSERT INTO t1(name) VALUES('Record_6'); -INSERT INTO t1(name) VALUES('Record_7'); +INSERT INTO t1 VALUES(9,'Record_9'); +INSERT INTO t1 VALUES(10,'Record_10'); COMMIT; --echo ## Inserting rows should give error here because connection should ## --echo ## disconnect after using COMMIT ## ---Error 2006,2013,1053 -INSERT INTO t1(name) VALUES('Record_4'); +--Error 2006,2013,ER_SERVER_SHUTDOWN +INSERT INTO t1 VALUES(4,'Record_4'); ---echo ## Creating new connection test_con2 ## -connect (test_con2,localhost,root,,); +--echo switch to connection test_con2 connection test_con2; SET @@session.completion_type = 2; --echo ## Inserting rows and using Rollback which should Rollback & release ## START TRANSACTION; SELECT * FROM t1; -INSERT INTO t1(name) VALUES('Record_8'); -INSERT INTO t1(name) VALUES('Record_9'); +INSERT INTO t1 VALUES(11,'Record_11'); +INSERT INTO t1 VALUES(12,'Record_12'); ROLLBACK; ---Error 2006,2013,1053 -INSERT INTO t1(name) VALUES('Record_4'); +--echo ## Expect a failure due to COMMIT/ROLLBACK AND RELEASE behavior ## +--Error 2006,2013,ER_SERVER_SHUTDOWN, +INSERT INTO t1 VALUES(4,'Record_4'); connection default; disconnect test_con1; From da3c773166f7c5c4d4ad653ae27a0d762f2ce7e8 Mon Sep 17 00:00:00 2001 From: Anurag Shekhar Date: Tue, 24 Feb 2009 20:44:47 +0530 Subject: [PATCH 030/132] Bug #38103 myisamchk: --help output incomplete In the output message for --help entry for -H --HELP was missing. Added this entry while printing the help text. storage/myisam/myisamchk.c: Added entry for -H --HELP while printing message for -? --help --- storage/myisam/myisamchk.c | 1 + 1 file changed, 1 insertion(+) diff --git a/storage/myisam/myisamchk.c b/storage/myisam/myisamchk.c index f8fcdcb6fab..8165bd191b1 100644 --- a/storage/myisam/myisamchk.c +++ b/storage/myisam/myisamchk.c @@ -363,6 +363,7 @@ static void usage(void) -#, --debug=... Output debug log. Often this is 'd:t:o,filename'.\n"); #endif printf("\ + -H, --HELP Display this help and exit.\n\ -?, --help Display this help and exit.\n\ -O, --set-variable var=option.\n\ Change the value of a variable. Please note that\n\ From 7099d7bc2bdf4513abcc8e4b20d583ac1262e156 Mon Sep 17 00:00:00 2001 From: "Tatiana A. Nurnberg" Date: Tue, 24 Feb 2009 16:42:18 +0100 Subject: [PATCH 031/132] Bug#40657: assertion with out of range variables and traditional sql_mode In STRICT mode, out-of-bounds values caused an error message to be queued (rather than just a warning), without any further error-like processing happening. (The error is queued during update, at which time it's too late. For it to be processed properly, it would need to be queued during check-stage.) The assertion rightfully complains that we're trying to send an OK while having an error queued. Changeset breaks a lot of tests out into check-stage. This also allows us to send more correct warnings/error messages. sql/set_var.cc: cleanup: fold get_unsigned() and fix_unsigned() into one, as well as all the semi-common code from the ::check functions. --- sql/set_var.cc | 184 ++++++++++++++++++++++--------------------------- 1 file changed, 81 insertions(+), 103 deletions(-) diff --git a/sql/set_var.cc b/sql/set_var.cc index e2f3590311c..ff32ec2458e 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -134,8 +134,6 @@ static int check_max_delayed_threads(THD *thd, set_var *var); static void fix_thd_mem_root(THD *thd, enum_var_type type); static void fix_trans_mem_root(THD *thd, enum_var_type type); static void fix_server_id(THD *thd, enum_var_type type); -static int get_unsigned(THD *thd, set_var *var); -static bool fix_unsigned(THD *, ulonglong *, bool, const struct my_option *); bool throw_bounds_warning(THD *thd, bool fixed, bool unsignd, const char *name, longlong val); static KEY_CACHE *create_key_cache(const char *name, uint length); @@ -1406,42 +1404,49 @@ bool throw_bounds_warning(THD *thd, bool fixed, bool unsignd, /** check an unsigned user-supplied value for a systemvariable against bounds. - if we needed to adjust the value, throw a warning/error. @param thd thread handle - @param num the value the user gave - @param warn throw warning/error (FALSE if we get here from - get_unsigned(), so we don't throw two warnings if - user supplies negative value to an unsigned variable) - @param option_limits the bounds-record + @param num the value to limit + @param option_limits the bounds-record, or NULL - @retval TRUE on error, FALSE otherwise (warning or OK) + @retval whether or not we needed to bound */ -static bool fix_unsigned(THD *thd, ulonglong *num, bool warn, - const struct my_option *option_limits) +static my_bool bound_unsigned(THD *thd, ulonglong *num, + const struct my_option *option_limits) { my_bool fixed = FALSE; ulonglong unadjusted= *num; - *num= getopt_ull_limit_value(unadjusted, option_limits, &fixed); - - return warn && throw_bounds_warning(thd, fixed, TRUE, option_limits->name, - (longlong) unadjusted); + if (option_limits) + *num= getopt_ull_limit_value(unadjusted, option_limits, &fixed); + return fixed; } /** Get unsigned system-variable. Negative value does not wrap around, but becomes zero. + Check user-supplied value for a systemvariable against bounds. + If we needed to adjust the value, throw a warning or error depending + on SQL-mode. - @param thd thread handle - @param var the system-variable to get + @param thd thread handle + @param var the system-variable to get + @param user_max a limit given with --maximum-variable-name=... or 0 + @param bound2ulong pass TRUE if size is ulong, not ulonglong. function + will then bound on systems where it's necessary. - @retval 0 - OK, 1 - warning, 2 - error + @retval TRUE on error, FALSE otherwise (warning or OK) */ -static int get_unsigned(THD *thd, set_var *var) +static bool get_unsigned(THD *thd, set_var *var, ulonglong user_max, + my_bool bound2ulong) { + int warnings= 0; + ulonglong unadjusted; + const struct my_option *limits= var->var->option_limits; + + /* get_unsigned() */ if (var->value->unsigned_flag) var->save_result.ulonglong_value= (ulonglong) var->value->val_int(); else @@ -1449,9 +1454,57 @@ static int get_unsigned(THD *thd, set_var *var) longlong v= var->value->val_int(); var->save_result.ulonglong_value= (ulonglong) ((v < 0) ? 0 : v); if (v < 0) - return throw_bounds_warning(thd, TRUE, FALSE, var->var->name, v) ? 2 : 1; + { + warnings++; + if (throw_bounds_warning(thd, TRUE, FALSE, var->var->name, v)) + return TRUE; /* warning was promoted to error, give up */ + } } - return 0; + + unadjusted= var->save_result.ulonglong_value; + + /* max, if any */ + + if ((user_max > 0) && (unadjusted > user_max)) + { + var->save_result.ulonglong_value= user_max; + + if ((warnings == 0) && throw_bounds_warning(thd, TRUE, TRUE, + var->var->name, + (longlong) unadjusted)) + return TRUE; + + warnings++; + } + + /* fix_unsigned() */ + if (limits) + { + my_bool fixed; + + var->save_result.ulonglong_value= getopt_ull_limit_value(unadjusted, + limits, &fixed); + + if ((warnings == 0) && throw_bounds_warning(thd, fixed, TRUE, limits->name, + (longlong) unadjusted)) + return TRUE; + } + else if (bound2ulong) + { +#if SIZEOF_LONG < SIZEOF_LONG_LONG + /* Avoid overflows on 32 bit systems */ + if (var->save_result.ulonglong_value > ULONG_MAX) + { + var->save_result.ulonglong_value= ULONG_MAX; + if ((warnings == 0) && throw_bounds_warning(thd, TRUE, TRUE, + var->var->name, + (longlong) unadjusted)) + return TRUE; + } +#endif + } + + return FALSE; } @@ -1465,27 +1518,7 @@ sys_var_long_ptr(sys_var_chain *chain, const char *name_arg, ulong *value_ptr_ar bool sys_var_long_ptr_global::check(THD *thd, set_var *var) { - bool ret = FALSE; - int got_warnings= get_unsigned(thd, var); - - if (got_warnings == 2) - ret= TRUE; - else if (option_limits) - ret= fix_unsigned(thd, &var->save_result.ulonglong_value, - (got_warnings == 0), option_limits); - else - { -#if SIZEOF_LONG < SIZEOF_LONG_LONG - /* Avoid overflows on 32 bit systems */ - if (var->save_result.ulonglong_value > ULONG_MAX) - { - ret= throw_bounds_warning(thd, TRUE, TRUE, name, - (longlong) var->save_result.ulonglong_value); - var->save_result.ulonglong_value= ULONG_MAX; - } -#endif - } - return ret; + return get_unsigned(thd, var, 0, TRUE); } bool sys_var_long_ptr_global::update(THD *thd, set_var *var) @@ -1511,8 +1544,7 @@ bool sys_var_ulonglong_ptr::update(THD *thd, set_var *var) { ulonglong tmp= var->save_result.ulonglong_value; pthread_mutex_lock(&LOCK_global_system_variables); - if (option_limits) - fix_unsigned(thd, &tmp, FALSE, option_limits); + bound_unsigned(thd, &tmp, option_limits); *value= (ulonglong) tmp; pthread_mutex_unlock(&LOCK_global_system_variables); return 0; @@ -1563,38 +1595,8 @@ uchar *sys_var_enum_const::value_ptr(THD *thd, enum_var_type type, bool sys_var_thd_ulong::check(THD *thd, set_var *var) { - ulonglong tmp; - int got_warnings= get_unsigned(thd, var); - - if (got_warnings == 2) + if (get_unsigned(thd, var, max_system_variables.*offset, TRUE)) return TRUE; - - tmp= var->save_result.ulonglong_value; - - /* Don't use bigger value than given with --maximum-variable-name=.. */ - if ((ulong) tmp > max_system_variables.*offset) - { - if (throw_bounds_warning(thd, TRUE, TRUE, name, (longlong) tmp)) - return TRUE; - tmp= max_system_variables.*offset; - } - - if (option_limits) - { - if (fix_unsigned(thd, &tmp, (got_warnings == 0), option_limits)) - return TRUE; - } -#if SIZEOF_LONG < SIZEOF_LONG_LONG - else if (tmp > ULONG_MAX) - { - if (throw_bounds_warning(thd, TRUE, TRUE, name, (longlong) tmp)) - return TRUE; - tmp= ULONG_MAX; - } -#endif - - var->save_result.ulonglong_value= (ulong) tmp; - return ((check_func && (*check_func)(thd, var))); } @@ -1641,8 +1643,7 @@ bool sys_var_thd_ha_rows::update(THD *thd, set_var *var) if ((ha_rows) tmp > max_system_variables.*offset) tmp= max_system_variables.*offset; - if (option_limits) - fix_unsigned(thd, &tmp, FALSE, option_limits); + bound_unsigned(thd, &tmp, option_limits); if (var->type == OPT_GLOBAL) { @@ -1684,30 +1685,7 @@ uchar *sys_var_thd_ha_rows::value_ptr(THD *thd, enum_var_type type, bool sys_var_thd_ulonglong::check(THD *thd, set_var *var) { - ulonglong tmp; - int got_warnings= get_unsigned(thd, var); - - if (got_warnings == 2) - return TRUE; - - tmp= var->save_result.ulonglong_value; - - if (tmp > max_system_variables.*offset) - { - if (throw_bounds_warning(thd, TRUE, TRUE, name, (longlong) tmp)) - return TRUE; - tmp= max_system_variables.*offset; - } - - if (option_limits) - { - if (fix_unsigned(thd, &tmp, (got_warnings == 0), option_limits)) - return TRUE; - } - - var->save_result.ulonglong_value= tmp; - - return FALSE; + return get_unsigned(thd, var, max_system_variables.*offset, FALSE); } bool sys_var_thd_ulonglong::update(THD *thd, set_var *var) @@ -2353,7 +2331,7 @@ bool sys_var_key_buffer_size::update(THD *thd, set_var *var) goto end; } - fix_unsigned(thd, &tmp, FALSE, option_limits); + bound_unsigned(thd, &tmp, option_limits); key_cache->param_buff_size= (ulonglong) tmp; /* If key cache didn't existed initialize it, else resize it */ @@ -2407,7 +2385,7 @@ bool sys_var_key_cache_long::update(THD *thd, set_var *var) if (key_cache->in_init) goto end; - fix_unsigned(thd, &tmp, FALSE, option_limits); + bound_unsigned(thd, &tmp, option_limits); *((ulong*) (((char*) key_cache) + offset))= (ulong) tmp; /* From 4da0c708b51f5b6df3da7ca759ccac3819030f6e Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 24 Feb 2009 17:54:03 +0100 Subject: [PATCH 032/132] Insert current year as last copyright year for the product Don't use both "License" and "license" as RPM macro, they are the same --- configure.in | 2 ++ support-files/Makefile.am | 1 + support-files/mysql.spec.sh | 12 ++++++------ 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/configure.in b/configure.in index b5beb7a24f5..ef2771f5d67 100644 --- a/configure.in +++ b/configure.in @@ -36,6 +36,7 @@ MYSQL_NUMERIC_VERSION=`echo $MYSQL_NO_DASH_VERSION | sed -e "s|[[a-z]][[a-z0-9]] MYSQL_BASE_VERSION=`echo $MYSQL_NUMERIC_VERSION | sed -e "s|\.[[^.]]*$||"` MYSQL_VERSION_ID=`echo $MYSQL_NUMERIC_VERSION | \ awk -F. '{printf "%d%0.2d%0.2d", $1, $2, $3}'` +MYSQL_COPYRIGHT_YEAR=`date '+%Y'` # Add previous major version for debian package upgrade path MYSQL_PREVIOUS_BASE_VERSION=5.0 @@ -70,6 +71,7 @@ AC_SUBST(MYSQL_NO_DASH_VERSION) AC_SUBST(MYSQL_BASE_VERSION) AC_SUBST(MYSQL_VERSION_ID) AC_SUBST(MYSQL_PREVIOUS_BASE_VERSION) +AC_SUBST(MYSQL_COPYRIGHT_YEAR) AC_SUBST(PROTOCOL_VERSION) AC_DEFINE_UNQUOTED([PROTOCOL_VERSION], [$PROTOCOL_VERSION], [mysql client protocol version]) diff --git a/support-files/Makefile.am b/support-files/Makefile.am index a6001e635e6..77eddea3227 100644 --- a/support-files/Makefile.am +++ b/support-files/Makefile.am @@ -119,6 +119,7 @@ SUFFIXES = .sh -e 's!@''SHARED_LIB_VERSION''@!@SHARED_LIB_VERSION@!' \ -e 's!@''MYSQL_BASE_VERSION''@!@MYSQL_BASE_VERSION@!' \ -e 's!@''MYSQL_NO_DASH_VERSION''@!@MYSQL_NO_DASH_VERSION@!' \ + -e 's!@''MYSQL_COPYRIGHT_YEAR''@!@MYSQL_COPYRIGHT_YEAR@!' \ -e 's!@''MYSQL_TCP_PORT''@!@MYSQL_TCP_PORT@!' \ -e 's!@''PERL_DBI_VERSION''@!@PERL_DBI_VERSION@!' \ -e 's!@''PERL_DBD_VERSION''@!@PERL_DBD_VERSION@!' \ diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index 7c08fdf4734..9c790675608 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -41,7 +41,7 @@ %else %define release 0.glibc23 %endif -%define license GPL +%define mysql_license GPL %define mysqld_user mysql %define mysqld_group mysql %define server_suffix -standard @@ -75,7 +75,7 @@ Summary: MySQL: a very fast and reliable SQL database server Group: Applications/Databases Version: @MYSQL_NO_DASH_VERSION@ Release: %{release} -License: Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc. All rights reserved. Use is subject to license terms. Under %{license} license as shown in the Description field. +License: Copyright 2000-2008 MySQL AB, 2008-@MYSQL_COPYRIGHT_YEAR@ Sun Microsystems, Inc. All rights reserved. Use is subject to license terms. Under %{mysql_license} license as shown in the Description field. Source: http://www.mysql.com/Downloads/MySQL-@MYSQL_BASE_VERSION@/mysql-%{mysql_version}.tar.gz URL: http://www.mysql.com/ Packager: Sun Microsystems, Inc. Product Engineering Team @@ -96,7 +96,7 @@ is intended for mission-critical, heavy-load production systems as well as for embedding into mass-deployed software. MySQL is a trademark of Sun Microsystems, Inc. -Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc. All rights reserved. +Copyright 2000-2008 MySQL AB, 2008-@MYSQL_COPYRIGHT_YEAR@ Sun Microsystems, Inc. All rights reserved. Use is subject to license terms. This software comes with ABSOLUTELY NO WARRANTY. This is free software, @@ -120,7 +120,7 @@ is intended for mission-critical, heavy-load production systems as well as for embedding into mass-deployed software. MySQL is a trademark of Sun Microsystems, Inc. -Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc. All rights reserved. +Copyright 2000-2008 MySQL AB, 2008-@MYSQL_COPYRIGHT_YEAR@ Sun Microsystems, Inc. All rights reserved. Use is subject to license terms. This software comes with ABSOLUTELY NO WARRANTY. This is free software, @@ -366,7 +366,7 @@ CFLAGS="$CFLAGS" \ CXXFLAGS="$CXXFLAGS" \ BuildMySQL "\ --with-debug \ - --with-comment=\"MySQL Community Server - Debug (%{license})\"") + --with-comment=\"MySQL Community Server - Debug (%{mysql_license})\"") # We might want to save the config log file if test -n "$MYSQL_DEBUGCONFLOG_DEST" @@ -387,7 +387,7 @@ CFLAGS="$CFLAGS" \ CXXFLAGS="$CXXFLAGS" \ BuildMySQL "\ --with-embedded-server \ - --with-comment=\"MySQL Community Server (%{license})\"") + --with-comment=\"MySQL Community Server (%{mysql_license})\"") # We might want to save the config log file if test -n "$MYSQL_CONFLOG_DEST" then From ff645025e172b61937826b49fb81bc7827475ebd Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 24 Feb 2009 19:09:22 +0100 Subject: [PATCH 033/132] Only specify the current year for the Sun product copyright --- support-files/mysql.spec.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index 9c790675608..778b04b30fe 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -75,7 +75,7 @@ Summary: MySQL: a very fast and reliable SQL database server Group: Applications/Databases Version: @MYSQL_NO_DASH_VERSION@ Release: %{release} -License: Copyright 2000-2008 MySQL AB, 2008-@MYSQL_COPYRIGHT_YEAR@ Sun Microsystems, Inc. All rights reserved. Use is subject to license terms. Under %{mysql_license} license as shown in the Description field. +License: Copyright 2000-2008 MySQL AB, @MYSQL_COPYRIGHT_YEAR@ Sun Microsystems, Inc. All rights reserved. Use is subject to license terms. Under %{mysql_license} license as shown in the Description field. Source: http://www.mysql.com/Downloads/MySQL-@MYSQL_BASE_VERSION@/mysql-%{mysql_version}.tar.gz URL: http://www.mysql.com/ Packager: Sun Microsystems, Inc. Product Engineering Team @@ -96,7 +96,7 @@ is intended for mission-critical, heavy-load production systems as well as for embedding into mass-deployed software. MySQL is a trademark of Sun Microsystems, Inc. -Copyright 2000-2008 MySQL AB, 2008-@MYSQL_COPYRIGHT_YEAR@ Sun Microsystems, Inc. All rights reserved. +Copyright 2000-2008 MySQL AB, @MYSQL_COPYRIGHT_YEAR@ Sun Microsystems, Inc. All rights reserved. Use is subject to license terms. This software comes with ABSOLUTELY NO WARRANTY. This is free software, @@ -120,7 +120,7 @@ is intended for mission-critical, heavy-load production systems as well as for embedding into mass-deployed software. MySQL is a trademark of Sun Microsystems, Inc. -Copyright 2000-2008 MySQL AB, 2008-@MYSQL_COPYRIGHT_YEAR@ Sun Microsystems, Inc. All rights reserved. +Copyright 2000-2008 MySQL AB, @MYSQL_COPYRIGHT_YEAR@ Sun Microsystems, Inc. All rights reserved. Use is subject to license terms. This software comes with ABSOLUTELY NO WARRANTY. This is free software, From 0f6e7f11761cb696103b01f452b5d5afe10bea97 Mon Sep 17 00:00:00 2001 From: Alexey Kopytov Date: Wed, 25 Feb 2009 10:36:11 +0200 Subject: [PATCH 034/132] Fixed a build failure on Ubuntu 8.10 introduced by the patch for bug #15936. On some platforms fenv.h may #undef the min/max macros defined in my_global.h. Fixed by moving the #include directive for fenv.h from mysqld.cc to my_global.h before definitions for min/max. include/my_global.h: Moved #include from mysqld.cc. sql/mysqld.cc: Moved #include to my_global.h. --- include/my_global.h | 3 +++ sql/mysqld.cc | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/my_global.h b/include/my_global.h index 3f872bfc855..f5a3016bb1e 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -324,6 +324,9 @@ C_MODE_END #ifdef HAVE_FLOAT_H #include #endif +#ifdef HAVE_FENV_H +#include /* For fesetround() */ +#endif #ifdef HAVE_SYS_TYPES_H #include diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 7856309b095..fcde4e2b626 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -187,9 +187,6 @@ int initgroups(const char *,unsigned int); typedef fp_except fp_except_t; #endif #endif /* __FreeBSD__ && HAVE_IEEEFP_H */ -#ifdef HAVE_FENV_H -#include -#endif #ifdef HAVE_SYS_FPU_H /* for IRIX to use set_fpc_csr() */ #include From e0c6aad83a364d3cc9aaa6b258bdfa31aa699e37 Mon Sep 17 00:00:00 2001 From: Bjorn Munch Date: Wed, 25 Feb 2009 10:32:13 +0100 Subject: [PATCH 035/132] Bug #43172 MTR leaves test files in /tmp after check_socket_path_length finds path too long Faulty logic in cleanup Put test file into tmpdir, cleanup by removing tmpdir --- mysql-test/lib/My/Platform.pm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/mysql-test/lib/My/Platform.pm b/mysql-test/lib/My/Platform.pm index 3dd5c552b10..69ffdfbb4ce 100644 --- a/mysql-test/lib/My/Platform.pm +++ b/mysql-test/lib/My/Platform.pm @@ -113,8 +113,8 @@ sub check_socket_path_length { # Create a tempfile name with same length as "path" my $tmpdir = tempdir( CLEANUP => 0); - my $len = length($path) - length($tmpdir); - my $testfile = $tmpdir . "x" x ($len > 0 ? $len : 1); + my $len = length($path) - length($tmpdir) - 1; + my $testfile = $tmpdir . "/" . "x" x ($len > 0 ? $len : 1); my $sock; eval { $sock= new IO::Socket::UNIX @@ -126,17 +126,15 @@ sub check_socket_path_length { die "Could not create UNIX domain socket: $!" unless defined $sock; - die "UNIX domain socket patch was truncated" + die "UNIX domain socket path was truncated" unless ($testfile eq $sock->hostpath()); $truncated= 0; # Yes, it worked! }; - #print "check_socket_path_length, failed: ", $@, '\n' if ($@); $sock= undef; # Close socket - unlink($testfile); # Remove the physical file - rmdir($tmpdir); # Remove the tempdir + rmtree($tmpdir); # Remove the tempdir and any socket file created return $truncated; } From 620438fdaef079216609bfcb0a8cb7b58c950e1e Mon Sep 17 00:00:00 2001 From: Georgi Kodinov Date: Wed, 25 Feb 2009 12:19:29 +0200 Subject: [PATCH 036/132] backport the fix for bug #37191 to 5.1-bugteam --- mysql-test/r/view_grant.result | 21 ++++++++++++++ mysql-test/t/view_grant.test | 38 +++++++++++++++++++++++++ sql/sql_view.cc | 52 ++++++++++++++++++++-------------- 3 files changed, 90 insertions(+), 21 deletions(-) diff --git a/mysql-test/r/view_grant.result b/mysql-test/r/view_grant.result index 1821e50e294..3e280e47bee 100644 --- a/mysql-test/r/view_grant.result +++ b/mysql-test/r/view_grant.result @@ -956,6 +956,27 @@ Warnings: Warning 1356 View 'test.v1' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them DROP VIEW v1; DROP TABLE t1; +CREATE USER mysqluser1@localhost; +CREATE DATABASE mysqltest1; +USE mysqltest1; +CREATE TABLE t1 ( a INT ); +CREATE TABLE t2 ( b INT ); +INSERT INTO t1 VALUES (1), (2); +INSERT INTO t2 VALUES (1), (2); +GRANT CREATE VIEW ON mysqltest1.* TO mysqluser1@localhost; +GRANT SELECT ON t1 TO mysqluser1@localhost; +GRANT INSERT ON t2 TO mysqluser1@localhost; +This would lead to failed assertion. +CREATE VIEW v1 AS SELECT a, b FROM t1, t2; +SELECT * FROM v1; +ERROR 42000: SELECT command denied to user 'mysqluser1'@'localhost' for table 'v1' +SELECT b FROM v1; +ERROR 42000: SELECT command denied to user 'mysqluser1'@'localhost' for table 'v1' +DROP TABLE t1, t2; +DROP VIEW v1; +DROP DATABASE mysqltest1; +DROP USER mysqluser1@localhost; +USE test; End of 5.1 tests. CREATE USER mysqluser1@localhost; CREATE DATABASE mysqltest1; diff --git a/mysql-test/t/view_grant.test b/mysql-test/t/view_grant.test index 4e8d97e4444..f3794a6ba73 100644 --- a/mysql-test/t/view_grant.test +++ b/mysql-test/t/view_grant.test @@ -1218,6 +1218,44 @@ SHOW CREATE VIEW v1; DROP VIEW v1; DROP TABLE t1; +# +# Bug#37191: Failed assertion in CREATE VIEW +# +CREATE USER mysqluser1@localhost; +CREATE DATABASE mysqltest1; + +USE mysqltest1; + +CREATE TABLE t1 ( a INT ); +CREATE TABLE t2 ( b INT ); + +INSERT INTO t1 VALUES (1), (2); +INSERT INTO t2 VALUES (1), (2); + +GRANT CREATE VIEW ON mysqltest1.* TO mysqluser1@localhost; + +GRANT SELECT ON t1 TO mysqluser1@localhost; +GRANT INSERT ON t2 TO mysqluser1@localhost; + +--connect (connection1, localhost, mysqluser1, , mysqltest1) + +--echo This would lead to failed assertion. +CREATE VIEW v1 AS SELECT a, b FROM t1, t2; + +--error ER_TABLEACCESS_DENIED_ERROR +SELECT * FROM v1; +--error ER_TABLEACCESS_DENIED_ERROR +SELECT b FROM v1; + +--disconnect connection1 +--connection default + +DROP TABLE t1, t2; +DROP VIEW v1; +DROP DATABASE mysqltest1; +DROP USER mysqluser1@localhost; +USE test; + --echo End of 5.1 tests. # diff --git a/sql/sql_view.cc b/sql/sql_view.cc index be66f7c2d80..b6ea6579d08 100644 --- a/sql/sql_view.cc +++ b/sql/sql_view.cc @@ -564,24 +564,36 @@ bool mysql_create_view(THD *thd, TABLE_LIST *views, fill_effective_table_privileges(thd, &view->grant, view->db, view->table_name); + /* + Make sure that the current user does not have more column-level privileges + on the newly created view than he/she does on the underlying + tables. E.g. it must not be so that the user has UPDATE privileges on a + view column of he/she doesn't have it on the underlying table's + corresponding column. In that case, return an error for CREATE VIEW. + */ { Item *report_item= NULL; + /* + This will hold the intersection of the priviliges on all columns in the + view. + */ uint final_priv= VIEW_ANY_ACL; - - for (sl= select_lex; sl; sl= sl->next_select()) - { - DBUG_ASSERT(view->db); /* Must be set in the parser */ - List_iterator_fast it(sl->item_list); - Item *item; - while ((item= it++)) + + for (sl= select_lex; sl; sl= sl->next_select()) { + DBUG_ASSERT(view->db); /* Must be set in the parser */ + List_iterator_fast it(sl->item_list); + Item *item; + while ((item= it++)) + { Item_field *fld= item->filed_for_view_update(); - uint priv= (get_column_grant(thd, &view->grant, view->db, - view->table_name, item->name) & - VIEW_ANY_ACL); + uint priv= (get_column_grant(thd, &view->grant, view->db, + view->table_name, item->name) & + VIEW_ANY_ACL); if (fld && !fld->field->table->s->tmp_table) - { + { + final_priv&= fld->have_privileges; if (~fld->have_privileges & priv) @@ -589,17 +601,15 @@ bool mysql_create_view(THD *thd, TABLE_LIST *views, } } } - - if (!final_priv) - { - DBUG_ASSERT(report_item); - - my_error(ER_COLUMNACCESS_DENIED_ERROR, MYF(0), - "create view", thd->security_ctx->priv_user, + + if (!final_priv && report_item) + { + my_error(ER_COLUMNACCESS_DENIED_ERROR, MYF(0), + "create view", thd->security_ctx->priv_user, thd->security_ctx->priv_host, report_item->name, - view->table_name); - res= TRUE; - goto err; + view->table_name); + res= TRUE; + goto err; } } #endif From 2bc4ad4f1f0faa191d9b5844677030fbea402db0 Mon Sep 17 00:00:00 2001 From: Sergey Glukhov Date: Wed, 25 Feb 2009 14:20:20 +0400 Subject: [PATCH 037/132] Bug#30305 Create routine in wrong context in SHOW PRIVILEGES Changed context of Create routine to Databases. mysql-test/r/grant.result: result fix mysql-test/r/sp.result: result fix sql/sql_show.cc: Changed context of Create routine to Databases. --- mysql-test/r/grant.result | 2 +- mysql-test/r/sp.result | 4 ++-- sql/sql_show.cc | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mysql-test/r/grant.result b/mysql-test/r/grant.result index 97945a702d8..7a5b0520f7c 100644 --- a/mysql-test/r/grant.result +++ b/mysql-test/r/grant.result @@ -457,7 +457,7 @@ Privilege Context Comment Alter Tables To alter the table Alter routine Functions,Procedures To alter or drop stored functions/procedures Create Databases,Tables,Indexes To create new databases and tables -Create routine Functions,Procedures To use CREATE FUNCTION/PROCEDURE +Create routine Databases To use CREATE FUNCTION/PROCEDURE Create temporary tables Databases To use CREATE TEMPORARY TABLE Create view Tables To create new views Create user Server Admin To create new users diff --git a/mysql-test/r/sp.result b/mysql-test/r/sp.result index bfa2f51e4fc..84a4166a45d 100644 --- a/mysql-test/r/sp.result +++ b/mysql-test/r/sp.result @@ -2475,7 +2475,7 @@ Privilege Context Comment Alter Tables To alter the table Alter routine Functions,Procedures To alter or drop stored functions/procedures Create Databases,Tables,Indexes To create new databases and tables -Create routine Functions,Procedures To use CREATE FUNCTION/PROCEDURE +Create routine Databases To use CREATE FUNCTION/PROCEDURE Create temporary tables Databases To use CREATE TEMPORARY TABLE Create view Tables To create new views Create user Server Admin To create new users @@ -2527,7 +2527,7 @@ Privilege Context Comment Alter Tables To alter the table Alter routine Functions,Procedures To alter or drop stored functions/procedures Create Databases,Tables,Indexes To create new databases and tables -Create routine Functions,Procedures To use CREATE FUNCTION/PROCEDURE +Create routine Databases To use CREATE FUNCTION/PROCEDURE Create temporary tables Databases To use CREATE TEMPORARY TABLE Create view Tables To create new views Create user Server Admin To create new users diff --git a/sql/sql_show.cc b/sql/sql_show.cc index 19155eec06b..50bbdeb2771 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -106,7 +106,7 @@ static struct show_privileges_st sys_privileges[]= {"Alter", "Tables", "To alter the table"}, {"Alter routine", "Functions,Procedures", "To alter or drop stored functions/procedures"}, {"Create", "Databases,Tables,Indexes", "To create new databases and tables"}, - {"Create routine","Functions,Procedures","To use CREATE FUNCTION/PROCEDURE"}, + {"Create routine","Databases","To use CREATE FUNCTION/PROCEDURE"}, {"Create temporary tables","Databases","To use CREATE TEMPORARY TABLE"}, {"Create view", "Tables", "To create new views"}, {"Create user", "Server Admin", "To create new users"}, From b63c6f566632a8da78f57ca93d405bd1782876ba Mon Sep 17 00:00:00 2001 From: Bjorn Munch Date: Wed, 25 Feb 2009 11:29:50 +0100 Subject: [PATCH 038/132] fixing bzr tree name --- .bzr-mysql/default.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bzr-mysql/default.conf b/.bzr-mysql/default.conf index f044f8e62da..63057f42ac6 100644 --- a/.bzr-mysql/default.conf +++ b/.bzr-mysql/default.conf @@ -1,4 +1,4 @@ [MYSQL] post_commit_to = "commits@lists.mysql.com" post_push_to = "commits@lists.mysql.com" -tree_name = "mysql-5.1" +tree_name = "mysql-5.1-mtr" From 5a6fa28226530cadb3ec571d1d76f848dd32d647 Mon Sep 17 00:00:00 2001 From: "Bernt M. Johnsen" Date: Wed, 25 Feb 2009 11:37:30 +0100 Subject: [PATCH 039/132] Prepare for push of BUG#43111 --- mysql-test/r/ps.result | 2 +- mysql-test/t/ps.test | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/mysql-test/r/ps.result b/mysql-test/r/ps.result index 09deaf2f322..d3fbbf0d538 100644 --- a/mysql-test/r/ps.result +++ b/mysql-test/r/ps.result @@ -235,7 +235,7 @@ execute stmt1; prepare stmt1 from "insert into t1 select i from t1"; execute stmt1; execute stmt1; -prepare stmt1 from "select * from t1 into outfile 'f1.txt'"; +prepare stmt1 from "select * from t1 into outfile '/tmp/f1.txt'"; execute stmt1; deallocate prepare stmt1; drop table t1; diff --git a/mysql-test/t/ps.test b/mysql-test/t/ps.test index 6c3f98f6a1a..d9e593fd76f 100644 --- a/mysql-test/t/ps.test +++ b/mysql-test/t/ps.test @@ -228,6 +228,10 @@ drop table t1; # statements or are correctly created and deleted on each execute # +--let $outfile=$MYSQLTEST_VARDIR/tmp/f1.txt +--error 0,1 +--remove_file $outfile + prepare stmt1 from "select 1 into @var"; execute stmt1; execute stmt1; @@ -238,11 +242,14 @@ execute stmt1; prepare stmt1 from "insert into t1 select i from t1"; execute stmt1; execute stmt1; -prepare stmt1 from "select * from t1 into outfile 'f1.txt'"; +--replace_result $MYSQLTEST_VARDIR +eval prepare stmt1 from "select * from t1 into outfile '$outfile'"; execute stmt1; deallocate prepare stmt1; drop table t1; +--remove_file $outfile + # # BUG#5242 "Prepared statement names are case sensitive" # From da3c4375cfe9530c04525ff6694e5f59f354c144 Mon Sep 17 00:00:00 2001 From: Davi Arnaut Date: Wed, 25 Feb 2009 11:42:58 +0100 Subject: [PATCH 040/132] Clean up test case to not leave open connections. mysql-test/include/handler.inc: Disconnect open connections once they are not being used. --- mysql-test/include/handler.inc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mysql-test/include/handler.inc b/mysql-test/include/handler.inc index 04f4cac831d..4eb9e413822 100644 --- a/mysql-test/include/handler.inc +++ b/mysql-test/include/handler.inc @@ -479,6 +479,7 @@ handler t1 open; --echo --> client 1 connection default; drop table t1; +disconnect con2; # # Bug#30632 HANDLER read failure causes hang @@ -717,4 +718,5 @@ handler t1 close; connection con1; --reap drop table t1; +disconnect con1; connection default; From 5d2fc5335411bdd05a08a9b062d3441d4308dcaa Mon Sep 17 00:00:00 2001 From: Sergey Glukhov Date: Wed, 25 Feb 2009 15:44:50 +0400 Subject: [PATCH 041/132] Bug#40345 MySQLDump prefixes view name with database name when view references other db print compact view name if the view belongs to the current database mysql-test/r/information_schema_db.result: result fix mysql-test/r/mysqldump.result: result fix mysql-test/r/view_grant.result: result fix sql/sql_show.cc: print compact view name if the view belongs to the current database --- mysql-test/r/information_schema_db.result | 2 +- mysql-test/r/mysqldump.result | 2 +- mysql-test/r/view_grant.result | 4 ++-- sql/sql_show.cc | 18 +++++++++++------- 4 files changed, 15 insertions(+), 11 deletions(-) diff --git a/mysql-test/r/information_schema_db.result b/mysql-test/r/information_schema_db.result index b9c3358f47e..67c9921e1ca 100644 --- a/mysql-test/r/information_schema_db.result +++ b/mysql-test/r/information_schema_db.result @@ -188,7 +188,7 @@ Field Type Null Key Default Extra f1 char(4) YES NULL show create view v2; View Create View -v2 CREATE ALGORITHM=UNDEFINED DEFINER=`testdb_2`@`localhost` SQL SECURITY DEFINER VIEW `test`.`v2` AS select `v1`.`f1` AS `f1` from `testdb_1`.`v1` +v2 CREATE ALGORITHM=UNDEFINED DEFINER=`testdb_2`@`localhost` SQL SECURITY DEFINER VIEW `v2` AS select `v1`.`f1` AS `f1` from `testdb_1`.`v1` show create view testdb_1.v1; ERROR 42000: SHOW VIEW command denied to user 'testdb_2'@'localhost' for table 'v1' select table_name from information_schema.columns a diff --git a/mysql-test/r/mysqldump.result b/mysql-test/r/mysqldump.result index c612f6c5073..49430a5c62d 100644 --- a/mysql-test/r/mysqldump.result +++ b/mysql-test/r/mysqldump.result @@ -3246,7 +3246,7 @@ USE `mysqldump_views`; /*!50001 DROP TABLE `nasishnasifu`*/; /*!50001 CREATE ALGORITHM=UNDEFINED */ /*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */ -/*!50001 VIEW `mysqldump_views`.`nasishnasifu` AS select `mysqldump_tables`.`basetable`.`id` AS `id` from `mysqldump_tables`.`basetable` */; +/*!50001 VIEW `nasishnasifu` AS select `mysqldump_tables`.`basetable`.`id` AS `id` from `mysqldump_tables`.`basetable` */; drop view nasishnasifu; drop database mysqldump_views; drop table mysqldump_tables.basetable; diff --git a/mysql-test/r/view_grant.result b/mysql-test/r/view_grant.result index 53ad8642ba4..2f8462045ca 100644 --- a/mysql-test/r/view_grant.result +++ b/mysql-test/r/view_grant.result @@ -26,7 +26,7 @@ create view v2 as select * from mysqltest.t2; ERROR 42000: ANY command denied to user 'mysqltest_1'@'localhost' for table 't2' show create view v1; View Create View -v1 CREATE ALGORITHM=UNDEFINED DEFINER=`mysqltest_1`@`localhost` SQL SECURITY DEFINER VIEW `test`.`v1` AS select `mysqltest`.`t1`.`a` AS `a`,`mysqltest`.`t1`.`b` AS `b` from `mysqltest`.`t1` +v1 CREATE ALGORITHM=UNDEFINED DEFINER=`mysqltest_1`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `mysqltest`.`t1`.`a` AS `a`,`mysqltest`.`t1`.`b` AS `b` from `mysqltest`.`t1` grant create view,drop,select on test.* to mysqltest_1@localhost; use test; alter view v1 as select * from mysqltest.t1; @@ -307,7 +307,7 @@ grant create view,select on test.* to mysqltest_1@localhost; create view v1 as select * from mysqltest.t1; show create view v1; View Create View -v1 CREATE ALGORITHM=UNDEFINED DEFINER=`mysqltest_1`@`localhost` SQL SECURITY DEFINER VIEW `test`.`v1` AS select `mysqltest`.`t1`.`a` AS `a`,`mysqltest`.`t1`.`b` AS `b` from `mysqltest`.`t1` +v1 CREATE ALGORITHM=UNDEFINED DEFINER=`mysqltest_1`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `mysqltest`.`t1`.`a` AS `a`,`mysqltest`.`t1`.`b` AS `b` from `mysqltest`.`t1` revoke select on mysqltest.t1 from mysqltest_1@localhost; select * from v1; ERROR HY000: View 'test.v1' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them diff --git a/sql/sql_show.cc b/sql/sql_show.cc index 50bbdeb2771..a3ccf770a3c 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -1232,21 +1232,25 @@ void append_definer(THD *thd, String *buffer, const LEX_STRING *definer_user, static int view_store_create_info(THD *thd, TABLE_LIST *table, String *buff) { + my_bool compact_view_name= TRUE; my_bool foreign_db_mode= (thd->variables.sql_mode & (MODE_POSTGRESQL | MODE_ORACLE | MODE_MSSQL | MODE_DB2 | MODE_MAXDB | MODE_ANSI)) != 0; - /* - Compact output format for view can be used - - if user has db of this view as current db - - if this view only references table inside it's own db - */ + if (!thd->db || strcmp(thd->db, table->view_db.str)) - table->compact_view_format= FALSE; + /* + print compact view name if the view belongs to the current database + */ + compact_view_name= table->compact_view_format= FALSE; else { + /* + Compact output format for view body can be used + if this view only references table inside it's own db + */ TABLE_LIST *tbl; table->compact_view_format= TRUE; for (tbl= thd->lex->query_tables; @@ -1267,7 +1271,7 @@ view_store_create_info(THD *thd, TABLE_LIST *table, String *buff) view_store_options(thd, table, buff); } buff->append(STRING_WITH_LEN("VIEW ")); - if (!table->compact_view_format) + if (!compact_view_name) { append_identifier(thd, buff, table->view_db.str, table->view_db.length); buff->append('.'); From fff57e9dfc851b80a99a6f83c0138b0010c750f2 Mon Sep 17 00:00:00 2001 From: Daniel Fischer Date: Wed, 25 Feb 2009 15:00:17 +0100 Subject: [PATCH 042/132] address review comments --- mysql-test/collections/README.experimental | 2 +- mysql-test/lib/mtr_report.pm | 16 ++++++--- mysql-test/mysql-test-run.pl | 38 +++++++++++++--------- 3 files changed, 34 insertions(+), 22 deletions(-) diff --git a/mysql-test/collections/README.experimental b/mysql-test/collections/README.experimental index d06e55f1246..9eee2394423 100644 --- a/mysql-test/collections/README.experimental +++ b/mysql-test/collections/README.experimental @@ -11,7 +11,7 @@ The syntax is as follows: 2) Empty lines and lines starting with a hash (#) are ignored. -3) If any other line contains a black followed by a hash (#), the hash +3) If any other line contains a blank followed by a hash (#), the hash and any subsequent characters are ignored. 4) The full test case name including the suite and execution mode diff --git a/mysql-test/lib/mtr_report.pm b/mysql-test/lib/mtr_report.pm index d1cae6324cb..73401dc4b33 100644 --- a/mysql-test/lib/mtr_report.pm +++ b/mysql-test/lib/mtr_report.pm @@ -109,10 +109,10 @@ sub mtr_report_test ($) { my ($tinfo)= @_; my $test_name = _mtr_report_test_name($tinfo); - my $comment= $tinfo->{'comment'}; - my $logfile= $tinfo->{'logfile'}; - my $warnings= $tinfo->{'warnings'}; - my $result= $tinfo->{'result'}; + my $comment= $tinfo->{'comment'}; + my $logfile= $tinfo->{'logfile'}; + my $warnings= $tinfo->{'warnings'}; + my $result= $tinfo->{'result'}; if ($result eq 'MTR_RES_FAILED'){ @@ -123,14 +123,20 @@ sub mtr_report_test ($) { { # Find out if this test case is an experimental one, so we can treat # the failure as an expected failure instead of a regression. - for my $exp ( @$::opt_experimental ) { + for my $exp ( @$::experimental_test_cases ) { if ( $exp ne $test_name ) { + # if the expression is not the name of this test case, but has + # an asterisk at the end, determine if the characters up to + # but excluding the asterisk are the same if ( $exp ne "" && substr($exp, -1, 1) eq "*" ) { $exp = substr($exp, 0, length($exp) - 1); if ( substr($test_name, 0, length($exp)) ne $exp ) { + # no match, try next entry next; } + # if yes, fall through to set the exp-fail status } else { + # no match, try next entry next; } } diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 8e772279aa3..89a6d89687a 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -170,6 +170,7 @@ my $config; # The currently running config my $current_config_name; # The currently running config file template our $opt_experimental; +our $experimental_test_cases; my $baseport; my $opt_build_thread= $ENV{'MTR_BUILD_THREAD'} || "auto"; @@ -963,24 +964,29 @@ sub command_line_setup { if ( $opt_experimental ) { - if ( open(FILE, "<", $opt_experimental) ) { - mtr_report("Using experimental file: $opt_experimental"); - $opt_experimental = []; - while() { - chomp; - s/( +|^)#.*$//; - s/^ +//; - s/ +$//; - if ( $_ eq "" ) { - next; - } - print " - $_\n"; - push @$opt_experimental, $_; + # read the list of experimental test cases from the file specified on + # the command line + open(FILE, "<", $opt_experimental) or mtr_error("Can't read experimental file: $opt_experimental"); + mtr_report("Using experimental file: $opt_experimental"); + $experimental_test_cases = []; + while() { + chomp; + # remove comments (# foo) at the beginning of the line, or after a + # blank at the end of the line + s/( +|^)#.*$//; + # remove whitespace + s/^ +//; + s/ +$//; + # if nothing left, don't need to remember this line + if ( $_ eq "" ) { + next; } - close FILE; - } else { - mtr_error("Can't read experimental file: $opt_experimental"); + # remember what is left as the name of another test case that should be + # treated as experimental + print " - $_\n"; + push @$experimental_test_cases, $_; } + close FILE; } foreach my $arg ( @ARGV ) From 00ac598a44fb38b888ccec14befc38348ddeae53 Mon Sep 17 00:00:00 2001 From: "Bernt M. Johnsen" Date: Wed, 25 Feb 2009 16:53:49 +0100 Subject: [PATCH 043/132] Prepared for push (BUG#43110) --- mysql-test/t/ps.test | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/mysql-test/t/ps.test b/mysql-test/t/ps.test index 6b20fd14394..db5994d434b 100644 --- a/mysql-test/t/ps.test +++ b/mysql-test/t/ps.test @@ -946,8 +946,13 @@ set global max_prepared_stmt_count=3; select @@max_prepared_stmt_count; show status like 'prepared_stmt_count'; prepare stmt from "select 1"; + connect (con1,localhost,root,,); + +# Switch to connection con1 connection con1; +let $con1_id=`SELECT CONNECTION_ID()`; + prepare stmt from "select 2"; prepare stmt1 from "select 3"; --error ER_MAX_PREPARED_STMT_COUNT_REACHED @@ -957,18 +962,17 @@ connection default; prepare stmt2 from "select 4"; select @@max_prepared_stmt_count; show status like 'prepared_stmt_count'; + +# Disconnect connection con1 and switch to default connection disconnect con1; connection default; -# Wait for the connection to die: deal with a possible race + +# Wait for the connection con1 to die +let $wait_condition=SELECT COUNT(*)=0 FROM information_schema.processlist WHERE id=$con1_id; +--source include/wait_condition.inc + deallocate prepare stmt; -let $query= select variable_value from information_schema.global_status - where variable_name = 'prepared_stmt_count'; -let $count= `$query`; -if ($count) -{ ---sleep 1 - let $count= `$query`; -} + select @@max_prepared_stmt_count; show status like 'prepared_stmt_count'; # From 1a11c2236fa096b8f9618cb4e5ffbf3d5add2787 Mon Sep 17 00:00:00 2001 From: Vladislav Vaintroub Date: Wed, 25 Feb 2009 16:57:49 +0100 Subject: [PATCH 044/132] Bug#43082: mysqld 32 bit cannot use big buffers due to 2GB usermode address space limit. Fix: use /LARGEADDRESSAWARE link option when linking 32 bit executables --- CMakeLists.txt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ae069498da1..f66453ef492 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -114,7 +114,13 @@ IF(MSVC) STRING(REPLACE "/EHsc" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) STRING(REPLACE "/EHsc" "" CMAKE_CXX_FLAGS_INIT ${CMAKE_CXX_FLAGS_INIT}) STRING(REPLACE "/EHsc" "" CMAKE_CXX_FLAGS_DEBUG_INIT ${CMAKE_CXX_FLAGS_DEBUG_INIT}) - + + # Mark 32 bit executables large address aware so they can + # use > 2GB address space + IF(CMAKE_SIZEOF_VOID_P MATCHES 4) + SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /LARGEADDRESSAWARE") + ENDIF(CMAKE_SIZEOF_VOID_P MATCHES 4) + # Disable automatic manifest generation. STRING(REPLACE "/MANIFEST" "/MANIFEST:NO" CMAKE_EXE_LINKER_FLAGS ${CMAKE_EXE_LINKER_FLAGS}) From c9e1884cd6e70d89f0a0c2bce1b80f84b913f59a Mon Sep 17 00:00:00 2001 From: Ramil Kalimullin Date: Thu, 26 Feb 2009 12:34:15 +0400 Subject: [PATCH 045/132] Fix for bug#19829:make test Failed in mysql_client_test *with --with-charset=utf8* Problem: wrong LONG TEXT field length is sent to a client when multibyte server character set used. Fix: always limit field length sent to a client to 2^32, as we store it in 4 byte slot. Note: mysql_client_test changed accordingly. sql/protocol.cc: Fix for bug#19829:make test Failed in mysql_client_test *with --with-charset=utf8* - limit field length sent to client to UINT_MAX32 as it may exceeds 32 bit slot for LONG TEXT fields if thd_charset->mbmaxlen > 1. tests/mysql_client_test.c: Fix for bug#19829:make test Failed in mysql_client_test *with --with-charset=utf8* - checking field members have in mind that field length is limited to UINT_MAX32. --- sql/protocol.cc | 22 ++++++++++++++++------ tests/mysql_client_test.c | 15 +++++++++------ 2 files changed, 25 insertions(+), 12 deletions(-) diff --git a/sql/protocol.cc b/sql/protocol.cc index ff58d96f59b..2309bac88a9 100644 --- a/sql/protocol.cc +++ b/sql/protocol.cc @@ -616,7 +616,8 @@ bool Protocol::send_fields(List *list, uint flags) else { /* With conversion */ - uint max_char_len; + ulonglong max_length; + uint32 field_length; int2store(pos, thd_charset->number); /* For TEXT/BLOB columns, field_length describes the maximum data @@ -627,12 +628,21 @@ bool Protocol::send_fields(List *list, uint flags) char_count * mbmaxlen, where character count is taken from the definition of the column. In other words, the maximum number of characters here is limited by the column definition. + + When one has a LONG TEXT column with a single-byte + character set, and the connection character set is multi-byte, the + client may get fields longer than UINT_MAX32, due to + -> conversion. + In that case column max length does not fit into the 4 bytes + reserved for it in the protocol. */ - max_char_len= (field.type >= (int) MYSQL_TYPE_TINY_BLOB && - field.type <= (int) MYSQL_TYPE_BLOB) ? - field.length / item->collation.collation->mbminlen : - field.length / item->collation.collation->mbmaxlen; - int4store(pos+2, max_char_len * thd_charset->mbmaxlen); + max_length= (field.type >= MYSQL_TYPE_TINY_BLOB && + field.type <= MYSQL_TYPE_BLOB) ? + field.length / item->collation.collation->mbminlen : + field.length / item->collation.collation->mbmaxlen; + max_length*= thd_charset->mbmaxlen; + field_length= (max_length > UINT_MAX32) ? UINT_MAX32 : max_length; + int4store(pos + 2, field_length); } pos[6]= field.type; int2store(pos+7,field.flags); diff --git a/tests/mysql_client_test.c b/tests/mysql_client_test.c index f848e93a5c6..7df84c600c9 100644 --- a/tests/mysql_client_test.c +++ b/tests/mysql_client_test.c @@ -714,6 +714,7 @@ static void do_verify_prepare_field(MYSQL_RES *result, { MYSQL_FIELD *field; CHARSET_INFO *cs; + ulonglong expected_field_length; if (!(field= mysql_fetch_field_direct(result, no))) { @@ -722,6 +723,8 @@ static void do_verify_prepare_field(MYSQL_RES *result, } cs= get_charset(field->charsetnr, 0); DIE_UNLESS(cs); + if ((expected_field_length= length * cs->mbmaxlen) > UINT_MAX32) + expected_field_length= UINT_MAX32; if (!opt_silent) { fprintf(stdout, "\n field[%d]:", no); @@ -736,8 +739,8 @@ static void do_verify_prepare_field(MYSQL_RES *result, fprintf(stdout, "\n org_table:`%s`\t(expected: `%s`)", field->org_table, org_table); fprintf(stdout, "\n database :`%s`\t(expected: `%s`)", field->db, db); - fprintf(stdout, "\n length :`%lu`\t(expected: `%lu`)", - field->length, length * cs->mbmaxlen); + fprintf(stdout, "\n length :`%lu`\t(expected: `%llu`)", + field->length, expected_field_length); fprintf(stdout, "\n maxlength:`%ld`", field->max_length); fprintf(stdout, "\n charsetnr:`%d`", field->charsetnr); fprintf(stdout, "\n default :`%s`\t(expected: `%s`)", @@ -773,11 +776,11 @@ static void do_verify_prepare_field(MYSQL_RES *result, as utf8. Field length is calculated as number of characters * maximum number of bytes a character can occupy. */ - if (length && field->length != length * cs->mbmaxlen) + if (length && (field->length != expected_field_length)) { - fprintf(stderr, "Expected field length: %d, got length: %d\n", - (int) (length * cs->mbmaxlen), (int) field->length); - DIE_UNLESS(field->length == length * cs->mbmaxlen); + fprintf(stderr, "Expected field length: %llu, got length: %lu\n", + expected_field_length, field->length); + DIE_UNLESS(field->length == expected_field_length); } if (def) DIE_UNLESS(strcmp(field->def, def) == 0); From 6877425f2f41717a329d757a5f98c57b4e0c1eb5 Mon Sep 17 00:00:00 2001 From: Patrick Crews Date: Thu, 26 Feb 2009 10:57:33 +0200 Subject: [PATCH 046/132] Bug#41893: main.variables mysql-test fails if new variable like '%alloc%' is added. Started fix in 5.0 as the same issue is here. Revising queries used given what appears to be the scope of this test to only select the manipulated variables. Added tests for values that are / are not multiples of 1024 to test rounding / constraints. This behavior is not currently documented (docs bug has been opened) --- mysql-test/r/variables.result | 46 ++++++++++++++++++++++++++++++----- mysql-test/t/variables.test | 38 +++++++++++++++++++++++++---- 2 files changed, 73 insertions(+), 11 deletions(-) diff --git a/mysql-test/r/variables.result b/mysql-test/r/variables.result index 376a8ffa38e..04ccf3d688c 100644 --- a/mysql-test/r/variables.result +++ b/mysql-test/r/variables.result @@ -236,32 +236,66 @@ set @@rand_seed1=10000000,@@rand_seed2=1000000; select ROUND(RAND(),5); ROUND(RAND(),5) 0.02887 -show variables like '%alloc%'; + +==+ Testing %alloc% system variables +== +==+ NOTE: These values *must* be a multiple of 1024 +== +==+ Other values will be rounded down to nearest multiple +== + +==+ Show initial values +== +SHOW VARIABLES WHERE variable_name IN ('range_alloc_block_size', +'query_alloc_block_size', 'query_prealloc_size', +'transaction_alloc_block_size', 'transaction_prealloc_size'); Variable_name Value query_alloc_block_size 8192 query_prealloc_size 8192 range_alloc_block_size 4096 transaction_alloc_block_size 8192 transaction_prealloc_size 4096 -set @@range_alloc_block_size=1024*16; +==+ Manipulate variable values += +Testing values that are multiples of 1024 +set @@range_alloc_block_size=1024*15+1024; +set @@query_alloc_block_size=1024*15+1024*2; +set @@query_prealloc_size=1024*18-1024; +set @@transaction_alloc_block_size=1024*21-1024*1; +set @@transaction_prealloc_size=1024*21-2048; +==+ Check manipulated values ==+ +SHOW VARIABLES WHERE variable_name IN ('range_alloc_block_size', +'query_alloc_block_size', 'query_prealloc_size', +'transaction_alloc_block_size', 'transaction_prealloc_size'); +Variable_name Value +query_alloc_block_size 17408 +query_prealloc_size 17408 +range_alloc_block_size 16384 +transaction_alloc_block_size 20480 +transaction_prealloc_size 19456 +==+ Manipulate variable values +== +Testing values that are not 1024 multiples +set @@range_alloc_block_size=1024*16+1023; set @@query_alloc_block_size=1024*17+2; -set @@query_prealloc_size=1024*18; +set @@query_prealloc_size=1024*18-1023; set @@transaction_alloc_block_size=1024*20-1; set @@transaction_prealloc_size=1024*21-1; select @@query_alloc_block_size; @@query_alloc_block_size 17408 -show variables like '%alloc%'; +==+ Check manipulated values ==+ +SHOW VARIABLES WHERE variable_name IN ('range_alloc_block_size', +'query_alloc_block_size', 'query_prealloc_size', +'transaction_alloc_block_size', 'transaction_prealloc_size'); Variable_name Value query_alloc_block_size 17408 -query_prealloc_size 18432 +query_prealloc_size 17408 range_alloc_block_size 16384 transaction_alloc_block_size 19456 transaction_prealloc_size 20480 +==+ Set values back to the default values +== set @@range_alloc_block_size=default; set @@query_alloc_block_size=default, @@query_prealloc_size=default; set transaction_alloc_block_size=default, @@transaction_prealloc_size=default; -show variables like '%alloc%'; +==+ Check the values not that they are reset +== +SHOW VARIABLES WHERE variable_name IN ('range_alloc_block_size', +'query_alloc_block_size', 'query_prealloc_size', +'transaction_alloc_block_size', 'transaction_prealloc_size'); Variable_name Value query_alloc_block_size 8192 query_prealloc_size 8192 diff --git a/mysql-test/t/variables.test b/mysql-test/t/variables.test index 60254ad9a1d..173be9d87c6 100644 --- a/mysql-test/t/variables.test +++ b/mysql-test/t/variables.test @@ -150,18 +150,46 @@ select @@timestamp>0; set @@rand_seed1=10000000,@@rand_seed2=1000000; select ROUND(RAND(),5); -show variables like '%alloc%'; -set @@range_alloc_block_size=1024*16; +--echo +--echo ==+ Testing %alloc% system variables +== +--echo ==+ NOTE: These values *must* be a multiple of 1024 +== +--echo ==+ Other values will be rounded down to nearest multiple +== +--echo +--echo ==+ Show initial values +== +SHOW VARIABLES WHERE variable_name IN ('range_alloc_block_size', +'query_alloc_block_size', 'query_prealloc_size', +'transaction_alloc_block_size', 'transaction_prealloc_size'); +--echo ==+ Manipulate variable values += +--echo Testing values that are multiples of 1024 +set @@range_alloc_block_size=1024*15+1024; +set @@query_alloc_block_size=1024*15+1024*2; +set @@query_prealloc_size=1024*18-1024; +set @@transaction_alloc_block_size=1024*21-1024*1; +set @@transaction_prealloc_size=1024*21-2048; +--echo ==+ Check manipulated values ==+ +SHOW VARIABLES WHERE variable_name IN ('range_alloc_block_size', +'query_alloc_block_size', 'query_prealloc_size', +'transaction_alloc_block_size', 'transaction_prealloc_size'); +--echo ==+ Manipulate variable values +== +--echo Testing values that are not 1024 multiples +set @@range_alloc_block_size=1024*16+1023; set @@query_alloc_block_size=1024*17+2; -set @@query_prealloc_size=1024*18; +set @@query_prealloc_size=1024*18-1023; set @@transaction_alloc_block_size=1024*20-1; set @@transaction_prealloc_size=1024*21-1; select @@query_alloc_block_size; -show variables like '%alloc%'; +--echo ==+ Check manipulated values ==+ +SHOW VARIABLES WHERE variable_name IN ('range_alloc_block_size', +'query_alloc_block_size', 'query_prealloc_size', +'transaction_alloc_block_size', 'transaction_prealloc_size'); +--echo ==+ Set values back to the default values +== set @@range_alloc_block_size=default; set @@query_alloc_block_size=default, @@query_prealloc_size=default; set transaction_alloc_block_size=default, @@transaction_prealloc_size=default; -show variables like '%alloc%'; +--echo ==+ Check the values not that they are reset +== +SHOW VARIABLES WHERE variable_name IN ('range_alloc_block_size', +'query_alloc_block_size', 'query_prealloc_size', +'transaction_alloc_block_size', 'transaction_prealloc_size'); # # Bug #10904 Illegal mix of collations between From a7fe00afb5442800f54e50636c7ee829c8194d60 Mon Sep 17 00:00:00 2001 From: Magnus Svensson Date: Thu, 26 Feb 2009 15:01:57 +0100 Subject: [PATCH 047/132] Bug#43215 6 error codes changed from 5.1 to 6.0 sql/share/errmsg.txt: - Reserve released error codes in 5.1 --- sql/share/errmsg.txt | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/sql/share/errmsg.txt b/sql/share/errmsg.txt index 5dc75c340ea..23231eefcc2 100644 --- a/sql/share/errmsg.txt +++ b/sql/share/errmsg.txt @@ -6154,3 +6154,18 @@ WARN_PLUGIN_BUSY ER_VARIABLE_IS_READONLY eng "%s variable '%s' is read-only. Use SET %s to assign the value" + +ER_WARN_ENGINE_TRANSACTION_ROLLBACK + eng "Storage engine %s does not support rollback for this statement. Transaction rolled back and must be restarted" + +ER_SLAVE_HEARTBEAT_FAILURE + eng "Unexpected master's heartbeat data: %s" +ER_SLAVE_HEARTBEAT_VALUE_OUT_OF_RANGE + eng "The requested value for the heartbeat period %s %s" + +ER_NDB_REPLICATION_SCHEMA_ERROR + eng "Bad schema for mysql.ndb_replication table. Message: %-.64s" +ER_CONFLICT_FN_PARSE_ERROR + eng "Error in parsing conflict function. Message: %-.64s" +ER_EXCEPTIONS_WRITE_ERROR + eng "Write to exceptions table failed. Message: %-.128s"" From afdf8a447f538a20f61fc4d7cea26975da53e973 Mon Sep 17 00:00:00 2001 From: Patrick Crews Date: Thu, 26 Feb 2009 18:00:47 +0200 Subject: [PATCH 048/132] Bug#41893 - main.variables mysql-test fails if new variable like '%alloc%' is added. Fixed a typo in the bug fix patch. --- mysql-test/t/variables.test | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mysql-test/t/variables.test b/mysql-test/t/variables.test index 173be9d87c6..424776dfda4 100644 --- a/mysql-test/t/variables.test +++ b/mysql-test/t/variables.test @@ -186,7 +186,7 @@ SHOW VARIABLES WHERE variable_name IN ('range_alloc_block_size', set @@range_alloc_block_size=default; set @@query_alloc_block_size=default, @@query_prealloc_size=default; set transaction_alloc_block_size=default, @@transaction_prealloc_size=default; ---echo ==+ Check the values not that they are reset +== +--echo ==+ Check the values now that they are reset +== SHOW VARIABLES WHERE variable_name IN ('range_alloc_block_size', 'query_alloc_block_size', 'query_prealloc_size', 'transaction_alloc_block_size', 'transaction_prealloc_size'); From a9d707037ab527564bb84885e0af69a2bb793219 Mon Sep 17 00:00:00 2001 From: Georgi Kodinov Date: Thu, 26 Feb 2009 19:00:44 +0200 Subject: [PATCH 049/132] Bug #41354: Access control is bypassed when all columns of a view are selected by * wildcard Backported a part of the fix for 36086 to 5.0 mysql-test/r/view_grant.result: Bug #41354: test case mysql-test/t/view_grant.test: Bug #41354: test case sql/sql_acl.cc: Bug #41354: return table error when no access and * sql/sql_base.cc: Bug #41354: backported the check in bug 36086 to 5.0 --- mysql-test/r/view_grant.result | 26 ++++++++++++++++++++++ mysql-test/t/view_grant.test | 40 ++++++++++++++++++++++++++++++++++ sql/sql_acl.cc | 28 +++++++++++++++++++----- sql/sql_base.cc | 2 +- 4 files changed, 89 insertions(+), 7 deletions(-) diff --git a/mysql-test/r/view_grant.result b/mysql-test/r/view_grant.result index 2f8462045ca..1df8ed335a7 100644 --- a/mysql-test/r/view_grant.result +++ b/mysql-test/r/view_grant.result @@ -919,4 +919,30 @@ c4 DROP DATABASE mysqltest1; DROP DATABASE mysqltest2; DROP USER mysqltest_u1@localhost; +CREATE DATABASE db1; +USE db1; +CREATE TABLE t1(f1 INT, f2 INT); +CREATE VIEW v1 AS SELECT f1, f2 FROM t1; +GRANT SELECT (f1) ON t1 TO foo; +GRANT SELECT (f1) ON v1 TO foo; +USE db1; +SELECT f1 FROM t1; +f1 +SELECT f2 FROM t1; +ERROR 42000: SELECT command denied to user 'foo'@'localhost' for column 'f2' in table 't1' +SELECT * FROM t1; +ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table 't1' +SELECT f1 FROM v1; +f1 +SELECT f2 FROM v1; +ERROR 42000: SELECT command denied to user 'foo'@'localhost' for column 'f2' in table 'v1' +SELECT * FROM v1; +ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table 'v1' +USE test; +REVOKE SELECT (f1) ON db1.t1 FROM foo; +REVOKE SELECT (f1) ON db1.v1 FROM foo; +DROP USER foo; +DROP VIEW db1.v1; +DROP TABLE db1.t1; +DROP DATABASE db1; End of 5.0 tests. diff --git a/mysql-test/t/view_grant.test b/mysql-test/t/view_grant.test index be9daacec4f..c8b31f711b5 100644 --- a/mysql-test/t/view_grant.test +++ b/mysql-test/t/view_grant.test @@ -1185,4 +1185,44 @@ DROP DATABASE mysqltest1; DROP DATABASE mysqltest2; DROP USER mysqltest_u1@localhost; + +# +# Bug #41354: Access control is bypassed when all columns of a view are +# selected by * wildcard + +CREATE DATABASE db1; +USE db1; +CREATE TABLE t1(f1 INT, f2 INT); +CREATE VIEW v1 AS SELECT f1, f2 FROM t1; + +GRANT SELECT (f1) ON t1 TO foo; +GRANT SELECT (f1) ON v1 TO foo; + +connect (addconfoo, localhost, foo,,); +connection addconfoo; +USE db1; + + +SELECT f1 FROM t1; +--error ER_COLUMNACCESS_DENIED_ERROR +SELECT f2 FROM t1; +--error ER_TABLEACCESS_DENIED_ERROR +SELECT * FROM t1; + +SELECT f1 FROM v1; +--error ER_COLUMNACCESS_DENIED_ERROR +SELECT f2 FROM v1; +--error ER_TABLEACCESS_DENIED_ERROR +SELECT * FROM v1; + +connection default; +USE test; +disconnect addconfoo; +REVOKE SELECT (f1) ON db1.t1 FROM foo; +REVOKE SELECT (f1) ON db1.v1 FROM foo; +DROP USER foo; +DROP VIEW db1.v1; +DROP TABLE db1.t1; +DROP DATABASE db1; + --echo End of 5.0 tests. diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index 22135d376fe..c59c42d512a 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -3866,6 +3866,11 @@ bool check_grant_all_columns(THD *thd, ulong want_access_arg, Security_context *sctx= thd->security_ctx; ulong want_access= want_access_arg; const char *table_name= NULL; + /* + Flag that gets set if privilege checking has to be performed on column + level. + */ + bool using_column_privileges= FALSE; if (grant_option) { @@ -3909,6 +3914,8 @@ bool check_grant_all_columns(THD *thd, ulong want_access_arg, GRANT_COLUMN *grant_column= column_hash_search(grant_table, field_name, (uint) strlen(field_name)); + if (grant_column) + using_column_privileges= TRUE; if (!grant_column || (~grant_column->rights & want_access)) goto err; } @@ -3924,12 +3931,21 @@ err: char command[128]; get_privilege_desc(command, sizeof(command), want_access); - my_error(ER_COLUMNACCESS_DENIED_ERROR, MYF(0), - command, - sctx->priv_user, - sctx->host_or_ip, - fields->name(), - table_name); + /* + Do not give an error message listing a column name unless the user has + privilege to see all columns. + */ + if (using_column_privileges) + my_error(ER_TABLEACCESS_DENIED_ERROR, MYF(0), + command, sctx->priv_user, + sctx->host_or_ip, table_name); + else + my_error(ER_COLUMNACCESS_DENIED_ERROR, MYF(0), + command, + sctx->priv_user, + sctx->host_or_ip, + fields->name(), + table_name); return 1; } diff --git a/sql/sql_base.cc b/sql/sql_base.cc index 881c6a421e8..781bbc0a553 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -5479,7 +5479,7 @@ insert_fields(THD *thd, Name_resolution_context *context, const char *db_name, #ifndef NO_EMBEDDED_ACCESS_CHECKS /* Ensure that we have access rights to all fields to be inserted. */ - if (!((table && (table->grant.privilege & SELECT_ACL) || + if (!((table && !tables->view && (table->grant.privilege & SELECT_ACL) || tables->view && (tables->grant.privilege & SELECT_ACL))) && !any_privileges) { From 2cca1991bd25fe9a085ccb4d66ed39d1e054d495 Mon Sep 17 00:00:00 2001 From: "Bernt M. Johnsen" Date: Thu, 26 Feb 2009 18:17:06 +0100 Subject: [PATCH 050/132] Prepared for push (BUG#42567) --- mysql-test/r/group_by.result | 12 ++++++++++++ mysql-test/t/func_group.test | 2 ++ mysql-test/t/group_by.test | 18 ++++++++++++++++++ 3 files changed, 32 insertions(+) diff --git a/mysql-test/r/group_by.result b/mysql-test/r/group_by.result index 48f97aeb428..742d4b90807 100644 --- a/mysql-test/r/group_by.result +++ b/mysql-test/r/group_by.result @@ -1691,3 +1691,15 @@ FROM t1; ERROR 21000: Subquery returns more than 1 row DROP TABLE t1; SET @@sql_mode = @old_sql_mode; +SET @old_sql_mode = @@sql_mode; +SET @@sql_mode='ONLY_FULL_GROUP_BY'; +CREATE TABLE t1(i INT); +INSERT INTO t1 VALUES (1), (10); +SELECT COUNT(i) FROM t1; +COUNT(i) +2 +SELECT COUNT(i) FROM t1 WHERE i > 1; +COUNT(i) +1 +DROP TABLE t1; +SET @@sql_mode = @old_sql_mode; diff --git a/mysql-test/t/func_group.test b/mysql-test/t/func_group.test index be4e9c32686..b0a3d0feb79 100644 --- a/mysql-test/t/func_group.test +++ b/mysql-test/t/func_group.test @@ -18,6 +18,8 @@ insert into t1 values (3,5,"C"); insert into t1 values (3,6,"D"); # Test of MySQL field extension with and without matching records. +#### Note: The two following statements may fail if the execution plan +#### or optimizer is changed. The result for column c is undefined. select a,c,sum(a) from t1 group by a; select a,c,sum(a) from t1 where a > 10 group by a; select sum(a) from t1 where a > 10; diff --git a/mysql-test/t/group_by.test b/mysql-test/t/group_by.test index e3cf3ca856d..5b96213034a 100644 --- a/mysql-test/t/group_by.test +++ b/mysql-test/t/group_by.test @@ -1139,4 +1139,22 @@ DROP TABLE t1; SET @@sql_mode = @old_sql_mode; +# +# Bug#42567 Invalid GROUP BY error +# + +# Setup of the subtest +SET @old_sql_mode = @@sql_mode; +SET @@sql_mode='ONLY_FULL_GROUP_BY'; + +CREATE TABLE t1(i INT); +INSERT INTO t1 VALUES (1), (10); + +# The actual test +SELECT COUNT(i) FROM t1; +SELECT COUNT(i) FROM t1 WHERE i > 1; + +# Cleanup of subtest +DROP TABLE t1; +SET @@sql_mode = @old_sql_mode; From ee772168032cde8f6dc7abf8155f573ccd96afeb Mon Sep 17 00:00:00 2001 From: Georgi Kodinov Date: Fri, 27 Feb 2009 09:41:39 +0200 Subject: [PATCH 051/132] addendum to the fix for bug #41354: fixed the error returned by SELECT * --- mysql-test/r/grant2.result | 2 +- mysql-test/t/grant2.test | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mysql-test/r/grant2.result b/mysql-test/r/grant2.result index 95748c89103..698e602e2e6 100644 --- a/mysql-test/r/grant2.result +++ b/mysql-test/r/grant2.result @@ -433,7 +433,7 @@ USE db1; SELECT c FROM t2; ERROR 42000: SELECT command denied to user 'mysqltest1'@'localhost' for column 'c' in table 't2' SELECT * FROM t2; -ERROR 42000: SELECT command denied to user 'mysqltest1'@'localhost' for column 'c' in table 't2' +ERROR 42000: SELECT command denied to user 'mysqltest1'@'localhost' for table 't2' SELECT * FROM t1 JOIN t2 USING (b); ERROR 42000: SELECT command denied to user 'mysqltest1'@'localhost' for column 'c' in table 't2' USE test; diff --git a/mysql-test/t/grant2.test b/mysql-test/t/grant2.test index 8f83c365170..2393bb1c6d8 100644 --- a/mysql-test/t/grant2.test +++ b/mysql-test/t/grant2.test @@ -615,7 +615,7 @@ connection conn1; USE db1; --error ER_COLUMNACCESS_DENIED_ERROR SELECT c FROM t2; ---error ER_COLUMNACCESS_DENIED_ERROR +--error ER_TABLEACCESS_DENIED_ERROR SELECT * FROM t2; --error ER_COLUMNACCESS_DENIED_ERROR SELECT * FROM t1 JOIN t2 USING (b); From 1f847d1604b9430356133aa379fe242cfc687cc5 Mon Sep 17 00:00:00 2001 From: Patrick Crews Date: Fri, 27 Feb 2009 10:24:57 +0200 Subject: [PATCH 052/132] Bug#41893: main.variables mysql-test fails in new variable like '%alloc%' is added. Added ORDER BY clause to I_S query to ensure consistent order. There were differences between 5.1 and 6.0 output. Correcting it 5.1. --- mysql-test/r/variables.result | 6 +++--- mysql-test/t/variables.test | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mysql-test/r/variables.result b/mysql-test/r/variables.result index c99d3f314c5..0b56e3c1d52 100644 --- a/mysql-test/r/variables.result +++ b/mysql-test/r/variables.result @@ -318,13 +318,13 @@ transaction_prealloc_size 4096 SELECT * FROM information_schema.session_variables WHERE variable_name IN ('range_alloc_block_size', 'query_alloc_block_size', 'query_prealloc_size', -'transaction_alloc_block_size', 'transaction_prealloc_size'); +'transaction_alloc_block_size', 'transaction_prealloc_size') ORDER BY 1; VARIABLE_NAME VARIABLE_VALUE +QUERY_ALLOC_BLOCK_SIZE 8192 +QUERY_PREALLOC_SIZE 8192 RANGE_ALLOC_BLOCK_SIZE 4096 TRANSACTION_ALLOC_BLOCK_SIZE 8192 TRANSACTION_PREALLOC_SIZE 4096 -QUERY_PREALLOC_SIZE 8192 -QUERY_ALLOC_BLOCK_SIZE 8192 Testing values that are multiples of 1024 set @@range_alloc_block_size=1024*15+1024; set @@query_alloc_block_size=1024*15+1024*2; diff --git a/mysql-test/t/variables.test b/mysql-test/t/variables.test index 5cfa614f94a..6cd5abc3ea2 100644 --- a/mysql-test/t/variables.test +++ b/mysql-test/t/variables.test @@ -188,7 +188,7 @@ SHOW VARIABLES WHERE variable_name IN ('range_alloc_block_size', SELECT * FROM information_schema.session_variables WHERE variable_name IN ('range_alloc_block_size', 'query_alloc_block_size', 'query_prealloc_size', -'transaction_alloc_block_size', 'transaction_prealloc_size'); +'transaction_alloc_block_size', 'transaction_prealloc_size') ORDER BY 1; --echo Testing values that are multiples of 1024 set @@range_alloc_block_size=1024*15+1024; set @@query_alloc_block_size=1024*15+1024*2; From f7cf8e57c12f435980bafb4f4b9c657a722345a4 Mon Sep 17 00:00:00 2001 From: Alexey Kopytov Date: Fri, 27 Feb 2009 11:26:06 +0200 Subject: [PATCH 053/132] Fix for bug #40552: Race condition around default_directories in load_defaults() load_defaults(), my_search_option_files() and my_print_default_files() utilized a global variable containing a pointer to thread local memory. This could lead to race conditions when those functions were called with high concurrency. Fixed by changing the interface of the said functions to avoid the necessity for using a global variable. Since we cannot change load_defaults() prototype for API compatibility reasons, it was renamed my_load_defaults(). Now load_defaults() is a thread-unsafe wrapper around a thread-safe version, my_load_defaults(). mysys/default.c: 1. Added a thread-safe version of load_defaults(), changed load_defaults() with the old interface to be a thread-unsafe wrapper around the thread-safe version. 2. Always use a private MEM_ROOT in my_print_default_files, don't use a global variable. sql-common/client.c: Use a thread-safe version of load_defaults(). --- include/my_sys.h | 7 +- mysys/default.c | 67 ++++++++++++++----- server-tools/instance-manager/instance_map.cc | 3 +- server-tools/instance-manager/options.cc | 4 +- server-tools/instance-manager/options.h | 3 + sql-common/client.c | 2 +- 6 files changed, 66 insertions(+), 20 deletions(-) diff --git a/include/my_sys.h b/include/my_sys.h index 5335b65822f..180bfe0f07d 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -842,14 +842,17 @@ extern void *memdup_root(MEM_ROOT *root,const void *str, size_t len); extern int get_defaults_options(int argc, char **argv, char **defaults, char **extra_defaults, char **group_suffix); +extern int my_load_defaults(const char *conf_file, const char **groups, + int *argc, char ***argv, const char ***); extern int load_defaults(const char *conf_file, const char **groups, - int *argc, char ***argv); + int *argc, char ***argv); extern int modify_defaults_file(const char *file_location, const char *option, const char *option_value, const char *section_name, int remove_option); extern int my_search_option_files(const char *conf_file, int *argc, char ***argv, uint *args_used, - Process_option_func func, void *func_ctx); + Process_option_func func, void *func_ctx, + const char **default_directories); extern void free_defaults(char **argv); extern void my_print_default_files(const char *conf_file); extern void print_defaults(const char *conf_file, const char **groups); diff --git a/mysys/default.c b/mysys/default.c index 6b2b31d43ec..cdd9462c1d1 100644 --- a/mysys/default.c +++ b/mysys/default.c @@ -151,7 +151,7 @@ static char *remove_end_comment(char *ptr); int my_search_option_files(const char *conf_file, int *argc, char ***argv, uint *args_used, Process_option_func func, - void *func_ctx) + void *func_ctx, const char **default_directories) { const char **dirs, *forced_default_file, *forced_extra_defaults; int error= 0; @@ -359,9 +359,8 @@ int get_defaults_options(int argc, char **argv, return org_argc - argc; } - /* - Read options from configurations files + Wrapper around my_load_defaults() for interface compatibility. SYNOPSIS load_defaults() @@ -372,6 +371,35 @@ int get_defaults_options(int argc, char **argv, argc Pointer to argc of original program argv Pointer to argv of original program + NOTES + + This function is NOT thread-safe as it uses a global pointer internally. + See also notes for my_load_defaults(). + + RETURN + 0 ok + 1 The given conf_file didn't exists +*/ +int load_defaults(const char *conf_file, const char **groups, + int *argc, char ***argv) +{ + return my_load_defaults(conf_file, groups, argc, argv, &default_directories); +} + +/* + Read options from configurations files + + SYNOPSIS + my_load_defaults() + conf_file Basename for configuration file to search for. + If this is a path, then only this file is read. + groups Which [group] entrys to read. + Points to an null terminated array of pointers + argc Pointer to argc of original program + argv Pointer to argv of original program + default_directories Pointer to a location where a pointer to the list + of default directories will be stored + IMPLEMENTATION Read options from configuration files and put them BEFORE the arguments @@ -386,13 +414,18 @@ int get_defaults_options(int argc, char **argv, that was put in *argv RETURN - 0 ok - 1 The given conf_file didn't exists + - If successful, 0 is returned. If 'default_directories' is not NULL, + a pointer to the array of default directory paths is stored to a location + it points to. That stored value must be passed to my_search_option_files() + later. + + - 1 is returned if the given conf_file didn't exist. In this case, the + value pointed to by default_directories is undefined. */ -int load_defaults(const char *conf_file, const char **groups, - int *argc, char ***argv) +int my_load_defaults(const char *conf_file, const char **groups, + int *argc, char ***argv, const char ***default_directories) { DYNAMIC_ARRAY args; TYPELIB group; @@ -402,10 +435,11 @@ int load_defaults(const char *conf_file, const char **groups, MEM_ROOT alloc; char *ptr,**res; struct handle_option_ctx ctx; + const char **dirs; DBUG_ENTER("load_defaults"); init_alloc_root(&alloc,512,0); - if ((default_directories= init_default_directories(&alloc)) == NULL) + if ((dirs= init_default_directories(&alloc)) == NULL) goto err; /* Check if the user doesn't want any default option processing @@ -426,6 +460,8 @@ int load_defaults(const char *conf_file, const char **groups, (*argc)--; *argv=res; *(MEM_ROOT*) ptr= alloc; /* Save alloc root for free */ + if (default_directories) + *default_directories= dirs; DBUG_RETURN(0); } @@ -444,7 +480,8 @@ int load_defaults(const char *conf_file, const char **groups, ctx.group= &group; error= my_search_option_files(conf_file, argc, argv, &args_used, - handle_default_option, (void *) &ctx); + handle_default_option, (void *) &ctx, + dirs); /* Here error contains <> 0 only if we have a fully specified conf_file or a forced default file @@ -490,6 +527,10 @@ int load_defaults(const char *conf_file, const char **groups, puts(""); exit(0); } + + if (error == 0 && default_directories) + *default_directories= dirs; + DBUG_RETURN(error); err: @@ -895,15 +936,11 @@ void my_print_default_files(const char *conf_file) fputs(conf_file,stdout); else { - /* - If default_directories is already initialized, use it. Otherwise, - use a private MEM_ROOT. - */ - const char **dirs = default_directories; + const char **dirs; MEM_ROOT alloc; init_alloc_root(&alloc,512,0); - if (!dirs && (dirs= init_default_directories(&alloc)) == NULL) + if ((dirs= init_default_directories(&alloc)) == NULL) { fputs("Internal error initializing default directories list", stdout); } diff --git a/server-tools/instance-manager/instance_map.cc b/server-tools/instance-manager/instance_map.cc index d7328d51cfe..b137370b50a 100644 --- a/server-tools/instance-manager/instance_map.cc +++ b/server-tools/instance-manager/instance_map.cc @@ -536,7 +536,8 @@ int Instance_map::load() */ if (my_search_option_files(Options::Main::config_file, &argc, (char ***) &argv, &args_used, - process_option, (void*) this)) + process_option, (void*) this, + Options::default_directories)) log_info("Falling back to compiled-in defaults."); return complete_initialization(); diff --git a/server-tools/instance-manager/options.cc b/server-tools/instance-manager/options.cc index 7eba3187dd9..6f084e7c63e 100644 --- a/server-tools/instance-manager/options.cc +++ b/server-tools/instance-manager/options.cc @@ -86,6 +86,7 @@ const char *Options::Main::bind_address= NULL; /* No default value */ uint Options::Main::monitoring_interval= DEFAULT_MONITORING_INTERVAL; uint Options::Main::port_number= DEFAULT_PORT; my_bool Options::Main::mysqld_safe_compatible= FALSE; +const char **Options::default_directories= NULL; /* Options::User_management */ @@ -439,7 +440,8 @@ int Options::load(int argc, char **argv) log_info("Loading config file '%s'...", (const char *) Main::config_file); - load_defaults(Main::config_file, default_groups, &argc, &saved_argv); + my_load_defaults(Main::config_file, default_groups, &argc, + &saved_argv, &default_directories); if ((handle_options(&argc, &saved_argv, my_long_options, get_one_option))) return ERR_INVALID_USAGE; diff --git a/server-tools/instance-manager/options.h b/server-tools/instance-manager/options.h index 0202ca271c9..5d4df51faae 100644 --- a/server-tools/instance-manager/options.h +++ b/server-tools/instance-manager/options.h @@ -91,6 +91,9 @@ struct Options #endif public: + /* Array of paths to be passed to my_search_option_files() later */ + static const char **default_directories; + static int load(int argc, char **argv); static void cleanup(); diff --git a/sql-common/client.c b/sql-common/client.c index 63c746a3f5a..91a47b6a6f8 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -1021,7 +1021,7 @@ void mysql_read_default_options(struct st_mysql_options *options, argc=1; argv=argv_buff; argv_buff[0]= (char*) "client"; groups[0]= (char*) "client"; groups[1]= (char*) group; groups[2]=0; - load_defaults(filename, groups, &argc, &argv); + my_load_defaults(filename, groups, &argc, &argv, NULL); if (argc != 1) /* If some default option */ { char **option=argv; From 71913e350a2dc1964d1298d14d4c5d692c419ce1 Mon Sep 17 00:00:00 2001 From: "Tatiana A. Nurnberg" Date: Fri, 27 Feb 2009 10:27:00 +0100 Subject: [PATCH 054/132] Bug#40657: assertion with out of range variables and traditional sql_mode In STRICT mode, out-of-bounds values caused an error message to be queued (rather than just a warning), without any further error-like processing happening. (The error is queued during update, at which time it's too late. For it to be processed properly, it would need to be queued during check-stage.) The assertion rightfully complains that we're trying to send an OK while having an error queued. Changeset breaks a lot of tests out into check-stage. This also allows us to send more correct warnings/error messages. sql/set_var.cc: cleanup: fold get_unsigned() and fix_unsigned() into one, as well as all the semi-common code from the ::check functions. --- sql/set_var.cc | 66 ++++++++++++++++++++++++++++++++------------------ 1 file changed, 42 insertions(+), 24 deletions(-) diff --git a/sql/set_var.cc b/sql/set_var.cc index ff32ec2458e..01cdecfca5b 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -1405,22 +1405,38 @@ bool throw_bounds_warning(THD *thd, bool fixed, bool unsignd, /** check an unsigned user-supplied value for a systemvariable against bounds. + TODO: This is a wrapper function to call clipping from within an update() + function. Calling bounds from within update() is fair game in theory, + but we can only send warnings from in there, not errors, and besides, + it violates our model of separating check from update phase. + To avoid breaking out of the server with an ASSERT() in strict mode, + we pretend we're not in strict mode when we go through here. Bug#43233 + was opened to remind us to replace this kludge with The Right Thing, + which of course is to do the check in the actual check phase, and then + throw an error or warning accordingly. + @param thd thread handle @param num the value to limit - @param option_limits the bounds-record, or NULL - - @retval whether or not we needed to bound + @param option_limits the bounds-record, or NULL if none */ -static my_bool bound_unsigned(THD *thd, ulonglong *num, +static void bound_unsigned(THD *thd, ulonglong *num, const struct my_option *option_limits) { - my_bool fixed = FALSE; - ulonglong unadjusted= *num; - if (option_limits) + { + my_bool fixed = FALSE; + ulonglong unadjusted= *num; + *num= getopt_ull_limit_value(unadjusted, option_limits, &fixed); - return fixed; + if (fixed) + { + ulong ssm= thd->variables.sql_mode; + thd->variables.sql_mode&= ~MODE_STRICT_ALL_TABLES; + throw_bounds_warning(thd, fixed, TRUE, option_limits->name, unadjusted); + thd->variables.sql_mode= ssm; + } + } } @@ -1445,6 +1461,7 @@ static bool get_unsigned(THD *thd, set_var *var, ulonglong user_max, int warnings= 0; ulonglong unadjusted; const struct my_option *limits= var->var->option_limits; + struct my_option fallback; /* get_unsigned() */ if (var->value->unsigned_flag) @@ -1477,32 +1494,33 @@ static bool get_unsigned(THD *thd, set_var *var, ulonglong user_max, warnings++; } + /* + if the sysvar doesn't have a proper bounds record but the check + function would like bounding to ULONG where its size differs from + that of ULONGLONG, we make up a bogus limits record here and let + the usual suspects handle the actual limiting. + */ + + if (!limits && bound2ulong) + { + bzero(&fallback, sizeof(fallback)); + fallback.var_type= GET_ULONG; + limits= &fallback; + } + /* fix_unsigned() */ if (limits) { my_bool fixed; - var->save_result.ulonglong_value= getopt_ull_limit_value(unadjusted, + var->save_result.ulonglong_value= getopt_ull_limit_value(var->save_result. + ulonglong_value, limits, &fixed); if ((warnings == 0) && throw_bounds_warning(thd, fixed, TRUE, limits->name, (longlong) unadjusted)) return TRUE; } - else if (bound2ulong) - { -#if SIZEOF_LONG < SIZEOF_LONG_LONG - /* Avoid overflows on 32 bit systems */ - if (var->save_result.ulonglong_value > ULONG_MAX) - { - var->save_result.ulonglong_value= ULONG_MAX; - if ((warnings == 0) && throw_bounds_warning(thd, TRUE, TRUE, - var->var->name, - (longlong) unadjusted)) - return TRUE; - } -#endif - } return FALSE; } @@ -2334,7 +2352,7 @@ bool sys_var_key_buffer_size::update(THD *thd, set_var *var) bound_unsigned(thd, &tmp, option_limits); key_cache->param_buff_size= (ulonglong) tmp; - /* If key cache didn't existed initialize it, else resize it */ + /* If key cache didn't exist initialize it, else resize it */ key_cache->in_init= 1; pthread_mutex_unlock(&LOCK_global_system_variables); From 9573707ffa3c52cfa2a552c03b2b7d884940e979 Mon Sep 17 00:00:00 2001 From: Ingo Struewing Date: Fri, 27 Feb 2009 12:20:53 +0100 Subject: [PATCH 055/132] Bug#40446 - mysql-test-run --gcov is broken Some variable values were missing and perl constructs failed. Initialized the variables and refactored the gcov functions. .bzrignore: Bug#40446 - mysql-test-run --gcov is broken Added gcov log files. mysql-test/lib/mtr_gcov.pl: Bug#40446 - mysql-test-run --gcov is broken Refactored the gcov functions. mysql-test/mysql-test-run.pl: Bug#40446 - mysql-test-run --gcov is broken Initialized gcov variables. Added usage information. --- .bzrignore | 2 ++ mysql-test/lib/mtr_gcov.pl | 58 ++++++++++++++++++++---------------- mysql-test/mysql-test-run.pl | 9 ++++-- 3 files changed, 40 insertions(+), 29 deletions(-) diff --git a/.bzrignore b/.bzrignore index 01ef6f2ffef..fad758b54b8 100644 --- a/.bzrignore +++ b/.bzrignore @@ -1295,6 +1295,8 @@ mysql-test/linux_sys_vars.inc mysql-test/load_sysvars.inc mysql-test/mtr mysql-test/mysql-test-run +mysql-test/mysql-test-gcov.err +mysql-test/mysql-test-gcov.msg mysql-test/mysql-test-run-shell mysql-test/mysql-test-run.log mysql-test/mysql_test_run_new diff --git a/mysql-test/lib/mtr_gcov.pl b/mysql-test/lib/mtr_gcov.pl index 5049fdd6063..f531889b08d 100644 --- a/mysql-test/lib/mtr_gcov.pl +++ b/mysql-test/lib/mtr_gcov.pl @@ -22,40 +22,46 @@ use strict; sub gcov_prepare ($) { my ($dir)= @_; + print "Purging gcov information from '$dir'...\n"; - `find $dir -name \*.gcov \ - -or -name \*.da | xargs rm`; + system("find $dir -name \*.gcov -o -name \*.da" + . " -o -name \*.gcda | grep -v 'README.gcov\$' | xargs rm"); } -my @mysqld_src_dirs= - ( - "strings", - "mysys", - "include", - "extra", - "regex", - "isam", - "merge", - "myisam", - "myisammrg", - "heap", - "sql", - ); - +# +# Collect gcov statistics. +# Arguments: +# $dir basedir, normally source directory +# $gcov gcov utility program [path] name +# $gcov_msg message file name +# $gcov_err error file name +# sub gcov_collect ($$$) { my ($dir, $gcov, $gcov_msg, $gcov_err)= @_; + # Get current directory to return to later. my $start_dir= cwd(); - print "Collecting source coverage info...\n"; - -f $gcov_msg and unlink($gcov_msg); - -f $gcov_err and unlink($gcov_err); - foreach my $d ( @mysqld_src_dirs ) - { - chdir("$dir/$d"); - foreach my $f ( (glob("*.h"), glob("*.cc"), glob("*.c")) ) - { - `$gcov $f 2>>$gcov_err >>$gcov_msg`; + print "Collecting source coverage info using '$gcov'...\n"; + -f "$start_dir/$gcov_msg" and unlink("$start_dir/$gcov_msg"); + -f "$start_dir/$gcov_err" and unlink("$start_dir/$gcov_err"); + + my @dirs= `find "$dir" -type d -print | sort`; + #print "List of directories:\n@dirs\n"; + + foreach my $d ( @dirs ) { + my $dir_reported= 0; + chomp($d); + chdir($d) or next; + + foreach my $f ( (glob("*.h"), glob("*.cc"), glob("*.c")) ) { + $f =~ /(.*)\.[ch]c?/; + -f "$1.gcno" or next; + if (!$dir_reported) { + print "Collecting in '$d'...\n"; + $dir_reported= 1; + } + system("$gcov $f 2>>$start_dir/$gcov_err >>$start_dir/$gcov_msg"); } chdir($start_dir); } diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 50617428d0f..b0b044b67f4 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -163,8 +163,9 @@ our $opt_force; our $opt_mem= $ENV{'MTR_MEM'}; our $opt_gcov; -our $opt_gcov_err; -our $opt_gcov_msg; +our $opt_gcov_exe= "gcov"; +our $opt_gcov_err= "mysql-test-gcov.msg"; +our $opt_gcov_msg= "mysql-test-gcov.err"; our $glob_debugger= 0; our $opt_gdb; @@ -396,7 +397,7 @@ sub main { mtr_print_line(); if ( $opt_gcov ) { - gcov_collect($basedir, $opt_gcov, + gcov_collect($basedir, $opt_gcov_exe, $opt_gcov_msg, $opt_gcov_err); } @@ -5057,6 +5058,8 @@ Misc options to turn off. sleep=SECONDS Passed to mysqltest, will be used as fixed sleep time + gcov Collect coverage information after the test. + The result is a gcov file per source and header file. HERE exit(1); From 090085164629b203d570bc1fe05294ae2a1c5a5f Mon Sep 17 00:00:00 2001 From: Bjorn Munch Date: Fri, 27 Feb 2009 13:07:01 +0100 Subject: [PATCH 056/132] Bug #43256 Bug#39026 got re-surrected Problems with use of share/mysql dir Explicitly look for "english" language file --- mysql-test/mysql-test-run.pl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 82ed1ff67fc..5e85cfe5cac 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -932,12 +932,12 @@ sub command_line_setup { } # Look for language files and charsetsdir, use same share - my $path_share= mtr_path_exists("$basedir/share/mysql", - "$basedir/sql/share", - "$basedir/share"); + $path_language= mtr_path_exists("$basedir/share/mysql/english", + "$basedir/sql/share/english", + "$basedir/share/english"); - - $path_language= mtr_path_exists("$path_share/english"); + + my $path_share= dirname($path_language); $path_charsetsdir= mtr_path_exists("$path_share/charsets"); if (using_extern()) From e5a0c0281e0c501e66b82b625ebcd92a9c485ce0 Mon Sep 17 00:00:00 2001 From: Patrick Crews Date: Fri, 27 Feb 2009 15:00:49 +0200 Subject: [PATCH 057/132] Bug#41893: Removal of trailing space noise causing Pushbuild failure. --- mysql-test/r/variables.result | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mysql-test/r/variables.result b/mysql-test/r/variables.result index 04ccf3d688c..fbec38c9a9f 100644 --- a/mysql-test/r/variables.result +++ b/mysql-test/r/variables.result @@ -292,7 +292,7 @@ transaction_prealloc_size 20480 set @@range_alloc_block_size=default; set @@query_alloc_block_size=default, @@query_prealloc_size=default; set transaction_alloc_block_size=default, @@transaction_prealloc_size=default; -==+ Check the values not that they are reset +== +==+ Check the values now that they are reset +== SHOW VARIABLES WHERE variable_name IN ('range_alloc_block_size', 'query_alloc_block_size', 'query_prealloc_size', 'transaction_alloc_block_size', 'transaction_prealloc_size'); From 15760fe9d8434dc9c960c123945b13890456bb5f Mon Sep 17 00:00:00 2001 From: Georgi Kodinov Date: Fri, 27 Feb 2009 15:25:06 +0200 Subject: [PATCH 058/132] Bug #41610: key_infix_len can be overwritten causing some group by queries to return no rows The algorithm of determining the best key for loose index scan is doing a loop over the available indexes and selects the one that has the best cost. It retrieves the parameters of the current index into a set of variables. If the cost of using the current index is lower than the best cost so far it copies these variables into another set of variables that contain the information for the best index so far. After having checked all the indexes it uses these variables (outside of the index loop) to create the table read plan object instance. The was a single omission : the key_infix/key_infix_len variables were used outside of the loop without being preserved in the loop for the best index so far. This causes these variables to get overwritten by the next index(es) checked. Fixed by adding variables to hold the data for the current index, passing the new variables to the function that assigns values to them and copying the new variables into the existing ones when selecting a new current best index. To avoid further such problems moved the declarations of the variables used to keep information about the current index inside the loop's compound statement. mysql-test/r/group_min_max.result: Bug #41610: test case mysql-test/t/group_min_max.test: Bug #41610: test case sql/opt_range.cc: Bug #41610: copy the infix data for the current best index --- mysql-test/r/group_min_max.result | 15 ++++++++ mysql-test/t/group_min_max.test | 23 +++++++++++++ sql/opt_range.cc | 57 +++++++++++++++++-------------- 3 files changed, 70 insertions(+), 25 deletions(-) diff --git a/mysql-test/r/group_min_max.result b/mysql-test/r/group_min_max.result index f2f488650d5..58be2af1bb8 100644 --- a/mysql-test/r/group_min_max.result +++ b/mysql-test/r/group_min_max.result @@ -2429,3 +2429,18 @@ id select_type table type possible_keys key key_len ref rows Extra Warnings: Note 1003 select sql_buffer_result `test`.`t1`.`a` AS `a`,(max(`test`.`t1`.`b`) + 1) AS `max(b)+1` from `test`.`t1` where (`test`.`t1`.`a` = 0) group by `test`.`t1`.`a` drop table t1; +CREATE TABLE t1 (a int, b int, c int, d int, +KEY foo (c,d,a,b), KEY bar (c,a,b,d)); +INSERT INTO t1 VALUES (1, 1, 1, 1), (1, 1, 1, 2), (1, 1, 1, 3), (1, 1, 1, 4); +INSERT INTO t1 SELECT * FROM t1; +INSERT INTO t1 SELECT * FROM t1; +INSERT INTO t1 SELECT a,b,c+1,d FROM t1; +EXPLAIN SELECT DISTINCT c FROM t1 WHERE d=4; +id select_type table type possible_keys key key_len ref rows Extra +1 SIMPLE t1 range NULL foo 10 NULL 9 Using where; Using index for group-by +SELECT DISTINCT c FROM t1 WHERE d=4; +c +1 +2 +DROP TABLE t1; +End of 5.0 tests diff --git a/mysql-test/t/group_min_max.test b/mysql-test/t/group_min_max.test index f7aed7301fb..e124bf9e786 100644 --- a/mysql-test/t/group_min_max.test +++ b/mysql-test/t/group_min_max.test @@ -935,3 +935,26 @@ insert into t1 (a,b) select a, max(b)+1 from t1 where a = 0 group by a; select * from t1; explain extended select sql_buffer_result a, max(b)+1 from t1 where a = 0 group by a; drop table t1; + + +# +# Bug #41610: key_infix_len can be overwritten causing some group by queries +# to return no rows +# + +CREATE TABLE t1 (a int, b int, c int, d int, + KEY foo (c,d,a,b), KEY bar (c,a,b,d)); + +INSERT INTO t1 VALUES (1, 1, 1, 1), (1, 1, 1, 2), (1, 1, 1, 3), (1, 1, 1, 4); +INSERT INTO t1 SELECT * FROM t1; +INSERT INTO t1 SELECT * FROM t1; +INSERT INTO t1 SELECT a,b,c+1,d FROM t1; + +#Should be non-empty +--ordered_result +EXPLAIN SELECT DISTINCT c FROM t1 WHERE d=4; +SELECT DISTINCT c FROM t1 WHERE d=4; + +DROP TABLE t1; + +--echo End of 5.0 tests diff --git a/sql/opt_range.cc b/sql/opt_range.cc index ebebfafb5d8..018fc8a9d44 100644 --- a/sql/opt_range.cc +++ b/sql/opt_range.cc @@ -7775,32 +7775,37 @@ get_best_group_min_max(PARAM *param, SEL_TREE *tree) */ KEY *cur_index_info= table->key_info; KEY *cur_index_info_end= cur_index_info + table->s->keys; - KEY_PART_INFO *cur_part= NULL; - KEY_PART_INFO *end_part; /* Last part for loops. */ - /* Last index part. */ - KEY_PART_INFO *last_part= NULL; - KEY_PART_INFO *first_non_group_part= NULL; - KEY_PART_INFO *first_non_infix_part= NULL; - uint key_infix_parts= 0; - uint cur_group_key_parts= 0; - uint cur_group_prefix_len= 0; /* Cost-related variables for the best index so far. */ double best_read_cost= DBL_MAX; ha_rows best_records= 0; SEL_ARG *best_index_tree= NULL; ha_rows best_quick_prefix_records= 0; uint best_param_idx= 0; - double cur_read_cost= DBL_MAX; - ha_rows cur_records; + + const uint pk= param->table->s->primary_key; SEL_ARG *cur_index_tree= NULL; ha_rows cur_quick_prefix_records= 0; uint cur_param_idx=MAX_KEY; - key_map cur_used_key_parts; - uint pk= param->table->s->primary_key; for (uint cur_index= 0 ; cur_index_info != cur_index_info_end ; cur_index_info++, cur_index++) { + KEY_PART_INFO *cur_part; + KEY_PART_INFO *end_part; /* Last part for loops. */ + /* Last index part. */ + KEY_PART_INFO *last_part; + KEY_PART_INFO *first_non_group_part; + KEY_PART_INFO *first_non_infix_part; + uint key_infix_parts; + uint cur_group_key_parts= 0; + uint cur_group_prefix_len= 0; + double cur_read_cost; + ha_rows cur_records; + key_map used_key_parts_map; + uint cur_key_infix_len= 0; + byte cur_key_infix[MAX_KEY_LENGTH]; + uint cur_used_key_parts; + /* Check (B1) - if current index is covering. */ if (!table->used_keys.is_set(cur_index)) goto next_index; @@ -7879,7 +7884,7 @@ get_best_group_min_max(PARAM *param, SEL_TREE *tree) else if (join->select_distinct) { select_items_it.rewind(); - cur_used_key_parts.clear_all(); + used_key_parts_map.clear_all(); uint max_key_part= 0; while ((item= select_items_it++)) { @@ -7890,13 +7895,13 @@ get_best_group_min_max(PARAM *param, SEL_TREE *tree) Check if this attribute was already present in the select list. If it was present, then its corresponding key part was alredy used. */ - if (cur_used_key_parts.is_set(key_part_nr)) + if (used_key_parts_map.is_set(key_part_nr)) continue; if (key_part_nr < 1 || key_part_nr > join->fields_list.elements) goto next_index; cur_part= cur_index_info->key_part + key_part_nr - 1; cur_group_prefix_len+= cur_part->store_length; - cur_used_key_parts.set_bit(key_part_nr); + used_key_parts_map.set_bit(key_part_nr); ++cur_group_key_parts; max_key_part= max(max_key_part,key_part_nr); } @@ -7908,7 +7913,7 @@ get_best_group_min_max(PARAM *param, SEL_TREE *tree) */ ulonglong all_parts, cur_parts; all_parts= (1<> 1; + cur_parts= used_key_parts_map.to_ulonglong() >> 1; if (all_parts != cur_parts) goto next_index; } @@ -7958,7 +7963,8 @@ get_best_group_min_max(PARAM *param, SEL_TREE *tree) &dummy); if (!get_constant_key_infix(cur_index_info, index_range_tree, first_non_group_part, min_max_arg_part, - last_part, thd, key_infix, &key_infix_len, + last_part, thd, cur_key_infix, + &cur_key_infix_len, &first_non_infix_part)) goto next_index; } @@ -8010,9 +8016,9 @@ get_best_group_min_max(PARAM *param, SEL_TREE *tree) } /* If we got to this point, cur_index_info passes the test. */ - key_infix_parts= key_infix_len ? + key_infix_parts= cur_key_infix_len ? (first_non_infix_part - first_non_group_part) : 0; - used_key_parts= cur_group_key_parts + key_infix_parts; + cur_used_key_parts= cur_group_key_parts + key_infix_parts; /* Compute the cost of using this index. */ if (tree) @@ -8024,7 +8030,7 @@ get_best_group_min_max(PARAM *param, SEL_TREE *tree) cur_quick_prefix_records= check_quick_select(param, cur_param_idx, cur_index_tree); } - cost_group_min_max(table, cur_index_info, used_key_parts, + cost_group_min_max(table, cur_index_info, cur_used_key_parts, cur_group_key_parts, tree, cur_index_tree, cur_quick_prefix_records, have_min, have_max, &cur_read_cost, &cur_records); @@ -8035,7 +8041,6 @@ get_best_group_min_max(PARAM *param, SEL_TREE *tree) */ if (cur_read_cost < best_read_cost - (DBL_EPSILON * cur_read_cost)) { - DBUG_ASSERT(tree != 0 || cur_param_idx == MAX_KEY); index_info= cur_index_info; index= cur_index; best_read_cost= cur_read_cost; @@ -8045,11 +8050,13 @@ get_best_group_min_max(PARAM *param, SEL_TREE *tree) best_param_idx= cur_param_idx; group_key_parts= cur_group_key_parts; group_prefix_len= cur_group_prefix_len; + key_infix_len= cur_key_infix_len; + if (key_infix_len) + memcpy (key_infix, cur_key_infix, sizeof (key_infix)); + used_key_parts= cur_used_key_parts; } - next_index: - cur_group_key_parts= 0; - cur_group_prefix_len= 0; + next_index:; } if (!index_info) /* No usable index found. */ DBUG_RETURN(NULL); From 97b68934bca29ab88f63d3887071248c0c602a82 Mon Sep 17 00:00:00 2001 From: Staale Smedseng Date: Fri, 27 Feb 2009 16:11:15 +0200 Subject: [PATCH 059/132] Recommit for merging and pushing --- mysql-test/r/preload.result | 4 ++-- mysql-test/r/ps.result | 12 ++++++------ mysql-test/r/repair.result | 2 +- mysql-test/r/rpl_failed_optimize.result | 2 +- mysql-test/suite/funcs_1/r/innodb_views.result | 2 +- mysql-test/suite/funcs_1/r/memory_views.result | 2 +- sql/sql_table.cc | 7 ++++++- 7 files changed, 18 insertions(+), 13 deletions(-) diff --git a/mysql-test/r/preload.result b/mysql-test/r/preload.result index 24a6e594a14..7ed0c62f33a 100644 --- a/mysql-test/r/preload.result +++ b/mysql-test/r/preload.result @@ -144,7 +144,7 @@ Key_reads 0 load index into cache t3, t2 key (primary,b) ; Table Op Msg_type Msg_text test.t3 preload_keys Error Table 'test.t3' doesn't exist -test.t3 preload_keys error Corrupt +test.t3 preload_keys status Operation failed test.t2 preload_keys status OK show status like "key_read%"; Variable_name Value @@ -159,7 +159,7 @@ Key_reads 0 load index into cache t3 key (b), t2 key (c) ; Table Op Msg_type Msg_text test.t3 preload_keys Error Table 'test.t3' doesn't exist -test.t3 preload_keys error Corrupt +test.t3 preload_keys status Operation failed test.t2 preload_keys Error Key 'c' doesn't exist in table 't2' test.t2 preload_keys status Operation failed show status like "key_read%"; diff --git a/mysql-test/r/ps.result b/mysql-test/r/ps.result index 09deaf2f322..116014a38d2 100644 --- a/mysql-test/r/ps.result +++ b/mysql-test/r/ps.result @@ -1386,13 +1386,13 @@ execute stmt; Table Op Msg_type Msg_text test.t1 repair status OK test.t4 repair Error Table 'test.t4' doesn't exist -test.t4 repair error Corrupt +test.t4 repair status Operation failed test.t3 repair status OK execute stmt; Table Op Msg_type Msg_text test.t1 repair status OK test.t4 repair Error Table 'test.t4' doesn't exist -test.t4 repair error Corrupt +test.t4 repair status Operation failed test.t3 repair status OK prepare stmt from "optimize table t1, t3, t4"; execute stmt; @@ -1400,23 +1400,23 @@ Table Op Msg_type Msg_text test.t1 optimize status OK test.t3 optimize status OK test.t4 optimize Error Table 'test.t4' doesn't exist -test.t4 optimize error Corrupt +test.t4 optimize status Operation failed execute stmt; Table Op Msg_type Msg_text test.t1 optimize status Table is already up to date test.t3 optimize status Table is already up to date test.t4 optimize Error Table 'test.t4' doesn't exist -test.t4 optimize error Corrupt +test.t4 optimize status Operation failed prepare stmt from "analyze table t4, t1"; execute stmt; Table Op Msg_type Msg_text test.t4 analyze Error Table 'test.t4' doesn't exist -test.t4 analyze error Corrupt +test.t4 analyze status Operation failed test.t1 analyze status Table is already up to date execute stmt; Table Op Msg_type Msg_text test.t4 analyze Error Table 'test.t4' doesn't exist -test.t4 analyze error Corrupt +test.t4 analyze status Operation failed test.t1 analyze status Table is already up to date deallocate prepare stmt; drop table t1, t2, t3; diff --git a/mysql-test/r/repair.result b/mysql-test/r/repair.result index c59a5300e64..e7866ae7656 100644 --- a/mysql-test/r/repair.result +++ b/mysql-test/r/repair.result @@ -27,7 +27,7 @@ drop table t1; repair table t1 use_frm; Table Op Msg_type Msg_text test.t1 repair Error Table 'test.t1' doesn't exist -test.t1 repair error Corrupt +test.t1 repair status Operation failed create table t1 engine=myisam SELECT 1,"table 1"; flush tables; repair table t1; diff --git a/mysql-test/r/rpl_failed_optimize.result b/mysql-test/r/rpl_failed_optimize.result index 33a8cdc4a2f..ff7f6ad6177 100644 --- a/mysql-test/r/rpl_failed_optimize.result +++ b/mysql-test/r/rpl_failed_optimize.result @@ -16,5 +16,5 @@ Error 1205 Lock wait timeout exceeded; try restarting transaction OPTIMIZE TABLE non_existing; Table Op Msg_type Msg_text test.non_existing optimize Error Table 'test.non_existing' doesn't exist -test.non_existing optimize error Corrupt +test.non_existing optimize status Operation failed drop table t1; diff --git a/mysql-test/suite/funcs_1/r/innodb_views.result b/mysql-test/suite/funcs_1/r/innodb_views.result index d29e38925f6..3d5c5a1e698 100644 --- a/mysql-test/suite/funcs_1/r/innodb_views.result +++ b/mysql-test/suite/funcs_1/r/innodb_views.result @@ -21367,7 +21367,7 @@ ERROR 42S02: Table 'test.v1' doesn't exist CHECK TABLE v1; Table Op Msg_type Msg_text test.v1 check Error Table 'test.v1' doesn't exist -test.v1 check error Corrupt +test.v1 check status Operation failed DESCRIBE v1; ERROR 42S02: Table 'test.v1' doesn't exist EXPLAIN SELECT * FROM v1; diff --git a/mysql-test/suite/funcs_1/r/memory_views.result b/mysql-test/suite/funcs_1/r/memory_views.result index d24d72473fd..9935e17a1dc 100644 --- a/mysql-test/suite/funcs_1/r/memory_views.result +++ b/mysql-test/suite/funcs_1/r/memory_views.result @@ -21368,7 +21368,7 @@ ERROR 42S02: Table 'test.v1' doesn't exist CHECK TABLE v1; Table Op Msg_type Msg_text test.v1 check Error Table 'test.v1' doesn't exist -test.v1 check error Corrupt +test.v1 check status Operation failed DESCRIBE v1; ERROR 42S02: Table 'test.v1' doesn't exist EXPLAIN SELECT * FROM v1; diff --git a/sql/sql_table.cc b/sql/sql_table.cc index eefe2a5596e..ff7f874ffcb 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -2314,7 +2314,12 @@ static bool mysql_admin_table(THD* thd, TABLE_LIST* tables, view_checksum(thd, table) == HA_ADMIN_WRONG_CHECKSUM) push_warning(thd, MYSQL_ERROR::WARN_LEVEL_ERROR, ER_VIEW_CHECKSUM, ER(ER_VIEW_CHECKSUM)); - result_code= HA_ADMIN_CORRUPT; + if (thd->net.last_errno == ER_NO_SUCH_TABLE) + /* A missing table is just issued as a failed command */ + result_code= HA_ADMIN_FAILED; + else + /* Default failure code is corrupt table */ + result_code= HA_ADMIN_CORRUPT; goto send_result; } From 63c9bb320f9541898142a170a1b8c8bcb76a354e Mon Sep 17 00:00:00 2001 From: Leonard Zhou Date: Sat, 28 Feb 2009 09:35:18 +0800 Subject: [PATCH 060/132] BUG#39526 sql_mode not retained in binary log for CREATE PROCEDURE Set wrong sql_mode when creating a procedure. So that the sql_mode can't be writen into binary log correctly. Restore the current session sql_mode right before generating the binlog event when creating a procedure. mysql-test/suite/binlog/r/binlog_sql_mode.result: Test result mysql-test/suite/binlog/t/binlog_sql_mode.test: Test file for sql_mode testing sql/sp.cc: Restore the current session sql_mode right before generating the binlog event. --- .../suite/binlog/r/binlog_sql_mode.result | 46 +++++++++++ .../suite/binlog/t/binlog_sql_mode.test | 76 +++++++++++++++++++ sql/sp.cc | 4 +- 3 files changed, 125 insertions(+), 1 deletion(-) create mode 100644 mysql-test/suite/binlog/r/binlog_sql_mode.result create mode 100644 mysql-test/suite/binlog/t/binlog_sql_mode.test diff --git a/mysql-test/suite/binlog/r/binlog_sql_mode.result b/mysql-test/suite/binlog/r/binlog_sql_mode.result new file mode 100644 index 00000000000..e306040502d --- /dev/null +++ b/mysql-test/suite/binlog/r/binlog_sql_mode.result @@ -0,0 +1,46 @@ +stop slave; +drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; +reset master; +reset slave; +drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; +start slave; +SET @old_sql_mode= @@global.sql_mode; +SET @old_binlog_format=@@session.binlog_format; +SET SESSION sql_mode=8; +Initialization +RESET MASTER; +CREATE TABLE t1 (id INT); +CREATE PROCEDURE testProc() SELECT * FROM t1; +CREATE VIEW testView as SELECT * from t1; +CREATE FUNCTION testFunc() +RETURNS INT +BEGIN +return 1; +END;| +CREATE TRIGGER testTrig BEFORE INSERT ON t1 +FOR EACH ROW BEGIN +UPDATE t1 SET id = id +1; +END;| +CREATE EVENT testEvent ON SCHEDULE +EVERY 1 DAY +DO +BEGIN +UPDATE t1 SET id = id +1; +END;| +Chceck Result +select +(@a:=load_file("MYSQLTEST_VARDIR/tmp/mysqlbinlog_bug39526.binlog")) +is not null; +(@a:=load_file("MYSQLTEST_VARDIR/tmp/mysqlbinlog_bug39526.binlog")) +is not null +1 +*** String sql_mode=0 is found: 0 *** +Clean Up +DROP PROCEDURE testProc; +DROP FUNCTION testFunc; +DROP TRIGGER testTrig; +DROP EVENT testEvent; +DROP VIEW testView; +DROP TABLE t1; +SET @@global.sql_mode= @old_sql_mode; +SET @@session.binlog_format=@old_binlog_format; diff --git a/mysql-test/suite/binlog/t/binlog_sql_mode.test b/mysql-test/suite/binlog/t/binlog_sql_mode.test new file mode 100644 index 00000000000..1777f8cb561 --- /dev/null +++ b/mysql-test/suite/binlog/t/binlog_sql_mode.test @@ -0,0 +1,76 @@ +# ==== Purpose ==== +# +# Test that sql_mode can correct restore before generating the binlog event +# when creating CREATEable objects. +# +# ==== Method ==== +# +# Scan binlog file to check if the sql_mode is still set to 0 before generating binlog event +# + +-- source include/master-slave.inc +-- source include/have_log_bin.inc + +# BUG#39526 sql_mode not retained in binary log for CREATE PROCEDURE + +SET @old_sql_mode= @@global.sql_mode; +SET @old_binlog_format=@@session.binlog_format; +let $MYSQLD_DATADIR= `select @@datadir`; +SET SESSION sql_mode=8; + +--echo Initialization + +RESET MASTER; +CREATE TABLE t1 (id INT); + +CREATE PROCEDURE testProc() SELECT * FROM t1; +CREATE VIEW testView as SELECT * from t1; + +DELIMITER |; +CREATE FUNCTION testFunc() + RETURNS INT + BEGIN + return 1; + END;| +DELIMITER ;| + +DELIMITER |; +CREATE TRIGGER testTrig BEFORE INSERT ON t1 + FOR EACH ROW BEGIN + UPDATE t1 SET id = id +1; + END;| +DELIMITER ;| + +DELIMITER |; +CREATE EVENT testEvent ON SCHEDULE + EVERY 1 DAY + DO + BEGIN + UPDATE t1 SET id = id +1; + END;| +DELIMITER ;| + +--echo Chceck Result + +let $MYSQLD_DATADIR= `select @@datadir`; +--exec $MYSQL_BINLOG $MYSQLD_DATADIR/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/mysqlbinlog_bug39526.binlog +--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR +eval select +(@a:=load_file("$MYSQLTEST_VARDIR/tmp/mysqlbinlog_bug39526.binlog")) +is not null; +let $s_mode_unsigned= `select @a like "%@@session.sql_mode=0%" /* must return 0 */`; +echo *** String sql_mode=0 is found: $s_mode_unsigned ***; + +--remove_file $MYSQLTEST_VARDIR/tmp/mysqlbinlog_bug39526.binlog + +--echo Clean Up + +DROP PROCEDURE testProc; +DROP FUNCTION testFunc; +DROP TRIGGER testTrig; +DROP EVENT testEvent; +DROP VIEW testView; +DROP TABLE t1; + +SET @@global.sql_mode= @old_sql_mode; +SET @@session.binlog_format=@old_binlog_format; diff --git a/sql/sp.cc b/sql/sp.cc index cc545992857..b2c7c389136 100644 --- a/sql/sp.cc +++ b/sql/sp.cc @@ -936,10 +936,12 @@ sp_create_routine(THD *thd, int type, sp_head *sp) ret= SP_INTERNAL_ERROR; goto done; } - + /* restore sql_mode when binloging */ + thd->variables.sql_mode= saved_mode; /* Such a statement can always go directly to binlog, no trans cache */ thd->binlog_query(THD::MYSQL_QUERY_TYPE, log_query.c_ptr(), log_query.length(), FALSE, FALSE); + thd->variables.sql_mode= 0; } } From ef165e36d9a9397dad36a23250456f578d88e1d9 Mon Sep 17 00:00:00 2001 From: "Bernt M. Johnsen" Date: Mon, 2 Mar 2009 11:03:13 +0100 Subject: [PATCH 061/132] Prepared BUG#42711 for push --- mysql-test/r/show_check.result | 2 +- mysql-test/t/mysql.test | 56 ++++++++++++++++++------------ mysql-test/t/mysqldump-compat.test | 8 +++-- mysql-test/t/mysqltest.test | 2 +- mysql-test/t/show_check.test | 11 +++--- 5 files changed, 48 insertions(+), 31 deletions(-) diff --git a/mysql-test/r/show_check.result b/mysql-test/r/show_check.result index ad3138e80ea..15f28fb9610 100644 --- a/mysql-test/r/show_check.result +++ b/mysql-test/r/show_check.result @@ -1094,7 +1094,7 @@ CREATE DATABASE mysqltest1; use mysqltest1; CREATE TABLE t1(ËÏÌÏÎËÁ1 INT); ----> Dumping mysqltest1 to show_check.mysqltest1.sql +---> Dumping mysqltest1 to outfile1 DROP DATABASE mysqltest1; diff --git a/mysql-test/t/mysql.test b/mysql-test/t/mysql.test index 594d10e46a5..12431e26596 100644 --- a/mysql-test/t/mysql.test +++ b/mysql-test/t/mysql.test @@ -98,35 +98,43 @@ drop table t1; # Bug #20432: mysql client interprets commands in comments # +--let $file = $MYSQLTEST_VARDIR/tmp/bug20432.sql + # if the client sees the 'use' within the comment, we haven't fixed ---exec echo "/*" > $MYSQLTEST_VARDIR/tmp/bug20432.sql ---exec echo "use" >> $MYSQLTEST_VARDIR/tmp/bug20432.sql ---exec echo "*/" >> $MYSQLTEST_VARDIR/tmp/bug20432.sql ---exec $MYSQL < $MYSQLTEST_VARDIR/tmp/bug20432.sql 2>&1 +--exec echo "/*" > $file +--exec echo "use" >> $file +--exec echo "*/" >> $file +--exec $MYSQL < $file 2>&1 # SQL can have embedded comments => workie ---exec echo "select /*" > $MYSQLTEST_VARDIR/tmp/bug20432.sql ---exec echo "use" >> $MYSQLTEST_VARDIR/tmp/bug20432.sql ---exec echo "*/ 1" >> $MYSQLTEST_VARDIR/tmp/bug20432.sql ---exec $MYSQL < $MYSQLTEST_VARDIR/tmp/bug20432.sql 2>&1 +--exec echo "select /*" > $file +--exec echo "use" >> $file +--exec echo "*/ 1" >> $file +--exec $MYSQL < $file 2>&1 # client commands on the other hand must be at BOL => error ---exec echo "/*" > $MYSQLTEST_VARDIR/tmp/bug20432.sql ---exec echo "xxx" >> $MYSQLTEST_VARDIR/tmp/bug20432.sql ---exec echo "*/ use" >> $MYSQLTEST_VARDIR/tmp/bug20432.sql +--exec echo "/*" > $file +--exec echo "xxx" >> $file +--exec echo "*/ use" >> $file --error 1 ---exec $MYSQL < $MYSQLTEST_VARDIR/tmp/bug20432.sql 2>&1 +--exec $MYSQL < $file 2>&1 # client comment recognized, but parameter missing => error ---exec echo "use" > $MYSQLTEST_VARDIR/tmp/bug20432.sql ---exec $MYSQL < $MYSQLTEST_VARDIR/tmp/bug20432.sql 2>&1 +--exec echo "use" > $file +--exec $MYSQL < $file 2>&1 + +--remove_file $file # # Bug #20328: mysql client interprets commands in comments # ---exec $MYSQL -e "help" > $MYSQLTEST_VARDIR/tmp/bug20328_1.result ---exec $MYSQL -e "help " > $MYSQLTEST_VARDIR/tmp/bug20328_2.result ---diff_files $MYSQLTEST_VARDIR/tmp/bug20328_1.result $MYSQLTEST_VARDIR/tmp/bug20328_2.result +--let $file1 = $MYSQLTEST_VARDIR/tmp/bug20328_1.result +--let $file2 = $MYSQLTEST_VARDIR/tmp/bug20328_2.result +--exec $MYSQL -e "help" > $file1 +--exec $MYSQL -e "help " > $file2 +--diff_files $file1 $file2 +--remove_file $file1 +--remove_file $file2 # # Bug #19216: Client crashes on long SELECT @@ -152,13 +160,15 @@ EOF # # Bug #20103: Escaping with backslash does not work # ---exec echo "SET SQL_MODE = 'NO_BACKSLASH_ESCAPES';" > $MYSQLTEST_VARDIR/tmp/bug20103.sql ---exec echo "SELECT '\';" >> $MYSQLTEST_VARDIR/tmp/bug20103.sql ---exec $MYSQL < $MYSQLTEST_VARDIR/tmp/bug20103.sql 2>&1 +--let $file = $MYSQLTEST_VARDIR/tmp/bug20103.sql +--exec echo "SET SQL_MODE = 'NO_BACKSLASH_ESCAPES';" > $file +--exec echo "SELECT '\';" >> $file +--exec $MYSQL < $file 2>&1 ---exec echo "SET SQL_MODE = '';" > $MYSQLTEST_VARDIR/tmp/bug20103.sql ---exec echo "SELECT '\';';" >> $MYSQLTEST_VARDIR/tmp/bug20103.sql ---exec $MYSQL < $MYSQLTEST_VARDIR/tmp/bug20103.sql 2>&1 +--exec echo "SET SQL_MODE = '';" > $file +--exec echo "SELECT '\';';" >> $file +--exec $MYSQL < $file 2>&1 +--remove_file $file # # Bug#17583: mysql drops connection when stdout is not writable diff --git a/mysql-test/t/mysqldump-compat.test b/mysql-test/t/mysqldump-compat.test index 848d66cc728..9a830b16f26 100644 --- a/mysql-test/t/mysqldump-compat.test +++ b/mysql-test/t/mysqldump-compat.test @@ -5,9 +5,13 @@ # Bug #30126: semicolon before closing */ in /*!... CREATE DATABASE ;*/ # +--let $file = $MYSQLTEST_VARDIR/tmp/bug30126.sql + CREATE DATABASE mysqldump_30126; USE mysqldump_30126; CREATE TABLE t1 (c1 int); ---exec $MYSQL_DUMP --add-drop-database mysqldump_30126 > $MYSQLTEST_VARDIR/tmp/bug30126.sql ---exec $MYSQL mysqldump_30126 < $MYSQLTEST_VARDIR/tmp/bug30126.sql +--exec $MYSQL_DUMP --add-drop-database mysqldump_30126 > $file +--exec $MYSQL mysqldump_30126 < $file DROP DATABASE mysqldump_30126; + +--remove_file $file diff --git a/mysql-test/t/mysqltest.test b/mysql-test/t/mysqltest.test index 93528f81449..d087d38560b 100644 --- a/mysql-test/t/mysqltest.test +++ b/mysql-test/t/mysqltest.test @@ -1459,7 +1459,7 @@ select "this will be executed"; remove_file $MYSQLTEST_VARDIR/tmp/zero_length_file.result; --error 0,1 -remove_file $MYSQLTEST_VARDIR/log/zero_length_file.reject; +remove_file $MYSQLTEST_VARDIR/tmp/zero_length_file.reject; --error 0,1 remove_file $MYSQL_TEST_DIR/r/zero_length_file.reject; diff --git a/mysql-test/t/show_check.test b/mysql-test/t/show_check.test index f4e0b906f60..2d261aa0675 100644 --- a/mysql-test/t/show_check.test +++ b/mysql-test/t/show_check.test @@ -794,10 +794,12 @@ CREATE TABLE t1( # Check: # - Dump mysqltest1; ---echo ---echo ---> Dumping mysqltest1 to show_check.mysqltest1.sql +--let $outfile1=$MYSQLTEST_VARDIR/tmp/show_check.mysqltest1.sql ---exec $MYSQL_DUMP --default-character-set=latin1 --character-sets-dir=$CHARSETSDIR --databases mysqltest1 > $MYSQLTEST_VARDIR/tmp/show_check.mysqltest1.sql +--echo +--echo ---> Dumping mysqltest1 to outfile1 + +--exec $MYSQL_DUMP --default-character-set=latin1 --character-sets-dir=$CHARSETSDIR --databases mysqltest1 > $outfile1 # - Clean mysqltest1; @@ -812,7 +814,8 @@ DROP DATABASE mysqltest1; --echo --echo ---> Restoring mysqltest1... ---exec $MYSQL test < $MYSQLTEST_VARDIR/tmp/show_check.mysqltest1.sql +--exec $MYSQL test < $outfile1 +--remove_file $outfile1 # - Check definition of the table. From 6293a2ea9306449afc1b00eaa8f1b0a1833ed8cc Mon Sep 17 00:00:00 2001 From: Bjorn Munch Date: Mon, 2 Mar 2009 13:48:35 +0100 Subject: [PATCH 062/132] Bug #40978 Error log gets truncated during testsuite, prevents debugging Error log gets truncated when mysqld is restarted by MTR mysql-test/include/check-warnings.test: Since server doesn't have log-error, get it from env. var. set by MTR mysql-test/lib/My/ConfigFactory.pm: "Hide" log-error in a comment mysql-test/mysql-test-run.pl: "Hide" log-error in my.cnf by comment add --console to arguments on Windows Move .err file to var/log --- mysql-test/include/check-warnings.test | 2 +- mysql-test/lib/My/ConfigFactory.pm | 8 ++++---- mysql-test/mysql-test-run.pl | 19 ++++++++++++++----- 3 files changed, 19 insertions(+), 10 deletions(-) diff --git a/mysql-test/include/check-warnings.test b/mysql-test/include/check-warnings.test index 2144957f742..5295dd51a85 100644 --- a/mysql-test/include/check-warnings.test +++ b/mysql-test/include/check-warnings.test @@ -26,7 +26,7 @@ create temporary table error_log ( ) engine=myisam; # Get the name of servers error log -let $log_error= query_get_value(show variables like 'log_error', Value, 1); +let $log_error= $MTR_LOG_ERROR; let $log_warning= $log_error.warnings; # Try tload the warnings into a temporary table, diff --git a/mysql-test/lib/My/ConfigFactory.pm b/mysql-test/lib/My/ConfigFactory.pm index 567a05ac7a1..852f706c858 100644 --- a/mysql-test/lib/My/ConfigFactory.pm +++ b/mysql-test/lib/My/ConfigFactory.pm @@ -116,8 +116,8 @@ sub fix_tmpdir { sub fix_log_error { my ($self, $config, $group_name, $group)= @_; - my $dir= dirname($group->value('datadir')); - return "$dir/mysqld.err"; + my $dir= $self->{ARGS}->{vardir}; + return "$dir/log/$group_name.err"; } sub fix_log { @@ -203,7 +203,7 @@ my @mysqld_rules= { '#host' => \&fix_host }, { 'port' => \&fix_port }, { 'socket' => \&fix_socket }, - { 'log-error' => \&fix_log_error }, + { '#log-error' => \&fix_log_error }, { 'log' => \&fix_log }, { 'log-slow-queries' => \&fix_log_slow_queries }, { '#user' => sub { return shift->{ARGS}->{user} || ""; } }, @@ -389,7 +389,7 @@ sub post_check_embedded_group { my @no_copy = ( - 'log-error', # Embedded server writes stderr to mysqltest's log file + '#log-error', # Embedded server writes stderr to mysqltest's log file 'slave-net-timeout', # Embedded server are not build with replication ); diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 5e85cfe5cac..a254180056b 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -3470,7 +3470,10 @@ sub start_check_warnings ($$) { my $name= "warnings-".$mysqld->name(); - extract_warning_lines($mysqld->value('log-error')); + my $log_error= $mysqld->value('#log-error'); + # To be communicated to the test + $ENV{MTR_LOG_ERROR}= $log_error; + extract_warning_lines($log_error); my $args; mtr_init_args(\$args); @@ -3986,6 +3989,12 @@ sub mysqld_start ($$) { $path_vardir_trace, $mysqld->name()); } + if (IS_WINDOWS) + { + # Trick the server to send output to stderr, with --console + mtr_add_arg($args, "--console"); + } + if ( $opt_gdb || $opt_manual_gdb ) { gdb_arguments(\$args, \$exe, $mysqld->name()); @@ -4018,7 +4027,7 @@ sub mysqld_start ($$) { # Remove the old pidfile if any unlink($mysqld->value('pid-file')); - my $output= $mysqld->value('log-error'); + my $output= $mysqld->value('#log-error'); if ( $opt_valgrind and $opt_debug ) { # When both --valgrind and --debug is selected, send @@ -4319,7 +4328,7 @@ sub start_servers($) { # Already started # Write start of testcase to log file - mark_log($mysqld->value('log-error'), $tinfo); + mark_log($mysqld->value('#log-error'), $tinfo); next; } @@ -4378,7 +4387,7 @@ sub start_servers($) { mkpath($tmpdir) unless -d $tmpdir; # Write start of testcase to log file - mark_log($mysqld->value('log-error'), $tinfo); + mark_log($mysqld->value('#log-error'), $tinfo); # Run -master.sh if ($mysqld->option('#!run-master-sh') and @@ -4429,7 +4438,7 @@ sub start_servers($) { $tinfo->{comment}= "Failed to start ".$mysqld->name(); - my $logfile= $mysqld->value('log-error'); + my $logfile= $mysqld->value('#log-error'); if ( defined $logfile and -f $logfile ) { $tinfo->{logfile}= mtr_fromfile($logfile); From 901b29860d24388b100dba9cb847f74313f7865c Mon Sep 17 00:00:00 2001 From: Timothy Smith Date: Mon, 2 Mar 2009 17:24:23 -0700 Subject: [PATCH 063/132] Applying InnoDB snashot 5.0-ss4007, part 1. Fixes Bug #39939: DROP TABLE/DISCARD TABLESPACE takes long time in buf_LRU_invalidate_tablespace() This was already fixed in 5.1+; this is a backport to 5.0. Detailed revision comments: r2743 | inaam | 2008-10-08 22:18:12 +0300 (Wed, 08 Oct 2008) | 13 lines branches/5.0: Backport of r2742 from branches/5.1: Fix Bug#39939 DROP TABLE/DISCARD TABLESPACE takes long time in buf_LRU_invalidate_tablespace() Improve implementation of buf_LRU_invalidate_tablespace by attempting hash index drop in batches instead of doing it one by one. Reviewed by: Heikki, Sunny, Marko Approved by: Heikki --- innobase/buf/buf0lru.c | 127 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 127 insertions(+) diff --git a/innobase/buf/buf0lru.c b/innobase/buf/buf0lru.c index 0f632f0752a..6984c196701 100644 --- a/innobase/buf/buf0lru.c +++ b/innobase/buf/buf0lru.c @@ -42,6 +42,11 @@ initial segment in buf_LRU_get_recent_limit */ #define BUF_LRU_INITIAL_RATIO 8 +/* When dropping the search hash index entries before deleting an ibd +file, we build a local array of pages belonging to that tablespace +in the buffer pool. Following is the size of that array. */ +#define BUF_LRU_DROP_SEARCH_HASH_SIZE 1024 + /* If we switch on the InnoDB monitor because there are too few available frames in the buffer pool, we set this to TRUE */ ibool buf_lru_switched_on_innodb_mon = FALSE; @@ -65,6 +70,120 @@ buf_LRU_block_free_hashed_page( buf_block_t* block); /* in: block, must contain a file page and be in a state where it can be freed */ +/********************************************************************** +Attempts to drop page hash index on a batch of pages belonging to a +particular space id. */ +static +void +buf_LRU_drop_page_hash_batch( +/*=========================*/ + ulint id, /* in: space id */ + const ulint* arr, /* in: array of page_no */ + ulint count) /* in: number of entries in array */ +{ + ulint i; + + ut_ad(arr != NULL); + ut_ad(count <= BUF_LRU_DROP_SEARCH_HASH_SIZE); + + for (i = 0; i < count; ++i) { + btr_search_drop_page_hash_when_freed(id, arr[i]); + } +} + +/********************************************************************** +When doing a DROP TABLE/DISCARD TABLESPACE we have to drop all page +hash index entries belonging to that table. This function tries to +do that in batch. Note that this is a 'best effort' attempt and does +not guarantee that ALL hash entries will be removed. */ +static +void +buf_LRU_drop_page_hash_for_tablespace( +/*==================================*/ + ulint id) /* in: space id */ +{ + buf_block_t* block; + ulint* page_arr; + ulint num_entries; + + page_arr = ut_malloc(sizeof(ulint) + * BUF_LRU_DROP_SEARCH_HASH_SIZE); + mutex_enter(&buf_pool->mutex); + +scan_again: + num_entries = 0; + block = UT_LIST_GET_LAST(buf_pool->LRU); + + while (block != NULL) { + buf_block_t* prev_block; + + mutex_enter(&block->mutex); + prev_block = UT_LIST_GET_PREV(LRU, block); + + ut_a(block->state == BUF_BLOCK_FILE_PAGE); + + if (block->space != id + || block->buf_fix_count > 0 + || block->io_fix != 0) { + /* We leave the fixed pages as is in this scan. + To be dealt with later in the final scan. */ + mutex_exit(&block->mutex); + goto next_page; + } + + ut_ad(block->space == id); + if (block->is_hashed) { + + /* Store the offset(i.e.: page_no) in the array + so that we can drop hash index in a batch + later. */ + page_arr[num_entries] = block->offset; + mutex_exit(&block->mutex); + ut_a(num_entries < BUF_LRU_DROP_SEARCH_HASH_SIZE); + ++num_entries; + + if (num_entries < BUF_LRU_DROP_SEARCH_HASH_SIZE) { + goto next_page; + } + /* Array full. We release the buf_pool->mutex to + obey the latching order. */ + mutex_exit(&buf_pool->mutex); + + buf_LRU_drop_page_hash_batch(id, page_arr, + num_entries); + num_entries = 0; + mutex_enter(&buf_pool->mutex); + } else { + mutex_exit(&block->mutex); + } + +next_page: + /* Note that we may have released the buf_pool->mutex + above after reading the prev_block during processing + of a page_hash_batch (i.e.: when the array was full). + This means that prev_block can change in LRU list. + This is OK because this function is a 'best effort' + to drop as many search hash entries as possible and + it does not guarantee that ALL such entries will be + dropped. */ + block = prev_block; + + /* If, however, block has been removed from LRU list + to the free list then we should restart the scan. + block->state is protected by buf_pool->mutex. */ + if (block && block->state != BUF_BLOCK_FILE_PAGE) { + ut_a(num_entries == 0); + goto scan_again; + } + } + + mutex_exit(&buf_pool->mutex); + + /* Drop any remaining batch of search hashed pages. */ + buf_LRU_drop_page_hash_batch(id, page_arr, num_entries); + ut_free(page_arr); +} + /********************************************************************** Invalidates all pages belonging to a given tablespace when we are deleting the data file(s) of that tablespace. */ @@ -78,6 +197,14 @@ buf_LRU_invalidate_tablespace( ulint page_no; ibool all_freed; + /* Before we attempt to drop pages one by one we first + attempt to drop page hash index entries in batches to make + it more efficient. The batching attempt is a best effort + attempt and does not guarantee that all pages hash entries + will be dropped. We get rid of remaining page hash entries + one by one below. */ + buf_LRU_drop_page_hash_for_tablespace(id); + scan_again: mutex_enter(&(buf_pool->mutex)); From c3fec5d22ff38388f68718bf77cca183778978a1 Mon Sep 17 00:00:00 2001 From: Timothy Smith Date: Mon, 2 Mar 2009 17:57:09 -0700 Subject: [PATCH 064/132] Applying InnoDB snashot 5.0-ss4007, part 2. Fixes Bug #18828: If InnoDB runs out of undo slots, it returns misleading 'table is full' This is a backport of code already in 5.1+. The error message change referred to in the detailed revision comments is still pending. Detailed revision comments: r3937 | calvin | 2009-01-15 03:11:56 +0200 (Thu, 15 Jan 2009) | 17 lines branches/5.0: Backport the fix for Bug#18828. Return DB_TOO_MANY_CONCURRENT_TRXS when we run out of UNDO slots in the rollback segment. The backport is requested by MySQL under bug#41529 - Safe handling of InnoDB running out of undo log slots. This is a partial fix since the MySQL error code requested to properly report the error condition back to the client has not yet materialized. Currently we have #ifdef'd the error code translation in ha_innodb.cc. This will have to be changed as and when MySQl add the new requested code or an equivalent code that we can then use. Given the above, currently we will get the old behavior, not the "fixed" and intended behavior. Approved by: Heikki (on IM) --- innobase/dict/dict0crea.c | 3 +- innobase/include/db0err.h | 5 ++ innobase/include/trx0undo.h | 13 +++-- innobase/row/row0mysql.c | 3 +- innobase/trx/trx0rec.c | 15 +++--- innobase/trx/trx0undo.c | 105 ++++++++++++++++++++++-------------- sql/ha_innodb.cc | 14 +++++ 7 files changed, 103 insertions(+), 55 deletions(-) diff --git a/innobase/dict/dict0crea.c b/innobase/dict/dict0crea.c index e20d8b6e83a..12d99734796 100644 --- a/innobase/dict/dict0crea.c +++ b/innobase/dict/dict0crea.c @@ -1249,7 +1249,8 @@ dict_create_or_check_foreign_constraint_tables(void) fprintf(stderr, "InnoDB: error %lu in creation\n", (ulong) error); - ut_a(error == DB_OUT_OF_FILE_SPACE); + ut_a(error == DB_OUT_OF_FILE_SPACE + || error == DB_TOO_MANY_CONCURRENT_TRXS); fprintf(stderr, "InnoDB: creation failed\n"); fprintf(stderr, "InnoDB: tablespace is full\n"); diff --git a/innobase/include/db0err.h b/innobase/include/db0err.h index 247c5de67db..68bdcdc8b7f 100644 --- a/innobase/include/db0err.h +++ b/innobase/include/db0err.h @@ -70,6 +70,11 @@ Created 5/24/1996 Heikki Tuuri work with e.g., FT indexes created by a later version of the engine. */ +#define DB_TOO_MANY_CONCURRENT_TRXS 47 /* when InnoDB runs out of the + preconfigured undo slots, this can + only happen when there are too many + concurrent transactions */ + /* The following are partial failure codes */ #define DB_FAIL 1000 #define DB_OVERFLOW 1001 diff --git a/innobase/include/trx0undo.h b/innobase/include/trx0undo.h index 4f1847aa88c..152a09c0f76 100644 --- a/innobase/include/trx0undo.h +++ b/innobase/include/trx0undo.h @@ -222,13 +222,16 @@ trx_undo_lists_init( Assigns an undo log for a transaction. A new undo log is created or a cached undo log reused. */ -trx_undo_t* +ulint trx_undo_assign_undo( /*=================*/ - /* out: the undo log, NULL if did not succeed: out of - space */ - trx_t* trx, /* in: transaction */ - ulint type); /* in: TRX_UNDO_INSERT or TRX_UNDO_UPDATE */ + /* out: DB_SUCCESS if undo log assign + * successful, possible error codes are: + * ER_TOO_MANY_CONCURRENT_TRXS + * DB_OUT_OF_FILE_SPAC + * DB_OUT_OF_MEMORY */ + trx_t* trx, /* in: transaction */ + ulint type); /* in: TRX_UNDO_INSERT or TRX_UNDO_UPDATE */ /********************************************************************** Sets the state of the undo log segment at a transaction finish. */ diff --git a/innobase/row/row0mysql.c b/innobase/row/row0mysql.c index 4bc5f39359c..d7213b25145 100644 --- a/innobase/row/row0mysql.c +++ b/innobase/row/row0mysql.c @@ -494,7 +494,8 @@ handle_new_error: /* MySQL will roll back the latest SQL statement */ } else if (err == DB_ROW_IS_REFERENCED || err == DB_NO_REFERENCED_ROW - || err == DB_CANNOT_ADD_CONSTRAINT) { + || err == DB_CANNOT_ADD_CONSTRAINT + || err == DB_TOO_MANY_CONCURRENT_TRXS) { if (savept) { /* Roll back the latest, possibly incomplete insertion or update */ diff --git a/innobase/trx/trx0rec.c b/innobase/trx/trx0rec.c index 3b7171e6038..44b734625dd 100644 --- a/innobase/trx/trx0rec.c +++ b/innobase/trx/trx0rec.c @@ -1013,6 +1013,7 @@ trx_undo_report_row_operation( ibool is_insert; trx_rseg_t* rseg; mtr_t mtr; + ulint err = DB_SUCCESS; mem_heap_t* heap = NULL; ulint offsets_[REC_OFFS_NORMAL_SIZE]; ulint* offsets = offsets_; @@ -1024,7 +1025,7 @@ trx_undo_report_row_operation( *roll_ptr = ut_dulint_zero; - return(DB_SUCCESS); + return(err); } ut_ad(thr); @@ -1042,7 +1043,7 @@ trx_undo_report_row_operation( if (trx->insert_undo == NULL) { - trx_undo_assign_undo(trx, TRX_UNDO_INSERT); + err = trx_undo_assign_undo(trx, TRX_UNDO_INSERT); } undo = trx->insert_undo; @@ -1052,7 +1053,7 @@ trx_undo_report_row_operation( if (trx->update_undo == NULL) { - trx_undo_assign_undo(trx, TRX_UNDO_UPDATE); + err = trx_undo_assign_undo(trx, TRX_UNDO_UPDATE); } @@ -1060,11 +1061,11 @@ trx_undo_report_row_operation( is_insert = FALSE; } - if (undo == NULL) { - /* Did not succeed: out of space */ + if (err != DB_SUCCESS) { + /* Did not succeed: return the error encountered */ mutex_exit(&(trx->undo_mutex)); - return(DB_OUT_OF_FILE_SPACE); + return(err); } page_no = undo->last_page_no; @@ -1154,7 +1155,7 @@ trx_undo_report_row_operation( if (UNIV_LIKELY_NULL(heap)) { mem_heap_free(heap); } - return(DB_SUCCESS); + return(err); } /*============== BUILDING PREVIOUS VERSION OF A RECORD ===============*/ diff --git a/innobase/trx/trx0undo.c b/innobase/trx/trx0undo.c index 251cd355897..997f25a66d8 100644 --- a/innobase/trx/trx0undo.c +++ b/innobase/trx/trx0undo.c @@ -374,27 +374,32 @@ trx_undo_page_init( /******************************************************************* Creates a new undo log segment in file. */ static -page_t* +ulint trx_undo_seg_create( /*================*/ - /* out: segment header page x-latched, NULL - if no space left */ + /* out: DB_SUCCESS if page creation OK + possible error codes are: + DB_TOO_MANY_CONCURRENT_TRXS + DB_OUT_OF_FILE_SPACE */ trx_rseg_t* rseg __attribute__((unused)),/* in: rollback segment */ trx_rsegf_t* rseg_hdr,/* in: rollback segment header, page x-latched */ ulint type, /* in: type of the segment: TRX_UNDO_INSERT or TRX_UNDO_UPDATE */ ulint* id, /* out: slot index within rseg header */ + page_t** undo_page, + /* out: segment header page x-latched, NULL + if there was an error */ mtr_t* mtr) /* in: mtr */ { ulint slot_no; ulint space; - page_t* undo_page; trx_upagef_t* page_hdr; trx_usegf_t* seg_hdr; ulint n_reserved; ibool success; - + ulint err = DB_SUCCESS; + ut_ad(mtr && id && rseg_hdr); #ifdef UNIV_SYNC_DEBUG ut_ad(mutex_own(&(rseg->mutex))); @@ -411,7 +416,7 @@ trx_undo_seg_create( "InnoDB: Warning: cannot find a free slot for an undo log. Do you have too\n" "InnoDB: many active transactions running concurrently?\n"); - return(NULL); + return(DB_TOO_MANY_CONCURRENT_TRXS); } space = buf_frame_get_space_id(rseg_hdr); @@ -420,29 +425,29 @@ trx_undo_seg_create( mtr); if (!success) { - return(NULL); + return(DB_OUT_OF_FILE_SPACE); } /* Allocate a new file segment for the undo log */ - undo_page = fseg_create_general(space, 0, + *undo_page = fseg_create_general(space, 0, TRX_UNDO_SEG_HDR + TRX_UNDO_FSEG_HEADER, TRUE, mtr); fil_space_release_free_extents(space, n_reserved); - if (undo_page == NULL) { + if (*undo_page == NULL) { /* No space left */ - return(NULL); + return(DB_OUT_OF_FILE_SPACE); } #ifdef UNIV_SYNC_DEBUG - buf_page_dbg_add_level(undo_page, SYNC_TRX_UNDO_PAGE); + buf_page_dbg_add_level(*undo_page, SYNC_TRX_UNDO_PAGE); #endif /* UNIV_SYNC_DEBUG */ - page_hdr = undo_page + TRX_UNDO_PAGE_HDR; - seg_hdr = undo_page + TRX_UNDO_SEG_HDR; + page_hdr = *undo_page + TRX_UNDO_PAGE_HDR; + seg_hdr = *undo_page + TRX_UNDO_SEG_HDR; - trx_undo_page_init(undo_page, type, mtr); + trx_undo_page_init(*undo_page, type, mtr); mlog_write_ulint(page_hdr + TRX_UNDO_PAGE_FREE, TRX_UNDO_SEG_HDR + TRX_UNDO_SEG_HDR_SIZE, @@ -456,10 +461,11 @@ trx_undo_seg_create( page_hdr + TRX_UNDO_PAGE_NODE, mtr); trx_rsegf_set_nth_undo(rseg_hdr, slot_no, - buf_frame_get_page_no(undo_page), mtr); + buf_frame_get_page_no(*undo_page), mtr); + *id = slot_no; - return(undo_page); + return(err); } /************************************************************************** @@ -1400,6 +1406,11 @@ trx_undo_mem_create( undo = mem_alloc(sizeof(trx_undo_t)); + if (undo == NULL) { + + return NULL; + } + undo->id = id; undo->type = type; undo->state = TRX_UNDO_ACTIVE; @@ -1479,11 +1490,15 @@ trx_undo_mem_free( /************************************************************************** Creates a new undo log. */ static -trx_undo_t* +ulint trx_undo_create( /*============*/ - /* out: undo log object, NULL if did not - succeed: out of space */ + /* out: DB_SUCCESS if successful in creating + the new undo lob object, possible error + codes are: + DB_TOO_MANY_CONCURRENT_TRXS + DB_OUT_OF_FILE_SPACE + DB_OUT_OF_MEMORY*/ trx_t* trx, /* in: transaction */ trx_rseg_t* rseg, /* in: rollback segment memory copy */ ulint type, /* in: type of the log: TRX_UNDO_INSERT or @@ -1491,36 +1506,39 @@ trx_undo_create( dulint trx_id, /* in: id of the trx for which the undo log is created */ XID* xid, /* in: X/Open transaction identification*/ + trx_undo_t** undo, /* out: the new undo log object, undefined + * if did not succeed */ mtr_t* mtr) /* in: mtr */ { trx_rsegf_t* rseg_header; ulint page_no; ulint offset; ulint id; - trx_undo_t* undo; page_t* undo_page; - + ulint err; + #ifdef UNIV_SYNC_DEBUG ut_ad(mutex_own(&(rseg->mutex))); #endif /* UNIV_SYNC_DEBUG */ if (rseg->curr_size == rseg->max_size) { - return(NULL); + return(DB_OUT_OF_FILE_SPACE); } rseg->curr_size++; rseg_header = trx_rsegf_get(rseg->space, rseg->page_no, mtr); - undo_page = trx_undo_seg_create(rseg, rseg_header, type, &id, mtr); + err = trx_undo_seg_create(rseg, rseg_header, type, &id, + &undo_page, mtr); - if (undo_page == NULL) { + if (err != DB_SUCCESS) { /* Did not succeed */ rseg->curr_size--; - return(NULL); + return(err); } page_no = buf_frame_get_page_no(undo_page); @@ -1532,9 +1550,14 @@ trx_undo_create( undo_page + offset, mtr); } - undo = trx_undo_mem_create(rseg, id, type, trx_id, xid, + *undo = trx_undo_mem_create(rseg, id, type, trx_id, xid, page_no, offset); - return(undo); + if (*undo == NULL) { + + err = DB_OUT_OF_MEMORY; + } + + return(err); } /*================ UNDO LOG ASSIGNMENT AND CLEANUP =====================*/ @@ -1653,17 +1676,20 @@ trx_undo_mark_as_dict_operation( Assigns an undo log for a transaction. A new undo log is created or a cached undo log reused. */ -trx_undo_t* +ulint trx_undo_assign_undo( /*=================*/ - /* out: the undo log, NULL if did not succeed: out of - space */ - trx_t* trx, /* in: transaction */ - ulint type) /* in: TRX_UNDO_INSERT or TRX_UNDO_UPDATE */ + /* out: DB_SUCCESS if undo log assign + successful, possible error codes are: + DD_TOO_MANY_CONCURRENT_TRXS + DB_OUT_OF_FILE_SPACE DB_OUT_OF_MEMORY*/ + trx_t* trx, /* in: transaction */ + ulint type) /* in: TRX_UNDO_INSERT or TRX_UNDO_UPDATE */ { trx_rseg_t* rseg; trx_undo_t* undo; mtr_t mtr; + ulint err = DB_SUCCESS; ut_ad(trx); ut_ad(trx->rseg); @@ -1684,15 +1710,11 @@ trx_undo_assign_undo( undo = trx_undo_reuse_cached(trx, rseg, type, trx->id, &trx->xid, &mtr); if (undo == NULL) { - undo = trx_undo_create(trx, rseg, type, trx->id, &trx->xid, - &mtr); - if (undo == NULL) { - /* Did not succeed */ + err = trx_undo_create(trx, rseg, type, trx->id, &trx->xid, + &undo, &mtr); + if (err != DB_SUCCESS) { - mutex_exit(&(rseg->mutex)); - mtr_commit(&mtr); - - return(NULL); + goto func_exit; } } @@ -1710,10 +1732,11 @@ trx_undo_assign_undo( trx_undo_mark_as_dict_operation(trx, undo, &mtr); } +func_exit: mutex_exit(&(rseg->mutex)); mtr_commit(&mtr); - return(undo); + return err; } /********************************************************************** diff --git a/sql/ha_innodb.cc b/sql/ha_innodb.cc index e0b7fb6e7f5..3bae0da3e02 100644 --- a/sql/ha_innodb.cc +++ b/sql/ha_innodb.cc @@ -524,6 +524,20 @@ convert_error_code_to_mysql( mark_transaction_to_rollback(thd, TRUE); return(HA_ERR_LOCK_TABLE_FULL); + } else if (error == DB_TOO_MANY_CONCURRENT_TRXS) { + + /* Once MySQL add the appropriate code to errmsg.txt then + we can get rid of this #ifdef. NOTE: The code checked by + the #ifdef is the suggested name for the error condition + and the actual error code name could very well be different. + This will require some monitoring, ie. the status + of this request on our part.*/ +#ifdef ER_TOO_MANY_CONCURRENT_TRXS + return(ER_TOO_MANY_CONCURRENT_TRXS); +#else + return(HA_ERR_RECORD_FILE_FULL); +#endif + } else if (error == DB_UNSUPPORTED) { return(HA_ERR_UNSUPPORTED); From 62d5d85c5d19b113b772ecadbf32f198831b543b Mon Sep 17 00:00:00 2001 From: Timothy Smith Date: Mon, 2 Mar 2009 18:00:23 -0700 Subject: [PATCH 065/132] Applying InnoDB snashot 5.0-ss4007, part 3. Fixes Bug #41571: MySQL segfaults after innodb recovery This 5.0 fix will not be pushed into 5.1; a separate fix (from innodb-5.1-ss4007) will be pushed into 5.1+. Detailed revision comments: r4003 | marko | 2009-01-20 16:12:50 +0200 (Tue, 20 Jan 2009) | 10 lines branches/5.0: rec_set_nth_field(): When the field already is SQL null, do nothing when it is being changed to SQL null. (Bug #41571) Normally, MySQL does not pass "do-nothing" updates to the storage engine. When it does and a column of an InnoDB table that is in ROW_FORMAT=COMPACT is being updated from NULL to NULL, the InnoDB buffer pool will be corrupted without this fix. rb://81 approved by Heikki Tuuri --- innobase/include/rem0rec.h | 11 ++++------- innobase/include/rem0rec.ic | 19 +++++++++---------- 2 files changed, 13 insertions(+), 17 deletions(-) diff --git a/innobase/include/rem0rec.h b/innobase/include/rem0rec.h index 69b397c9682..b573c5d4c3b 100644 --- a/innobase/include/rem0rec.h +++ b/innobase/include/rem0rec.h @@ -368,8 +368,9 @@ rec_set_field_extern_bits( /*************************************************************** This is used to modify the value of an already existing field in a record. The previous value must have exactly the same size as the new value. If len -is UNIV_SQL_NULL then the field is treated as an SQL null for old-style -records. For new-style records, len must not be UNIV_SQL_NULL. */ +is UNIV_SQL_NULL then the field is treated as an SQL null. +For records in ROW_FORMAT=COMPACT (new-style records), len must not be +UNIV_SQL_NULL unless the field already is SQL null. */ UNIV_INLINE void rec_set_nth_field( @@ -378,11 +379,7 @@ rec_set_nth_field( const ulint* offsets,/* in: array returned by rec_get_offsets() */ ulint n, /* in: index number of the field */ const void* data, /* in: pointer to the data if not SQL null */ - ulint len); /* in: length of the data or UNIV_SQL_NULL. - If not SQL null, must have the same - length as the previous value. - If SQL null, previous value must be - SQL null. */ + ulint len); /* in: length of the data or UNIV_SQL_NULL */ /************************************************************** The following function returns the data size of an old-style physical record, that is the sum of field lengths. SQL null fields diff --git a/innobase/include/rem0rec.ic b/innobase/include/rem0rec.ic index 1abbb503bab..64c91724386 100644 --- a/innobase/include/rem0rec.ic +++ b/innobase/include/rem0rec.ic @@ -1204,8 +1204,9 @@ rec_get_nth_field_size( /*************************************************************** This is used to modify the value of an already existing field in a record. The previous value must have exactly the same size as the new value. If len -is UNIV_SQL_NULL then the field is treated as an SQL null for old-style -records. For new-style records, len must not be UNIV_SQL_NULL. */ +is UNIV_SQL_NULL then the field is treated as an SQL null. +For records in ROW_FORMAT=COMPACT (new-style records), len must not be +UNIV_SQL_NULL unless the field already is SQL null. */ UNIV_INLINE void rec_set_nth_field( @@ -1215,11 +1216,7 @@ rec_set_nth_field( ulint n, /* in: index number of the field */ const void* data, /* in: pointer to the data if not SQL null */ - ulint len) /* in: length of the data or UNIV_SQL_NULL. - If not SQL null, must have the same - length as the previous value. - If SQL null, previous value must be - SQL null. */ + ulint len) /* in: length of the data or UNIV_SQL_NULL */ { byte* data2; ulint len2; @@ -1227,9 +1224,11 @@ rec_set_nth_field( ut_ad(rec); ut_ad(rec_offs_validate(rec, NULL, offsets)); - if (len == UNIV_SQL_NULL) { - ut_ad(!rec_offs_comp(offsets)); - rec_set_nth_field_sql_null(rec, n); + if (UNIV_UNLIKELY(len == UNIV_SQL_NULL)) { + if (!rec_offs_nth_sql_null(offsets, n)) { + ut_a(!rec_offs_comp(offsets)); + rec_set_nth_field_sql_null(rec, n); + } return; } From 20b1c21bf0fe4945d9326ec8a88386c2a70ea038 Mon Sep 17 00:00:00 2001 From: Timothy Smith Date: Mon, 2 Mar 2009 18:06:44 -0700 Subject: [PATCH 066/132] Applying InnoDB snashot 5.1-ss3931, part 1. Fixes Bug #38187: Error 153 when creating savepoints Detailed revision comments: r3911 | sunny | 2009-01-13 14:15:24 +0200 (Tue, 13 Jan 2009) | 13 lines branches/5.1: Fix Bug#38187 Error 153 when creating savepoints InnoDB previously treated savepoints as a stack e.g., SAVEPOINT a; SAVEPOINT b; SAVEPOINT c; SAVEPOINT b; <- This would delete b and c. This fix changes the behavior to: SAVEPOINT a; SAVEPOINT b; SAVEPOINT c; SAVEPOINT b; <- Does not delete savepoint c --- storage/innobase/include/trx0roll.h | 14 +++++++- storage/innobase/trx/trx0roll.c | 51 +++++++++++++++-------------- storage/innobase/trx/trx0trx.c | 4 +-- 3 files changed, 41 insertions(+), 28 deletions(-) diff --git a/storage/innobase/include/trx0roll.h b/storage/innobase/include/trx0roll.h index 25546430ba0..c1eca3d5753 100644 --- a/storage/innobase/include/trx0roll.h +++ b/storage/innobase/include/trx0roll.h @@ -15,6 +15,8 @@ Created 3/26/1996 Heikki Tuuri #include "mtr0mtr.h" #include "trx0sys.h" +#define trx_roll_free_all_savepoints(s) trx_roll_savepoints_free((s), NULL) + /*********************************************************************** Returns a transaction savepoint taken at this point in time. */ @@ -237,7 +239,17 @@ trx_release_savepoint_for_mysql( const char* savepoint_name); /* in: savepoint name */ /*********************************************************************** -Frees savepoint structs. */ +Frees a single savepoint struct. */ + +void +trx_roll_savepoint_free( +/*=====================*/ + trx_t* trx, /* in: transaction handle */ + trx_named_savept_t* savep); /* in: savepoint to free */ + +/*********************************************************************** +Frees savepoint structs starting from savep, if savep == NULL then +free all savepoints. */ void trx_roll_savepoints_free( diff --git a/storage/innobase/trx/trx0roll.c b/storage/innobase/trx/trx0roll.c index 91dcf035f96..8934fe87c7e 100644 --- a/storage/innobase/trx/trx0roll.c +++ b/storage/innobase/trx/trx0roll.c @@ -185,7 +185,25 @@ trx_rollback_last_sql_stat_for_mysql( } /*********************************************************************** -Frees savepoint structs. */ +Frees a single savepoint struct. */ + +void +trx_roll_savepoint_free( +/*=====================*/ + trx_t* trx, /* in: transaction handle */ + trx_named_savept_t* savep) /* in: savepoint to free */ +{ + ut_a(savep != NULL); + ut_a(UT_LIST_GET_LEN(trx->trx_savepoints) > 0); + + UT_LIST_REMOVE(trx_savepoints, trx->trx_savepoints, savep); + mem_free(savep->name); + mem_free(savep); +} + +/*********************************************************************** +Frees savepoint structs starting from savep, if savep == NULL then +free all savepoints. */ void trx_roll_savepoints_free( @@ -206,9 +224,7 @@ trx_roll_savepoints_free( while (savep != NULL) { next_savep = UT_LIST_GET_NEXT(trx_savepoints, savep); - UT_LIST_REMOVE(trx_savepoints, trx->trx_savepoints, savep); - mem_free(savep->name); - mem_free(savep); + trx_roll_savepoint_free(trx, savep); savep = next_savep; } @@ -343,8 +359,8 @@ trx_savepoint_for_mysql( } /*********************************************************************** -Releases a named savepoint. Savepoints which -were set after this savepoint are deleted. */ +Releases only the named savepoint. Savepoints which were set after this +savepoint are left as is. */ ulint trx_release_savepoint_for_mysql( @@ -360,31 +376,16 @@ trx_release_savepoint_for_mysql( savep = UT_LIST_GET_FIRST(trx->trx_savepoints); + /* Search for the savepoint by name and free if found. */ while (savep != NULL) { if (0 == ut_strcmp(savep->name, savepoint_name)) { - /* Found */ - break; + trx_roll_savepoint_free(trx, savep); + return(DB_SUCCESS); } savep = UT_LIST_GET_NEXT(trx_savepoints, savep); } - if (savep == NULL) { - - return(DB_NO_SAVEPOINT); - } - - /* We can now free all savepoints strictly later than this one */ - - trx_roll_savepoints_free(trx, savep); - - /* Now we can free this savepoint too */ - - UT_LIST_REMOVE(trx_savepoints, trx->trx_savepoints, savep); - - mem_free(savep->name); - mem_free(savep); - - return(DB_SUCCESS); + return(DB_NO_SAVEPOINT); } /*********************************************************************** diff --git a/storage/innobase/trx/trx0trx.c b/storage/innobase/trx/trx0trx.c index 1fceaa3562c..43456865903 100644 --- a/storage/innobase/trx/trx0trx.c +++ b/storage/innobase/trx/trx0trx.c @@ -930,8 +930,8 @@ trx_commit_off_kernel( mutex_enter(&kernel_mutex); } - /* Free savepoints */ - trx_roll_savepoints_free(trx, NULL); + /* Free all savepoints */ + trx_roll_free_all_savepoints(trx); trx->conc_state = TRX_NOT_STARTED; trx->rseg = NULL; From 39a4ab6ce3340e43a6aee581792131a0da974498 Mon Sep 17 00:00:00 2001 From: Timothy Smith Date: Mon, 2 Mar 2009 18:08:02 -0700 Subject: [PATCH 067/132] Applying InnoDB snashot 5.1-ss3931, part 2. Fixes Bug #42075: dict_load_indexes failure in dict_load_table will corrupt the dictionary cache Detailed revision comments: r3930 | marko | 2009-01-14 15:51:30 +0200 (Wed, 14 Jan 2009) | 4 lines branches/5.1: dict_load_table(): If dict_load_indexes() fails, invoke dict_table_remove_from_cache() instead of dict_mem_table_free(), so that the data dictionary will not point to freed data. (Bug #42075, Issue #153, rb://76 approved by Heikki Tuuri) --- storage/innobase/dict/dict0load.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/storage/innobase/dict/dict0load.c b/storage/innobase/dict/dict0load.c index f594e64f517..65f1c9536bd 100644 --- a/storage/innobase/dict/dict0load.c +++ b/storage/innobase/dict/dict0load.c @@ -868,11 +868,11 @@ err_exit: of the error condition, since the user may want to dump data from the clustered index. However we load the foreign key information only if all indexes were loaded. */ - if (err != DB_SUCCESS && !srv_force_recovery) { - dict_mem_table_free(table); - table = NULL; - } else if (err == DB_SUCCESS) { + if (err == DB_SUCCESS) { err = dict_load_foreigns(table->name, TRUE); + } else if (!srv_force_recovery) { + dict_table_remove_from_cache(table); + table = NULL; } #if 0 if (err != DB_SUCCESS && table != NULL) { From d2e4204a1e9cda6fa64bc4910bbdb07281d7bee3 Mon Sep 17 00:00:00 2001 From: Timothy Smith Date: Mon, 2 Mar 2009 18:09:35 -0700 Subject: [PATCH 068/132] Applying InnoDB snashot 5.1-ss4007, part 1. Fixes Bug #41571: MySQL segfaults after innodb recovery Detailed revision comments: r4004 | marko | 2009-01-20 16:19:00 +0200 (Tue, 20 Jan 2009) | 12 lines branches/5.1: Merge r4003 from branches/5.0: rec_set_nth_field(): When the field already is SQL null, do nothing when it is being changed to SQL null. (Bug #41571) Normally, MySQL does not pass "do-nothing" updates to the storage engine. When it does and a column of an InnoDB table that is in ROW_FORMAT=COMPACT is being updated from NULL to NULL, the InnoDB buffer pool will be corrupted without this fix. rb://81 approved by Heikki Tuuri --- storage/innobase/include/rem0rec.h | 11 ++++------- storage/innobase/include/rem0rec.ic | 19 +++++++++---------- 2 files changed, 13 insertions(+), 17 deletions(-) diff --git a/storage/innobase/include/rem0rec.h b/storage/innobase/include/rem0rec.h index 43ef6650e90..abc204bb583 100644 --- a/storage/innobase/include/rem0rec.h +++ b/storage/innobase/include/rem0rec.h @@ -365,8 +365,9 @@ rec_set_field_extern_bits( /*************************************************************** This is used to modify the value of an already existing field in a record. The previous value must have exactly the same size as the new value. If len -is UNIV_SQL_NULL then the field is treated as an SQL null for old-style -records. For new-style records, len must not be UNIV_SQL_NULL. */ +is UNIV_SQL_NULL then the field is treated as an SQL null. +For records in ROW_FORMAT=COMPACT (new-style records), len must not be +UNIV_SQL_NULL unless the field already is SQL null. */ UNIV_INLINE void rec_set_nth_field( @@ -375,11 +376,7 @@ rec_set_nth_field( const ulint* offsets,/* in: array returned by rec_get_offsets() */ ulint n, /* in: index number of the field */ const void* data, /* in: pointer to the data if not SQL null */ - ulint len); /* in: length of the data or UNIV_SQL_NULL. - If not SQL null, must have the same - length as the previous value. - If SQL null, previous value must be - SQL null. */ + ulint len); /* in: length of the data or UNIV_SQL_NULL */ /************************************************************** The following function returns the data size of an old-style physical record, that is the sum of field lengths. SQL null fields diff --git a/storage/innobase/include/rem0rec.ic b/storage/innobase/include/rem0rec.ic index 5a4a0a0b5df..d91fb4c4391 100644 --- a/storage/innobase/include/rem0rec.ic +++ b/storage/innobase/include/rem0rec.ic @@ -1219,8 +1219,9 @@ rec_get_nth_field_size( /*************************************************************** This is used to modify the value of an already existing field in a record. The previous value must have exactly the same size as the new value. If len -is UNIV_SQL_NULL then the field is treated as an SQL null for old-style -records. For new-style records, len must not be UNIV_SQL_NULL. */ +is UNIV_SQL_NULL then the field is treated as an SQL null. +For records in ROW_FORMAT=COMPACT (new-style records), len must not be +UNIV_SQL_NULL unless the field already is SQL null. */ UNIV_INLINE void rec_set_nth_field( @@ -1230,11 +1231,7 @@ rec_set_nth_field( ulint n, /* in: index number of the field */ const void* data, /* in: pointer to the data if not SQL null */ - ulint len) /* in: length of the data or UNIV_SQL_NULL. - If not SQL null, must have the same - length as the previous value. - If SQL null, previous value must be - SQL null. */ + ulint len) /* in: length of the data or UNIV_SQL_NULL */ { byte* data2; ulint len2; @@ -1242,9 +1239,11 @@ rec_set_nth_field( ut_ad(rec); ut_ad(rec_offs_validate(rec, NULL, offsets)); - if (len == UNIV_SQL_NULL) { - ut_ad(!rec_offs_comp(offsets)); - rec_set_nth_field_sql_null(rec, n); + if (UNIV_UNLIKELY(len == UNIV_SQL_NULL)) { + if (!rec_offs_nth_sql_null(offsets, n)) { + ut_a(!rec_offs_comp(offsets)); + rec_set_nth_field_sql_null(rec, n); + } return; } From 17c0218a1810cf81c361b3cec4d26c51296b6dbf Mon Sep 17 00:00:00 2001 From: Timothy Smith Date: Mon, 2 Mar 2009 18:10:37 -0700 Subject: [PATCH 069/132] Applying InnoDB snashot 5.1-ss4007, part 2. Fixes Bug #42152: Race condition in lock_is_table_exclusive() Detailed revision comments: r4005 | marko | 2009-01-20 16:22:36 +0200 (Tue, 20 Jan 2009) | 8 lines branches/5.1: lock_is_table_exclusive(): Acquire kernel_mutex before accessing table->locks and release kernel_mutex before returning from the function. This fixes a portential race condition in the "commit every 10,000 rows" in ALTER TABLE, CREATE INDEX, DROP INDEX, and OPTIMIZE TABLE. (Bug #42152) rb://80 approved by Heikki Tuuri --- storage/innobase/lock/lock0lock.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/storage/innobase/lock/lock0lock.c b/storage/innobase/lock/lock0lock.c index 173d074cb82..d9bc8ba09e4 100644 --- a/storage/innobase/lock/lock0lock.c +++ b/storage/innobase/lock/lock0lock.c @@ -681,7 +681,10 @@ lock_is_table_exclusive( lock_t* lock; ibool ok = FALSE; - ut_ad(table && trx); + ut_ad(table); + ut_ad(trx); + + lock_mutex_enter_kernel(); for (lock = UT_LIST_GET_FIRST(table->locks); lock; @@ -689,7 +692,7 @@ lock_is_table_exclusive( if (lock->trx != trx) { /* A lock on the table is held by some other transaction. */ - return(FALSE); + goto not_ok; } if (!(lock_get_type(lock) & LOCK_TABLE)) { @@ -706,11 +709,16 @@ lock_is_table_exclusive( auto_increment lock. */ break; default: +not_ok: /* Other table locks than LOCK_IX are not allowed. */ - return(FALSE); + ok = FALSE; + goto func_exit; } } +func_exit: + lock_mutex_exit_kernel(); + return(ok); } @@ -3664,6 +3672,7 @@ lock_table_has_to_wait_in_queue( dict_table_t* table; lock_t* lock; + ut_ad(mutex_own(&kernel_mutex)); ut_ad(lock_get_wait(wait_lock)); table = wait_lock->un_member.tab_lock.table; From 140cc614c944154282fce87064f5e3552406a14c Mon Sep 17 00:00:00 2001 From: Matthias Leich Date: Tue, 3 Mar 2009 21:34:18 +0100 Subject: [PATCH 070/132] Last slice of fix for Bug#42003 tests missing the disconnect of connections <> default + Fix for Bug#43114 wait_until_count_sessions too restrictive, random PB failures + Removal of a lot of other weaknesses found + modifications according to review --- .../include/wait_until_count_sessions.inc | 33 +- mysql-test/r/consistent_snapshot.result | 32 +- mysql-test/r/dirty_close.result | 10 +- mysql-test/r/flush_block_commit.result | 74 +- .../r/flush_block_commit_notembedded.result | 30 +- mysql-test/r/flush_read_lock_kill.result | 17 +- mysql-test/r/lock_multi.result | 8 +- mysql-test/r/mysqlbinlog.result | 16 +- mysql-test/r/read_only.result | 2 +- mysql-test/r/show_check.result | 6 +- mysql-test/r/skip_name_resolve.result | 6 +- mysql-test/r/sp-security.result | 16 +- mysql-test/r/view.result | 66 +- mysql-test/r/view_grant.result | 4 +- mysql-test/t/alter_table-big.test | 7 +- mysql-test/t/connect.test | 42 +- mysql-test/t/consistent_snapshot.test | 44 +- mysql-test/t/dirty_close.test | 21 +- mysql-test/t/flush_block_commit.test | 96 +- .../t/flush_block_commit_notembedded.test | 47 +- mysql-test/t/flush_read_lock_kill.test | 35 +- mysql-test/t/init_connect.test | 10 +- mysql-test/t/lock_multi.test | 201 +++-- mysql-test/t/mysqlbinlog.test | 41 +- mysql-test/t/mysqltest.test | 25 +- mysql-test/t/read_only.test | 28 +- mysql-test/t/show_check.test | 73 +- mysql-test/t/skip_name_resolve.test | 9 +- mysql-test/t/sp-security.test | 59 +- mysql-test/t/sp_notembedded.test | 40 +- mysql-test/t/ssl-big.test | 28 +- mysql-test/t/ssl.test | 8 + mysql-test/t/ssl_compress.test | 10 + mysql-test/t/status.test | 7 + mysql-test/t/user_limits.test | 41 +- mysql-test/t/view.test | 833 ++++++++++-------- mysql-test/t/view_grant.test | 196 +++-- mysql-test/t/wait_timeout.test | 5 +- mysql-test/t/xa.test | 28 +- 39 files changed, 1352 insertions(+), 902 deletions(-) diff --git a/mysql-test/include/wait_until_count_sessions.inc b/mysql-test/include/wait_until_count_sessions.inc index 41348bee129..6364ac95ada 100644 --- a/mysql-test/include/wait_until_count_sessions.inc +++ b/mysql-test/include/wait_until_count_sessions.inc @@ -2,14 +2,23 @@ # # SUMMARY # -# Waits until the passed number ($count_sessions) of concurrent sessions was -# observed via +# Waits until the passed number ($count_sessions) of concurrent sessions or +# a smaller number was observed via # SHOW STATUS LIKE 'Threads_connected' # or the operation times out. -# Note: Starting with 5.1 we could also use -# SELECT COUNT(*) FROM information_schema.processlist -# I stay with "SHOW STATUS LIKE 'Threads_connected'" because this -# runs in all versions 5.0+ +# Note: +# 1. We wait for $current_sessions <= $count_sessions because in the use case +# with count_sessions.inc before and wait_until_count_sessions.inc after +# the core of the test it could happen that the disconnects of sessions +# belonging to the preceeding test are not finished. +# sessions at test begin($count_sessions) = m + n +# sessions of the previous test which will be soon disconnected = n (n >= 0) +# sessions at test end ($current sessions, assuming the test disconnects +# all additional sessions) = m +# 2. Starting with 5.1 we could also use +# SELECT COUNT(*) FROM information_schema.processlist +# I stay with "SHOW STATUS LIKE 'Threads_connected'" because this +# runs in all versions 5.0+ # # # USAGE @@ -19,7 +28,7 @@ # # OR typical example of a test which uses more than one session # Such a test could harm successing tests if there is no server shutdown -# and start between.cw +# and start between. # # If the testing box is slow than the disconnect of sessions belonging to # the current test might happen when the successing test gets executed. @@ -79,7 +88,11 @@ # backup.test, grant3.test # # -# Created: 2009-01-14 mleich +# Created: +# 2009-01-14 mleich +# Modified: +# 2009-02-24 mleich Fix Bug#43114 wait_until_count_sessions too restrictive, +# random PB failures # let $wait_counter= 100; @@ -93,7 +106,7 @@ let $wait_timeout= 0; while ($wait_counter) { let $current_sessions= query_get_value(SHOW STATUS LIKE 'Threads_connected', Value, 1); - let $success= `SELECT $current_sessions = $count_sessions`; + let $success= `SELECT $current_sessions <= $count_sessions`; if ($success) { let $wait_counter= 0; @@ -107,7 +120,7 @@ while ($wait_counter) if (!$success) { --echo # Timeout in wait_until_count_sessions.inc - --echo # Number of sessions expected: $count_sessions found: $current_sessions + --echo # Number of sessions expected: < $count_sessions found: $current_sessions SHOW PROCESSLIST; } diff --git a/mysql-test/r/consistent_snapshot.result b/mysql-test/r/consistent_snapshot.result index 90606abbe4e..694c996a58e 100644 --- a/mysql-test/r/consistent_snapshot.result +++ b/mysql-test/r/consistent_snapshot.result @@ -1,15 +1,23 @@ -drop table if exists t1; -create table t1 (a int) engine=innodb; -start transaction with consistent snapshot; -insert into t1 values(1); -select * from t1; +DROP TABLE IF EXISTS t1; +# Establish connection con1 (user=root) +# Establish connection con2 (user=root) +# Switch to connection con1 +CREATE TABLE t1 (a INT) ENGINE=innodb; +START TRANSACTION WITH CONSISTENT SNAPSHOT; +# Switch to connection con2 +INSERT INTO t1 VALUES(1); +# Switch to connection con1 +SELECT * FROM t1; a -commit; -delete from t1; -start transaction; -insert into t1 values(1); -select * from t1; +COMMIT; +DELETE FROM t1; +START TRANSACTION; +# Switch to connection con2 +INSERT INTO t1 VALUES(1); +# Switch to connection con1 +SELECT * FROM t1; a 1 -commit; -drop table t1; +COMMIT; +# Switch to connection default + close connections con1 and con2 +DROP TABLE t1; diff --git a/mysql-test/r/dirty_close.result b/mysql-test/r/dirty_close.result index c4fc19a35f8..b49b72f1b95 100644 --- a/mysql-test/r/dirty_close.result +++ b/mysql-test/r/dirty_close.result @@ -1,9 +1,9 @@ -drop table if exists t1; -create table t1 (n int); -insert into t1 values (1),(2),(3); -select * from t1; +DROP TABLE IF EXISTS t1; +CREATE TABLE t1 (n INT); +INSERT INTO t1 VALUES (1),(2),(3); +SELECT * FROM t1; n 1 2 3 -drop table t1; +DROP TABLE t1; diff --git a/mysql-test/r/flush_block_commit.result b/mysql-test/r/flush_block_commit.result index d5b10868358..d2197beaaab 100644 --- a/mysql-test/r/flush_block_commit.result +++ b/mysql-test/r/flush_block_commit.result @@ -1,39 +1,57 @@ -drop table if exists t1; -create table t1 (a int) engine=innodb; -begin; -insert into t1 values(1); -flush tables with read lock; -select * from t1; +# Establish connection con1 (user=root) +# Establish connection con2 (user=root) +# Establish connection con3 (user=root) +# Switch to connection con1 +DROP TABLE IF EXISTS t1; +CREATE TABLE t1 (a INT) ENGINE=innodb; +BEGIN; +INSERT INTO t1 VALUES(1); +# Switch to connection con2 +FLUSH TABLES WITH READ LOCK; +SELECT * FROM t1; a -commit; -select * from t1; +# Switch to connection con1 +COMMIT; +# Switch to connection con2 +SELECT * FROM t1; a -unlock tables; -begin; -select * from t1 for update; +UNLOCK TABLES; +# Switch to connection con1 +# Switch to connection con1 +BEGIN; +SELECT * FROM t1 FOR UPDATE; a 1 -begin; -select * from t1 for update; -flush tables with read lock; -commit; +# Switch to connection con2 +BEGIN; +SELECT * FROM t1 FOR UPDATE; +# Switch to connection con3 +FLUSH TABLES WITH READ LOCK; +# Switch to connection con1 +COMMIT; +# Switch to connection con2 a 1 -unlock tables; -commit; -begin; -insert into t1 values(10); -flush tables with read lock; -commit; -unlock tables; -flush tables with read lock; -unlock tables; -begin; -select * from t1; +# Switch to connection con3 +UNLOCK TABLES; +# Switch to connection con2 +COMMIT; +# Switch to connection con1 +BEGIN; +INSERT INTO t1 VALUES(10); +FLUSH TABLES WITH READ LOCK; +COMMIT; +UNLOCK TABLES; +# Switch to connection con2 +FLUSH TABLES WITH READ LOCK; +UNLOCK TABLES; +BEGIN; +SELECT * FROM t1; a 1 10 -show create database test; +SHOW CREATE DATABASE test; Database Create Database test CREATE DATABASE `test` /*!40100 DEFAULT CHARACTER SET latin1 */ -drop table t1; +DROP TABLE t1; +# Switch to connection default and close connections con1, con2, con3 diff --git a/mysql-test/r/flush_block_commit_notembedded.result b/mysql-test/r/flush_block_commit_notembedded.result index 599efeb3e2d..76c55e948dd 100644 --- a/mysql-test/r/flush_block_commit_notembedded.result +++ b/mysql-test/r/flush_block_commit_notembedded.result @@ -1,15 +1,23 @@ -create table t1 (a int) engine=innodb; -reset master; -set autocommit=0; -insert t1 values (1); -flush tables with read lock; -show master status; +# Establish connection con1 (user=root) +# Establish connection con2 (user=root) +# Switch to connection con1 +CREATE TABLE t1 (a INT) ENGINE=innodb; +RESET MASTER; +SET AUTOCOMMIT=0; +INSERT t1 VALUES (1); +# Switch to connection con2 +FLUSH TABLES WITH READ LOCK; +SHOW MASTER STATUS; File Position Binlog_Do_DB Binlog_Ignore_DB master-bin.000001 98 -commit; -show master status; +# Switch to connection con1 +COMMIT; +# Switch to connection con2 +SHOW MASTER STATUS; File Position Binlog_Do_DB Binlog_Ignore_DB master-bin.000001 98 -unlock tables; -drop table t1; -set autocommit=1; +UNLOCK TABLES; +# Switch to connection con1 +DROP TABLE t1; +SET AUTOCOMMIT=1; +# Switch to connection default and close connections con1 and con2 diff --git a/mysql-test/r/flush_read_lock_kill.result b/mysql-test/r/flush_read_lock_kill.result index 6703b6bd533..b16a8b114b3 100644 --- a/mysql-test/r/flush_read_lock_kill.result +++ b/mysql-test/r/flush_read_lock_kill.result @@ -1,9 +1,12 @@ -drop table if exists t1; -create table t1 (kill_id int); -insert into t1 values(connection_id()); -flush tables with read lock; -select ((@id := kill_id) - kill_id) from t1; +SET @old_concurrent_insert= @@global.concurrent_insert; +SET @@global.concurrent_insert= 0; +DROP TABLE IF EXISTS t1; +CREATE TABLE t1 (kill_id INT); +INSERT INTO t1 VALUES(connection_id()); +FLUSH TABLES WITH READ LOCK; +SELECT ((@id := kill_id) - kill_id) FROM t1; ((@id := kill_id) - kill_id) 0 -kill connection @id; -drop table t1; +KILL CONNECTION @id; +DROP TABLE t1; +SET @@global.concurrent_insert= @old_concurrent_insert; diff --git a/mysql-test/r/lock_multi.result b/mysql-test/r/lock_multi.result index 0430d560a7a..d1b50a0080c 100644 --- a/mysql-test/r/lock_multi.result +++ b/mysql-test/r/lock_multi.result @@ -51,10 +51,10 @@ ERROR HY000: Can't execute the query because you have a conflicting read lock UNLOCK TABLES; DROP DATABASE mysqltest_1; ERROR HY000: Can't drop database 'mysqltest_1'; database doesn't exist -use mysql; +USE mysql; LOCK TABLES columns_priv WRITE, db WRITE, host WRITE, user WRITE; FLUSH TABLES; -use mysql; +USE mysql; SELECT user.Select_priv FROM user, db WHERE user.user = db.user LIMIT 1; OPTIMIZE TABLES columns_priv, db, host, user; Table Op Msg_type Msg_text @@ -65,7 +65,7 @@ mysql.user optimize status OK UNLOCK TABLES; Select_priv N -use test; +USE test; use test; CREATE TABLE t1 (c1 int); LOCK TABLE t1 WRITE; @@ -93,7 +93,7 @@ create table t1 (a int); connection: locker lock tables t1 read; connection: writer -create table t2 like t1;; +create table t2 like t1; connection: default kill query ERROR 70100: Query execution was interrupted diff --git a/mysql-test/r/mysqlbinlog.result b/mysql-test/r/mysqlbinlog.result index 4fd87861ded..83e1459b71a 100644 --- a/mysql-test/r/mysqlbinlog.result +++ b/mysql-test/r/mysqlbinlog.result @@ -349,17 +349,17 @@ DELIMITER ; ROLLBACK /* added by mysqlbinlog */; /*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/; CREATE TABLE t1 (c1 CHAR(10)); -flush logs; +FLUSH LOGS; INSERT INTO t1 VALUES ('0123456789'); -flush logs; +FLUSH LOGS; DROP TABLE t1; # Query thread_id=REMOVED exec_time=REMOVED error_code=REMOVED -flush logs; -create table t1(a int); -insert into t1 values(connection_id()); -flush logs; -drop table t1; +FLUSH LOGS; +CREATE TABLE t1(a INT); +INSERT INTO t1 VALUES(connection_id()); +FLUSH LOGS; +DROP TABLE t1; 1 -drop table t1; +DROP TABLE t1; shell> mysqlbinlog std_data/corrupt-relay-bin.000624 > var/tmp/bug31793.sql End of 5.0 tests diff --git a/mysql-test/r/read_only.result b/mysql-test/r/read_only.result index 1bf99a8ea07..4b405ddd71a 100644 --- a/mysql-test/r/read_only.result +++ b/mysql-test/r/read_only.result @@ -47,7 +47,7 @@ Note 1051 Unknown table 'ttt' drop table t1,t2; drop user test@localhost; # -# Bug #27440 read_only allows create and drop database +# Bug#27440 read_only allows create and drop database # drop database if exists mysqltest_db1; drop database if exists mysqltest_db2; diff --git a/mysql-test/r/show_check.result b/mysql-test/r/show_check.result index ad3138e80ea..70e7a95fc5b 100644 --- a/mysql-test/r/show_check.result +++ b/mysql-test/r/show_check.result @@ -507,9 +507,9 @@ ERROR 42000: Access denied for user 'mysqltest_3'@'localhost' to database 'mysql drop table mysqltest.t1; drop database mysqltest; set names binary; -delete from mysql.user +delete from mysql.user where user='mysqltest_1' || user='mysqltest_2' || user='mysqltest_3'; -delete from mysql.db +delete from mysql.db where user='mysqltest_1' || user='mysqltest_2' || user='mysqltest_3'; flush privileges; CREATE TABLE t1 (i int, KEY (i)) ENGINE=MEMORY; @@ -916,7 +916,7 @@ def TRIGGERS DEFINER Definer 252 589815 14 N 17 0 33 Trigger Event Table Statement Timing Created sql_mode Definer t1_bi INSERT t1 SET @a = 1 BEFORE NULL root@localhost ---------------------------------------------------------------- -SELECT +SELECT TRIGGER_CATALOG, TRIGGER_SCHEMA, TRIGGER_NAME, diff --git a/mysql-test/r/skip_name_resolve.result b/mysql-test/r/skip_name_resolve.result index 8ef52e75238..47741fed250 100644 --- a/mysql-test/r/skip_name_resolve.result +++ b/mysql-test/r/skip_name_resolve.result @@ -5,10 +5,10 @@ GRANT USAGE ON *.* TO 'mysqltest_1'@'127.0.0.1/255.255.255.255' GRANT ALL PRIVILEGES ON `test`.* TO 'mysqltest_1'@'127.0.0.1/255.255.255.255' REVOKE ALL ON test.* FROM mysqltest_1@'127.0.0.1/255.255.255.255'; DROP USER mysqltest_1@'127.0.0.1/255.255.255.255'; -select user(); -user() +SELECT USER(); +USER() # -show processlist; +SHOW PROCESSLIST; Id User Host db Command Time State Info root test