1. 12 Mar, 2008 1 commit
    • unknown's avatar
      Bug#26703: DROP DATABASE fails if database contains a #mysql50# \ · b5978a94
      unknown authored
      	table with backticks
      
      (Thanks to Lu Jingdong, though I did not take his patch directly, as
      it contained a significant flaw.)
      
      It wasn't a backtick/parsing problem.  We merely didn't anticipate
      and allocate enough space to handle the optional "#mysql50#" table-
      name prefix. 
      
      Now, allocate that extra space in case we need it when we look up 
      a legacy table to get its file's name.
      
      
      mysql-test/r/drop.result:
        Verify that databases with old-style files can be removed.
      mysql-test/t/drop.test:
        Verify that databases with old-style files can be removed.
      sql/sql_db.cc:
        Extend the size of the memory that holds the table's name, so that
        the legacy "mysql50" prefix fits.
      b5978a94
  2. 06 Mar, 2008 1 commit
    • unknown's avatar
      Bug#28269: FEDERATED engine fails to quote reserved words for \ · b2a68038
      unknown authored
      	field names
      
      Add a test that proves the bug is fixed.  This doesn't add any
      new server code.
      
      
      mysql-test/r/federated.result:
        Verifying that one can use federated with keyword and bizarre 
        column names.
      mysql-test/t/federated.test:
        Verifying that one can use federated with keyword and bizarre 
        column names.
        
        Eval interprets one level of backslash escaping, so some of this 
        may look strange.
      b2a68038
  3. 05 Mar, 2008 9 commits
    • unknown's avatar
      Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug34726/my51-bug34726 · 5521666f
      unknown authored
      into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-build
      
      
      sql/sql_class.cc:
        Auto merged
      5521666f
    • unknown's avatar
      Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug#33464/my51-bug#33464 · f6d51ae7
      unknown authored
      into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-build
      
      
      mysql-test/r/grant.result:
        Auto merged
      mysql-test/t/grant.test:
        Auto merged
      f6d51ae7
    • unknown's avatar
      Move test that has more to do with grants than DROP. We shouldn't have · 2eb67908
      unknown authored
      grant warnings on embedded server.
      
      
      mysql-test/r/drop.result:
        Move test that has more to do with grants than DROP.
      mysql-test/r/grant.result:
        Move test that has more to do with grants than DROP.
      mysql-test/t/drop.test:
        Move test that has more to do with grants than DROP.
      mysql-test/t/grant.test:
        Move test that has more to do with grants than DROP.
      2eb67908
    • unknown's avatar
      Bug#34726: open_tables() crashes server if running with --debug · b6595704
      unknown authored
      The DBUG code emits the current value of the proc_info member of THD,
      which may be set to NULL.  It was wrong to dereference that value
      with the format string %s without verifying that it was valid.
      
      Now, insert an inline test that substitutes the string "(null)" for
      NULL pointers.
      
      
      sql/sql_class.cc:
        Dereferencing a NULL is illegal (though not fatal for %s on some 
        platforms), and we have no assurance that the caller didn't call us 
        with a valid string.
      b6595704
    • unknown's avatar
      Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug#33464/my51-bug#33464 · 97fc6931
      unknown authored
      into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-build
      
      
      sql/sql_acl.cc:
        Auto merged
      97fc6931
    • unknown's avatar
      Bug#33464: DROP FUNCTION caused a crash · 2b7dda9e
      unknown authored
      The cause of the crash is an assertion failure that we do not emit 
      an error message (grant not found) and then return "ok".  The 
      assertion is valid, and we were ignoring the buggy behavior prior 
      to the "Diagnostics" result-verification.
      
      Use an error handler to mutate innocuous missing-grant errors, when 
      removing routines, into warnings.
      
      
      mysql-test/r/drop.result:
        Show that the crash disappears.  Also prepare for the larger bug to
        be fixed with only minor changes to this test.
      mysql-test/t/drop.test:
        Show that the crash disappears.  Also prepare for the larger bug to
        be fixed with only minor changes to this test.
      sql/sql_acl.cc:
        Disable a segment of code that makes a faulty assumption
        about the existence of a routine's defining user, until that 
        assumption becomes true.
        
        Push a new handler onto the error-handler stack, so that when 
        removing a routine, a missing ACL grant is now a warning
        instead of an error.  If any unexpected error is raised then tell
        the caller.
      2b7dda9e
    • unknown's avatar
      Merge trift2.:/MySQL/M50/push-5.0 · 6a8190b8
      unknown authored
      into  trift2.:/MySQL/M51/push-5.1
      
      
      configure.in:
        Auto merged
      6a8190b8
    • unknown's avatar
      Merge trift2.:/MySQL/M51/mysql-5.1 · 00ee3b45
      unknown authored
      into  trift2.:/MySQL/M51/push-5.1
      
      
      configure.in:
        Auto merged
      00ee3b45
    • unknown's avatar
      Merge trift2.:/MySQL/M50/mysql-5.0 · 1cddfc2f
      unknown authored
      into  trift2.:/MySQL/M50/push-5.0
      
      
      configure.in:
        Auto merged
      1cddfc2f
  4. 03 Mar, 2008 4 commits
  5. 29 Feb, 2008 4 commits
  6. 28 Feb, 2008 9 commits
    • unknown's avatar
      Merge buzz.(none):/home/davi/mysql-5.0-runtime · 05480a88
      unknown authored
      into  buzz.(none):/home/davi/mysql-5.1-runtime
      
      
      mysql-test/r/ps.result:
        Auto merged
      mysql-test/t/limit.test:
        Auto merged
      mysql-test/t/ps.test:
        Auto merged
      sql/item.h:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/item.cc:
        Auto merged
      mysql-test/suite/rpl/r/rpl_user_variables.result:
        Manual merge
      mysql-test/suite/rpl/t/rpl_user_variables.test:
        Manual merge
      sql/sql_yacc.yy:
        Manual merge
      05480a88
    • unknown's avatar
      Post-merge fix for Bug 33851. The initialization order of members · 8b779456
      unknown authored
      must match the order which they were declared in the class definition. 
      
      
      sql/item.cc:
        Fix initialization order, parameter was the last one declared.
      8b779456
    • unknown's avatar
      Merge alf.(none):/src/macro_bugs/my50-macro_bugs · d01042ad
      unknown authored
      into  alf.(none):/src/macro_bugs/my51-macro_bugs
      
      
      d01042ad
    • unknown's avatar
      Merge alf.(none):/src/mysql-5.0-build · aeb3bd3c
      unknown authored
      into  alf.(none):/src/macro_bugs/my50-macro_bugs
      
      
      aeb3bd3c
    • unknown's avatar
      Merge alf.(none):/src/mysql-5.1-build · dba489e6
      unknown authored
      into  alf.(none):/src/macro_bugs/my51-macro_bugs
      
      
      dba489e6
    • unknown's avatar
      Bug#34655 Compile error · 33a4e760
      unknown authored
      Rename client_last_error to last_error and client_last_errno to last_errno
      to not break connectors which use the internal net structure for error handling.
      
      
      include/mysql_com.h:
        Rename client_last_error to last_error, client_last_errno to last_errno.
      include/mysql_h.ic:
        Rename client_last_error to last_error, client_last_errno to last_errno.
      libmysql/libmysql.c:
        Rename client_last_error to last_error, client_last_errno to last_errno.
      libmysql/manager.c:
        Rename client_last_error to last_error, client_last_errno to last_errno.
      libmysqld/lib_sql.cc:
        Rename client_last_error to last_error, client_last_errno to last_errno.
      libmysqld/libmysqld.c:
        Rename client_last_error to last_error, client_last_errno to last_errno.
      server-tools/instance-manager/mysql_connection.cc:
        Rename client_last_error to last_error, client_last_errno to last_errno.
      sql/log_event.cc:
        Rename client_last_error to last_error, client_last_errno to last_errno.
      sql-common/client.c:
        Rename client_last_error to last_error, client_last_errno to last_errno.
      sql/log_event_old.cc:
        Rename client_last_error to last_error, client_last_errno to last_errno.
      sql/net_serv.cc:
        Rename client_last_error to last_error, client_last_errno to last_errno.
      sql/repl_failsafe.cc:
        Rename client_last_error to last_error, client_last_errno to last_errno.
      33a4e760
    • unknown's avatar
      Bug#33851 Passing UNSIGNED param to EXECUTE returns ERROR 1210 · 1164e2bc
      unknown authored
      The problem is that passing anything other than a integer to a limit
      clause in a prepared statement would fail. This limitation was introduced
      to avoid replication problems (e.g: replicating the statement with a
      string argument would cause a parse failure in the slave).
      
      The solution is to convert arguments to the limit clause to a integer
      value and use this converted value when persisting the query to the log.
      
      
      mysql-test/r/limit.result:
        Update test case result.
      mysql-test/r/ps.result:
        Add test case result for Bug#33851
      mysql-test/r/rpl_user_variables.result:
        Test case result for replication of prepared statement with
        limit clause.
      mysql-test/t/limit.test:
        Test parameters to limit clause.
      mysql-test/t/ps.test:
        Add test case for Bug#33851
      mysql-test/t/rpl_user_variables.test:
        Test replication of a parameter which value is converted.
      sql/item.cc:
        Convert value to integer if it's a parameter to a limit clause.
      sql/item.h:
        Flag signal that item is a parameter to a limit clause.
      sql/item_func.cc:
        Const member functions, object is not mutated.
      sql/sql_class.h:
        Const member functions, object is not mutated.
      sql/sql_yacc.yy:
        Flag that item is a parameter to a limit clause.
      1164e2bc
    • unknown's avatar
      Disable test case due to Bug#34891: sp_notembedded.test fails · 944f2599
      unknown authored
      sporadically.
      
      
      mysql-test/r/sp_notembedded.result:
        Disable test case.
      mysql-test/t/sp_notembedded.test:
        Disable test case.
      944f2599
    • unknown's avatar
      Fix for Bug#34852: SHOW OPEN TABLES output is not repeatable · ce7b8e12
      unknown authored
      (show_check.test fails sporadically).
      
      Fix test case for Bug#12183 to make it stable.
      
      
      mysql-test/r/show_check.result:
        Fix result file.
      mysql-test/t/show_check.test:
        Make test case for Bug#12183 stable.
      ce7b8e12
  7. 27 Feb, 2008 9 commits
  8. 26 Feb, 2008 3 commits
    • unknown's avatar
      ha_ndbcluster.m4: · e45057ea
      unknown authored
        Use MYSQL_NUMERIC_VERSION, to make sure NDB_VERSION_BUILD is numeric
      
      
      config/ac-macros/ha_ndbcluster.m4:
        Use MYSQL_NUMERIC_VERSION, to make sure NDB_VERSION_BUILD is numeric
      e45057ea
    • unknown's avatar
      Merge mysql.com:/home/kent/bk/build/mysql-5.0-build · 11135184
      unknown authored
      into  mysql.com:/home/kent/bk/build/mysql-5.1-build
      
      
      config/ac-macros/misc.m4:
        Auto merged
      configure.in:
        Auto merged
      BitKeeper/deleted/.del-openssl.m4~41cebd0ba8281769:
        Auto merged
      storage/ndb/src/common/util/SocketServer.cpp:
        Auto merged
      11135184
    • unknown's avatar
      Makefile.am, Info.plist.sh: · 1aaa63aa
      unknown authored
        Use MYSQL_NUMERIC_VERSION, only three numbers separated with dot
      misc.m4, character_sets.m4, openssl.m4:
        Removed unneded semicolon
      
      
      config/ac-macros/character_sets.m4:
        Removed unneded semicolon
      config/ac-macros/misc.m4:
        Removed unneded semicolon
      config/ac-macros/openssl.m4:
        Removed unneded semicolon
      support-files/MacOSX/Info.plist.sh:
        Use MYSQL_NUMERIC_VERSION, only three numbers separated with dot
      support-files/MacOSX/Makefile.am:
        Use MYSQL_NUMERIC_VERSION, only three numbers separated with dot
      1aaa63aa