mirror of
https://github.com/MariaDB/server.git
synced 2026-05-16 20:07:13 +02:00
Fixes after merge with 4.1
FOUND is not a reserved keyword anymore Added Item_field::set_no_const_sub() to be able to mark fields that can't be substituted Added 'simple_select' method to be able to quickly determinate if a select_result is a normal SELECT Note that the 5.0 tree is not yet up to date: Sanja will have to fix multi-update-locks for this merge to be complete BUILD/SETUP.sh: Portability fix client/mysqltest.c: Portability fix mysql-test/r/drop.result: updated results mysql-test/r/func_str.result: New warnings (after merge) mysql-test/r/insert.result: Updated tests mysql-test/r/join_nested.result: Updated results (because of new column types in 5.0) mysql-test/r/lock_multi.result: Temporarly wrong results until Sanja fixes multi-update-lock in 5.0 mysql-test/r/multi_update.result: Temporary fix until Sanja fixes multi-update locking mysql-test/r/ps_1general.result: Update of results after merge mysql-test/r/ps_2myisam.result: Update of results after merge mysql-test/r/ps_3innodb.result: Update of results after merge mysql-test/r/ps_4heap.result: Update of results after merge mysql-test/r/ps_5merge.result: Update of results after merge mysql-test/r/ps_6bdb.result: Update of results after merge mysql-test/r/query_cache.result: Update of results after merge mysql-test/r/range.result: New results for new tests mysql-test/r/rpl_auto_increment.result: Update with new 4.0 information mysql-test/r/rpl_charset.result: After merge fixes mysql-test/r/subselect.result: After merge fixes mysql-test/r/view.result: Temporary fix until multi-update-locking is fixed mysql-test/t/drop.test: Safety fix mysql-test/t/multi_update.test: Temporary fix until multi-update-locking is fixed mysql-test/t/rpl_charset.test: More comments mysql-test/t/sp-error.test: Updated comments mysql-test/t/view.test: Temporary fix until multi-update-locking is fixed scripts/mysql_fix_privilege_tables.sh: Better error message sql-common/client.c: More debugging sql/ha_ndbcluster.cc: After merge fixes sql/handler.cc: After merge fixes sql/item.cc: Simple optimization of creating item After merge fixed Added Item_field::set_no_const_sub() to be able to mark fields that can't be substituted The problem is that if you compare a string field to a binary string, you can't replace the field with a string constant as the binary comparison may then fail (The original field value may be in a different case) sql/item.h: Added Item::set_no_const_sub() to be able to mark fields that can't be substituted sql/item_cmpfunc.cc: Mark fields compared as binary to not be substituted. sql/item_func.cc: After merge fix sql/log_event.cc: After merge fix sql/mysql_priv.h: After merge fix sql/opt_range.cc: After merge fix sql/protocol.cc: Made flags uint instead of int (as it's used as a bit mask) sql/protocol.h: Made flags uint instead of int (as it's used as a bit mask) sql/protocol_cursor.cc: Made flags uint instead of int (as it's used as a bit mask) Indentation cleanups sql/sp.cc: After merge fixes Removed compiler warnings sql/sp_head.cc: After merge fixes sql/sql_base.cc: After merge fixes Removed 'send_error' from 'insert_fields()' as the error is sent higher up sql/sql_class.cc: Give assert if set_n_backup_item_arena is used twice sql/sql_class.h: Give assert if set_n_backup_item_arena is used twice After merge fixes Added 'simple_select' method to be able to quickly determinate if a select_result is a normal SELECT sql/sql_handler.cc: After merge fixes sql/sql_parse.cc: After merge fixes sql/sql_prepare.cc: After merge fixes sql/sql_select.cc: After merge fixes Moved 'build_equal_items' to optimize_cond() (logical place) sql/sql_table.cc: After merge fixes sql/sql_trigger.cc: After merge fixes sql/sql_update.cc: After merge fixes (This should be fixed by Sanja to have lower granuality locking of tables in multi-update) sql/sql_view.cc: After merge fixes sql/sql_yacc.yy: After merge fixes Don't have FOUND as a reserved keyword
This commit is contained in:
unknown
parent
f095274fe8
commit
f5a47f156b
53 changed files with 653 additions and 563 deletions
|
|
@ -1151,7 +1151,7 @@ def table 253 64 2 N 1 31 8
|
|||
def type 253 10 3 N 1 31 8
|
||||
def possible_keys 253 4096 0 Y 0 31 8
|
||||
def key 253 64 0 Y 0 31 8
|
||||
def key_len 8 3 0 Y 32800 0 8
|
||||
def key_len 253 4096 0 Y 128 31 63
|
||||
def ref 253 1024 0 Y 0 31 8
|
||||
def rows 8 10 1 N 32801 0 8
|
||||
def Extra 253 255 0 N 1 31 8
|
||||
|
|
@ -1280,7 +1280,7 @@ set @arg00=NULL;
|
|||
set @arg01=2;
|
||||
execute stmt1 using @arg00, @arg01;
|
||||
Warnings:
|
||||
Warning 1263 Data truncated; NULL supplied to NOT NULL column 'a' at row 1
|
||||
Warning 1263 Column set to default value; NULL supplied to NOT NULL column 'a' at row 1
|
||||
select a,b from t1 order by a;
|
||||
a b
|
||||
0 two
|
||||
|
|
@ -2545,12 +2545,12 @@ set @arg00= 9223372036854775807 ;
|
|||
execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
|
||||
@arg00, @arg00, @arg00, @arg00, @arg00 ;
|
||||
Warnings:
|
||||
Warning 1264 Data truncated; out of range for column 'c1' at row 1
|
||||
Warning 1264 Data truncated; out of range for column 'c2' at row 1
|
||||
Warning 1264 Data truncated; out of range for column 'c3' at row 1
|
||||
Warning 1264 Data truncated; out of range for column 'c4' at row 1
|
||||
Warning 1264 Data truncated; out of range for column 'c5' at row 1
|
||||
Warning 1264 Data truncated; out of range for column 'c12' at row 1
|
||||
Warning 1264 Out of range value adjusted for column 'c1' at row 1
|
||||
Warning 1264 Out of range value adjusted for column 'c2' at row 1
|
||||
Warning 1264 Out of range value adjusted for column 'c3' at row 1
|
||||
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 'c12' at row 1
|
||||
execute my_select ;
|
||||
c1 127
|
||||
c2 32767
|
||||
|
|
@ -2568,12 +2568,12 @@ set @arg00= '9223372036854775807' ;
|
|||
execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
|
||||
@arg00, @arg00, @arg00, @arg00, @arg00 ;
|
||||
Warnings:
|
||||
Warning 1264 Data truncated; out of range for column 'c1' at row 1
|
||||
Warning 1264 Data truncated; out of range for column 'c2' at row 1
|
||||
Warning 1264 Data truncated; out of range for column 'c3' at row 1
|
||||
Warning 1265 Data truncated for column 'c4' at row 1
|
||||
Warning 1265 Data truncated for column 'c5' at row 1
|
||||
Warning 1264 Data truncated; out of range for column 'c12' at row 1
|
||||
Warning 1264 Out of range value adjusted for column 'c1' at row 1
|
||||
Warning 1264 Out of range value adjusted for column 'c2' at row 1
|
||||
Warning 1264 Out of range value adjusted for column 'c3' at row 1
|
||||
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 'c12' at row 1
|
||||
execute my_select ;
|
||||
c1 127
|
||||
c2 32767
|
||||
|
|
@ -2591,12 +2591,12 @@ set @arg00= -9223372036854775808 ;
|
|||
execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
|
||||
@arg00, @arg00, @arg00, @arg00, @arg00 ;
|
||||
Warnings:
|
||||
Warning 1264 Data truncated; out of range for column 'c1' at row 1
|
||||
Warning 1264 Data truncated; out of range for column 'c2' at row 1
|
||||
Warning 1264 Data truncated; out of range for column 'c3' at row 1
|
||||
Warning 1264 Data truncated; out of range for column 'c4' at row 1
|
||||
Warning 1264 Data truncated; out of range for column 'c5' at row 1
|
||||
Warning 1264 Data truncated; out of range for column 'c12' at row 1
|
||||
Warning 1264 Out of range value adjusted for column 'c1' at row 1
|
||||
Warning 1264 Out of range value adjusted for column 'c2' at row 1
|
||||
Warning 1264 Out of range value adjusted for column 'c3' at row 1
|
||||
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 'c12' at row 1
|
||||
execute my_select ;
|
||||
c1 -128
|
||||
c2 -32768
|
||||
|
|
@ -2614,12 +2614,12 @@ set @arg00= '-9223372036854775808' ;
|
|||
execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
|
||||
@arg00, @arg00, @arg00, @arg00, @arg00 ;
|
||||
Warnings:
|
||||
Warning 1264 Data truncated; out of range for column 'c1' at row 1
|
||||
Warning 1264 Data truncated; out of range for column 'c2' at row 1
|
||||
Warning 1264 Data truncated; out of range for column 'c3' at row 1
|
||||
Warning 1265 Data truncated for column 'c4' at row 1
|
||||
Warning 1265 Data truncated for column 'c5' at row 1
|
||||
Warning 1264 Data truncated; out of range for column 'c12' at row 1
|
||||
Warning 1264 Out of range value adjusted for column 'c1' at row 1
|
||||
Warning 1264 Out of range value adjusted for column 'c2' at row 1
|
||||
Warning 1264 Out of range value adjusted for column 'c3' at row 1
|
||||
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 'c12' at row 1
|
||||
execute my_select ;
|
||||
c1 -128
|
||||
c2 -32768
|
||||
|
|
@ -2637,14 +2637,14 @@ set @arg00= 1.11111111111111111111e+50 ;
|
|||
execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
|
||||
@arg00, @arg00, @arg00, @arg00, @arg00 ;
|
||||
Warnings:
|
||||
Warning 1264 Data truncated; out of range for column 'c1' at row 1
|
||||
Warning 1264 Data truncated; out of range for column 'c2' at row 1
|
||||
Warning 1264 Data truncated; out of range for column 'c3' at row 1
|
||||
Warning 1264 Data truncated; out of range for column 'c4' at row 1
|
||||
Warning 1264 Data truncated; out of range for column 'c5' at row 1
|
||||
Warning 1264 Data truncated; out of range for column 'c6' at row 1
|
||||
Warning 1264 Data truncated; out of range for column 'c7' at row 1
|
||||
Warning 1264 Data truncated; out of range for column 'c12' at row 1
|
||||
Warning 1264 Out of range value adjusted for column 'c1' at row 1
|
||||
Warning 1264 Out of range value adjusted for column 'c2' at row 1
|
||||
Warning 1264 Out of range value adjusted for column 'c3' at row 1
|
||||
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
|
||||
Warning 1264 Out of range value adjusted for column 'c12' at row 1
|
||||
execute my_select ;
|
||||
c1 127
|
||||
c2 32767
|
||||
|
|
@ -2668,8 +2668,8 @@ Warning 1265 Data truncated for column 'c3' at row 1
|
|||
Warning 1265 Data truncated for column 'c4' at row 1
|
||||
Warning 1265 Data truncated for column 'c5' at row 1
|
||||
Warning 1265 Data truncated for column 'c6' at row 1
|
||||
Warning 1264 Data truncated; out of range for column 'c7' at row 1
|
||||
Warning 1264 Data truncated; out of range for column 'c12' at row 1
|
||||
Warning 1264 Out of range value adjusted for column 'c7' at row 1
|
||||
Warning 1264 Out of range value adjusted for column 'c12' at row 1
|
||||
execute my_select ;
|
||||
c1 1
|
||||
c2 1
|
||||
|
|
@ -2687,14 +2687,14 @@ set @arg00= -1.11111111111111111111e+50 ;
|
|||
execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
|
||||
@arg00, @arg00, @arg00, @arg00, @arg00 ;
|
||||
Warnings:
|
||||
Warning 1264 Data truncated; out of range for column 'c1' at row 1
|
||||
Warning 1264 Data truncated; out of range for column 'c2' at row 1
|
||||
Warning 1264 Data truncated; out of range for column 'c3' at row 1
|
||||
Warning 1264 Data truncated; out of range for column 'c4' at row 1
|
||||
Warning 1264 Data truncated; out of range for column 'c5' at row 1
|
||||
Warning 1264 Data truncated; out of range for column 'c6' at row 1
|
||||
Warning 1264 Data truncated; out of range for column 'c7' at row 1
|
||||
Warning 1264 Data truncated; out of range for column 'c12' at row 1
|
||||
Warning 1264 Out of range value adjusted for column 'c1' at row 1
|
||||
Warning 1264 Out of range value adjusted for column 'c2' at row 1
|
||||
Warning 1264 Out of range value adjusted for column 'c3' at row 1
|
||||
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
|
||||
Warning 1264 Out of range value adjusted for column 'c12' at row 1
|
||||
execute my_select ;
|
||||
c1 -128
|
||||
c2 -32768
|
||||
|
|
@ -2718,8 +2718,8 @@ Warning 1265 Data truncated for column 'c3' at row 1
|
|||
Warning 1265 Data truncated for column 'c4' at row 1
|
||||
Warning 1265 Data truncated for column 'c5' at row 1
|
||||
Warning 1265 Data truncated for column 'c6' at row 1
|
||||
Warning 1264 Data truncated; out of range for column 'c7' at row 1
|
||||
Warning 1264 Data truncated; out of range for column 'c12' at row 1
|
||||
Warning 1264 Out of range value adjusted for column 'c7' at row 1
|
||||
Warning 1264 Out of range value adjusted for column 'c12' at row 1
|
||||
execute my_select ;
|
||||
c1 -1
|
||||
c2 -1
|
||||
|
|
@ -2950,45 +2950,45 @@ Warning 1265 Data truncated for column 'c17' at row 1
|
|||
Warnings:
|
||||
Warning 1265 Data truncated for column 'c17' at row 1
|
||||
Warnings:
|
||||
Warning 1264 Data truncated; out of range for column 'c13' at row 1
|
||||
Warning 1264 Out of range value adjusted for column 'c13' at row 1
|
||||
Warning 1265 Data truncated for column 'c14' at row 1
|
||||
Warning 1265 Data truncated for column 'c15' at row 1
|
||||
Warning 1264 Data truncated; out of range for column 'c16' at row 1
|
||||
Warning 1264 Data truncated; out of range for column 'c17' at row 1
|
||||
Warning 1264 Out of range value adjusted for column 'c16' at row 1
|
||||
Warning 1264 Out of range value adjusted for column 'c17' at row 1
|
||||
Warnings:
|
||||
Warning 1264 Data truncated; out of range for column 'c13' at row 1
|
||||
Warning 1264 Out of range value adjusted for column 'c13' at row 1
|
||||
Warning 1265 Data truncated for column 'c14' at row 1
|
||||
Warning 1265 Data truncated for column 'c15' at row 1
|
||||
Warning 1264 Data truncated; out of range for column 'c16' at row 1
|
||||
Warning 1264 Data truncated; out of range for column 'c17' at row 1
|
||||
Warning 1264 Out of range value adjusted for column 'c16' at row 1
|
||||
Warning 1264 Out of range value adjusted for column 'c17' at row 1
|
||||
Warnings:
|
||||
Warning 1264 Data truncated; out of range for column 'c13' at row 1
|
||||
Warning 1264 Out of range value adjusted for column 'c13' at row 1
|
||||
Warning 1265 Data truncated for column 'c14' at row 1
|
||||
Warning 1265 Data truncated for column 'c15' at row 1
|
||||
Warning 1264 Data truncated; out of range for column 'c16' at row 1
|
||||
Warning 1264 Data truncated; out of range for column 'c17' at row 1
|
||||
Warning 1264 Out of range value adjusted for column 'c16' at row 1
|
||||
Warning 1264 Out of range value adjusted for column 'c17' at row 1
|
||||
Warnings:
|
||||
Warning 1264 Data truncated; out of range for column 'c13' at row 1
|
||||
Warning 1264 Out of range value adjusted for column 'c13' at row 1
|
||||
Warning 1265 Data truncated for column 'c14' at row 1
|
||||
Warning 1265 Data truncated for column 'c15' at row 1
|
||||
Warning 1264 Data truncated; out of range for column 'c16' at row 1
|
||||
Warning 1264 Data truncated; out of range for column 'c17' at row 1
|
||||
Warning 1264 Out of range value adjusted for column 'c16' at row 1
|
||||
Warning 1264 Out of range value adjusted for column 'c17' at row 1
|
||||
Warnings:
|
||||
Warning 1265 Data truncated for column 'c15' at row 1
|
||||
Warning 1264 Data truncated; out of range for column 'c16' at row 1
|
||||
Warning 1264 Data truncated; out of range for column 'c17' at row 1
|
||||
Warning 1264 Out of range value adjusted for column 'c16' at row 1
|
||||
Warning 1264 Out of range value adjusted for column 'c17' at row 1
|
||||
Warnings:
|
||||
Warning 1265 Data truncated for column 'c15' at row 1
|
||||
Warning 1264 Data truncated; out of range for column 'c16' at row 1
|
||||
Warning 1264 Data truncated; out of range for column 'c17' at row 1
|
||||
Warning 1264 Out of range value adjusted for column 'c16' at row 1
|
||||
Warning 1264 Out of range value adjusted for column 'c17' at row 1
|
||||
Warnings:
|
||||
Warning 1265 Data truncated for column 'c15' at row 1
|
||||
Warning 1264 Data truncated; out of range for column 'c16' at row 1
|
||||
Warning 1264 Data truncated; out of range for column 'c17' at row 1
|
||||
Warning 1264 Out of range value adjusted for column 'c16' at row 1
|
||||
Warning 1264 Out of range value adjusted for column 'c17' at row 1
|
||||
Warnings:
|
||||
Warning 1265 Data truncated for column 'c15' at row 1
|
||||
Warning 1264 Data truncated; out of range for column 'c16' at row 1
|
||||
Warning 1264 Data truncated; out of range for column 'c17' at row 1
|
||||
Warning 1264 Out of range value adjusted for column 'c16' at row 1
|
||||
Warning 1264 Out of range value adjusted for column 'c17' at row 1
|
||||
select c1, c13, c14, c15, c16, c17 from t9 order by c1 ;
|
||||
c1 c13 c14 c15 c16 c17
|
||||
20 1991-01-01 1991-01-01 01:01:01 1991-01-01 01:01:01 01:01:01 1991
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue