1. 26 Nov, 2008 1 commit
  2. 25 Nov, 2008 5 commits
  3. 24 Nov, 2008 7 commits
  4. 22 Nov, 2008 2 commits
  5. 21 Nov, 2008 11 commits
    • Ingo Struewing's avatar
      Bug#28234 - global/session scope - documentation vs implementation · f92c5731
      Ingo Struewing authored
      Several system variables did not behave like system variables should do.
      When trying to SET them or use them in SELECT, they were reported as
      "unknown system variable". But they appeared in SHOW VARIABLES.
      
      This has been fixed by removing the "fixed_vars" array of variables
      and integrating the variables into the normal system variables chain.
      All of these variables do now behave as read-only global-only
      variables. Trying to SET them tells they are read-only, trying to
      SELECT the session value tells they are global only. Selecting the
      global value works. It delivers the same value as SHOW VARIABLES.
      
      
      mysql-test/r/variables-notembedded.result:
        Bug#28234 - global/session scope - documentation vs implementation
        New test result.
      mysql-test/r/variables.result:
        Bug#28234 - global/session scope - documentation vs implementation
        New test result.
      mysql-test/t/variables-notembedded.test:
        Bug#28234 - global/session scope - documentation vs implementation
        Added a test for each moved variable that is not present in an
        embedded server.
      mysql-test/t/variables.test:
        Bug#28234 - global/session scope - documentation vs implementation
        Added a test for each moved variable that is also present in an
        embedded server.
      sql/item_func.cc:
        Bug#28234 - global/session scope - documentation vs implementation
        Added SHOW_BOOL to some Item_func_get_system_var methods.
      sql/set_var.cc:
        Bug#28234 - global/session scope - documentation vs implementation
        Moved all variables from the "fixed_vars" array into the normal
        system variables chain by using the new variable class sys_var_const.
        Removed the fixed_show_vars array and its initialization in
        enumerate_sys_vars().
        Removed mysql_append_static_vars(), which added fixed_vars arrays
        to the fixed_show_vars array.
      sql/set_var.h:
        Bug#28234 - global/session scope - documentation vs implementation
        Added the new system variable class sys_var_const.
        Removed declaration of mysql_append_static_vars().
      sql/slave.cc:
        Bug#28234 - global/session scope - documentation vs implementation
        Moved the definition of show_slave_skip_errors() from sql_repl.cc
        to here and renamed it to print_slave_skip_errors().
        Changed print_slave_skip_errors() to create a static buffer with
        a printable version of the error numbers set.
        Added a call of print_slave_skip_errors() to init_slave_skip_errors().
      sql/slave.h:
        Bug#28234 - global/session scope - documentation vs implementation
        Added declaration of slave_skip_error_names.
      sql/sql_repl.cc:
        Bug#28234 - global/session scope - documentation vs implementation
        Moved all variables from the "fixed_vars" array into the normal
        system variables chain by using the new variable class sys_var_const.
        Moved the definition of show_slave_skip_errors() to slave.cc and
        modified it to compute the string once at server initialization only.
        Removed the call to mysql_append_static_vars().
      f92c5731
    • Horst Hunger's avatar
      Due to merges. · f5890962
      Horst Hunger authored
      f5890962
    • Horst Hunger's avatar
      caf29020
    • Alexey Botchkov's avatar
      warning of notused function fixed · 3f2044cd
      Alexey Botchkov authored
      3f2044cd
    • Ramil Kalimullin's avatar
      Auto-merge · 1b8a4c57
      Ramil Kalimullin authored
      1b8a4c57
    • Ramil Kalimullin's avatar
      Auto-merge · bb38a57a
      Ramil Kalimullin authored
      bb38a57a
    • Sergey Glukhov's avatar
      null merge · aba0e5a9
      Sergey Glukhov authored
      aba0e5a9
    • Sergey Glukhov's avatar
      Bug#34760 Character set autodetection appears to fail · bd6376f1
      Sergey Glukhov authored
      the problem is the same as reported in bug#20835,
      so the fix is backport of bug#20835 patch.
      
      
      mysql-test/r/subselect.result:
        test result
      mysql-test/t/subselect.test:
        test case
      bd6376f1
    • Vladislav Vaintroub's avatar
      ff5685d7
    • Ramil Kalimullin's avatar
      Fix for bug#36772: When using UTF8, CONVERT with GROUP BY · 39efef85
      Ramil Kalimullin authored
      returns truncated results
      
      Problem: performig conversion from {INT, DECIMAL, REAL} to CHAR
      we incorrectly set its max length in some cases that may lead
      to truncated results returned.
      
      Fix: properly set CONVERT({INT, DECIMAL, REAL}, CHAR) result's
      max length.
      
      
      mysql-test/r/ctype_utf8.result:
        Fix for bug#36772: When using UTF8, CONVERT with GROUP BY
        returns truncated results
          - test result.
      mysql-test/t/ctype_utf8.test:
        Fix for bug#36772: When using UTF8, CONVERT with GROUP BY
        returns truncated results
          - test case.
      sql/item_timefunc.cc:
        Fix for bug#36772: When using UTF8, CONVERT with GROUP BY
        returns truncated results
          - calculating Item_char_typecast::max_length use initial
        argument's charset mbmaxlen instead of from_cs->mbmaxlen,
        as from_cs may differ in some case (see comment above).
      39efef85
    • Vladislav Vaintroub's avatar
      merge · 0b98b897
      Vladislav Vaintroub authored
      0b98b897
  6. 20 Nov, 2008 6 commits
    • Chad MILLER's avatar
      Merge update for bug 39178 fix. · 75a6be98
      Chad MILLER authored
      75a6be98
    • Chad MILLER's avatar
      Update to change for bug 39178. Revert error-handling change, perhaps · 490bc421
      Chad MILLER authored
      temporarily if yassl maintainer has plans for other error handling.
      490bc421
    • Ramil Kalimullin's avatar
      Fix for bug#40770: Server Crash when running with triggers including · c3dc1d6d
      Ramil Kalimullin authored
      variable settings (rpl_sys)
      
      Problem: under certain conditions (e.g. user variables usage in triggers)
      accessing a user defined variable we may use a variables hash table that
      belongs to already deleted thread. It happens if
      thd= new THD;
      has the same address as just deleted thd as we use
      if (stored_thd == thd)
      to check.
      That may lead to unpredictable results, server crash etc.
      
      Fix: use thread_id instead of thd address to distinguish threads.
      
      Note: no simple and repeatable test case.
      
      
      sql/item_func.cc:
        Fix for bug#40770: Server Crash when running with triggers including
        variable settings (rpl_sys)
          - store and use thd->thread_id to distinguish threads instead of
        thread address as it may be the same as just deleted thread had, 
        i.e. we may get (old_thd == new_thd) after
        delete old_thd;
        new_thd= new THD;
          - set entry_thread_id only when we get a real entry, clear it 
        if the hash search fails.
      sql/item_func.h:
        Fix for bug#40770: Server Crash when running with triggers including
        variable settings (rpl_sys)
          - Item_func_set_user_var::entry_thread_id introduced.
      c3dc1d6d
    • Ramil Kalimullin's avatar
      Null-merge · 4f597b14
      Ramil Kalimullin authored
      4f597b14
    • Ramil Kalimullin's avatar
      Fix for bug#40875: Memory leak in FEDERATED handler · 1cd8b9f7
      Ramil Kalimullin authored
      Problem: memory leak occurs when we open a federated table
      that has its share in the hash.
      
      Fix: free not used memory.
      
      Note: the fix should NOT be merged to 5.1 (the code changed).
      
      
      sql/ha_federated.cc:
        Fix for bug#40875: Memory leak in FEDERATED handler
          - free memory (tmp_share.scheme) allocated in the parse_url()
        if it isn't used anymore.
      1cd8b9f7
    • Staale Smedseng's avatar
      A fix for Bug#22891 "session level max_allowed_packet can be · e5ae4e23
      Staale Smedseng authored
      set but is ignored".
                                        
      This patch makes @@session.max_allowed_packed and
      @@session.net_buffer_length read-only as suggested in the bug
      report. The user will have to use SET GLOBAL (and reconnect)
      to alter the session values of these variables.
                                  
      The error string ER_VARIABLE_IS_READONLY is introduced.
                                  
      Tests are modified accordingly.
      
      
      sql/set_var.cc:
        The class sys_var_thd_ulong_session_readonly is introduced as
        a specialization of sys_var_thd_ulong implementing a read-only
        session variable. The class overrides check() and
        check_default() to achieve the read-only property for the
        session part of the variable.
      sql/set_var.h:
        The class sys_var_thd_ulong_session_readonly is introduced as
        a specialization of sys_var_thd_ulong implementing a read-only
        session variable. The class overrides check() and
        check_default() to achieve the read-only property for the
        session part of the variable.
      sql/share/errmsg.txt:
        New error ER_VARIABLE_IS_READONLY.
      e5ae4e23
  7. 19 Nov, 2008 5 commits
    • Vladislav Vaintroub's avatar
      Bug#39494 : key_buffer_size > 4GB does not work on 64 bit Windows · 09ac30f6
      Vladislav Vaintroub authored
      Cache size  is truncated via 32bit ulong  in  ha_init_key_cache() and 
      ha_resize_key_cache() 
      
      This change fixes the cast to size_t instead of ulong. This cast is safe,
      because key_buffer_size parameter is limited to SIZE_T_MAX
      09ac30f6
    • Alexey Botchkov's avatar
      Bug#38293 Libmysqld crash in mysql_library_init if language file missing · 36c4b37b
      Alexey Botchkov authored
         additional fix - the 'debug' keyword removed
      36c4b37b
    • Alexey Botchkov's avatar
      merging · 9ac2f960
      Alexey Botchkov authored
      9ac2f960
    • Alexey Botchkov's avatar
      Bug#38293 Libmysqld crash in mysql_library_init if language file missing · 4d3f05b0
      Alexey Botchkov authored
          That's a Win-specific error.
          When we create libmysqld.dll we have many libraries like mysys, dbug,
          strings, etc linked into that dll, so the application built upon
          this library shouldn't link these libraries to itself, rather use
          those inside the dll.
      
          Fixed by redirecting calls into the libmysqld.dll
      
      per-file comments:
        dbug/dbug.c
      Bug#38293 Libmysqld crash in mysql_library_init if language file missing
          fake _db_something definitions added
      
        include/my_dbug.h
      Bug#38293 Libmysqld crash in mysql_library_init if language file missing
        fake _db_something declarations added
      
        libmysqld/examples/CMakeLists.txt
      Bug#38293 Libmysqld crash in mysql_library_init if language file missing
          superfluous libraries removed from linking
      
        libmysqld/libmysqld.def
      Bug#38293 Libmysqld crash in mysql_library_init if language file missing
          set of mysys functions added to the export section
      4d3f05b0
    • Alexey Botchkov's avatar
      merging · 2512923c
      Alexey Botchkov authored
      2512923c
  8. 18 Nov, 2008 3 commits
    • Chad MILLER's avatar
      Merge fix for bug 39178. · c720394e
      Chad MILLER authored
      c720394e
    • Chad MILLER's avatar
      Bug#39178: non-RSA keys in connection to a RSA-keyed yaSSL-using server \ · 480046c5
      Chad MILLER authored
      		using crashes server
      
      When the server is configured to use a RSA key, and when the client sends
      a cipher-suite list that contains a non-RSA key as acceptable, the server 
      would try to process that key even though it was impossible.
      
      Now, yaSSL sets its own acceptable-cipher list according to what kind of
      key the server is started with, and will never explore and try to pair 
      impossible combinations.
      
      This involves a partial import of the current YaSSL tree, not the whole
      thing, so as to try to avoid introducing new bugs.
      
      (Updated to avoid many whitespace changes and make diff smaller.)
      480046c5
    • Sergey Vojtovich's avatar
      Merge. · ca1ad1c5
      Sergey Vojtovich authored
      ca1ad1c5