Changed to use my_global.h

Fixed problem with LIKE with latin1_de
Added parsing support of UNSIGNED LONG LONG


Docs/manual.texi:
  Changelog
client/client_priv.h:
  Changed to use my_global.h
client/completion_hash.cc:
  Changed to use my_global.h
client/errmsg.c:
  Changed to use my_global.h
client/get_password.c:
  Changed to use my_global.h
client/mysqldump.c:
  Changed to use my_global.h
client/mysqlshow.c:
  Changed to use my_global.h
client/mysqltest.c:
  Changed to use my_global.h
client/password.c:
  Changed to use my_global.h
client/readline.cc:
  Changed to use my_global.h
client/sql_string.cc:
  Changed to use my_global.h
client/thimble.cc:
  Changed to use my_global.h
client/thread_test.c:
  Changed to use my_global.h
dbug/dbug.c:
  Changed to use my_global.h
dbug/dbug_analyze.c:
  Changed to use my_global.h
dbug/example1.c:
  Changed to use my_global.h
dbug/example2.c:
  Changed to use my_global.h
dbug/example3.c:
  Changed to use my_global.h
dbug/factorial.c:
  Changed to use my_global.h
dbug/main.c:
  Changed to use my_global.h
dbug/sanity.c:
  Changed to use my_global.h
extra/comp_err.c:
  Changed to use my_global.h
extra/my_print_defaults.c:
  Changed to use my_global.h
extra/perror.c:
  Changed to use my_global.h
extra/replace.c:
  Changed to use my_global.h
extra/resolve_stack_dump.c:
  Changed to use my_global.h
extra/resolveip.c:
  Changed to use my_global.h
fs/libmysqlfs.h:
  Changed to use my_global.h
fs/mysqlcorbafs.h:
  Changed to use my_global.h
heap/hp_test1.c:
  Changed to use my_global.h
include/Makefile.am:
  Changed to use my_global.h
include/m_ctype.h:
  Changed to use my_global.h
include/my_base.h:
  Changed to use my_global.h
innobase/include/univ.i:
  Changed to use my_global.h
libmysql/dll.c:
  Changed to use my_global.h
libmysql/errmsg.c:
  Changed to use my_global.h
libmysql/get_password.c:
  Changed to use my_global.h
libmysql/libmysql.c:
  Changed to use my_global.h
libmysql/net.c:
  Changed to use my_global.h
libmysql/password.c:
  Changed to use my_global.h
libmysqld/lib_sql.cc:
  Changed to use my_global.h
libmysqld/lib_vio.c:
  Changed to use my_global.h
libmysqld/libmysqld.c:
  Changed to use my_global.h
mysql-test/mysql-test-run.sh:
  Changed to use latin1 as default character set
mysql-test/r/ctype_latin1_de.result:
  Changed to use my_global.h
mysql-test/r/func_like.result:
  New test
mysql-test/t/ctype_latin1_de.test:
  Added test of part keys
mysql-test/t/func_like.test:
  New test
mysys/checksum.c:
  Changed to use my_global.h
mysys/getopt.c:
  Changed to use my_global.h
mysys/getopt1.c:
  Changed to use my_global.h
mysys/make-conf.c:
  Changed to use my_global.h
mysys/my_alloc.c:
  Changed to use my_global.h
mysys/my_clock.c:
  Changed to use my_global.h
mysys/my_compress.c:
  Changed to use my_global.h
mysys/mysys_priv.h:
  Changed to use my_global.h
mysys/test_charset.c:
  Changed to use my_global.h
mysys/testhash.c:
  Changed to use my_global.h
mysys/thr_alarm.c:
  Changed to use my_global.h
mysys/thr_mutex.c:
  Changed to use my_global.h
regex/debug.c:
  Changed to use my_global.h
regex/main.c:
  Changed to use my_global.h
regex/regcomp.c:
  Changed to use my_global.h
regex/regerror.c:
  Changed to use my_global.h
