automake fix

[packages/mysql.git] / mysql-userstatv2.patch

diff --git a/mysql-userstatv2.patch b/mysql-userstatv2.patch
index 6eb4e3d97fd531f85f8d033b4317e058eb671a3e..d2f5fe69d97a7c6dee965cc19ac20e50d2b9e004 100644 (file)
--- a/mysql-userstatv2.patch
+++ b/mysql-userstatv2.patch
@@ -1147,39 +1147,6 @@ diff -ruN a/netware/Makefile.in b/netware/Makefile.in
  LIBS = @LIBS@
  LIBTOOL = @LIBTOOL@
  LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -ruN a/os2/Makefile.in b/os2/Makefile.in
---- a/os2/Makefile.in  Wed Jul 29 13:33:34 2009 -0700
-+++ b/os2/Makefile.in  Wed Jul 29 13:34:11 2009 -0700
-@@ -156,6 +156,7 @@
- LIBDL = @LIBDL@
- LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
- LIBOBJS = @LIBOBJS@
-+LIBRT = @LIBRT@
- LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
- LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -ruN a/os2/include/Makefile.in b/os2/include/Makefile.in
---- a/os2/include/Makefile.in  Wed Jul 29 13:33:34 2009 -0700
-+++ b/os2/include/Makefile.in  Wed Jul 29 13:34:11 2009 -0700
-@@ -156,6 +156,7 @@
- LIBDL = @LIBDL@
- LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
- LIBOBJS = @LIBOBJS@
-+LIBRT = @LIBRT@
- LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
- LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -ruN a/os2/include/sys/Makefile.in b/os2/include/sys/Makefile.in
---- a/os2/include/sys/Makefile.in      Wed Jul 29 13:33:34 2009 -0700
-+++ b/os2/include/sys/Makefile.in      Wed Jul 29 13:34:11 2009 -0700
-@@ -144,6 +144,7 @@
- LIBDL = @LIBDL@
- LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
- LIBOBJS = @LIBOBJS@
-+LIBRT = @LIBRT@
- LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
- LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
 diff -ruN /dev/null b/patch_info/userstats.info
 --- /dev/null  Thu Jan 01 00:00:00 1970 +0000
 +++ b/patch_info/userstats.info        Wed Jul 29 13:34:11 2009 -0700
@@ -2365,9 +2332,8 @@ diff -ruN a/sql/sql_lex.h b/sql/sql_lex.h
    /* This should be the last !!! */
    SQLCOM_END
  };
-diff -ruN a/sql/sql_parse.cc b/sql/sql_parse.cc
---- a/sql/sql_parse.cc Wed Jul 29 13:33:34 2009 -0700
-+++ b/sql/sql_parse.cc Wed Jul 29 13:34:11 2009 -0700
+--- mysql-5.0.96/sql/sql_parse.cc~     2012-05-08 23:53:39.000000000 +0300
++++ mysql-5.0.96/sql/sql_parse.cc      2012-05-09 00:06:42.467315321 +0300
 @@ -78,6 +78,12 @@
                               const char *table_name);
  static bool check_show_create_table_access(THD *thd, TABLE_LIST *table);
@@ -3036,7 +3002,7 @@ diff -ruN a/sql/sql_parse.cc b/sql/sql_parse.cc
        return TRUE;
      }
      /*
-@@ -6472,6 +6954,30 @@
+@@ -6993,6 +6993,31 @@
    lex_start(thd);
    mysql_reset_thd_for_next_command(thd);
  
@@ -3053,7 +3019,7 @@ diff -ruN a/sql/sql_parse.cc b/sql/sql_parse.cc
 +
 +  if (opt_userstat_running) {
 +#ifdef HAVE_CLOCK_GETTIME
-+    /* get start cputime */ 
++    /* get start cputime */
 +    if (!(cputime_error = clock_gettime(CLOCK_THREAD_CPUTIME_ID, &tp)))
 +      start_cpu_nsecs = tp.tv_sec*1000000000.0+tp.tv_nsec;
 +#endif
@@ -3064,7 +3030,8 @@ diff -ruN a/sql/sql_parse.cc b/sql/sql_parse.cc
 +    }
 +  }
 +
