[Commits] bzr commit into Mariadb 5.2, with Maria 2.0:maria/5.2 branch (knielsen:2785)

5 May 2010

#At lp:maria/5.2

 2785 knielsen@knielsen-hq.org	2010-05-05 [merge]
      Automerge mariadb 5.1 -> mariadb 5.2
      modified:
        .bzr-mysql/default.conf
        extra/libevent/event-internal.h
        extra/yassl/taocrypt/src/algebra.cpp
        sql/hash_filo.cc
        sql/mf_iocache.cc
        sql/mysqld.cc
        sql/repl_failsafe.cc
        sql/sql_base.cc
        sql/sql_parse.cc
        sql/sql_repl.cc
        storage/maria/ma_loghandler.c
        storage/pbxt/src/locklist_xt.cc
        storage/pbxt/src/pbms_enabled.cc
        storage/xtradb/include/univ.i
        storage/xtradb/sync/sync0sync.c
        strings/ctype-utf8.c

=== modified file '.bzr-mysql/default.conf'

--- a/.bzr-mysql/default.conf	2010-03-15 11:51:23 +0000
+++ b/.bzr-mysql/default.conf	2010-05-05 13:12:14 +0000
@@ -1,6 +1,6 @@
 [MYSQL]
 tree_location = lp:maria/5.2
-post_commit_to = maria-developers@lists.launchpad.net
+post_commit_to = commits@mariadb.org
 post_commit_url = lp:maria/5.2
 tree_name = maria/5.2
 project_name = "Mariadb 5.2, with Maria 2.0"

=== modified file 'extra/libevent/event-internal.h'
--- a/extra/libevent/event-internal.h	2009-10-31 05:29:16 +0000
+++ b/extra/libevent/event-internal.h	2010-04-09 10:39:27 +0000
@@ -74,7 +74,6 @@ struct event_base {
    Copyright (c) 1991, 1993, The Regents of the University of California.
    All rights reserved.
 */
-#define	TAILQ_EMPTY(head)		((head)->tqh_first == NULL)
 #define	TAILQ_FIRST(head)		((head)->tqh_first)
 #define	TAILQ_END(head)			NULL
 #define	TAILQ_NEXT(elm, field)		((elm)->field.tqe_next)

=== modified file 'extra/yassl/taocrypt/src/algebra.cpp'
--- a/extra/yassl/taocrypt/src/algebra.cpp	2009-02-13 16:41:47 +0000
+++ b/extra/yassl/taocrypt/src/algebra.cpp	2010-04-21 00:25:59 +0000
@@ -18,7 +18,6 @@
 
 /* based on Wei Dai's algebra.cpp from CryptoPP */
 #undef  NDEBUG
-#define DEBUG   // GCC 4.0 bug if NDEBUG and Optimize > 1
 
 #include "runtime.hpp"
 #include "algebra.hpp"

=== modified file 'sql/hash_filo.cc'
--- a/sql/hash_filo.cc	2006-12-31 00:02:27 +0000
+++ b/sql/hash_filo.cc	2010-04-21 00:25:59 +0000
@@ -25,3 +25,8 @@
 
 #include "mysql_priv.h"
 #include "hash_filo.h"
+
+#ifdef __WIN__
+// Remove linker warning 4221 about empty file
+namespace { char dummy; };
+#endif // __WIN__

=== modified file 'sql/mf_iocache.cc'
--- a/sql/mf_iocache.cc	2007-10-11 17:29:09 +0000
+++ b/sql/mf_iocache.cc	2010-04-21 00:25:59 +0000
@@ -85,6 +85,12 @@ int _my_b_net_read(register IO_CACHE *in
 }
 
 } /* extern "C" */
+
+#elif defined(__WIN__)
+
+// Remove linker warning 4221 about empty file
+namespace { char dummy; };
+
 #endif /* HAVE_REPLICATION */
 
 

=== modified file 'sql/mysqld.cc'
--- a/sql/mysqld.cc	2010-04-08 17:19:01 +0000
+++ b/sql/mysqld.cc	2010-05-05 13:12:14 +0000
@@ -2683,9 +2683,11 @@ bugs.\n");
 
 end:
 #ifndef __WIN__
+  /* Terminate */
   exit(1);
 #else