regex/regexec.c:
  Changed to use my_global.h
regex/regexp.c:
  Changed to use my_global.h
regex/regfree.c:
  Changed to use my_global.h
regex/reginit.c:
  Changed to use my_global.h
sql/cache_manager.cc:
  Changed to use my_global.h
sql/gen_lex_hash.cc:
  Changed to use my_global.h
sql/ha_berkeley.cc:
  Fixed problem with UNIQUE keys that could contain NULL
sql/ha_gemini.h:
  Changed to use my_global.h
sql/handler.cc:
  Fixed problem after merge
sql/item.cc:
  Added Item_unit
sql/item.h:
  Added Item_uint
sql/matherr.c:
  Changed to use my_global.h
sql/md5.c:
  Changed to use my_global.h
sql/mini_client.cc:
  Changed to use my_global.h
sql/my_lock.c:
  Changed to use my_global.h
sql/mysql_priv.h:
  Changed to use my_global.h
sql/net_serv.cc:
  Changed to use my_global.h
sql/password.c:
  Changed to use my_global.h
sql/sql_lex.cc:
  Added parsing support of UNSIGNED LONG LONG
sql/sql_show.cc:
  Changed to use my_global.h
sql/sql_string.cc:
  Changed to use my_global.h
sql/sql_yacc.yy:
  Added usage of Int_uint
sql/stacktrace.c:
  Changed to use my_global.h
sql/udf_example.cc:
  Changed to use my_global.h
strings/atof.c:
  Changed to use my_global.h
strings/bchange.c:
  Changed to use my_global.h
strings/bcmp.c:
  Changed to use my_global.h
strings/bfill.c:
  Changed to use my_global.h
strings/bmove.c:
  Changed to use my_global.h
strings/bmove512.c:
  Changed to use my_global.h
strings/bmove_upp.c:
  Changed to use my_global.h
strings/ctype-big5.c:
  Changed to use my_global.h
strings/ctype-czech.c:
  Changed to use my_global.h
strings/ctype-euc_kr.c:
  Changed to use my_global.h
strings/ctype-gb2312.c:
  Changed to use my_global.h
strings/ctype-gbk.c:
  Changed to use my_global.h
strings/ctype-latin1_de.c:
  Fixed problem with LIKE
strings/ctype-sjis.c:
  Changed to use my_global.h
strings/ctype-tis620.c:
  Changed to use my_global.h
strings/ctype-ujis.c:
  Changed to use my_global.h
strings/ctype.c:
  Changed to use my_global.h
strings/do_ctype.c:
  Changed to use my_global.h
strings/int2str.c:
  Changed to use my_global.h
strings/is_prefix.c:
  Changed to use my_global.h
strings/llstr.c:
  Changed to use my_global.h
strings/longlong2str.c:
  Changed to use my_global.h
strings/r_strinstr.c:
  Changed to use my_global.h
strings/str2int.c:
  Changed to use my_global.h
strings/str_test.c:
  Changed to use my_global.h
strings/strappend.c:
  Changed to use my_global.h
strings/strcend.c:
  Changed to use my_global.h
strings/strcont.c:
  Changed to use my_global.h
strings/strend.c:
  Changed to use my_global.h
strings/strfill.c:
  Changed to use my_global.h
strings/strings-not-used.h:
  Changed to use my_global.h
strings/strinstr.c:
  Changed to use my_global.h
strings/strmake.c:
  Changed to use my_global.h
strings/strmov.c:
  Changed to use my_global.h
strings/strnlen.c:
  Changed to use my_global.h
strings/strnmov.c:
  Changed to use my_global.h
strings/strstr.c:
  Changed to use my_global.h
strings/strto.c:
  Changed to use my_global.h
strings/strtol.c:
  Changed to use my_global.h
strings/strtoll.c:
  Changed to use my_global.h
strings/strtoul.c:
  Changed to use my_global.h
strings/strtoull.c:
  Changed to use my_global.h
