Commit 4adab48b authored by unknown's avatar unknown
Browse files

Things missing in last changset 

After merge fixes
Don't give duplicate warnings for some ::store() functions


mysql-test/mysql-test-run.sh:
  Added back missing line
mysql-test/r/ps_2myisam.result:
  Update results after removing duplicate warnings from ::store()
mysql-test/r/ps_3innodb.result:
  Update results after removing duplicate warnings from ::store()
mysql-test/r/ps_4heap.result:
  Update results after removing duplicate warnings from ::store()
mysql-test/r/ps_5merge.result:
  Update results after removing duplicate warnings from ::store()
sql/field.cc:
  Don't give duplicate warnings for some ::store() functions
  Before we could get different number of warnings in the test suite for different platforms
sql/field.h:
  Update results after removing duplicate warnings from ::store()
sql/sql_class.h:
  Update results after removing duplicate warnings from ::store()
sql/sql_error.cc:
  Update results after removing duplicate warnings from ::store()
sql/sql_list.h:
  After merge fix
parent 2d435c8a

mysql-test/mysql-test-run.sh

+1 −0
Original line number Diff line number Diff line
@@ -692,6 +692,7 @@ then 
fi



MYSQL_CLIENT_TEST="$MYSQL_CLIENT_TEST --no-defaults --testcase --user=root --socket=$MASTER_MYSOCK --port=$MYSQL_TCP_PORT --silent"

MYSQL_DUMP="$MYSQL_DUMP --no-defaults -uroot --socket=$MASTER_MYSOCK --password=$DBPASSWD $EXTRA_MYSQLDUMP_OPT"

MYSQL_BINLOG="$MYSQL_BINLOG --no-defaults --local-load=$MYSQL_TMP_DIR  --character-sets-dir=$CHARSETSDIR $EXTRA_MYSQLBINLOG_OPT"

MYSQL_FIX_SYSTEM_TABLES="$MYSQL_FIX_SYSTEM_TABLES --no-defaults --host=localhost --port=$MASTER_MYPORT --socket=$MASTER_MYSOCK --user=root --password=$DBPASSWD --basedir=$BASEDIR --bindir=$CLIENT_BINDIR --verbose"

MYSQL="$MYSQL --host=localhost --port=$MASTER_MYPORT --socket=$MASTER_MYSOCK --user=root --password=$DBPASSWD"

mysql-test/r/ps_2myisam.result

+0 −2
Original line number Diff line number Diff line
@@ -2666,7 +2666,6 @@ Warning 1264 Out of range value adjusted for column 'c4' at row 1 
Warning	1264	Out of range value adjusted for column 'c5' at row 1

Warning	1264	Out of range value adjusted for column 'c6' at row 1

Warning	1264	Out of range value adjusted for column 'c7' at row 1

Note	1265	Data truncated for column 'c12' at row 1

Warning	1264	Out of range value adjusted for column 'c12' at row 1

execute my_select ;

c1	127
@@ -2717,7 +2716,6 @@ Warning 1264 Out of range value adjusted for column 'c4' at row 1 
Warning	1264	Out of range value adjusted for column 'c5' at row 1

Warning	1264	Out of range value adjusted for column 'c6' at row 1

Warning	1264	Out of range value adjusted for column 'c7' at row 1

Note	1265	Data truncated for column 'c12' at row 1

Warning	1264	Out of range value adjusted for column 'c12' at row 1

execute my_select ;

c1	-128

mysql-test/r/ps_3innodb.result

+0 −2
Original line number Diff line number Diff line
@@ -2649,7 +2649,6 @@ Warning 1264 Out of range value adjusted for column 'c4' at row 1 
Warning	1264	Out of range value adjusted for column 'c5' at row 1

Warning	1264	Out of range value adjusted for column 'c6' at row 1

Warning	1264	Out of range value adjusted for column 'c7' at row 1

Note	1265	Data truncated for column 'c12' at row 1

Warning	1264	Out of range value adjusted for column 'c12' at row 1

execute my_select ;

c1	127
@@ -2700,7 +2699,6 @@ Warning 1264 Out of range value adjusted for column 'c4' at row 1 
Warning	1264	Out of range value adjusted for column 'c5' at row 1

Warning	1264	Out of range value adjusted for column 'c6' at row 1

Warning	1264	Out of range value adjusted for column 'c7' at row 1

Note	1265	Data truncated for column 'c12' at row 1

Warning	1264	Out of range value adjusted for column 'c12' at row 1

execute my_select ;

c1	-128

mysql-test/r/ps_4heap.result

+0 −2
Original line number Diff line number Diff line
@@ -2650,7 +2650,6 @@ Warning 1264 Out of range value adjusted for column 'c4' at row 1 
Warning	1264	Out of range value adjusted for column 'c5' at row 1

Warning	1264	Out of range value adjusted for column 'c6' at row 1

Warning	1264	Out of range value adjusted for column 'c7' at row 1

Note	1265	Data truncated for column 'c12' at row 1

Warning	1264	Out of range value adjusted for column 'c12' at row 1

execute my_select ;

c1	127
@@ -2701,7 +2700,6 @@ Warning 1264 Out of range value adjusted for column 'c4' at row 1 
Warning	1264	Out of range value adjusted for column 'c5' at row 1

Warning	1264	Out of range value adjusted for column 'c6' at row 1

Warning	1264	Out of range value adjusted for column 'c7' at row 1

Note	1265	Data truncated for column 'c12' at row 1

Warning	1264	Out of range value adjusted for column 'c12' at row 1

execute my_select ;

c1	-128

mysql-test/r/ps_5merge.result

+0 −4
Original line number Diff line number Diff line
@@ -2586,7 +2586,6 @@ Warning 1264 Out of range value adjusted for column 'c4' at row 1 
Warning	1264	Out of range value adjusted for column 'c5' at row 1

Warning	1264	Out of range value adjusted for column 'c6' at row 1

Warning	1264	Out of range value adjusted for column 'c7' at row 1

Note	1265	Data truncated for column 'c12' at row 1

Warning	1264	Out of range value adjusted for column 'c12' at row 1

execute my_select ;

c1	127
@@ -2637,7 +2636,6 @@ Warning 1264 Out of range value adjusted for column 'c4' at row 1 
Warning	1264	Out of range value adjusted for column 'c5' at row 1

Warning	1264	Out of range value adjusted for column 'c6' at row 1

Warning	1264	Out of range value adjusted for column 'c7' at row 1

Note	1265	Data truncated for column 'c12' at row 1

Warning	1264	Out of range value adjusted for column 'c12' at row 1

execute my_select ;

c1	-128
@@ -5597,7 +5595,6 @@ Warning 1264 Out of range value adjusted for column 'c4' at row 1 
Warning	1264	Out of range value adjusted for column 'c5' at row 1

Warning	1264	Out of range value adjusted for column 'c6' at row 1

Warning	1264	Out of range value adjusted for column 'c7' at row 1

Note	1265	Data truncated for column 'c12' at row 1

Warning	1264	Out of range value adjusted for column 'c12' at row 1

execute my_select ;

c1	127
@@ -5648,7 +5645,6 @@ Warning 1264 Out of range value adjusted for column 'c4' at row 1 
Warning	1264	Out of range value adjusted for column 'c5' at row 1

Warning	1264	Out of range value adjusted for column 'c6' at row 1

Warning	1264	Out of range value adjusted for column 'c7' at row 1

Note	1265	Data truncated for column 'c12' at row 1

Warning	1264	Out of range value adjusted for column 'c12' at row 1

execute my_select ;

c1	-128