1. 01 Jul, 2010 1 commit
  2. 25 Jun, 2010 1 commit
    • Georgi Kodinov's avatar
      Bug #53095: SELECT column_name FROM INFORMATION_SCHEMA.STATISTICS · 3e1a4707
      Georgi Kodinov authored
      returns nothing
            
      When looking for table or database names inside INFORMATION_SCHEMA
      we must convert the table and database names to lowercase (just as it's
      done in the rest of the server) when lowercase_table_names is non-zero.
      This will allow us to find the same tables that we would find if there
      is no condition.
      
      Fixed by converting to lower case when extracting the database and 
      table name conditions.
      Test case added.
      3e1a4707
  3. 04 Jul, 2010 2 commits
    • unknown's avatar
      Postfix for bug#48321 · fd0eb0c1
      unknown authored
      Some test cases set ANSI_QUOTES in sql_mode.
      So we have to use single quotes to quote literal strings.
      fd0eb0c1
    • unknown's avatar
      The following statements support the CURRENT_USER() where a user is needed. · 1a17d7e8
      unknown authored
      DROP USER 
      RENAME USER CURRENT_USER() ...
      GRANT ... TO CURRENT_USER()
      REVOKE ... FROM CURRENT_USER()
      ALTER DEFINER = CURRENT_USER() EVENTbut, When these statements are binlogged, CURRENT_USER() just is binlogged
      as 'CURRENT_USER()', it is not expanded to the real user name. When slave 
      executes the log event, 'CURRENT_USER()' is expand to the user of slave 
      SQL thread, but SQL thread's user name always NULL. This breaks the replication.
      
      After this patch, session's user will be written into query log events 
      if these statements call CURREN_USER() or 'ALTER EVENT' does not assign a definer.
      
      
      mysql-test/include/diff_tables.inc:
        Expend its abilities.
        Now it can diff not only in sessions of 'master' and 'slave', but 
        other sessions as well.
      sql/log_event.cc:
        session's user will be written into Query_log_event, if is_current_user_used() is TRUE.
        On slave SQL thread, Only thd->invoker is written into Query_log_event,
        if it exists.
      sql/sql_acl.cc:
        On slave SQL thread, grantor should copy from thd->invoker, if it exists
      sql/sql_class.h:
        On slave SQL thread, thd->invoker is used to store the applying event's
        invoker.
      1a17d7e8
  4. 03 Jul, 2010 1 commit
  5. 02 Jul, 2010 5 commits
    • Davi Arnaut's avatar
      Bug#53445: Build with -Wall and fix warnings that it generates · 0300935f
      Davi Arnaut authored
      If bzero is not available, resort to memset. Also, remove dead
      bzero.c
      0300935f
    • Davi Arnaut's avatar
      Bug#53445: Build with -Wall and fix warnings that it generates · 0eb26fdf
      Davi Arnaut authored
      Apart strict-aliasing warnings, fix the remaining warnings
      generated by GCC 4.4.4 -Wall and -Wextra flags.
      
      One major source of warnings was the in-house function my_bcmp
      which (unconventionally) took pointers to unsigned characters
      as the byte sequences to be compared. Since my_bcmp and bcmp
      are deprecated functions whose only difference with memcmp is
      the return value, every use of the function is replaced with
      memcmp as the special return value wasn't actually being used
      by any caller.
      
      There were also various other warnings, mostly due to type
      mismatches, missing return values, missing prototypes, dead
      code (unreachable) and ignored return values.
      
      BUILD/SETUP.sh:
        Remove flags that are implied by -Wall and -Wextra.
        Do not warn about unused parameters in C++.
      BUILD/check-cpu:
        Print only the compiler version instead of verbose banner.
        Although the option is gcc specific, the check was only
        being used for GCC specific checks anyway.
      client/mysql.cc:
        bcmp is no longer defined.
      client/mysqltest.cc:
        Pass a string to function expecting a format string.
        Replace use of bcmp with memcmp.
      cmd-line-utils/readline/Makefile.am:
        Always define _GNU_SOURCE when compiling GNU readline.
        Required to make certain prototypes visible.
      cmd-line-utils/readline/input.c:
        Condition for the code to be meaningful.
      configure.in:
        Remove check for bcmp.
      extra/comp_err.c:
        Use appropriate type.
      extra/replace.c:
        Replace use of bcmp with memcmp.
      extra/yassl/src/crypto_wrapper.cpp:
        Do not ignore the return value of fgets. Retrieve the file
        position if fgets succeed -- if it fails, the function will
        bail out and return a error.
      extra/yassl/taocrypt/include/blowfish.hpp:
        Use a single array instead of accessing positions of the sbox_
        through a subscript to pbox_.
      extra/yassl/taocrypt/include/runtime.hpp:
        One definition of such functions is enough.
      extra/yassl/taocrypt/src/aes.cpp:
        Avoid potentially ambiguous conditions.
      extra/yassl/taocrypt/src/algebra.cpp:
        Rename arguments to avoid shadowing related warnings.
      extra/yassl/taocrypt/src/blowfish.cpp:
        Avoid potentially ambiguous conditions.
      extra/yassl/taocrypt/src/integer.cpp:
        Do not define type within a anonymous union.
        Use a variable to return a value instead of
        leaving the result in a register -- compiler
        does not know the logic inside the asm.
      extra/yassl/taocrypt/src/misc.cpp:
        Define handler for pure virtual functions.
        Remove unused code.
      extra/yassl/taocrypt/src/twofish.cpp:
        Avoid potentially ambiguous conditions.
      extra/yassl/testsuite/test.hpp:
        Function must have C language linkage.
      include/m_string.h:
        Remove check which relied on bcmp being defined -- they weren't
        being used as bcmp is only visible when _BSD_SOURCE is defined.
      include/my_bitmap.h:
        Remove bogus helpers which were used only in a few files and
        were causing warnings about dead code.
      include/my_global.h:
        Due to G++ bug, always silence false-positive uninitialized
        variables warnings when compiling C++ code with G++.
        Remove bogus helper.
      libmysql/Makefile.shared:
        Remove built-in implementation of bcmp.
      mysql-test/lib/My/SafeProcess/safe_process.cc:
        Cast pid to largest possible type for a process identifier.
      mysys/mf_loadpath.c:
        Leave space of the ending nul.
      mysys/mf_pack.c:
        Replace bcmp with memcmp.
      mysys/my_bitmap.c:
        Dead code removal.
      mysys/my_gethwaddr.c:
        Remove unused variable.
      mysys/my_getopt.c:
        Silence bogus uninitialized variable warning.
        Do not cast away the constant qualifier.
      mysys/safemalloc.c:
        Cast to expected type.
      mysys/thr_lock.c:
        Silence bogus uninitialized variable warning.
      sql/field.cc:
        Replace bogus helper with a more appropriate logic which is
        used throughout the code.
      sql/item.cc:
        Remove bogus logical condition which always evaluates to TRUE.
      sql/item_create.cc:
        Simplify code to avoid signedness related warnings.
      sql/log_event.cc:
        Replace use of bcmp with memcmp.
        No need to use helpers for simple bit operations.
      sql/log_event_old.cc:
        Replace bmove_align with memcpy.
      sql/mysqld.cc:
        Move use declaration of variable to the ifdef block where it
        is used. Remove now-unnecessary casts and arguments.
      sql/set_var.cc:
        Replace bogus helpers with simple and classic bit operations.
      sql/slave.cc:
        Cast to expected type and silence bogus warning.
      sql/sql_class.h:
        Don't use enum values as bit flags, the supposed type safety is
        bogus as the combined bit flags are not a value in the enumeration.
      sql/udf_example.c:
        Only declare variable when necessary.
      sql/unireg.h:
        Replace use of bmove_align with memcpy.
      storage/innobase/os/os0file.c:
        Silence bogus warning.
      storage/myisam/mi_open.c:
        Remove bogus cast, DBUG_DUMP expects a pointer to unsigned
        char.
      storage/myisam/mi_page.c:
        Remove bogus cast, DBUG_DUMP expects a pointer to unsigned
        char.
      strings/bcmp.c:
        Remove built-in bcmp.
      strings/ctype-ucs2.c:
        Silence bogus warning.
      tests/mysql_client_test.c:
        Use a appropriate type as expected by simple_command().
      0eb26fdf
    • Georgi Kodinov's avatar
      merge · 7b216887
      Georgi Kodinov authored
      7b216887
    • Georgi Kodinov's avatar
      merge · a3746b1c
      Georgi Kodinov authored
      a3746b1c
    • Georgi Kodinov's avatar
      merge · ecc2d279
      Georgi Kodinov authored
      ecc2d279
  6. 01 Jul, 2010 2 commits
    • Alexey Kopytov's avatar
      Automerge. · 82b8bc6e
      Alexey Kopytov authored
      82b8bc6e
    • Alexey Kopytov's avatar
      Bug#54667: Unnecessary signal handler redefinition · f3ccf506
      Alexey Kopytov authored
      POSIX requires that a signal handler defined with sigaction()
      is not reset on delivering a signal unless SA_NODEFER or
      SA_RESETHAND is set. It is therefore unnecessary to redefine
      the handler on signal delivery on platforms where sigaction()
      is used without those flags.
      
      include/my_alarm.h:
        Renamed DONT_REMEMBER_SIGNAL ->
        SIGNAL_HANDLER_RESET_ON_DELIVERY.
      include/my_global.h:
        Renamed DONT_REMEMBER_SIGNAL ->
        SIGNAL_HANDLER_RESET_ON_DELIVERY. The latter is now defined
        only on non-BSD platforms missing the POSIX sigaction()
        function.
      libmysql/libmysql.c:
        Renamed DONT_REMEMBER_SIGNAL ->
        SIGNAL_HANDLER_RESET_ON_DELIVERY
      mysys/thr_alarm.c:
        Renamed DONT_REMEMBER_SIGNAL ->
        SIGNAL_HANDLER_RESET_ON_DELIVERY
      sql/mysqld.cc:
        Renamed DONT_REMEMBER_SIGNAL ->
        SIGNAL_HANDLER_RESET_ON_DELIVERY
      f3ccf506
  7. 30 Jun, 2010 2 commits
    • Sergey Glukhov's avatar
      Bug#51431 Wrong sort order after import of dump file · 1c538876
      Sergey Glukhov authored
      The problem is that QUICK_SELECT_DESC behaviour depends
      on used_key_parts value which can be bigger than selected
      best_key_parts value if an engine supports clustered key.
      But used_key_parts is overwritten with best_key_parts
      value that prevents from correct selection of index
      access method. The fix is to preserve used_key_parts
      value for further use in QUICK_SELECT_DESC.
      
      
      mysql-test/r/innodb_mysql.result:
        test case
      mysql-test/t/innodb_mysql.test:
        test case
      sql/sql_select.cc:
        preserve used_key_parts value for further use in QUICK_SELECT_DESC
      1c538876
    • Staale Smedseng's avatar
      Bug #53899 Wrong mysql_stmt_errno() after connection loss with · 18388d21
      Staale Smedseng authored
      automatic reconnect
      
      A client with automatic reconnect enabled will see the error
      message "Lost connection to MySQL server during query" if the
      connection is lost between mysql_stmt_prepare() and
      mysql_stmt_execute(). The mysql_stmt_errno() number, however,
      is 0 -- not the corresponding value 2013.
      
      This patch checks for the case where the prepared statement
      has been pruned due to a connection loss (i.e., stmt->mysql
      has been set to NULL) during a call to cli_advanced_command(),
      and avoids changing the last_errno to the result of the last
      reconnect attempt.
      18388d21
  8. 29 Jun, 2010 1 commit
  9. 28 Jun, 2010 5 commits
    • Luis Soares's avatar
    • Davi Arnaut's avatar
      bfd3b7a1
    • Davi Arnaut's avatar
      407b68bf
    • Davi Arnaut's avatar
      Bug#54457: Test suite broken for 32-bit build · 715bac92
      Davi Arnaut authored
      The default value of the myisam_max_extra_sort_file_size could be
      higher than the maximum accepted value, leading to warnings upon
      the server start.
      
      The solution is to simply set the value to the maximum value in a
      32-bit built (2147483647, one less than the current). This should
      be harmless as the option is currently unused in 5.1.
      
      include/myisam.h:
        Remove now-unused macro.
      sql/mysqld.cc:
        Set max value to INT_MAX32.
      715bac92
    • Davi Arnaut's avatar
      Bug#54041: MySQL 5.0.92 fails when tests from Connector/C suite run · e42d9085
      Davi Arnaut authored
      The problem was that a user could supply supply data in chunks
      via the COM_STMT_SEND_LONG_DATA command to prepared statement
      parameter other than of type TEXT or BLOB. This posed a problem
      since other parameter types aren't setup to handle long data,
      which would lead to a crash when attempting to use the supplied
      data.
      
      Given that long data can be supplied at any stage of a prepared
      statement, coupled with the fact that the type of a parameter
      marker might change between consecutive executions, the solution
      is to validate at execution time each parameter marker for which
      a data stream was provided. If the parameter type is not TEXT or
      BLOB (that is, if the type is not able to handle a data stream),
      a error is returned.
      
      sql/sql_prepare.cc:
        Before converting the parameter data stream, check the type
        compatibility.
      tests/mysql_client_test.c:
        Add test case.
      e42d9085
  10. 27 Jun, 2010 2 commits
    • Alfranio Correia's avatar
      77854696
    • unknown's avatar
      The following statements support the CURRENT_USER() where a user is needed. · 451cea3f
      unknown authored
      DROP USER 
      RENAME USER CURRENT_USER() ...
      GRANT ... TO CURRENT_USER()
      REVOKE ... FROM CURRENT_USER()
      ALTER DEFINER = CURRENT_USER() EVENTbut, When these statements are binlogged, CURRENT_USER() just is binlogged
      as 'CURRENT_USER()', it is not expanded to the real user name. When slave 
      executes the log event, 'CURRENT_USER()' is expand to the user of slave 
      SQL thread, but SQL thread's user name always NULL. This breaks the replication.
      
      After this patch, session's user will be written into query log events 
      if these statements call CURREN_USER() or 'ALTER EVENT' does not assign a definer.
      
      
      mysql-test/include/diff_tables.inc:
        Expend its abilities.
        Now it can diff not only in sessions of 'master' and 'slave', but 
        other sessions as well.
      mysql-test/include/rpl_diff_tables.inc:
        Diff the same table between master and slaves.
      sql/log_event.cc:
        session's user will be written into Query_log_event, if is_current_user_used() is TRUE.
        On slave SQL thread, Only thd->variables.current_user is written into Query_log_event,
        if it exists.
      sql/sql_acl.cc:
        On slave SQL thread, grantor should copy from thd->variables.current_user, if it exists
      sql/sql_class.h:
        On slave SQL thread, thd->variables.current_user is used to store the applying event's
        invoker.
      451cea3f
  11. 26 Jun, 2010 1 commit
    • Jon Olav Hauglid's avatar
      Bug #54360 Deadlock DROP/ALTER/CREATE DATABASE with open HANDLER · b4593605
      Jon Olav Hauglid authored
      This deadlock happened if DROP DATABASE was blocked due to an open
      HANDLER table from a different connection. While DROP DATABASE
      is blocked, it holds the LOCK_mysql_create_db mutex. This results
      in a deadlock if the connection with the open HANDLER table tries
      to execute a CREATE/ALTER/DROP DATABASE statement as they all
      try to acquire LOCK_mysql_create_db.
      
      This patch makes this deadlock scenario very unlikely by closing and
      marking for re-open all HANDLER tables for which there are pending
      conflicing locks, before LOCK_mysql_create_db is acquired.
      However, there is still a very slight possibility that a connection
      could access one of these HANDLER tables between closing/marking for
      re-open and the acquisition of LOCK_mysql_create_db.
      
      This patch is for 5.1 only, a separate and complete fix will be
      made for 5.5+.
      
      Test case added to schema.test.
      b4593605
  12. 25 Jun, 2010 2 commits
    • Georgi Kodinov's avatar
      merge · 8fc01031
      Georgi Kodinov authored
      8fc01031
    • Sergey Glukhov's avatar
      Bug#54422 query with = 'variables' · 2a86768e
      Sergey Glukhov authored
      During creation of the table list of
      processed tables hidden I_S table 'VARIABLES'
      is erroneously added into the table list.
      it leads to ER_UNKNOWN_TABLE error in
      TABLE_LIST::add_table_to_list() function.
      The fix is to skip addition of hidden I_S
      tables into the table list.
      
      
      mysql-test/r/information_schema.result:
        test case
      mysql-test/t/information_schema.test:
        test case
      sql/sql_show.cc:
        The fix is to skip addition of hidden I_S
        tables into the table list.
      2a86768e
  13. 24 Jun, 2010 5 commits
    • Ramil Kalimullin's avatar
      a515a9ed
    • Martin Hansson's avatar
      Bug#41660: Sort-index_merge for non-first join table may · 2b734bbe
      Martin Hansson authored
      require O(#scans) memory
      
      When an index merge operation was restarted, it would
      re-allocate the Unique object controlling the duplicate row
      ID elimination. Fixed by making the Unique object a member
      of QUICK_INDEX_MERGE_SELECT and thus reusing it throughout
      the lifetime of this object.
      2b734bbe
    • Ramil Kalimullin's avatar
      Automerge. · f4420a3b
      Ramil Kalimullin authored
      f4420a3b
    • Alexey Kopytov's avatar
      Automerge. · 4b2e7aa1
      Alexey Kopytov authored
      4b2e7aa1
    • Ramil Kalimullin's avatar
      Fix for bug #54459: Assertion failed: param.sort_length, · 4e872863
      Ramil Kalimullin authored
      file .\filesort.cc, line 149 (part II)
      
      Problem: the server didn't disregard sort order 
      for some zero length tuples.
      
      Fix: skip sort order in such a case 
      (zero length NOT NULL string functions).
      
      
      mysql-test/r/select.result:
        Fix for bug #54459: Assertion failed: param.sort_length, 
        file .\filesort.cc, line 149 (part II)
          - test result.
      mysql-test/t/select.test:
        Fix for bug #54459: Assertion failed: param.sort_length, 
        file .\filesort.cc, line 149 (part II)
          - test case.
      sql/sql_select.cc:
        Fix for bug #54459: Assertion failed: param.sort_length, 
        file .\filesort.cc, line 149 (part II)
          - disregard sort order for zero length NOT NULL string functions
        along with zero length NOT NULL fields.
      4e872863
  14. 22 Jun, 2010 1 commit
    • Alexey Kopytov's avatar
      Bug#54477: Crash on IN / CASE with NULL arguments · 0e656039
      Alexey Kopytov authored
      Incorrect handling of NULL arguments could lead to a crash on
      the IN or CASE operations when either NULL arguments were
      passed explicitly as arguments (IN) or implicitly generated by
      the WITH ROLLUP modifier (both IN and CASE).
      
      Item_func_case::find_item() assumed all necessary comparators
      to be instantiated in fix_length_and_dec(). However, in the
      presence of WITH ROLLUP modifier, arguments could be
      substituted with an Item_null leading to an "unexpected"
      STRING_RESULT comparator being invoked.
      
      In addition to the problem identical to the above,
      Item_func_in::val_int() could crash even with explicitly passed
      NULL arguments due to an optimization in fix_length_and_dec()
      leading to NULL arguments being ignored during comparators
      creation.
      
      
      mysql-test/r/func_in.result:
        Test cases for bug#54477.
      mysql-test/t/func_in.test:
        Test cases for bug#54477.
      sql/item_cmpfunc.cc:
        Added additional checks for Item_nulls in 
        Item_func_case::find_item() and Item_func_in::val_int().
      0e656039
  15. 21 Jun, 2010 1 commit
    • Sergey Glukhov's avatar
      Bug#50389 Using intersect does not return all rows · b36a0282
      Sergey Glukhov authored
      In process of record search it is not taken into account
      that inital quick->file->ref value could be inapplicable
      to range interval. After proper row is found this value is
      stored into the record buffer and later the record is
      filtered out at condition evaluation stage.
      The fix is store a refernce of found row to the handler ref field.
      
      
      mysql-test/r/innodb_mysql.result:
        test case
      mysql-test/std_data/intersect-bug50389.tsv:
        test case
      mysql-test/t/innodb_mysql.test:
        test case
      sql/opt_range.cc:
        store a refernce of found row to the handler ref field.
      b36a0282
  16. 19 Jun, 2010 1 commit
    • Ramil Kalimullin's avatar
      Fix for bug #54575: crash when joining tables with unique set column · 1614c3c1
      Ramil Kalimullin authored
      Problem: a flaw (derefencing a NULL pointer) in the LIKE optimization
      code may lead to a server crash in some rare cases.
      
      Fix: check the pointer before its dereferencing.
      
      
      mysql-test/r/func_like.result:
        Fix for bug #54575: crash when joining tables with unique set column
          - test result.
      mysql-test/t/func_like.test:
        Fix for bug #54575: crash when joining tables with unique set column
          - test case.
      sql/item_cmpfunc.cc:
        Fix for bug #54575: crash when joining tables with unique set column
          - check res2 buffer pointer before its dereferencing 
        as it may be NULL in some cases.
      1614c3c1
  17. 18 Jun, 2010 1 commit
    • Ramil Kalimullin's avatar
      Fix for bug #54393: crash and/or valgrind errors in · 5088fb13
      Ramil Kalimullin authored
      mysql_client_binlog_statement
      
      Problem: server may read from unassigned memory performing
      "wrong" BINLOG queries.
      
      Fix: never read from unassigned memory.
      
      
      mysql-test/suite/binlog/r/binlog_base64_flag.result:
        Fix for bug #54393: crash and/or valgrind errors in
        mysql_client_binlog_statement
          - test result.
      mysql-test/suite/binlog/t/binlog_base64_flag.test:
        Fix for bug #54393: crash and/or valgrind errors in
        mysql_client_binlog_statement
          - test case.
      sql/sql_binlog.cc:
        Fix for bug #54393: crash and/or valgrind errors in
        mysql_client_binlog_statement
          - coded_len should not count trailing '/0';
          - never read from unassigned memory.
      5088fb13
  18. 17 Jun, 2010 4 commits
  19. 15 Jun, 2010 2 commits
    • Joerg Bruehe's avatar
      Fix bug#27072: RPM autostarts the server · b3eac87c
      Joerg Bruehe authored
      This is the fix for 5.1, where only the behaviour on upgrade is changed:
      If the server was stopped when the upgrade begins, we assume the
      administrator is taking manual action, so we do not start the (new)
      server at the end of the upgrade.
      We still install the start/stop script, so it will be started on reboot.
      
      
      support-files/mysql.spec.sh:
        In the "pre" section of the spec file, check the server status, and write
        the result to a file.
        In the "post" section, evaluate the status file, and start the server if
        it was running during status analysis.
        In 5.1, we start the server if there is no status file (which will happen
        on first installation, when there is no data directory yet).
      b3eac87c
    • Alexey Kopytov's avatar
      Backport of the patch for bug52208 to 5.1 since the · d2e58e4e
      Alexey Kopytov authored
      root cause of 52208 resulted in another test failure
      in 5.1.
      d2e58e4e