• unknown's avatar
    Fix for bug #4508 "CONVERT_TZ() function with new time zone as param crashes server". · 68d7b266
    unknown authored
    Instead of trying to open time zone tables during calculation of CONVERT_TZ() function
    or setting of @@time_zone variable we should open and lock them with the rest of 
    statement's table (so we should add them to global table list) and after that use such 
    pre-opened tables for loading info about time zones.
    
    
    mysql-test/r/timezone2.result:
      Added test for bug #4508
    mysql-test/t/timezone2.test:
      Added test for bug #4508
    scripts/mysql_create_system_tables.sh:
      Added one more test time zone to time zone tables which is needed for test for bug #4508.
    sql/item_create.cc:
      CONVERT_TZ() now is treated as special function.
    sql/item_create.h:
      CONVERT_TZ() now is treated as special function.
    sql/item_timefunc.cc:
      Item_func_convert_tz now uses list of pre-opened time zone tables instead of trying to
      open them ad-hoc. Also it avoid calling of current_thd.
    sql/item_timefunc.h:
      Added comment describing special nature of CONVERT_TZ() function.
      Optimization: Added own fix_fields() method and tz_tables member for caching pointer
      to list of open time zone tables to Item_func_convert_tz class.
    sql/lex.h:
      CONVERT_TZ() now is treated as special function.
    sql/mysql_priv.h:
      Removed function which is no longer used.
    sql/set_var.cc:
      Now my_tz_find() accepts list of pre-opened time zone tables as last argument 
      and no longer needs pointer to current THD.
    sql/set_var.h:
      Exported sys_time_zone, which is now used in sql_yacc.yy for quick finding out if we are
      setting @@time_zone variable.
    sql/sql_base.cc:
      Moved propagation of pointers to open tables from global list to local select lists to
      open_and_lock_tables(), also added implicit usage of time zone tables as condition for
      such propagation.
    sql/sql_lex.cc:
      Added fake_time_zone_tables_list which is used to indicate that time zone tables are
      implicitly used in statement.
      st_select_lex_unit::create_total_list(): if time zone tables are implicitly used in
      statement add them to global tables list.
    sql/sql_lex.h:
      Added LEX::time_zone_tables_used member which is used to indicate that time zone tables 
      are implicitly used in this statement (by pointing to fake_time_zone_table_list) and 
      for holding pointer to those tables after they've been opened.
    sql/sql_parse.cc:
      We should also create global table list if statement uses time zone tables implicitly.
      Added initialization of LEX::time_zone_tables_used to mysql_query_init().
    sql/sql_prepare.cc:
      We should also create global table list if statement uses time zone tables implicitly.
    sql/sql_select.cc:
      Removed functions which are no longer used.
    sql/sql_yacc.yy:
      CONVERT_TZ() and @@time_zone variable are handled in special way since they implicitly 
      use time zone tables.
    sql/tztime.cc:
      Fix for bug #4508 "CONVERT_TZ() function with new time zone as param crashes server".
      If statement uses CONVERT_TZ() function or @@time_zone variable is set then it implicitly
      uses time zone tables. We need to open and lock such tables with all other tables of 
      such statement.
      
      All code responsible for opening table was removed from tz_load_from_db() and function was 
      renamed to tz_load_from_open_tables() (which uses list of pre-opened tables).
      We also have new functions for construction and initialization of table list of time
      zone tables.
      my_tz_find() now always require list of pre-opened time zone tables and no longer needs
      current THD. So we have to pre-open them in my_tz_init().
      Also now we try to open time zone tables only if they were found during startup.
    sql/tztime.h:
      New function for construction of table list of time zone tables my_tz_get_table_list().
      Now my_tz_find() requires list of pre-pened time zone tables instead of current thread.
    68d7b266
item_create.h 5.79 KB