strings/strxmov.c:
  Changed to use my_global.h
strings/strxnmov.c:
  Changed to use my_global.h
strings/udiv.c:
  Changed to use my_global.h
tools/mysqlmanager.c:
  Changed to use my_global.h
vio/test-ssl.c:
  Changed to use my_global.h
vio/test-sslclient.c:
  Changed to use my_global.h
vio/test-sslserver.c:
  Changed to use my_global.h
vio/test-ssl:
  Changed to use my_global.h
vio/vio.c:
  Changed to use my_global.h
vio/viosocket.c:
  Changed to use my_global.h
vio/viossl.c:
  Changed to use my_global.h
vio/viosslfactories.c:
  Changed to use my_global.h
vio/viotest-ssl.c:
  Changed to use my_global.h

20 files changed, 84 insertions, 38 deletions

diff --git a/sql/cache_manager.cc b/sql/cache_manager.cc
index 9ea25315f8c..9aec222909a 100644
--- a/sql/cache_manager.cc
+++ b/sql/cache_manager.cc
@@ -18,7 +18,7 @@
 #pragma implementation		       /* gcc: Class implementation */
 #endif
 
-#include <global.h>
+#include <my_global.h>
 #include <my_sys.h>
 #include "cache_manager.h"
 
diff --git a/sql/gen_lex_hash.cc b/sql/gen_lex_hash.cc
index 36683c0f239..722f5226980 100644
--- a/sql/gen_lex_hash.cc
+++ b/sql/gen_lex_hash.cc
@@ -16,7 +16,7 @@
 
 
 #define NO_YACC_SYMBOLS
-#include <global.h>
+#include <my_global.h>
 #include <my_sys.h>
 #include <m_string.h>
 #ifndef __GNU_LIBRARY__
diff --git a/sql/ha_berkeley.cc b/sql/ha_berkeley.cc
index 9a437607729..d0f927732ad 100644
--- a/sql/ha_berkeley.cc
+++ b/sql/ha_berkeley.cc
@@ -365,11 +365,9 @@ berkeley_cmp_packed_key(DB *file, const DBT *new_key, const DBT *saved_key)
     {
       if (*new_key_ptr != *saved_key_ptr++)
 	return ((int) *new_key_ptr - (int) saved_key_ptr[-1]);
+      key_length--;
       if (!*new_key_ptr++)
-      {
-	key_length--;
 	continue;
-      }
     }
     if ((cmp=key_part->field->pack_cmp(new_key_ptr,saved_key_ptr,
 				       key_part->length)))
@@ -1399,7 +1397,7 @@ int ha_berkeley::index_read_idx(byte * buf, uint keynr, const byte * key,
   statistic_increment(ha_read_key_count,&LOCK_status);
   DBUG_ENTER("index_read_idx");
   current_row.flags=DB_DBT_REALLOC;
-  active_index= -1;
+  active_index= (uint) -1;
   DBUG_RETURN(read_row(key_file[keynr]->get(key_file[keynr], transaction,
 				 pack_key(&last_key, keynr, key_buff, key,
 					  key_len),
diff --git a/sql/ha_gemini.h b/sql/ha_gemini.h
index 96c0cdd4241..006401271c6 100644
--- a/sql/ha_gemini.h
+++ b/sql/ha_gemini.h
@@ -19,7 +19,7 @@
 #pragma interface			/* gcc class implementation */
 #endif
 
-#include "gem_global.h"
+#include "gem_my_global.h"
 #include "dstd.h"
 #include "dsmpub.h"
 
diff --git a/sql/handler.cc b/sql/handler.cc
index f790417cf79..0c7f1c9c2b1 100644
--- a/sql/handler.cc
+++ b/sql/handler.cc
@@ -839,14 +839,16 @@ int ha_create_table(const char *name, HA_CREATE_INFO *create_info,
   }
   error=table.file->create(name,&table,create_info);
   VOID(closefrm(&table));
-  if (error) {
-    if (table.db_type == DB_TYPE_INNOBASE) {
+  if (error)
+  {
+    if (table.db_type == DB_TYPE_INNODB)
+    {
       /* Creation of InnoDB table cannot fail because of an OS error:
 	 put error as the number */
       my_error(ER_CANT_CREATE_TABLE,MYF(ME_BELL+ME_WAITTANG),name,error);
-    } else {
-      my_error(ER_CANT_CREATE_TABLE,MYF(ME_BELL+ME_WAITTANG),name,my_errno);
     }
+    else
+      my_error(ER_CANT_CREATE_TABLE,MYF(ME_BELL+ME_WAITTANG),name,my_errno);
   }
   DBUG_RETURN(error != 0);
 }
diff --git a/sql/item.cc b/sql/item.cc
index c0cdac51b1e..d5961fe1733 100644
--- a/sql/item.cc
+++ b/sql/item.cc
@@ -231,6 +231,22 @@ void Item_int::print(String *str)
   str->append(name);
 }
 
+String *Item_uint::val_str(String *str)
+{
+  str->set((ulonglong) value);
+  return str;
+}
+
+void Item_uint::print(String *str)
+{
+  if (!name)
+  {
+    str_value.set((ulonglong) value);
+    name=str_value.c_ptr();
+  }
+  str->append(name);
+}
+
 
 String *Item_real::val_str(String *str)
 {
@@ -317,6 +333,12 @@ void Item_int::make_field(Send_field *tmp_field)
   init_make_field(tmp_field,FIELD_TYPE_LONGLONG);
 }
 
+void Item_uint::make_field(Send_field *tmp_field)
+{
+  init_make_field(tmp_field,FIELD_TYPE_LONGLONG);
+  tmp_field->flags|= UNSIGNED_FLAG;
+}
+
 void Item_real::make_field(Send_field *tmp_field)
 {
   init_make_field(tmp_field,FIELD_TYPE_DOUBLE);
diff --git a/sql/item.h b/sql/item.h
index 9ad633d9278..98abdc834d9 100644
--- a/sql/item.h
+++ b/sql/item.h
@@ -181,6 +181,19 @@ public:
 };
 
 
+class Item_uint :public Item_int
+{
+public:
+  Item_uint(const char *str_arg, uint length) :
+    Item_int(str_arg, (longlong) strtoull(str_arg,(char**) 0,10), length) {}
+  double val() { return ulonglong2double(value); }
+  String *val_str(String*);
+  void make_field(Send_field *field);
+  Item *new_item() { return new Item_uint(name,max_length); }
+  void print(String *str);
+};
+
+
 class Item_real :public Item
 {
 public:
diff --git a/sql/matherr.c b/sql/matherr.c
index 8523a78ce94..ed18438cd0c 100644
--- a/sql/matherr.c
+++ b/sql/matherr.c
@@ -16,7 +16,7 @@
 
 /* Fix that we got POSTFIX_ERROR when doing unreasonable math (not core) */
 
-#include <global.h>
+#include <my_global.h>
 #include <errno.h>
 
 	/* Fix that we gets POSTFIX_ERROR when error in math */
diff --git a/sql/md5.c b/sql/md5.c
index 66b96b92ab2..a4ff75d469a 100644
--- a/sql/md5.c
+++ b/sql/md5.c
@@ -28,7 +28,7 @@ documentation and/or software.
    Replace of MD5_memset and MD5_memcpy with memset & memcpy
 */
 
-#include <global.h>
+#include <my_global.h>
 #include <m_string.h>
 #include "md5.h"
 
diff --git a/sql/mini_client.cc b/sql/mini_client.cc
index 09944959673..24c414a8f8b 100644
--- a/sql/mini_client.cc
+++ b/sql/mini_client.cc
@@ -40,7 +40,7 @@ inline int local_thr_alarm(my_bool *A,int B __attribute__((unused)),ALARM *C __a
 #define thr_got_alarm(A) 0
 #endif
 
-#include <global.h>
+#include <my_global.h>
 #include <mysql_com.h>
 #include <violite.h>
 #include <my_sys.h>
diff --git a/sql/my_lock.c b/sql/my_lock.c
index 7025682d40e..19d38fd9c79 100644
--- a/sql/my_lock.c
+++ b/sql/my_lock.c
@@ -19,7 +19,7 @@
 #else
 
 #undef MAP_TO_USE_RAID			/* Avoid RAID mappings */
-#include <global.h>
+#include <my_global.h>
 #include <my_sys.h>
 #include <mysys_err.h>
 #include <my_pthread.h>
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h
index 8e38c8174a4..74bb3411773 100644
--- a/sql/mysql_priv.h
+++ b/sql/mysql_priv.h
@@ -17,7 +17,7 @@
 #ifndef _MYSQL_PRIV_H
 #define _MYSQL_PRIV_H
 
-#include <global.h>
+#include <my_global.h>
 #include <my_sys.h>
 #include <m_string.h>
 #include "mysql_version.h"
diff --git a/sql/net_serv.cc b/sql/net_serv.cc
index fded2c3ce32..960ff5cc7bf 100644
--- a/sql/net_serv.cc
+++ b/sql/net_serv.cc
@@ -30,7 +30,7 @@
 #ifdef __WIN__
 #include <winsock.h>
 #endif
-#include <global.h>
+#include <my_global.h>
 #include <mysql_com.h>
 #include <violite.h>
 #include <my_sys.h>
diff --git a/sql/password.c b/sql/password.c
index 1c88aabcce2..1db94e0db8a 100644
--- a/sql/password.c
+++ b/sql/password.c
@@ -34,7 +34,7 @@
   This saves a hashed number as a string in the password field.
 *****************************************************************************/
 
-#include <global.h>
+#include <my_global.h>
 #include <my_sys.h>
 #include <m_string.h>
 #include "mysql.h"
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc
index bfda57a06ad..c3f98713c45 100644
--- a/sql/sql_lex.cc
+++ b/sql/sql_lex.cc
@@ -337,7 +337,8 @@ static const char *longlong_str="9223372036854775807";
 static const uint longlong_len=19;
 static const char *signed_longlong_str="-9223372036854775808";
 static const uint signed_longlong_len=19;
-
+static const char *unsigned_longlong_str="18446744073709551615";
+static const uint unsigned_longlong_len=20;
 
 inline static uint int_token(const char *str,uint length)
 {
@@ -393,7 +394,13 @@ inline static uint int_token(const char *str,uint length)
     else if (length < longlong_len)
       return LONG_NUM;
     else if (length > longlong_len)
-      return REAL_NUM;
+    {
+      if (length > unsigned_longlong_len)
+	return REAL_NUM;
+      cmp=unsigned_longlong_str;
+      smaller=ULONGLONG_NUM;
+      bigger=REAL_NUM;
+    }
     else
     {
       cmp=longlong_str;
diff --git a/sql/sql_show.cc b/sql/sql_show.cc
index 7806bef7163..b51e9ab5a73 100644
--- a/sql/sql_show.cc
+++ b/sql/sql_show.cc
@@ -17,7 +17,7 @@
 
 /* Function with list databases, tables or fields */
 
-#include "global.h"
+#include "my_global.h"
 #include "mysql_priv.h"
 #include "sql_select.h"                         // For select_describe
 #include "sql_acl.h"
diff --git a/sql/sql_string.cc b/sql/sql_string.cc
index e6cdd089bf1..5aecb3bc158 100644
--- a/sql/sql_string.cc
+++ b/sql/sql_string.cc
@@ -21,7 +21,7 @@
 #pragma implementation				// gcc: Class implementation
 #endif
 
-#include <global.h>
+#include <my_global.h>
 #include <my_sys.h>
 #include <m_string.h>
 #include <m_ctype.h>
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
index 2318a6d309e..6a54c3cdd36 100644
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -43,7 +43,7 @@ inline Item *or_or_concat(Item* A, Item* B)
 %union {
   int  num;
   ulong ulong_num;
-  ulonglong ulonglong_num;
+  ulonglong ulonglong_number;
   LEX_STRING lex_str;
   LEX_STRING *lex_str_ptr;
   LEX_SYMBOL symbol;
@@ -349,6 +349,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b,int *yystacksize);
 %token	TINYBLOB
 %token	TINYINT
 %token	TINYTEXT
+%token	ULONGLONG_NUM
 %token	UNSIGNED
 %token	VARBINARY
 %token	VARCHAR
@@ -465,7 +466,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b,int *yystacksize);
 
 %type <lex_str>
 	IDENT TEXT_STRING REAL_NUM FLOAT_NUM NUM LONG_NUM HEX_NUM LEX_HOSTNAME
-	field_ident select_alias ident ident_or_text
+	ULONGLONG_NUM field_ident select_alias ident ident_or_text
 
 %type <lex_str_ptr>
 	opt_table_alias
@@ -488,8 +489,8 @@ bool my_yyoverflow(short **a, YYSTYPE **b,int *yystacksize);
 %type <ulong_num>
 	ULONG_NUM raid_types
 
-%type <ulonglong_num>
-	ULONGLONG_NUM
+%type <ulonglong_number>
+	ulonglong_num
 
 %type <item>
 	literal text_literal insert_ident group_ident order_ident
@@ -652,7 +653,7 @@ master_def:
 	 Lex->mi.port = $3;
        }
        |
-       MASTER_LOG_POS_SYM EQ ULONGLONG_NUM
+       MASTER_LOG_POS_SYM EQ ulonglong_num
        {
 	 Lex->mi.pos = $3;
        }
@@ -766,12 +767,12 @@ create_table_options:
 
 create_table_option:
 	TYPE_SYM EQ table_types		{ Lex->create_info.db_type= $3; }
-	| MAX_ROWS EQ ULONGLONG_NUM	{ Lex->create_info.max_rows= $3; }
-	| MIN_ROWS EQ ULONGLONG_NUM	{ Lex->create_info.min_rows= $3; }
+	| MAX_ROWS EQ ulonglong_num	{ Lex->create_info.max_rows= $3; }
+	| MIN_ROWS EQ ulonglong_num	{ Lex->create_info.min_rows= $3; }
 	| AVG_ROW_LENGTH EQ ULONG_NUM	{ Lex->create_info.avg_row_length=$3; }
 	| PASSWORD EQ TEXT_STRING	{ Lex->create_info.password=$3.str; }
 	| COMMENT_SYM EQ TEXT_STRING	{ Lex->create_info.comment=$3.str; }
-	| AUTO_INC EQ ULONGLONG_NUM	{ Lex->create_info.auto_increment_value=$3; Lex->create_info.used_fields|= HA_CREATE_USED_AUTO;}
+	| AUTO_INC EQ ulonglong_num	{ Lex->create_info.auto_increment_value=$3; Lex->create_info.used_fields|= HA_CREATE_USED_AUTO;}
 	| PACK_KEYS_SYM EQ ULONG_NUM	{ Lex->create_info.table_options|= $3 ? HA_OPTION_PACK_KEYS : HA_OPTION_NO_PACK_KEYS; }
 	| CHECKSUM_SYM EQ ULONG_NUM	{ Lex->create_info.table_options|= $3 ? HA_OPTION_CHECKSUM : HA_OPTION_NO_CHECKSUM; }
 	| DELAY_KEY_WRITE_SYM EQ ULONG_NUM { Lex->create_info.table_options|= $3 ? HA_OPTION_DELAY_KEY_WRITE : HA_OPTION_NO_DELAY_KEY_WRITE; }
@@ -2047,16 +2048,18 @@ delete_limit_clause:
 	{
 	  Select->select_limit= HA_POS_ERROR;
 	}
-	| LIMIT ULONGLONG_NUM
+	| LIMIT ulonglong_num
 	{ Select->select_limit= (ha_rows) $2; }
 
 ULONG_NUM:
 	NUM	    { $$= strtoul($1.str,NULL,10); }
+	| ULONGLONG_NUM { $$= (ulonglong) strtoul($1.str,NULL,10); }
 	| REAL_NUM  { $$= strtoul($1.str,NULL,10); }
 	| FLOAT_NUM { $$= strtoul($1.str,NULL,10); }
 
-ULONGLONG_NUM:
+ulonglong_num:
 	NUM	    { $$= (ulonglong) strtoul($1.str,NULL,10); }
+	| ULONGLONG_NUM { $$= (ulonglong) strtoul($1.str,NULL,10); }
 	| LONG_NUM  { $$= strtoull($1.str,NULL,10); }
 	| REAL_NUM  { $$= strtoull($1.str,NULL,10); }
 	| FLOAT_NUM { $$= strtoull($1.str,NULL,10); }
@@ -2417,7 +2420,7 @@ show_param:
 	      YYABORT;
 	  }
         | NEW_SYM MASTER_SYM FOR_SYM SLAVE WITH MASTER_LOG_FILE_SYM EQ 
-	  TEXT_STRING AND MASTER_LOG_POS_SYM EQ ULONGLONG_NUM AND
+	  TEXT_STRING AND MASTER_LOG_POS_SYM EQ ulonglong_num AND
 	MASTER_LOG_SEQ_SYM EQ ULONG_NUM AND MASTER_SERVER_ID_SYM EQ
 	ULONG_NUM
           {
@@ -2499,7 +2502,7 @@ binlog_in:
 
 binlog_from:
 	/* empty */ { Lex->mi.pos = 4; /* skip magic number */ }
-        | FROM ULONGLONG_NUM { Lex->mi.pos = $2; }
+        | FROM ulonglong_num { Lex->mi.pos = $2; }
 
 
 /* A Oracle compatible synonym for show */
@@ -2705,6 +2708,7 @@ literal:
 	text_literal	{ $$ =	$1; }
 	| NUM		{ $$ =	new Item_int($1.str, (longlong) atol($1.str),$1.length); }
 	| LONG_NUM	{ $$ =	new Item_int($1.str); }
+	| ULONGLONG_NUM	{ $$ =	new Item_uint($1.str, $1.length); }
 	| REAL_NUM	{ $$ =	new Item_real($1.str, $1.length); }
 	| FLOAT_NUM	{ $$ =	new Item_float($1.str, $1.length); }
 	| NULL_SYM	{ $$ =	new Item_null();
@@ -2993,11 +2997,11 @@ option_value:
 	{
 	  current_thd->user_time=0;
 	}
-	| LAST_INSERT_ID equal ULONGLONG_NUM
+	| LAST_INSERT_ID equal ulonglong_num
 	{
 	  current_thd->insert_id($3);
 	}
-	| INSERT_ID equal ULONGLONG_NUM
+	| INSERT_ID equal ulonglong_num
 	{
 	  current_thd->next_insert_id=$3;
 	}
diff --git a/sql/stacktrace.c b/sql/stacktrace.c
index 81d8debc27a..32bc37f5500 100644
--- a/sql/stacktrace.c
+++ b/sql/stacktrace.c
@@ -14,7 +14,7 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
-#include <global.h>
+#include <my_global.h>
 #include "stacktrace.h"
 #include <signal.h>
 #include <my_pthread.h>
diff --git a/sql/udf_example.cc b/sql/udf_example.cc
index bf3aa3d0074..3a528a9ad3a 100644
--- a/sql/udf_example.cc
+++ b/sql/udf_example.cc
@@ -103,7 +103,7 @@
 #include <stdio.h>
 #include <string.h>
 #else
-#include <global.h>
+#include <my_global.h>
 #include <my_sys.h>
 #endif
 #include <mysql.h>