-   if (query_cache_send_result_to_client(thd, (char*) inBuf, length) <= 0)
++
+   if (query_cache_send_result_to_client(thd, rawbuf, length) <= 0)
    {
      LEX *lex= thd->lex;
 @@ -6550,6 +7056,43 @@
@@ -3487,9 +3454,8 @@ diff -ruN a/sql/sql_prepare.cc b/sql/sql_prepare.cc
    DBUG_VOID_RETURN;
  }
  
-diff -ruN a/sql/sql_show.cc b/sql/sql_show.cc
---- a/sql/sql_show.cc  Wed Jul 29 13:33:34 2009 -0700
-+++ b/sql/sql_show.cc  Wed Jul 29 13:34:11 2009 -0700
+--- mysql-5.0.92/sql/sql_show.cc~      2011-02-24 15:55:10.000000000 +0200
++++ mysql-5.0.92/sql/sql_show.cc       2011-02-24 15:56:28.993570019 +0200
 @@ -540,6 +540,7 @@
                sctx->master_access);
    if (!(db_access & DB_ACLS) && (!grant_option || check_grant_db(thd,dbname)))
@@ -3877,13 +3843,13 @@ diff -ruN a/sql/sql_show.cc b/sql/sql_show.cc
  
  /*
    Description of ST_FIELD_INFO in table.h
-@@ -4504,6 +4870,8 @@
+@@ -4906,6 +4906,8 @@
  {
-   {"CHARACTER_SETS", charsets_fields_info, create_schema_table, 
+   {"CHARACTER_SETS", charsets_fields_info, create_schema_table,
     fill_schema_charsets, make_character_sets_old_format, 0, -1, -1, 0},
 +  {"CLIENT_STATISTICS", client_stats_fields_info, create_schema_table, 
 +    fill_schema_client_stats, make_old_format, 0, -1, -1, 0},
-   {"COLLATIONS", collation_fields_info, create_schema_table, 
+   {"COLLATIONS", collation_fields_info, create_schema_table,
     fill_schema_collation, make_old_format, 0, -1, -1, 0},
    {"COLLATION_CHARACTER_SET_APPLICABILITY", coll_charset_app_fields_info,
 @@ -4512,6 +4880,8 @@
@@ -3895,7 +3861,7 @@ diff -ruN a/sql/sql_show.cc b/sql/sql_show.cc
    {"KEY_COLUMN_USAGE", key_column_usage_fields_info, create_schema_table,
      get_all_tables, 0, get_schema_key_column_usage_record, 4, 5, 0},
    {"OPEN_TABLES", open_tables_fields_info, create_schema_table,
-@@ -4537,10 +4907,14 @@
+@@ -4941,10 +4943,14 @@
     get_all_tables, make_table_names_old_format, 0, 1, 2, 1},
    {"TABLE_PRIVILEGES", table_privileges_fields_info, create_schema_table,
      fill_schema_table_privileges, 0, 0, -1, -1, 0},
@@ -3903,13 +3869,13 @@ diff -ruN a/sql/sql_show.cc b/sql/sql_show.cc
 +    fill_schema_table_stats, make_old_format, 0, -1, -1, 0},
    {"TRIGGERS", triggers_fields_info, create_schema_table,
     get_all_tables, make_old_format, get_schema_triggers_record, 5, 6, 0},
-   {"USER_PRIVILEGES", user_privileges_fields_info, create_schema_table, 
+   {"USER_PRIVILEGES", user_privileges_fields_info, create_schema_table,
      fill_schema_user_privileges, 0, 0, -1, -1, 0},
 +  {"USER_STATISTICS", user_stats_fields_info, create_schema_table, 
 +    fill_schema_user_stats, make_old_format, 0, -1, -1, 0},
    {"VARIABLES", variables_fields_info, create_schema_table, fill_variables,
     make_old_format, 0, -1, -1, 1},
-   {"VIEWS", view_fields_info, create_schema_table, 
+   {"VIEWS", view_fields_info, create_schema_table,
 diff -ruN a/sql/sql_update.cc b/sql/sql_update.cc
 --- a/sql/sql_update.cc        Wed Jul 29 13:33:34 2009 -0700
 +++ b/sql/sql_update.cc        Wed Jul 29 13:34:11 2009 -0700