From: monty Date: June 6 2006 5:21pm Subject: bk commit into 5.1 tree (monty:1.2189) List-Archive: http://lists.mysql.com/commits/7330 Message-Id: <20060606172142.BE1C310659E1@narttu.mysql.fi> Below is the list of changes that have just been committed into a local 5.1 repository of monty. When monty does a push these changes will be propagated to the main repository and, within 24 hours after the push, to the public repository. For information on how to access the public repository see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html ChangeSet 1.2189 06/06/06 20:21:36 monty@stripped +18 -0 Added --pipe option for faster compile Changed error to be more descriptive when you are refering to a not existing key Fixed core dump in view test and changed to better error message BUILD/compile-pentium64 1.1 06/06/06 20:21:32 monty@stripped +13 -0 New BitKeeper file ``BUILD/compile-pentium64'' sql/sql_base.cc 1.330 06/06/06 20:21:32 monty@stripped +2 -2 Fixed core dump in view test Changed to correct error message that also shows the name of the faulty table sql/share/errmsg.txt 1.106 06/06/06 20:21:32 monty@stripped +1 -1 Fix that ER_KEY_DOES_NOT_EXISTS has same SQLSTATE as ER_KEY_COLUMN_DOES_NOT_EXISTS BUILD/compile-pentium64 1.0 06/06/06 20:21:32 monty@stripped +0 -0 BitKeeper file /home/my/mysql-5.1/BUILD/compile-pentium64 mysql-test/t/view.test 1.149 06/06/06 20:21:31 monty@stripped +1 -1 Changed error to be more descriptive mysql-test/t/select.test 1.102 06/06/06 20:21:31 monty@stripped +2 -2 Changed error to be more descriptive mysql-test/t/explain.test 1.10 06/06/06 20:21:31 monty@stripped +2 -2 Changed error to be more descriptive mysql-test/t/disabled.def 1.164 06/06/06 20:21:31 monty@stripped +5 -3 Disable im_instance_conf and im_options until Bug#20294 (Instance manager test im_instance_conf fails randomly) is fixed mysql-test/r/view.result 1.163 06/06/06 20:21:31 monty@stripped +1 -1 Changed error to be more descriptive mysql-test/r/ssl_compress.result 1.3 06/06/06 20:21:31 monty@stripped +2 -2 Changed error to be more descriptive mysql-test/r/ssl.result 1.3 06/06/06 20:21:31 monty@stripped +2 -2 Changed error to be more descriptive mysql-test/r/select.result 1.126 06/06/06 20:21:31 monty@stripped +2 -2 Changed error to be more descriptive mysql-test/r/preload.result 1.10 06/06/06 20:21:31 monty@stripped +2 -2 Changed error to be more descriptive mysql-test/r/key_cache.result 1.18 06/06/06 20:21:31 monty@stripped +2 -2 Changed error to be more descriptive mysql-test/r/explain.result 1.17 06/06/06 20:21:31 monty@stripped +2 -2 Changed error to be more descriptive mysql-test/r/compress.result 1.4 06/06/06 20:21:31 monty@stripped +2 -2 Changed error to be more descriptive mysql-test/include/common-tests.inc 1.2 06/06/06 20:21:31 monty@stripped +2 -2 Changed error to be more descriptive BUILD/compile-pentium64-debug 1.4 06/06/06 20:21:31 monty@stripped +1 -1 Added --pipe option for faster compile (This changset was missing in the tree I used to rebuild a new 5.1 tree) BUILD/compile-pentium64-debug-max 1.4 06/06/06 20:21:31 monty@stripped +1 -1 Added --pipe option for faster compile (This changset was missing in the tree I used to rebuild a new 5.1 tree) # This is a BitKeeper patch. What follows are the unified diffs for the # set of deltas contained in the patch. The rest of the patch, the part # that BitKeeper cares about, is below these diffs. # User: monty # Host: narttu.mysql.fi # Root: /home/my/mysql-5.1 --- 1.329/sql/sql_base.cc 2006-06-06 14:48:09 +03:00 +++ 1.330/sql/sql_base.cc 2006-06-06 20:21:32 +03:00 @@ -5487,8 +5487,8 @@ name->length(), 1)) <= 0) { - my_error(ER_KEY_COLUMN_DOES_NOT_EXITS, MYF(0), name->c_ptr(), - table->pos_in_table_list->alias); + my_error(ER_KEY_DOES_NOT_EXITS, MYF(0), name->c_ptr(), + table->alias); map->set_all(); return 1; } --- 1.105/sql/share/errmsg.txt 2006-06-04 19:23:57 +03:00 +++ 1.106/sql/share/errmsg.txt 2006-06-06 20:21:32 +03:00 @@ -3935,7 +3935,7 @@ spa "Tu estás usando modo de actualización segura y tentado actualizar una tabla sin un WHERE que usa una KEY columna" swe "Du använder 'säker uppdateringsmod' och försökte uppdatera en tabell utan en WHERE-sats som använder sig av en nyckel" ukr "÷É Õ ÒÅÖÉͦ ÂÅÚÐÅÞÎÏÇÏ ÏÎÏ×ÌÅÎÎÑ ÔÁ ÎÁÍÁÇÁ¤ÔÅÓØ ÏÎÏ×ÉÔÉ ÔÁÂÌÉÃÀ ÂÅÚ ÏÐÅÒÁÔÏÒÁ WHERE, ÝÏ ×ÉËÏÒÉÓÔÏ×Õ¤ KEY ÓÔÏ×ÂÅÃØ" -ER_KEY_DOES_NOT_EXITS +ER_KEY_DOES_NOT_EXITS 42000 S1009 cze "Kl-Bíè '%-.64s' v tabulce '%-.64s' neexistuje" dan "Nøglen '%-.64s' eksisterer ikke i tabellen '%-.64s'" nla "Zoeksleutel '%-.64s' bestaat niet in tabel '%-.64s'" --- 1.162/mysql-test/r/view.result 2006-05-24 19:50:55 +03:00 +++ 1.163/mysql-test/r/view.result 2006-06-06 20:21:31 +03:00 @@ -614,7 +614,7 @@ create table t1 (a int, b int); create view v1 as select a, sum(b) from t1 group by a; select b from v1 use index (some_index) where b=1; -ERROR 42000: Key column 'some_index' doesn't exist in table +ERROR 42000: Key 'some_index' doesn't exist in table 'v1' drop view v1; drop table t1; create table t1 (col1 char(5),col2 char(5)); --- 1.148/mysql-test/t/view.test 2006-05-24 19:50:55 +03:00 +++ 1.149/mysql-test/t/view.test 2006-06-06 20:21:31 +03:00 @@ -516,7 +516,7 @@ # create table t1 (a int, b int); create view v1 as select a, sum(b) from t1 group by a; --- error 1072 +--error 1176 select b from v1 use index (some_index) where b=1; drop view v1; drop table t1; --- 1.9/mysql-test/r/preload.result 2005-05-13 12:08:03 +03:00 +++ 1.10/mysql-test/r/preload.result 2006-06-06 20:21:31 +03:00 @@ -160,11 +160,11 @@ load index into cache t3 key (b), t2 key (c) ; Table Op Msg_type Msg_text test.t3 preload_keys error Table 'test.t3' doesn't exist -test.t2 preload_keys error Key column 'c' doesn't exist in table +test.t2 preload_keys error Key 'c' doesn't exist in table 't2' test.t2 preload_keys status Operation failed Warnings: Error 1146 Table 'test.t3' doesn't exist -Error 1072 Key column 'c' doesn't exist in table +Error 1176 Key 'c' doesn't exist in table 't2' show status like "key_read%"; Variable_name Value Key_read_requests 0 --- 1.3/BUILD/compile-pentium64-debug-max 2006-04-05 16:50:27 +03:00 +++ 1.4/BUILD/compile-pentium64-debug-max 2006-06-06 20:21:31 +03:00 @@ -7,5 +7,5 @@ extra_configs="$pentium_configs $debug_configs $max_configs" extra_configs="$extra_configs " - +CC="$CC --pipe" . "$path/FINISH.sh" --- 1.163/mysql-test/t/disabled.def 2006-06-06 14:34:39 +03:00 +++ 1.164/mysql-test/t/disabled.def 2006-06-06 20:21:31 +03:00 @@ -13,6 +13,8 @@ #events_stress : BUG#17619 2006-02-21 andrey Race conditions #events : BUG#17619 2006-02-21 andrey Race conditions #events_scheduling : BUG#19170 2006-04-26 andrey Test case of 19170 fails on some platforms. Has to be checked. +im_instance_conf : Bug#20294 2006-06-06 monty Instance manager test im_instance_conf fails randomly +im_options : Bug#20294 2006-06-06 monty Instance manager test im_instance_conf fails randomly ndb_autodiscover : BUG#18952 2006-02-16 jmiller Needs to be fixed w.r.t binlog ndb_autodiscover2 : BUG#18952 2006-02-16 jmiller Needs to be fixed w.r.t binlog #ndb_binlog_discover : BUG#19395 2006-04-28 tomas/knielsen mysqld does not always detect cluster shutdown @@ -27,12 +29,12 @@ #rpl_ndb_commit_afterflush : BUG#19328 2006-05-04 tomas Slave timeout with COM_REGISTER_SLAVE error causing stop rpl_ndb_dd_partitions : BUG#19259 2006-04-21 rpl_ndb_dd_partitions fails on s/AMD rpl_ndb_ddl : BUG#18946 result file needs update + test needs to checked -rpl_ndb_innodb2ndb : Bug #19710 Cluster replication to partition table fails on DELETE FROM statement +rpl_ndb_innodb2ndb : Bug #19710 Cluster replication to partition table fails on DELETE FROM statement #rpl_ndb_log : BUG#18947 2006-03-21 tomas CRBR: order in binlog of create table and insert (on different table) not determ -rpl_ndb_myisam2ndb : Bug #19710 Cluster replication to partition table fails on DELETE FROM statement +rpl_ndb_myisam2ndb : Bug #19710 Cluster replication to partition table fails on DELETE FROM statement rpl_switch_stm_row_mixed : BUG#18590 2006-03-28 brian rpl_row_blob_innodb : BUG#18980 2006-04-10 kent Test fails randomly -rpl_row_func003 : BUG#19074 2006-13-04 andrei test failed +rpl_row_func003 : BUG#19074 2006-13-04 andrei test failed rpl_row_inexist_tbl : BUG#18948 2006-03-09 mats Disabled since patch makes this test wait forever rpl_sp : BUG#16456 2006-02-16 jmiller --- 1.16/mysql-test/r/explain.result 2006-05-03 17:02:36 +03:00 +++ 1.17/mysql-test/r/explain.result 2006-06-06 20:21:31 +03:00 @@ -24,9 +24,9 @@ id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE t1 const str str 11 const 1 explain select * from t1 use key (str,str,foo) where str="foo"; -ERROR 42000: Key column 'foo' doesn't exist in table +ERROR 42000: Key 'foo' doesn't exist in table 't1' explain select * from t1 ignore key (str,str,foo) where str="foo"; -ERROR 42000: Key column 'foo' doesn't exist in table +ERROR 42000: Key 'foo' doesn't exist in table 't1' drop table t1; explain select 1; id select_type table type possible_keys key key_len ref rows Extra --- 1.125/mysql-test/r/select.result 2006-05-17 11:15:27 +03:00 +++ 1.126/mysql-test/r/select.result 2006-06-06 20:21:31 +03:00 @@ -144,9 +144,9 @@ id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE t2 ref fld3 fld3 30 const 1 Using where; Using index explain select fld3 from t2 ignore index (fld3,not_used); -ERROR 42000: Key column 'not_used' doesn't exist in table +ERROR 42000: Key 'not_used' doesn't exist in table 't2' explain select fld3 from t2 use index (not_used); -ERROR 42000: Key column 'not_used' doesn't exist in table +ERROR 42000: Key 'not_used' doesn't exist in table 't2' select t2.fld3 from t2 where fld3 >= 'honeysuckle' and fld3 <= 'honoring' order by fld3; fld3 honeysuckle --- 1.9/mysql-test/t/explain.test 2006-05-03 17:02:36 +03:00 +++ 1.10/mysql-test/t/explain.test 2006-06-06 20:21:31 +03:00 @@ -15,9 +15,9 @@ explain select * from t1 use key (str,str) where str="foo"; #The following should give errors ---error 1072 +--error 1176 explain select * from t1 use key (str,str,foo) where str="foo"; ---error 1072 +--error 1176 explain select * from t1 ignore key (str,str,foo) where str="foo"; drop table t1; --- 1.101/mysql-test/t/select.test 2006-05-12 05:46:54 +03:00 +++ 1.102/mysql-test/t/select.test 2006-06-06 20:21:31 +03:00 @@ -1296,9 +1296,9 @@ # The next should give an error # --- error 1072 +--error 1176 explain select fld3 from t2 ignore index (fld3,not_used); --- error 1072 +--error 1176 explain select fld3 from t2 use index (not_used); # --- 1.17/mysql-test/r/key_cache.result 2006-04-20 04:08:10 +03:00 +++ 1.18/mysql-test/r/key_cache.result 2006-06-06 20:21:31 +03:00 @@ -191,10 +191,10 @@ ERROR HY000: Unknown key cache 'unknown_key_cache' cache index t1 key (unknown_key) in keycache1; Table Op Msg_type Msg_text -test.t1 assign_to_keycache error Key column 'unknown_key' doesn't exist in table +test.t1 assign_to_keycache error Key 'unknown_key' doesn't exist in table 't1' test.t1 assign_to_keycache status Operation failed Warnings: -Error 1072 Key column 'unknown_key' doesn't exist in table +Error 1176 Key 'unknown_key' doesn't exist in table 't1' select @@keycache2.key_buffer_size; @@keycache2.key_buffer_size 4194304 --- 1.3/BUILD/compile-pentium64-debug 2006-04-05 16:50:27 +03:00 +++ 1.4/BUILD/compile-pentium64-debug 2006-06-06 20:21:31 +03:00 @@ -7,5 +7,5 @@ extra_configs="$pentium_configs $debug_configs $static_link" extra_configs="$extra_configs " - +CC="$CC --pipe" . "$path/FINISH.sh" --- New file --- +++ BUILD/compile-pentium64 06/06/06 20:21:32 #! /bin/sh path=`dirname $0` . "$path/SETUP.sh" $@ --with-debug=full extra_flags="$pentium64_cflags $fast_cflags" c_warnings="$c_warnings" cxx_warnings="$cxx_warnings" extra_configs="$pentium_configs $static_link" extra_configs="$extra_configs " CC="$CC --pipe" . "$path/FINISH.sh" --- 1.1/mysql-test/include/common-tests.inc 2005-10-18 16:38:22 +03:00 +++ 1.2/mysql-test/include/common-tests.inc 2006-06-06 20:21:31 +03:00 @@ -1296,9 +1296,9 @@ # The next should give an error # --- error 1072 +-- error 1176 explain select fld3 from t2 ignore index (fld3,not_used); --- error 1072 +-- error 1176 explain select fld3 from t2 use index (not_used); # --- 1.3/mysql-test/r/compress.result 2006-05-12 19:58:42 +03:00 +++ 1.4/mysql-test/r/compress.result 2006-06-06 20:21:31 +03:00 @@ -145,9 +145,9 @@ id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE t2 ref fld3 fld3 30 const 1 Using where; Using index explain select fld3 from t2 ignore index (fld3,not_used); -ERROR 42000: Key column 'not_used' doesn't exist in table +ERROR 42000: Key 'not_used' doesn't exist in table 't2' explain select fld3 from t2 use index (not_used); -ERROR 42000: Key column 'not_used' doesn't exist in table +ERROR 42000: Key 'not_used' doesn't exist in table 't2' select t2.fld3 from t2 where fld3 >= 'honeysuckle' and fld3 <= 'honoring' order by fld3; fld3 honeysuckle --- 1.2/mysql-test/r/ssl.result 2005-10-13 12:27:55 +03:00 +++ 1.3/mysql-test/r/ssl.result 2006-06-06 20:21:31 +03:00 @@ -145,9 +145,9 @@ id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE t2 ref fld3 fld3 30 const 1 Using where; Using index explain select fld3 from t2 ignore index (fld3,not_used); -ERROR 42000: Key column 'not_used' doesn't exist in table +ERROR 42000: Key 'not_used' doesn't exist in table 't2' explain select fld3 from t2 use index (not_used); -ERROR 42000: Key column 'not_used' doesn't exist in table +ERROR 42000: Key 'not_used' doesn't exist in table 't2' select t2.fld3 from t2 where fld3 >= 'honeysuckle' and fld3 <= 'honoring' order by fld3; fld3 honeysuckle --- 1.2/mysql-test/r/ssl_compress.result 2005-10-13 12:27:55 +03:00 +++ 1.3/mysql-test/r/ssl_compress.result 2006-06-06 20:21:31 +03:00 @@ -148,9 +148,9 @@ id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE t2 ref fld3 fld3 30 const 1 Using where; Using index explain select fld3 from t2 ignore index (fld3,not_used); -ERROR 42000: Key column 'not_used' doesn't exist in table +ERROR 42000: Key 'not_used' doesn't exist in table 't2' explain select fld3 from t2 use index (not_used); -ERROR 42000: Key column 'not_used' doesn't exist in table +ERROR 42000: Key 'not_used' doesn't exist in table 't2' select t2.fld3 from t2 where fld3 >= 'honeysuckle' and fld3 <= 'honoring' order by fld3; fld3 honeysuckle