-  /* On Windows, do not terminate, but pass control to the exception filter */;
+  /* On Windows, do not terminate, but pass control to exception filter */
+  ;
 #endif
 }
 

=== modified file 'sql/repl_failsafe.cc'
--- a/sql/repl_failsafe.cc	2010-01-22 10:58:21 +0000
+++ b/sql/repl_failsafe.cc	2010-04-21 00:25:59 +0000
@@ -1036,5 +1036,10 @@ err:
   return error;
 }
 
+#elif defined(__WIN__)
+
+// Remove linker warning 4221 about empty file
+namespace { char dummy; };
+
 #endif /* HAVE_REPLICATION */
 

=== modified file 'sql/sql_base.cc'
--- a/sql/sql_base.cc	2010-03-25 13:33:39 +0000
+++ b/sql/sql_base.cc	2010-05-05 13:12:14 +0000
@@ -233,8 +233,12 @@ static void check_unused(void)
 uint create_table_def_key(THD *thd, char *key, TABLE_LIST *table_list,
                           bool tmp_table)
 {
-  uint key_length= (uint) (strmov(strmov(key, table_list->db)+1,
-                                  table_list->table_name)-key)+1;
+  char *db_end= strnmov(key, table_list->db, MAX_DBKEY_LENGTH - 2);
+  *db_end++= '\0';
+  char *table_end= strnmov(db_end, table_list->table_name,
+                           key + MAX_DBKEY_LENGTH - 1 - db_end);
+  *table_end++= '\0';
+  uint key_length= (uint) (table_end-key);
   if (tmp_table)
   {
     int4store(key + key_length, thd->server_id);

=== modified file 'sql/sql_parse.cc'
--- a/sql/sql_parse.cc	2010-04-08 12:10:05 +0000
+++ b/sql/sql_parse.cc	2010-05-05 13:12:14 +0000
@@ -1240,10 +1240,12 @@ bool dispatch_command(enum enum_server_c
     break;
 #else
   {
-    char *fields, *packet_end= packet + packet_length, *arg_end;
+    char *fields, *packet_end= packet + packet_length, *wildcard;
     /* Locked closure of all tables */
     TABLE_LIST table_list;
-    LEX_STRING conv_name;
+    char db_buff[NAME_LEN+1];
+    uint32 db_length;
+    uint dummy_errors;
 
     /* used as fields initializator */
     lex_start(thd);
@@ -1255,11 +1257,22 @@ bool dispatch_command(enum enum_server_c
     /*
       We have name + wildcard in packet, separated by endzero
     */
-    arg_end= strend(packet);
-    thd->convert_string(&conv_name, system_charset_info,
-			packet, (uint) (arg_end - packet), thd->charset());
-    table_list.alias= table_list.table_name= conv_name.str;
-    packet= arg_end + 1;
+    wildcard= strend(packet);
+    db_length= wildcard - packet;
+    wildcard++;
+    uint query_length= (uint) (packet_end - wildcard); // Don't count end \0
+    if (db_length > NAME_LEN || query_length > NAME_LEN)
+    {
+      my_message(ER_UNKNOWN_COM_ERROR, ER(ER_UNKNOWN_COM_ERROR), MYF(0));
+      break;
+    }
+    db_length= copy_and_convert(db_buff, sizeof(db_buff)-1,
+                                system_charset_info, packet, db_length,
+                                thd->charset(), &dummy_errors);
+    db_buff[db_length]= '\0';
+    table_list.alias= table_list.table_name= db_buff;
+    if (!(fields= (char *) thd->memdup(wildcard, query_length + 1)))
+      break;
 
     if (is_schema_db(table_list.db, table_list.db_length))
     {
@@ -1268,9 +1281,6 @@ bool dispatch_command(enum enum_server_c
         table_list.schema_table= schema_table;
     }
 
-    uint query_length= (uint) (packet_end - packet); // Don't count end \0
-    if (!(fields= (char *) thd->memdup(packet, query_length + 1)))
-      break;
     thd->set_query(fields, query_length);
     general_log_print(thd, command, "%s %s", table_list.table_name, fields);
     if (lower_case_table_names)

=== modified file 'sql/sql_repl.cc'
--- a/sql/sql_repl.cc	2010-03-04 08:03:07 +0000
+++ b/sql/sql_repl.cc	2010-04-21 00:25:59 +0000
@@ -1835,6 +1835,11 @@ int init_replication_sys_vars()
   return 0;
 }
 
+#elif defined(__WIN__)
+
+// Remove linker warning 4221 about empty file
+namespace { char dummy; };
+
 #endif /* HAVE_REPLICATION */
 
 

=== modified file 'storage/maria/ma_loghandler.c'
--- a/storage/maria/ma_loghandler.c	2010-04-08 09:52:53 +0000
+++ b/storage/maria/ma_loghandler.c	2010-05-05 13:12:14 +0000
@@ -1460,8 +1460,9 @@ LSN translog_get_file_max_lsn_stored(uin
 
   {
     LOGHANDLER_FILE_INFO info;
-    File fd= open_logfile_by_number_no_cache(file);
+    File fd;
     LINT_INIT_STRUCT(info);
+    fd= open_logfile_by_number_no_cache(file);
     if ((fd < 0) ||
         (translog_read_file_header(&info, fd) | my_close(fd, MYF(MY_WME))))
     {

=== modified file 'storage/pbxt/src/locklist_xt.cc'
--- a/storage/pbxt/src/locklist_xt.cc	2009-08-17 11:12:36 +0000
+++ b/storage/pbxt/src/locklist_xt.cc	2010-04-21 00:25:59 +0000
@@ -186,5 +186,10 @@ void xt_trace_thread_locks(XTThread *sel
 	}
 }
 
+#elif defined(__WIN__)
+
+// Remove linker warning 4221 about empty file
+namespace { char dummy; };
+
 #endif
 

=== modified file 'storage/pbxt/src/pbms_enabled.cc'
--- a/storage/pbxt/src/pbms_enabled.cc	2009-11-24 10:55:06 +0000
+++ b/storage/pbxt/src/pbms_enabled.cc	2010-04-21 00:25:59 +0000
@@ -241,4 +241,9 @@ void pbms_completed(TABLE *table, bool o
 	 return ;
 }
 
+#elif defined(__WIN__)
+
+// Remove linker warning 4221 about empty file
+namespace { char dummy; };
+
 #endif // PBMS_ENABLED

=== modified file 'storage/xtradb/include/univ.i'
--- a/storage/xtradb/include/univ.i	2010-01-15 15:58:25 +0000
+++ b/storage/xtradb/include/univ.i	2010-04-21 00:25:59 +0000
@@ -290,7 +290,7 @@ management to ensure correct alignment f
 /* The 2-logarithm of UNIV_PAGE_SIZE: */
 #define UNIV_PAGE_SIZE_SHIFT	14
 /* The universal page size of the database */
-#define UNIV_PAGE_SIZE		(1 << UNIV_PAGE_SIZE_SHIFT)
+#define UNIV_PAGE_SIZE		(1u << UNIV_PAGE_SIZE_SHIFT)
 
 /* Maximum number of parallel threads in a parallelized operation */
 #define UNIV_MAX_PARALLELISM	32

=== modified file 'storage/xtradb/sync/sync0sync.c'
--- a/storage/xtradb/sync/sync0sync.c	2010-01-06 12:00:14 +0000
+++ b/storage/xtradb/sync/sync0sync.c	2010-04-21 00:25:59 +0000
@@ -423,8 +423,11 @@ mutex_set_waiters(
 	mutex_t*	mutex,	/*!< in: mutex */
 	ulint		n)	/*!< in: value to set */
 {
+#ifndef INNODB_RW_LOCKS_USE_ATOMICS
 	volatile ulint*	ptr;		/* declared volatile to ensure that
 					the value is stored to memory */
+#endif
+
 	ut_ad(mutex);
 
 #ifdef INNODB_RW_LOCKS_USE_ATOMICS

=== modified file 'strings/ctype-utf8.c'
--- a/strings/ctype-utf8.c	2010-04-01 09:04:26 +0000
+++ b/strings/ctype-utf8.c	2010-05-05 13:12:14 +0000
@@ -4114,6 +4114,10 @@ my_wc_mb_filename(CHARSET_INFO *cs __att
 {
   int code;
   char hex[]= "0123456789abcdef";
+
+  if (s >= e)
+    return MY_CS_TOOSMALL;
+
   if (wc < 128 && filename_safe_char[wc])
   {
     *s= (uchar) wc;

    

knielsen＠knielsen-hq.org

tags

participants (1)