bzr push into mysql-trunk-merge branch (davi:3120 to 3123) WL#5486

[Davi Arnaut]

 3123 Davi Arnaut	2010-07-15
      WL#5486: Remove code for unsupported platforms
      
      Restore hack necessary to setup a libmysqld archive.

    modified:
      libmysqld/Makefile.am
 3122 Davi Arnaut	2010-07-15
      Fix tree name.

    modified:
      .bzr-mysql/default.conf
 3121 Davi Arnaut	2010-07-15
      Bug#45288: pb2 returns a lot of compilation warnings on linux
      
      Fix compiler warnings due to: a mismatch in the prototypes for
      check_access and implicit conversions from double to ulonglong
      and vice-versa.
     @ mysys/my_getopt.c
        Explicit conversion from ulonglong to double. Might need to
        be tweaked in the future.
     @ sql/sql_parse.h
        Make prototype equal to the case when not compiling under embedded.
     @ sql/sys_vars.cc
        Explicit conversion from ulonglong to double. Destination var
        is a ulonglong.
     @ sql/sys_vars.h
        Explicit conversion from ulonglong to double. Might need to
        be tweaked in the future.

    modified:
      mysys/my_getopt.c
      sql/sql_parse.h
      sql/sys_vars.cc
      sql/sys_vars.h
 3120 Georgi Kodinov	2010-07-15 [merge]
      merge

    modified:
      mysql-test/r/information_schema.result
      mysql-test/t/information_schema.test
      sql/sql_show.cc
=== modified file '.bzr-mysql/default.conf'
--- a/.bzr-mysql/default.conf	2010-07-15 13:47:50 +0000
+++ b/.bzr-mysql/default.conf	2010-07-15 18:05:08 +0000
@@ -1,4 +1,4 @@
 [MYSQL]
 post_commit_to = "commits@stripped"
 post_push_to = "commits@stripped"
-tree_name = "mysql-trunk-bugfixing"
+tree_name = "mysql-trunk-merge"

=== modified file 'libmysqld/Makefile.am'
--- a/libmysqld/Makefile.am	2010-07-15 11:13:30 +0000
+++ b/libmysqld/Makefile.am	2010-07-15 18:44:15 +0000
@@ -157,6 +157,22 @@ if DARWIN_MWCC
 	mwld -lib -o $@ libmysqld_int.a `echo $(INC_LIB) | sort -u` $(storageobjects)
 else
 	-rm -f libmysqld.a
+	current_dir=`pwd`; \
+	rm -rf tmp; mkdir tmp; \
+	(for arc in $(INC_LIB) ./libmysqld_int.a; do \
+	  arpath=`echo $$arc|sed 's|[^/]*$$||'|sed 's|\.libs/$$||'`; \
+	  artmp=`echo $$arc|sed 's|^.*/|tmp/lib-|'`; \
+	    for F in `$(AR) t $$arc | grep -v SYMDEF`; do \
+	      if test -e "$$arpath/$$F" ; then echo "$$arpath/$$F"; else \
+	        mkdir $$artmp; cd $$artmp > /dev/null; \
+	        $(AR) x ../../$$arc; \
+	        cd $$current_dir > /dev/null; \
+	        ls $$artmp/* | grep -v SYMDEF; \
+	        continue 2; fi; done; \
+	done; echo $(libmysqld_a_DEPENDENCIES) ) | sort -u | xargs $(AR) cq libmysqld.a; \
+	$(AR) r libmysqld.a $(storageobjects); \
+	$(RANLIB) libmysqld.a ; \
+	rm -rf tmp
 endif
 
 ## XXX: any time the client interface changes, we'll need to bump

=== modified file 'mysys/my_getopt.c'
--- a/mysys/my_getopt.c	2010-07-15 13:47:50 +0000
+++ b/mysys/my_getopt.c	2010-07-15 17:45:08 +0000
@@ -1032,7 +1032,7 @@ static void init_one_value(const struct
     *((ulonglong*) variable)= (ulonglong) value;
     break;
   case GET_DOUBLE:
-    *((double*) variable)=  (double) value;
+    *((double*) variable)= ulonglong2double(value);
     break;
   case GET_STR:
     /*

=== modified file 'sql/sql_parse.h'
--- a/sql/sql_parse.h	2010-06-17 13:31:51 +0000
+++ b/sql/sql_parse.h	2010-07-15 17:45:08 +0000
@@ -183,9 +183,8 @@ inline bool check_merge_table_access(THD
 inline bool check_some_routine_access(THD *thd, const char *db,
                                       const char *name, bool is_proc)
 { return false; }
-inline bool check_access(THD *thd, ulong access, const char *db,
-                         ulong *save_priv, bool no_grant, bool no_errors,
-                         bool schema_db)
+inline bool check_access(THD *, ulong, const char *, ulong *save_priv,
+                         GRANT_INTERNAL_INFO *, bool, bool)
 {
   if (save_priv)
     *save_priv= GLOBAL_ACLS;

=== modified file 'sql/sys_vars.cc'
--- a/sql/sys_vars.cc	2010-07-15 11:13:30 +0000
+++ b/sql/sys_vars.cc	2010-07-15 17:45:08 +0000
@@ -942,10 +942,10 @@ static bool update_cached_long_query_tim
 {
   if (type == OPT_SESSION)
     thd->variables.long_query_time=
-      thd->variables.long_query_time_double * 1e6;
+      double2ulonglong(thd->variables.long_query_time_double * 1e6);
   else
     global_system_variables.long_query_time=
-      global_system_variables.long_query_time_double * 1e6;
+      double2ulonglong(global_system_variables.long_query_time_double * 1e6);
   return false;
 }
 

=== modified file 'sql/sys_vars.h'
--- a/sql/sys_vars.h	2010-07-08 21:20:08 +0000
+++ b/sql/sys_vars.h	2010-07-15 17:45:08 +0000
@@ -741,13 +741,13 @@ public:
           uint deprecated_version=0, const char *substitute=0,
           int parse_flag= PARSE_NORMAL)
     : sys_var(&all_sys_vars, name_arg, comment, flag_args, off, getopt.id,
-              getopt.arg_type, SHOW_DOUBLE, def_val, lock, binlog_status_arg,
-              on_check_func, on_update_func, deprecated_version, substitute,
-              parse_flag)
+              getopt.arg_type, SHOW_DOUBLE, (longlong) double2ulonglong(def_val),
+              lock, binlog_status_arg, on_check_func, on_update_func,
+              deprecated_version, substitute, parse_flag)
   {
     option.var_type= GET_DOUBLE;
-    option.min_value= min_val;
-    option.max_value= max_val;
+    option.min_value= (longlong) double2ulonglong(min_val);
+    option.max_value= (longlong) double2ulonglong(max_val);
     global_var(double)= (double)option.def_value;
     DBUG_ASSERT(min_val < max_val);
     DBUG_ASSERT(min_val <= def_val);


Attachment: [text/bzr-bundle] bzr/[e-mail]