Commit c43a7e2e authored by unknown's avatar unknown
Browse files

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
parents 61938527 3bf3bb20

.bzrignore

+3 −0
Original line number Diff line number Diff line
@@ -1269,3 +1269,6 @@ vio/viotest.cpp 
zlib/*.ds?

zlib/*.vcproj

libmysqld/ha_blackhole.cc

client/my_user.c

libmysqld/my_user.c

sql/my_user.c

client/Makefile.am

+5 −2
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ mysqltestmanager_pwgen_SOURCES = mysqlmanager-pwgen.c 
mysqltestmanagerc_SOURCES=      mysqlmanagerc.c $(yassl_dummy_link_fix)

mysqlcheck_SOURCES=             mysqlcheck.c $(yassl_dummy_link_fix)

mysqlshow_SOURCES=              mysqlshow.c $(yassl_dummy_link_fix)

mysqldump_SOURCES=              mysqldump.c $(yassl_dummy_link_fix)

mysqldump_SOURCES=              mysqldump.c my_user.c $(yassl_dummy_link_fix)

mysqlimport_SOURCES=            mysqlimport.c $(yassl_dummy_link_fix)

sql_src=log_event.h mysql_priv.h log_event.cc my_decimal.h my_decimal.cc

strings_src=decimal.c
@@ -62,7 +62,10 @@ link_sources: 
        for f in $(strings_src) ; do \

          rm -f $(srcdir)/$$f; \

          @LN_CP_F@ $(top_srcdir)/strings/$$f $$f; \

         done;

         done; \

         rm -f $(srcdir)/my_user.c; \

         @LN_CP_F@ $(top_srcdir)/sql-common/my_user.c my_user.c;

	



# Don't update the files from bitkeeper

%::SCCS/s.%

client/mysqldump.c

+32 −3
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ 


#include <my_global.h>

#include <my_sys.h>

#include <my_user.h>

#include <m_string.h>

#include <m_ctype.h>

#include <hash.h>
@@ -1840,9 +1841,37 @@ static void dump_triggers_for_table (char *table, char *db) 
DELIMITER ;;\n");

  while ((row= mysql_fetch_row(result)))

  {

    fprintf(sql_file, "/*!50003 SET SESSION SQL_MODE=\"%s\" */;;\n\

/*!50003 CREATE TRIGGER %s %s %s ON %s FOR EACH ROW%s%s */;;\n\n",

            row[6], /* sql_mode */

    fprintf(sql_file,

            "/*!50003 SET SESSION SQL_MODE=\"%s\" */;;\n"

            "/*!50003 CREATE */ ",

            row[6] /* sql_mode */);



    if (mysql_num_fields(result) > 7)

    {

      /*

        mysqldump can be run against the server, that does not support definer

        in triggers (there is no DEFINER column in SHOW TRIGGERS output). So,

        we should check if we have this column before accessing it.

      */



      uint       user_name_len;

      char       user_name_str[USERNAME_LENGTH + 1];

      char       quoted_user_name_str[USERNAME_LENGTH * 2 + 3];

      uint       host_name_len;

      char       host_name_str[HOSTNAME_LENGTH + 1];

      char       quoted_host_name_str[HOSTNAME_LENGTH * 2 + 3];

    

      parse_user(row[7], strlen(row[7]), user_name_str, &user_name_len,

                 host_name_str, &host_name_len);



      fprintf(sql_file,

              "/*!50017 DEFINER=%s@%s */ ",

              quote_name(user_name_str, quoted_user_name_str, FALSE),

              quote_name(host_name_str, quoted_host_name_str, FALSE));

    }



    fprintf(sql_file,

            "/*!50003 TRIGGER %s %s %s ON %s FOR EACH ROW%s%s */;;\n\n",

            quote_name(row[0], name_buff, 0), /* Trigger */

            row[4], /* Timing */

            row[1], /* Event */

client/mysqltest.c

+1102 −841

File changed.

Preview size limit exceeded, changes collapsed.

config/ac-macros/yassl.m4

+3 −1
Original line number Diff line number Diff line
@@ -30,7 +30,9 @@ AC_DEFUN([MYSQL_CHECK_YASSL], [ 
        ;;

    esac

    AC_SUBST([yassl_taocrypt_extra_cxxflags])



    # Link extra/yassl/include/openssl subdir to include/

    yassl_h_ln_cmd="\$(LN) -s \$(top_srcdir)/extra/yassl/include/openssl openssl"

    AC_SUBST(yassl_h_ln_cmd)

  else

    yassl_dir=""

    AC_MSG_RESULT(no)