Merge with 5.5

mysql-test/r/auto_increment.result

@@ -516,3 +516,25 @@ pk
 1
 18446744073709551614
 DROP TABLE t1;
+CREATE TABLE t1 (pk BIGINT UNSIGNED AUTO_INCREMENT, PRIMARY KEY (pk));
+insert into t1 values((1<<63)+1);
+insert into t1 values(null);
+select last_insert_id();
+last_insert_id()
+9223372036854775810
+select * from t1;
+pk
+9223372036854775809
+9223372036854775810
+drop table t1;
+CREATE TABLE t1 (pk BIGINT AUTO_INCREMENT, PRIMARY KEY (pk));
+insert into t1 values(-5);
+insert into t1 values(null);
+select last_insert_id();
+last_insert_id()
+1
+select * from t1;
+pk
+-5
+1
+drop table t1;

mysql-test/r/connect.result

@@ -257,3 +257,27 @@ connect(localhost,mysqltest_nouser,,test,MASTER_PORT,MASTER_SOCKET);
 ERROR 28000: Access denied for user 'mysqltest_nouser'@'localhost' (using password: NO)
 DROP USER mysqltest_up1@'%';
 DROP USER mysqltest_up2@'%';
+#
+# BUG#1010351: New "via" keyword in 5.2+ can't be used as identifier anymore  
+#
+create table t1 (via int);
+alter table t1 add key(via);
+drop table t1;
+create table t1 (col1 int);
+alter table t1 add via int not null;
+drop table t1;
+drop procedure if exists p1;
+create procedure p1(x int)
+foo: loop
+if x = 0 then
+leave foo;
+end if;
+select 'test';
+set x = x-1;
+end loop foo|
+call p1(2);
+test
+test
+test
+test
+drop procedure p1;

mysql-test/t/auto_increment.test

@@ -380,3 +380,19 @@ CREATE TABLE t1 (pk BIGINT UNSIGNED AUTO_INCREMENT, PRIMARY KEY (pk));
 INSERT INTO t1 VALUES (NULL), (18446744073709551615-1), (NULL);
 SELECT * FROM t1;
 DROP TABLE t1;
+
+# MDEV-331 last_insert_id() returns a signed number
+# Check that last_insert_id() generates a signed value
+CREATE TABLE t1 (pk BIGINT UNSIGNED AUTO_INCREMENT, PRIMARY KEY (pk));
+insert into t1 values((1<<63)+1);
+insert into t1 values(null);
+select last_insert_id();
+select * from t1;
+drop table t1;
+
+CREATE TABLE t1 (pk BIGINT AUTO_INCREMENT, PRIMARY KEY (pk));
+insert into t1 values(-5);
+insert into t1 values(null);
+select last_insert_id();
+select * from t1;
+drop table t1;

mysql-test/t/connect.test

@@ -397,3 +397,33 @@ DROP USER mysqltest_up2@'%';
 # Wait till all disconnects are completed
 --source include/wait_until_count_sessions.inc
 
+
+--echo #
+--echo # BUG#1010351: New "via" keyword in 5.2+ can't be used as identifier anymore  
+--echo #
+create table t1 (via int);
+alter table t1 add key(via);
+drop table t1;
+
+create table t1 (col1 int);
+alter table t1 add via int not null;
+drop table t1;
+
+--disable_warnings
+drop procedure if exists p1;
+--enable_warnings
+
+delimiter |;
+create procedure p1(x int)
+foo: loop
+  if x = 0 then
+    leave foo;
+  end if;
+  select 'test';
+  set x = x-1;
+end loop foo|
+
+delimiter ;|
+call p1(2);
+drop procedure p1;
+

scripts/mysqld_multi.sh

@@ -116,7 +116,6 @@ sub main
     print "will be disabled\nand some will be enabled.\n\n";
   }
 
-  init_log() if (!defined($opt_log));
   $groupids = $ARGV[1];
   if ($opt_version)
   {
@@ -142,6 +141,7 @@ sub main
 	       !($ARGV[0] =~ m/^stop$/i) &&
 	       !($ARGV[0] =~ m/^report$/i)));
 
+  init_log() if (!defined($opt_log));
   if (!$opt_no_log)
   {
     w2log("$my_progname log file version $VER; run: ",

sql/item_func.h

@@ -1201,6 +1201,7 @@ public:
   {
     if (arg_count)
       max_length= args[0]->max_length;
+    unsigned_flag=1;
   }
   bool fix_fields(THD *thd, Item **ref);
   bool check_vcol_func_processor(uchar *int_arg) 

sql/sql_yacc.yy

@@ -13252,6 +13252,7 @@ keyword_sp:
         | X509_SYM                 {}
         | XML_SYM                  {}
         | YEAR_SYM                 {}
+        | VIA_SYM               {}
         ;
 
 /* Option functions */