List:Commits« Previous MessageNext Message »
From:Marc Alff Date:July 15 2011 8:06am
Subject:bzr push into mysql-trunk-wl5342 branch (marc.alff:3380 to 3381)
View as plain text  
 3381 Marc Alff	2011-07-15 [merge]
      Merge mysql-trunk --> mysql-trunk-wl5342

    added:
      mysql-test/suite/rpl/r/rpl_row_corruption.result
      mysql-test/suite/rpl/t/rpl_row_corruption-slave.opt
      mysql-test/suite/rpl/t/rpl_row_corruption.test
    modified:
      mysql-test/r/grant.result
      mysql-test/r/information_schema.result
      mysql-test/r/sp.result
      mysql-test/r/view.result
      mysql-test/t/disabled.def
      mysql-test/t/grant.test
      mysql-test/t/information_schema.test
      mysql-test/t/sp.test
      mysql-test/t/view.test
      sql/log_event.cc
      sql/sp_head.cc
      sql/sp_head.h
      sql/sql_insert.cc
      sql/sql_parse.cc
      sql/sql_select.cc
      sql/sql_view.cc
      sql/sql_yacc.yy
      tests/mysql_client_test.c
 3380 Marc Alff	2011-07-14
      WL#5342 PERFORMANCE SCHEMA SETUP_OBJECTS, ENABLED column 
      
      Implemented stronger checks for out of bound enum values.
      Added tests in dml_setup_objects, setup_objects.

    modified:
      mysql-test/suite/perfschema/r/dml_setup_objects.result
      mysql-test/suite/perfschema/r/setup_objects.result
      mysql-test/suite/perfschema/t/dml_setup_objects.test
      mysql-test/suite/perfschema/t/setup_objects.test
      storage/perfschema/table_setup_objects.cc
=== modified file 'mysql-test/r/grant.result'
--- a/mysql-test/r/grant.result	2011-05-10 13:37:37 +0000
+++ b/mysql-test/r/grant.result	2011-07-14 07:32:01 +0000
@@ -2559,3 +2559,29 @@ Grants for mysqltest_u1@%
 GRANT USAGE ON *.* TO 'mysqltest_u1'@'%'
 drop database mysqltest_db1;
 drop user mysqltest_u1;
+#
+# Bug#11756966 - 48958: STORED PROCEDURES CAN BE LEVERAGED TO BYPASS
+#                DATABASE SECURITY
+#
+DROP DATABASE IF EXISTS secret;
+DROP DATABASE IF EXISTS no_such_db;
+CREATE DATABASE secret;
+GRANT USAGE ON *.* TO 'untrusted'@localhost;
+# Connection con1
+SHOW GRANTS;
+Grants for untrusted@localhost
+GRANT USAGE ON *.* TO 'untrusted'@'localhost'
+SHOW DATABASES;
+Database
+information_schema
+test
+# Both statements below should fail with the same error.
+# They used to give different errors, thereby
+# hinting that the secret database exists.
+CREATE PROCEDURE no_such_db.foo() BEGIN END;
+ERROR 42000: Access denied for user 'untrusted'@'localhost' to database 'no_such_db'
+CREATE PROCEDURE secret.peek_at_secret() BEGIN END;
+ERROR 42000: Access denied for user 'untrusted'@'localhost' to database 'secret'
+# Connection default
+DROP USER 'untrusted'@localhost;
+DROP DATABASE secret;

=== modified file 'mysql-test/r/information_schema.result'
--- a/mysql-test/r/information_schema.result	2011-03-11 18:53:12 +0000
+++ b/mysql-test/r/information_schema.result	2011-07-14 07:32:01 +0000
@@ -1111,7 +1111,7 @@ CREATE PROCEDURE p1 ()
 BEGIN
 SELECT 'foo' FROM DUAL;
 END |
-ERROR 42000: Unknown database 'information_schema'
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'
 select ROUTINE_NAME from routines where ROUTINE_SCHEMA='information_schema';
 ROUTINE_NAME
 grant all on information_schema.* to 'user1'@'localhost';

=== modified file 'mysql-test/r/sp.result'
--- a/mysql-test/r/sp.result	2011-06-21 15:32:01 +0000
+++ b/mysql-test/r/sp.result	2011-07-14 08:05:12 +0000
@@ -7573,3 +7573,26 @@ DROP TABLE t1;
 DROP PROCEDURE p1;
 
 # End of 5.5 test
+#
+# Bug#12663165 SP DEAD CODE REMOVAL DOESN'T UNDERSTAND CONTINUE HANDLERS
+#
+DROP FUNCTION IF EXISTS f1;
+CREATE FUNCTION f1() RETURNS INT
+BEGIN
+DECLARE CONTINUE HANDLER FOR SQLEXCEPTION BEGIN END;
+BEGIN
+DECLARE CONTINUE HANDLER FOR SQLEXCEPTION RETURN f1();
+BEGIN
+DECLARE CONTINUE HANDLER FOR SQLEXCEPTION RETURN f1();
+RETURN f1();
+END;
+END;
+RETURN 1;
+END $
+SELECT f1();
+f1()
+1
+Warnings:
+Error	1424	Recursive stored functions and triggers are not allowed.
+Error	1305	FUNCTION test.f1 does not exist
+DROP FUNCTION f1;

=== modified file 'mysql-test/r/view.result'
--- a/mysql-test/r/view.result	2011-04-08 08:15:19 +0000
+++ b/mysql-test/r/view.result	2011-07-13 10:29:51 +0000
@@ -4102,3 +4102,16 @@ UNLOCK TABLES;
 # Connection default
 DROP PROCEDURE p1;
 DROP TABLE t1;
+#
+# Bug#11757397 49437: CANNOT DO SHOW FIELDS FOR BIG VIEW 
+#
+DROP TABLE IF EXISTS t1, t2, t3, table_broken;
+DROP VIEW IF EXISTS view_broken;
+CREATE TABLE t1 (a1 int, a2 int, a3 int, a4 int, a5 int, a6 int, a7 int, a8 int, a9 int, a10 int, a11 int, a12 int, a13 int, a14 int, a15 int, a16 int, a17 int, a18 int, a19 int, a20 int, a21 int, a22 int, a23 int, a24 int, a25 int, a26 int, a27 int, a28 int, a29 int, a30 int, a31 int, a32 int, a33 int, a34 int, a35 int, a36 int, a37 int, a38 int, a39 int, a40 int, a41 int, a42 int, a43 int, a44 int, a45 int, a46 int, a47 int, a48 int, a49 int, a50 int, a51 int, a52 int, a53 int, a54 int, a55 int, a56 int, a57 int, a58 int, a59 int, a60 int, a61 int, a62 int, a63 int, a64 int, a65 int, a66 int, a67 int, a68 int, a69 int, a70 int, a71 int, a72 int, a73 int, a74 int, a75 int, a76 int, a77 int, a78 int, a79 int, a80 int, a81 int, a82 int, a83 int, a84 int, a85 int, a86 int, a87 int, a88 int, a89 int, a90 int, a91 int, a92 int, a93 int, a94 int, a95 int, a96 int, a97 int, a98 int, a99 int, a100 int, a101 int, a102 int, a103 int, a104 int, a105 int, a106 int, a107 int, a108 int,!
  a109 int, a110 int, a111 int, a112 int, a113 int, a114 int, a115 int, a116 int, a117 int, a118 int, a119 int, a120 int, a121 int, a122 int, a123 int, a124 int, a125 int, a126 int, a127 int, a128 int, a129 int, a130 int, a131 int, a132 int, a133 int, a134 int, a135 int, a136 int, a137 int, a138 int, a139 int, a140 int, a141 int, a142 int, a143 int, a144 int, a145 int, a146 int, a147 int, a148 int, a149 int, a150 int, a151 int, a152 int, a153 int, a154 int, a155 int, a156 int, a157 int, a158 int, a159 int, a160 int, a161 int, a162 int, a163 int, a164 int, a165 int, a166 int, a167 int, a168 int, a169 int, a170 int, a171 int, a172 int, a173 int, a174 int, a175 int, a176 int, a177 int, a178 int, a179 int, a180 int, a181 int, a182 int, a183 int, a184 int, a185 int, a186 int, a187 int, a188 int, a189 int, a190 int, a191 int, a192 int, a193 int, a194 int, a195 int, a196 int, a197 int, a198 int, a199 int, a200 int, a201 int, a202 int, a203 int, a204 int, a205 int, a206 int, a207 in!
 t, a208 int, a209 int, a210 int, a211 int, a212 int, a213 int, a214 in
t, a215 int, a216 int, a217 int, a218 int, a219 int, a220 int, a221 int, a222 int, a223 int, a224 int, a225 int, a226 int, a227 int, a228 int, a229 int, a230 int, a231 int, a232 int, a233 int, a234 int, a235 int, a236 int, a237 int, a238 int, a239 int, a240 int, a241 int, a242 int, a243 int, a244 int, a245 int, a246 int, a247 int, a248 int, a249 int, a250 int, a251 int, a252 int, a253 int, a254 int, a255 int, a256 int, a257 int, a258 int, a259 int, a260 int, a261 int, a262 int, a263 int, a264 int, a265 int, a266 int, a267 int, a268 int, a269 int, a270 int, a271 int, a272 int, a273 int, a274 int, a275 int, a276 int, a277 int, a278 int, a279 int, a280 int, a281 int, a282 int, a283 int, a284 int, a285 int, a286 int, a287 int, a288 int, a289 int, a290 int, a291 int, a292 int, a293 int, a294 int, a295 int, a296 int, a297 int, a298 int, a299 int, a300 int, a301 int, a302 int, a303 int, a304 int, a305 int, a306 int, a307 int, a308 int, a309 int, a310 int, a311 int, a312 int, a313 i!
 nt, a314 int, a315 int, a316 int, a317 int, a318 int, a319 int, a320 int, a321 int, a322 int, a323 int, a324 int, a325 int, a326 int, a327 int, a328 int, a329 int, a330 int, a331 int, a332 int, a333 int, a334 int, a335 int, a336 int, a337 int, a338 int, a339 int, a340 int, a341 int, a342 int, a343 int, a344 int, a345 int, a346 int, a347 int, a348 int, a349 int, a350 int, a351 int, a352 int, a353 int, a354 int, a355 int, a356 int, a357 int, a358 int, a359 int, a360 int, a361 int, a362 int, a363 int, a364 int, a365 int, a366 int, a367 int, a368 int, a369 int, a370 int, a371 int, a372 int, a373 int, a374 int, a375 int, a376 int, a377 int, a378 int, a379 int, a380 int, a381 int, a382 int, a383 int, a384 int, a385 int, a386 int, a387 int, a388 int, a389 int, a390 int, a391 int, a392 int, a393 int, a394 int, a395 int, a396 int, a397 int, a398 int, a399 int, a400 int, a401 int, a402 int, a403 int, a404 int, a405 int, a406 int, a407 int, a408 int, a409 int, a410 int, a411 int, a412!
  int, a413 int, a414 int, a415 int, a416 int, a417 int, a418 int, a419
 int, a420 int, a421 int, a422 int, a423 int, a424 int, a425 int, a426 int, a427 int, a428 int, a429 int, a430 int, a431 int, a432 int, a433 int, a434 int, a435 int, a436 int, a437 int, a438 int, a439 int, a440 int, a441 int, a442 int, a443 int, a444 int, a445 int, a446 int, a447 int, a448 int, a449 int, a450 int, a451 int, a452 int, a453 int, a454 int, a455 int, a456 int, a457 int, a458 int, a459 int, a460 int, a461 int, a462 int, a463 int, a464 int, a465 int, a466 int, a467 int, a468 int, a469 int, a470 int, a471 int, a472 int, a473 int, a474 int, a475 int, a476 int, a477 int, a478 int, a479 int, a480 int, a481 int, a482 int, a483 int, a484 int, a485 int, a486 int, a487 int, a488 int, a489 int, a490 int, a491 int, a492 int, a493 int, a494 int, a495 int, a496 int, a497 int, a498 int, a499 int, a500 int, a501 int, a502 int, a503 int, a504 int, a505 int, a506 int, a507 int, a508 int, a509 int, a510 int, a511 int, a512 int, a513 int, a514 int, a515 int, a516 int, a517 int, a51!
 8 int, a519 int, a520 int, a521 int, a522 int, a523 int, a524 int, a525 int, a526 int, a527 int, a528 int, a529 int, a530 int, a531 int, a532 int, a533 int, a534 int, a535 int, a536 int, a537 int, a538 int, a539 int, a540 int, a541 int, a542 int, a543 int, a544 int, a545 int, a546 int, a547 int, a548 int, a549 int, a550 int, a551 int, a552 int, a553 int, a554 int, a555 int, a556 int, a557 int, a558 int, a559 int, a560 int, a561 int, a562 int, a563 int, a564 int, a565 int, a566 int, a567 int, a568 int, a569 int, a570 int, a571 int, a572 int, a573 int, a574 int, a575 int, a576 int, a577 int, a578 int, a579 int, a580 int, a581 int, a582 int, a583 int, a584 int, a585 int, a586 int, a587 int, a588 int, a589 int, a590 int, a591 int, a592 int, a593 int, a594 int, a595 int, a596 int, a597 int, a598 int, a599 int, a600 int, a601 int, a602 int, a603 int, a604 int, a605 int, a606 int, a607 int, a608 int, a609 int, a610 int, a611 int, a612 int, a613 int, a614 int, a615 int, a616 int, a!
 617 int, a618 int, a619 int, a620 int, a621 int, a622 int, a623 int, a
624 int, a625 int, a626 int, a627 int, a628 int, a629 int, a630 int, a631 int, a632 int, a633 int, a634 int, a635 int, a636 int, a637 int, a638 int, a639 int, a640 int, a641 int, a642 int, a643 int, a644 int, a645 int, a646 int, a647 int, a648 int, a649 int, a650 int, a651 int, a652 int, a653 int, a654 int, a655 int, a656 int, a657 int, a658 int, a659 int, a660 int, a661 int, a662 int, a663 int, a664 int, a665 int, a666 int, a667 int, a668 int, a669 int, a670 int, a671 int, a672 int, a673 int, a674 int, a675 int, a676 int, a677 int, a678 int, a679 int, a680 int, a681 int, a682 int, a683 int, a684 int, a685 int, a686 int, a687 int, a688 int, a689 int, a690 int, a691 int, a692 int, a693 int, a694 int, a695 int, a696 int, a697 int, a698 int, a699 int, a700 int, a701 int, a702 int, a703 int, a704 int, a705 int, a706 int, a707 int, a708 int, a709 int, a710 int, a711 int, a712 int, a713 int, a714 int, a715 int, a716 int, a717 int, a718 int, a719 int, a720 int, a721 int, a722 int, !
 a723 int, a724 int, a725 int, a726 int, a727 int, a728 int, a729 int, a730 int, a731 int, a732 int, a733 int, a734 int, a735 int, a736 int, a737 int, a738 int, a739 int, a740 int, a741 int, a742 int, a743 int, a744 int, a745 int, a746 int, a747 int, a748 int, a749 int, a750 int, a751 int, a752 int, a753 int, a754 int, a755 int, a756 int, a757 int, a758 int, a759 int, a760 int, a761 int, a762 int, a763 int, a764 int, a765 int, a766 int, a767 int, a768 int, a769 int, a770 int, a771 int, a772 int, a773 int, a774 int, a775 int, a776 int, a777 int, a778 int, a779 int, a780 int, a781 int, a782 int, a783 int, a784 int, a785 int, a786 int, a787 int, a788 int, a789 int, a790 int, a791 int, a792 int, a793 int, a794 int, a795 int, a796 int, a797 int, a798 int, a799 int, a800 int, a801 int, a802 int, a803 int, a804 int, a805 int, a806 int, a807 int, a808 int, a809 int, a810 int, a811 int, a812 int, a813 int, a814 int, a815 int, a816 int, a817 int, a818 int, a819 int, a820 int, a821 int!
 , a822 int, a823 int, a824 int, a825 int, a826 int, a827 int, a828 int
, a829 int, a830 int, a831 int, a832 int, a833 int, a834 int, a835 int, a836 int, a837 int, a838 int, a839 int, a840 int, a841 int, a842 int, a843 int, a844 int, a845 int, a846 int, a847 int, a848 int, a849 int, a850 int, a851 int, a852 int, a853 int, a854 int, a855 int, a856 int, a857 int, a858 int, a859 int, a860 int, a861 int, a862 int, a863 int, a864 int, a865 int, a866 int, a867 int, a868 int, a869 int, a870 int, a871 int, a872 int, a873 int, a874 int, a875 int, a876 int, a877 int, a878 int, a879 int, a880 int, a881 int, a882 int, a883 int, a884 int, a885 int, a886 int, a887 int, a888 int, a889 int, a890 int, a891 int, a892 int, a893 int, a894 int, a895 int, a896 int, a897 int, a898 int, a899 int, a900 int, a901 int, a902 int, a903 int, a904 int, a905 int, a906 int, a907 int, a908 int, a909 int, a910 int, a911 int, a912 int, a913 int, a914 int, a915 int, a916 int, a917 int, a918 int, a919 int, a920 int, a921 int, a922 int, a923 int, a924 int, a925 int, a926 int, a927 in!
 t, a928 int, a929 int, a930 int, a931 int, a932 int, a933 int, a934 int, a935 int, a936 int, a937 int, a938 int, a939 int, a940 int, a941 int, a942 int, a943 int, a944 int, a945 int, a946 int, a947 int, a948 int, a949 int, a950 int, a951 int, a952 int, a953 int, a954 int, a955 int, a956 int, a957 int, a958 int, a959 int, a960 int, a961 int, a962 int, a963 int, a964 int, a965 int, a966 int, a967 int, a968 int, a969 int, a970 int, a971 int, a972 int, a973 int, a974 int, a975 int, a976 int, a977 int, a978 int, a979 int, a980 int, a981 int, a982 int, a983 int, a984 int, a985 int, a986 int, a987 int, a988 int, a989 int, a990 int, a991 int, a992 int, a993 int, a994 int, a995 int, a996 int, a997 int, a998 int, a999 int, a1000 int, a1001 int, a1002 int, a1003 int, a1004 int, a1005 int, a1006 int, a1007 int, a1008 int, a1009 int, a1010 int, a1011 int, a1012 int, a1013 int, a1014 int, a1015 int, a1016 int, a1017 int, a1018 int, a1019 int, a1020 int, a1021 int, a1022 int, a1023 int, a!
 1024 int, a1025 int, a1026 int, a1027 int, a1028 int, a1029 int, a1030
 int, a1031 int, a1032 int, a1033 int, a1034 int, a1035 int, a1036 int, a1037 int, a1038 int, a1039 int, a1040 int, a1041 int, a1042 int, a1043 int, a1044 int, a1045 int, a1046 int, a1047 int, a1048 int, a1049 int, a1050 int, a1051 int, a1052 int, a1053 int, a1054 int, a1055 int, a1056 int, a1057 int, a1058 int, a1059 int, a1060 int, a1061 int, a1062 int, a1063 int, a1064 int, a1065 int, a1066 int, a1067 int, a1068 int, a1069 int, a1070 int, a1071 int, a1072 int, a1073 int, a1074 int, a1075 int, a1076 int, a1077 int, a1078 int, a1079 int, a1080 int, a1081 int, a1082 int, a1083 int, a1084 int, a1085 int, a1086 int, a1087 int, a1088 int, a1089 int, a1090 int, a1091 int, a1092 int, a1093 int, a1094 int, a1095 int, a1096 int, a1097 int, a1098 int, a1099 int, a1100 int, a1101 int, a1102 int, a1103 int, a1104 int, a1105 int, a1106 int, a1107 int, a1108 int, a1109 int, a1110 int, a1111 int, a1112 int, a1113 int, a1114 int, a1115 int, a1116 int, a1117 int, a1118 int, a1119 int, a112!
 0 int, a1121 int, a1122 int, a1123 int, a1124 int, a1125 int, a1126 int, a1127 int, a1128 int, a1129 int, a1130 int, a1131 int, a1132 int, a1133 int, a1134 int, a1135 int, a1136 int, a1137 int, a1138 int, a1139 int, a1140 int, a1141 int, a1142 int, a1143 int, a1144 int, a1145 int, a1146 int, a1147 int, a1148 int, a1149 int, a1150 int, a1151 int, a1152 int, a1153 int, a1154 int, a1155 int, a1156 int, a1157 int, a1158 int, a1159 int, a1160 int, a1161 int, a1162 int, a1163 int, a1164 int, a1165 int, a1166 int, a1167 int, a1168 int, a1169 int, a1170 int, a1171 int, a1172 int, a1173 int, a1174 int, a1175 int, a1176 int, a1177 int, a1178 int, a1179 int, a1180 int, a1181 int, a1182 int, a1183 int, a1184 int, a1185 int, a1186 int, a1187 int, a1188 int, a1189 int, a1190 int, a1191 int, a1192 int, a1193 int, a1194 int, a1195 int, a1196 int, a1197 int, a1198 int, a1199 int, a1200 int, a1201 int, a1202 int, a1203 int, a1204 int, a1205 int, a1206 int, a1207 int, a1208 int, a1209 int, a1!
 210 int, a1211 int, a1212 int, a1213 int, a1214 int, a1215 int, a1216 
int, a1217 int, a1218 int, a1219 int, a1220 int, a1221 int, a1222 int, a1223 int, a1224 int, a1225 int, a1226 int, a1227 int, a1228 int, a1229 int, a1230 int, a1231 int, a1232 int, a1233 int, a1234 int, a1235 int, a1236 int, a1237 int, a1238 int, a1239 int, a1240 int, a1241 int, a1242 int, a1243 int, a1244 int, a1245 int, a1246 int, a1247 int, a1248 int, a1249 int, a1250 int, a1251 int, a1252 int, a1253 int, a1254 int, a1255 int, a1256 int, a1257 int, a1258 int, a1259 int, a1260 int, a1261 int, a1262 int, a1263 int, a1264 int, a1265 int, a1266 int, a1267 int, a1268 int, a1269 int, a1270 int, a1271 int, a1272 int, a1273 int, a1274 int, a1275 int, a1276 int, a1277 int, a1278 int, a1279 int, a1280 int, a1281 int, a1282 int, a1283 int, a1284 int, a1285 int, a1286 int, a1287 int, a1288 int, a1289 int, a1290 int, a1291 int, a1292 int, a1293 int, a1294 int, a1295 int, a1296 int, a1297 int, a1298 int, a1299 int, a1300 int, a1301 int, a1302 int, a1303 int, a1304 int, a1305 int, a1306!
  int, a1307 int, a1308 int, a1309 int, a1310 int, a1311 int, a1312 int, a1313 int, a1314 int, a1315 int, a1316 int, a1317 int, a1318 int, a1319 int, a1320 int, a1321 int, a1322 int, a1323 int, a1324 int, a1325 int, a1326 int, a1327 int, a1328 int, a1329 int, a1330 int, a1331 int, a1332 int, a1333 int, a1334 int, a1335 int, a1336 int, a1337 int, a1338 int, a1339 int, a1340 int, a1341 int, a1342 int, a1343 int, a1344 int, a1345 int, a1346 int, a1347 int, a1348 int, a1349 int, a1350 int, a1351 int, a1352 int, a1353 int, a1354 int, a1355 int, a1356 int, a1357 int, a1358 int, a1359 int, a1360 int, a1361 int, a1362 int, a1363 int, a1364 int, a1365 int, a1366 int, a1367 int, a1368 int, a1369 int, a1370 int, a1371 int, a1372 int, a1373 int, a1374 int, a1375 int, a1376 int, a1377 int, a1378 int, a1379 int, a1380 int, a1381 int, a1382 int, a1383 int, a1384 int, a1385 int, a1386 int, a1387 int, a1388 int, a1389 int, a1390 int, a1391 int, a1392 int, a1393 int, a1394 int, a1395 int, a13!
 96 int, a1397 int, a1398 int, a1399 int, a1400 int, a1401 int, a1402 i
nt, a1403 int, a1404 int, a1405 int, a1406 int, a1407 int, a1408 int, a1409 int, a1410 int, a1411 int, a1412 int, a1413 int, a1414 int, a1415 int, a1416 int, a1417 int, a1418 int, a1419 int, a1420 int, a1421 int, a1422 int, a1423 int, a1424 int, a1425 int, a1426 int, a1427 int, a1428 int, a1429 int, a1430 int, a1431 int, a1432 int, a1433 int, a1434 int, a1435 int, a1436 int, a1437 int, a1438 int, a1439 int, a1440 int, a1441 int, a1442 int, a1443 int, a1444 int, a1445 int, a1446 int, a1447 int, a1448 int, a1449 int, a1450 int, a1451 int, a1452 int, a1453 int, a1454 int, a1455 int, a1456 int, a1457 int, a1458 int, a1459 int, a1460 int, a1461 int, a1462 int, a1463 int, a1464 int, a1465 int, a1466 int, a1467 int, a1468 int, a1469 int, a1470 int, a1471 int, a1472 int, a1473 int, a1474 int, a1475 int, a1476 int, a1477 int, a1478 int, a1479 int, a1480 int, a1481 int, a1482 int, a1483 int, a1484 int, a1485 int, a1486 int, a1487 int, a1488 int, a1489 int, a1490 int, a1491 int, a1492 !
 int, a1493 int, a1494 int, a1495 int, a1496 int, a1497 int, a1498 int, a1499 int, a1500 int, a text);
+CREATE TABLE t2 (b1 int, b2 int, b3 int, b4 int, b5 int, b6 int, b7 int, b8 int, b9 int, b10 int, b11 int, b12 int, b13 int, b14 int, b15 int, b16 int, b17 int, b18 int, b19 int, b20 int, b21 int, b22 int, b23 int, b24 int, b25 int, b26 int, b27 int, b28 int, b29 int, b30 int, b31 int, b32 int, b33 int, b34 int, b35 int, b36 int, b37 int, b38 int, b39 int, b40 int, b41 int, b42 int, b43 int, b44 int, b45 int, b46 int, b47 int, b48 int, b49 int, b50 int, b51 int, b52 int, b53 int, b54 int, b55 int, b56 int, b57 int, b58 int, b59 int, b60 int, b61 int, b62 int, b63 int, b64 int, b65 int, b66 int, b67 int, b68 int, b69 int, b70 int, b71 int, b72 int, b73 int, b74 int, b75 int, b76 int, b77 int, b78 int, b79 int, b80 int, b81 int, b82 int, b83 int, b84 int, b85 int, b86 int, b87 int, b88 int, b89 int, b90 int, b91 int, b92 int, b93 int, b94 int, b95 int, b96 int, b97 int, b98 int, b99 int, b100 int, b101 int, b102 int, b103 int, b104 int, b105 int, b106 int, b107 int, b108 int,!
  b109 int, b110 int, b111 int, b112 int, b113 int, b114 int, b115 int, b116 int, b117 int, b118 int, b119 int, b120 int, b121 int, b122 int, b123 int, b124 int, b125 int, b126 int, b127 int, b128 int, b129 int, b130 int, b131 int, b132 int, b133 int, b134 int, b135 int, b136 int, b137 int, b138 int, b139 int, b140 int, b141 int, b142 int, b143 int, b144 int, b145 int, b146 int, b147 int, b148 int, b149 int, b150 int, b151 int, b152 int, b153 int, b154 int, b155 int, b156 int, b157 int, b158 int, b159 int, b160 int, b161 int, b162 int, b163 int, b164 int, b165 int, b166 int, b167 int, b168 int, b169 int, b170 int, b171 int, b172 int, b173 int, b174 int, b175 int, b176 int, b177 int, b178 int, b179 int, b180 int, b181 int, b182 int, b183 int, b184 int, b185 int, b186 int, b187 int, b188 int, b189 int, b190 int, b191 int, b192 int, b193 int, b194 int, b195 int, b196 int, b197 int, b198 int, b199 int, b200 int, b201 int, b202 int, b203 int, b204 int, b205 int, b206 int, b207 in!
 t, b208 int, b209 int, b210 int, b211 int, b212 int, b213 int, b214 in
t, b215 int, b216 int, b217 int, b218 int, b219 int, b220 int, b221 int, b222 int, b223 int, b224 int, b225 int, b226 int, b227 int, b228 int, b229 int, b230 int, b231 int, b232 int, b233 int, b234 int, b235 int, b236 int, b237 int, b238 int, b239 int, b240 int, b241 int, b242 int, b243 int, b244 int, b245 int, b246 int, b247 int, b248 int, b249 int, b250 int, b251 int, b252 int, b253 int, b254 int, b255 int, b256 int, b257 int, b258 int, b259 int, b260 int, b261 int, b262 int, b263 int, b264 int, b265 int, b266 int, b267 int, b268 int, b269 int, b270 int, b271 int, b272 int, b273 int, b274 int, b275 int, b276 int, b277 int, b278 int, b279 int, b280 int, b281 int, b282 int, b283 int, b284 int, b285 int, b286 int, b287 int, b288 int, b289 int, b290 int, b291 int, b292 int, b293 int, b294 int, b295 int, b296 int, b297 int, b298 int, b299 int, b300 int, b301 int, b302 int, b303 int, b304 int, b305 int, b306 int, b307 int, b308 int, b309 int, b310 int, b311 int, b312 int, b313 i!
 nt, b314 int, b315 int, b316 int, b317 int, b318 int, b319 int, b320 int, b321 int, b322 int, b323 int, b324 int, b325 int, b326 int, b327 int, b328 int, b329 int, b330 int, b331 int, b332 int, b333 int, b334 int, b335 int, b336 int, b337 int, b338 int, b339 int, b340 int, b341 int, b342 int, b343 int, b344 int, b345 int, b346 int, b347 int, b348 int, b349 int, b350 int, b351 int, b352 int, b353 int, b354 int, b355 int, b356 int, b357 int, b358 int, b359 int, b360 int, b361 int, b362 int, b363 int, b364 int, b365 int, b366 int, b367 int, b368 int, b369 int, b370 int, b371 int, b372 int, b373 int, b374 int, b375 int, b376 int, b377 int, b378 int, b379 int, b380 int, b381 int, b382 int, b383 int, b384 int, b385 int, b386 int, b387 int, b388 int, b389 int, b390 int, b391 int, b392 int, b393 int, b394 int, b395 int, b396 int, b397 int, b398 int, b399 int, b400 int, b401 int, b402 int, b403 int, b404 int, b405 int, b406 int, b407 int, b408 int, b409 int, b410 int, b411 int, b412!
  int, b413 int, b414 int, b415 int, b416 int, b417 int, b418 int, b419
 int, b420 int, b421 int, b422 int, b423 int, b424 int, b425 int, b426 int, b427 int, b428 int, b429 int, b430 int, b431 int, b432 int, b433 int, b434 int, b435 int, b436 int, b437 int, b438 int, b439 int, b440 int, b441 int, b442 int, b443 int, b444 int, b445 int, b446 int, b447 int, b448 int, b449 int, b450 int, b451 int, b452 int, b453 int, b454 int, b455 int, b456 int, b457 int, b458 int, b459 int, b460 int, b461 int, b462 int, b463 int, b464 int, b465 int, b466 int, b467 int, b468 int, b469 int, b470 int, b471 int, b472 int, b473 int, b474 int, b475 int, b476 int, b477 int, b478 int, b479 int, b480 int, b481 int, b482 int, b483 int, b484 int, b485 int, b486 int, b487 int, b488 int, b489 int, b490 int, b491 int, b492 int, b493 int, b494 int, b495 int, b496 int, b497 int, b498 int, b499 int, b500 int, b501 int, b502 int, b503 int, b504 int, b505 int, b506 int, b507 int, b508 int, b509 int, b510 int, b511 int, b512 int, b513 int, b514 int, b515 int, b516 int, b517 int, b51!
 8 int, b519 int, b520 int, b521 int, b522 int, b523 int, b524 int, b525 int, b526 int, b527 int, b528 int, b529 int, b530 int, b531 int, b532 int, b533 int, b534 int, b535 int, b536 int, b537 int, b538 int, b539 int, b540 int, b541 int, b542 int, b543 int, b544 int, b545 int, b546 int, b547 int, b548 int, b549 int, b550 int, b551 int, b552 int, b553 int, b554 int, b555 int, b556 int, b557 int, b558 int, b559 int, b560 int, b561 int, b562 int, b563 int, b564 int, b565 int, b566 int, b567 int, b568 int, b569 int, b570 int, b571 int, b572 int, b573 int, b574 int, b575 int, b576 int, b577 int, b578 int, b579 int, b580 int, b581 int, b582 int, b583 int, b584 int, b585 int, b586 int, b587 int, b588 int, b589 int, b590 int, b591 int, b592 int, b593 int, b594 int, b595 int, b596 int, b597 int, b598 int, b599 int, b600 int, b601 int, b602 int, b603 int, b604 int, b605 int, b606 int, b607 int, b608 int, b609 int, b610 int, b611 int, b612 int, b613 int, b614 int, b615 int, b616 int, b!
 617 int, b618 int, b619 int, b620 int, b621 int, b622 int, b623 int, b
624 int, b625 int, b626 int, b627 int, b628 int, b629 int, b630 int, b631 int, b632 int, b633 int, b634 int, b635 int, b636 int, b637 int, b638 int, b639 int, b640 int, b641 int, b642 int, b643 int, b644 int, b645 int, b646 int, b647 int, b648 int, b649 int, b650 int, b651 int, b652 int, b653 int, b654 int, b655 int, b656 int, b657 int, b658 int, b659 int, b660 int, b661 int, b662 int, b663 int, b664 int, b665 int, b666 int, b667 int, b668 int, b669 int, b670 int, b671 int, b672 int, b673 int, b674 int, b675 int, b676 int, b677 int, b678 int, b679 int, b680 int, b681 int, b682 int, b683 int, b684 int, b685 int, b686 int, b687 int, b688 int, b689 int, b690 int, b691 int, b692 int, b693 int, b694 int, b695 int, b696 int, b697 int, b698 int, b699 int, b700 int, b701 int, b702 int, b703 int, b704 int, b705 int, b706 int, b707 int, b708 int, b709 int, b710 int, b711 int, b712 int, b713 int, b714 int, b715 int, b716 int, b717 int, b718 int, b719 int, b720 int, b721 int, b722 int, !
 b723 int, b724 int, b725 int, b726 int, b727 int, b728 int, b729 int, b730 int, b731 int, b732 int, b733 int, b734 int, b735 int, b736 int, b737 int, b738 int, b739 int, b740 int, b741 int, b742 int, b743 int, b744 int, b745 int, b746 int, b747 int, b748 int, b749 int, b750 int, b751 int, b752 int, b753 int, b754 int, b755 int, b756 int, b757 int, b758 int, b759 int, b760 int, b761 int, b762 int, b763 int, b764 int, b765 int, b766 int, b767 int, b768 int, b769 int, b770 int, b771 int, b772 int, b773 int, b774 int, b775 int, b776 int, b777 int, b778 int, b779 int, b780 int, b781 int, b782 int, b783 int, b784 int, b785 int, b786 int, b787 int, b788 int, b789 int, b790 int, b791 int, b792 int, b793 int, b794 int, b795 int, b796 int, b797 int, b798 int, b799 int, b800 int, b801 int, b802 int, b803 int, b804 int, b805 int, b806 int, b807 int, b808 int, b809 int, b810 int, b811 int, b812 int, b813 int, b814 int, b815 int, b816 int, b817 int, b818 int, b819 int, b820 int, b821 int!
 , b822 int, b823 int, b824 int, b825 int, b826 int, b827 int, b828 int
, b829 int, b830 int, b831 int, b832 int, b833 int, b834 int, b835 int, b836 int, b837 int, b838 int, b839 int, b840 int, b841 int, b842 int, b843 int, b844 int, b845 int, b846 int, b847 int, b848 int, b849 int, b850 int, b851 int, b852 int, b853 int, b854 int, b855 int, b856 int, b857 int, b858 int, b859 int, b860 int, b861 int, b862 int, b863 int, b864 int, b865 int, b866 int, b867 int, b868 int, b869 int, b870 int, b871 int, b872 int, b873 int, b874 int, b875 int, b876 int, b877 int, b878 int, b879 int, b880 int, b881 int, b882 int, b883 int, b884 int, b885 int, b886 int, b887 int, b888 int, b889 int, b890 int, b891 int, b892 int, b893 int, b894 int, b895 int, b896 int, b897 int, b898 int, b899 int, b900 int, b901 int, b902 int, b903 int, b904 int, b905 int, b906 int, b907 int, b908 int, b909 int, b910 int, b911 int, b912 int, b913 int, b914 int, b915 int, b916 int, b917 int, b918 int, b919 int, b920 int, b921 int, b922 int, b923 int, b924 int, b925 int, b926 int, b927 in!
 t, b928 int, b929 int, b930 int, b931 int, b932 int, b933 int, b934 int, b935 int, b936 int, b937 int, b938 int, b939 int, b940 int, b941 int, b942 int, b943 int, b944 int, b945 int, b946 int, b947 int, b948 int, b949 int, b950 int, b951 int, b952 int, b953 int, b954 int, b955 int, b956 int, b957 int, b958 int, b959 int, b960 int, b961 int, b962 int, b963 int, b964 int, b965 int, b966 int, b967 int, b968 int, b969 int, b970 int, b971 int, b972 int, b973 int, b974 int, b975 int, b976 int, b977 int, b978 int, b979 int, b980 int, b981 int, b982 int, b983 int, b984 int, b985 int, b986 int, b987 int, b988 int, b989 int, b990 int, b991 int, b992 int, b993 int, b994 int, b995 int, b996 int, b997 int, b998 int, b999 int, b1000 int, b1001 int, b1002 int, b1003 int, b1004 int, b1005 int, b1006 int, b1007 int, b1008 int, b1009 int, b1010 int, b1011 int, b1012 int, b1013 int, b1014 int, b1015 int, b1016 int, b1017 int, b1018 int, b1019 int, b1020 int, b1021 int, b1022 int, b1023 int, b!
 1024 int, b1025 int, b1026 int, b1027 int, b1028 int, b1029 int, b1030
 int, b1031 int, b1032 int, b1033 int, b1034 int, b1035 int, b1036 int, b1037 int, b1038 int, b1039 int, b1040 int, b1041 int, b1042 int, b1043 int, b1044 int, b1045 int, b1046 int, b1047 int, b1048 int, b1049 int, b1050 int, b1051 int, b1052 int, b1053 int, b1054 int, b1055 int, b1056 int, b1057 int, b1058 int, b1059 int, b1060 int, b1061 int, b1062 int, b1063 int, b1064 int, b1065 int, b1066 int, b1067 int, b1068 int, b1069 int, b1070 int, b1071 int, b1072 int, b1073 int, b1074 int, b1075 int, b1076 int, b1077 int, b1078 int, b1079 int, b1080 int, b1081 int, b1082 int, b1083 int, b1084 int, b1085 int, b1086 int, b1087 int, b1088 int, b1089 int, b1090 int, b1091 int, b1092 int, b1093 int, b1094 int, b1095 int, b1096 int, b1097 int, b1098 int, b1099 int, b1100 int, b1101 int, b1102 int, b1103 int, b1104 int, b1105 int, b1106 int, b1107 int, b1108 int, b1109 int, b1110 int, b1111 int, b1112 int, b1113 int, b1114 int, b1115 int, b1116 int, b1117 int, b1118 int, b1119 int, b112!
 0 int, b1121 int, b1122 int, b1123 int, b1124 int, b1125 int, b1126 int, b1127 int, b1128 int, b1129 int, b1130 int, b1131 int, b1132 int, b1133 int, b1134 int, b1135 int, b1136 int, b1137 int, b1138 int, b1139 int, b1140 int, b1141 int, b1142 int, b1143 int, b1144 int, b1145 int, b1146 int, b1147 int, b1148 int, b1149 int, b1150 int, b1151 int, b1152 int, b1153 int, b1154 int, b1155 int, b1156 int, b1157 int, b1158 int, b1159 int, b1160 int, b1161 int, b1162 int, b1163 int, b1164 int, b1165 int, b1166 int, b1167 int, b1168 int, b1169 int, b1170 int, b1171 int, b1172 int, b1173 int, b1174 int, b1175 int, b1176 int, b1177 int, b1178 int, b1179 int, b1180 int, b1181 int, b1182 int, b1183 int, b1184 int, b1185 int, b1186 int, b1187 int, b1188 int, b1189 int, b1190 int, b1191 int, b1192 int, b1193 int, b1194 int, b1195 int, b1196 int, b1197 int, b1198 int, b1199 int, b1200 int, b1201 int, b1202 int, b1203 int, b1204 int, b1205 int, b1206 int, b1207 int, b1208 int, b1209 int, b1!
 210 int, b1211 int, b1212 int, b1213 int, b1214 int, b1215 int, b1216 
int, b1217 int, b1218 int, b1219 int, b1220 int, b1221 int, b1222 int, b1223 int, b1224 int, b1225 int, b1226 int, b1227 int, b1228 int, b1229 int, b1230 int, b1231 int, b1232 int, b1233 int, b1234 int, b1235 int, b1236 int, b1237 int, b1238 int, b1239 int, b1240 int, b1241 int, b1242 int, b1243 int, b1244 int, b1245 int, b1246 int, b1247 int, b1248 int, b1249 int, b1250 int, b1251 int, b1252 int, b1253 int, b1254 int, b1255 int, b1256 int, b1257 int, b1258 int, b1259 int, b1260 int, b1261 int, b1262 int, b1263 int, b1264 int, b1265 int, b1266 int, b1267 int, b1268 int, b1269 int, b1270 int, b1271 int, b1272 int, b1273 int, b1274 int, b1275 int, b1276 int, b1277 int, b1278 int, b1279 int, b1280 int, b1281 int, b1282 int, b1283 int, b1284 int, b1285 int, b1286 int, b1287 int, b1288 int, b1289 int, b1290 int, b1291 int, b1292 int, b1293 int, b1294 int, b1295 int, b1296 int, b1297 int, b1298 int, b1299 int, b1300 int, b1301 int, b1302 int, b1303 int, b1304 int, b1305 int, b1306!
  int, b1307 int, b1308 int, b1309 int, b1310 int, b1311 int, b1312 int, b1313 int, b1314 int, b1315 int, b1316 int, b1317 int, b1318 int, b1319 int, b1320 int, b1321 int, b1322 int, b1323 int, b1324 int, b1325 int, b1326 int, b1327 int, b1328 int, b1329 int, b1330 int, b1331 int, b1332 int, b1333 int, b1334 int, b1335 int, b1336 int, b1337 int, b1338 int, b1339 int, b1340 int, b1341 int, b1342 int, b1343 int, b1344 int, b1345 int, b1346 int, b1347 int, b1348 int, b1349 int, b1350 int, b1351 int, b1352 int, b1353 int, b1354 int, b1355 int, b1356 int, b1357 int, b1358 int, b1359 int, b1360 int, b1361 int, b1362 int, b1363 int, b1364 int, b1365 int, b1366 int, b1367 int, b1368 int, b1369 int, b1370 int, b1371 int, b1372 int, b1373 int, b1374 int, b1375 int, b1376 int, b1377 int, b1378 int, b1379 int, b1380 int, b1381 int, b1382 int, b1383 int, b1384 int, b1385 int, b1386 int, b1387 int, b1388 int, b1389 int, b1390 int, b1391 int, b1392 int, b1393 int, b1394 int, b1395 int, b13!
 96 int, b1397 int, b1398 int, b1399 int, b1400 int, b1401 int, b1402 i
nt, b1403 int, b1404 int, b1405 int, b1406 int, b1407 int, b1408 int, b1409 int, b1410 int, b1411 int, b1412 int, b1413 int, b1414 int, b1415 int, b1416 int, b1417 int, b1418 int, b1419 int, b1420 int, b1421 int, b1422 int, b1423 int, b1424 int, b1425 int, b1426 int, b1427 int, b1428 int, b1429 int, b1430 int, b1431 int, b1432 int, b1433 int, b1434 int, b1435 int, b1436 int, b1437 int, b1438 int, b1439 int, b1440 int, b1441 int, b1442 int, b1443 int, b1444 int, b1445 int, b1446 int, b1447 int, b1448 int, b1449 int, b1450 int, b1451 int, b1452 int, b1453 int, b1454 int, b1455 int, b1456 int, b1457 int, b1458 int, b1459 int, b1460 int, b1461 int, b1462 int, b1463 int, b1464 int, b1465 int, b1466 int, b1467 int, b1468 int, b1469 int, b1470 int, b1471 int, b1472 int, b1473 int, b1474 int, b1475 int, b1476 int, b1477 int, b1478 int, b1479 int, b1480 int, b1481 int, b1482 int, b1483 int, b1484 int, b1485 int, b1486 int, b1487 int, b1488 int, b1489 int, b1490 int, b1491 int, b1492 !
 int, b1493 int, b1494 int, b1495 int, b1496 int, b1497 int, b1498 int, b1499 int, b1500 int, b text);
+CREATE TABLE t3 (c1 int, c2 int, c3 int, c4 int, c5 int, c6 int, c7 int, c8 int, c9 int, c10 int, c11 int, c12 int, c13 int, c14 int, c15 int, c16 int, c17 int, c18 int, c19 int, c20 int, c21 int, c22 int, c23 int, c24 int, c25 int, c26 int, c27 int, c28 int, c29 int, c30 int, c31 int, c32 int, c33 int, c34 int, c35 int, c36 int, c37 int, c38 int, c39 int, c40 int, c41 int, c42 int, c43 int, c44 int, c45 int, c46 int, c47 int, c48 int, c49 int, c50 int, c51 int, c52 int, c53 int, c54 int, c55 int, c56 int, c57 int, c58 int, c59 int, c60 int, c61 int, c62 int, c63 int, c64 int, c65 int, c66 int, c67 int, c68 int, c69 int, c70 int, c71 int, c72 int, c73 int, c74 int, c75 int, c76 int, c77 int, c78 int, c79 int, c80 int, c81 int, c82 int, c83 int, c84 int, c85 int, c86 int, c87 int, c88 int, c89 int, c90 int, c91 int, c92 int, c93 int, c94 int, c95 int, c96 int, c97 int, c98 int, c99 int, c100 int, c101 int, c102 int, c103 int, c104 int, c105 int, c106 int, c107 int, c108 int,!
  c109 int, c110 int, c111 int, c112 int, c113 int, c114 int, c115 int, c116 int, c117 int, c118 int, c119 int, c120 int, c121 int, c122 int, c123 int, c124 int, c125 int, c126 int, c127 int, c128 int, c129 int, c130 int, c131 int, c132 int, c133 int, c134 int, c135 int, c136 int, c137 int, c138 int, c139 int, c140 int, c141 int, c142 int, c143 int, c144 int, c145 int, c146 int, c147 int, c148 int, c149 int, c150 int, c151 int, c152 int, c153 int, c154 int, c155 int, c156 int, c157 int, c158 int, c159 int, c160 int, c161 int, c162 int, c163 int, c164 int, c165 int, c166 int, c167 int, c168 int, c169 int, c170 int, c171 int, c172 int, c173 int, c174 int, c175 int, c176 int, c177 int, c178 int, c179 int, c180 int, c181 int, c182 int, c183 int, c184 int, c185 int, c186 int, c187 int, c188 int, c189 int, c190 int, c191 int, c192 int, c193 int, c194 int, c195 int, c196 int, c197 int, c198 int, c199 int, c200 int, c201 int, c202 int, c203 int, c204 int, c205 int, c206 int, c207 in!
 t, c208 int, c209 int, c210 int, c211 int, c212 int, c213 int, c214 in
t, c215 int, c216 int, c217 int, c218 int, c219 int, c220 int, c221 int, c222 int, c223 int, c224 int, c225 int, c226 int, c227 int, c228 int, c229 int, c230 int, c231 int, c232 int, c233 int, c234 int, c235 int, c236 int, c237 int, c238 int, c239 int, c240 int, c241 int, c242 int, c243 int, c244 int, c245 int, c246 int, c247 int, c248 int, c249 int, c250 int, c251 int, c252 int, c253 int, c254 int, c255 int, c256 int, c257 int, c258 int, c259 int, c260 int, c261 int, c262 int, c263 int, c264 int, c265 int, c266 int, c267 int, c268 int, c269 int, c270 int, c271 int, c272 int, c273 int, c274 int, c275 int, c276 int, c277 int, c278 int, c279 int, c280 int, c281 int, c282 int, c283 int, c284 int, c285 int, c286 int, c287 int, c288 int, c289 int, c290 int, c291 int, c292 int, c293 int, c294 int, c295 int, c296 int, c297 int, c298 int, c299 int, c300 int, c301 int, c302 int, c303 int, c304 int, c305 int, c306 int, c307 int, c308 int, c309 int, c310 int, c311 int, c312 int, c313 i!
 nt, c314 int, c315 int, c316 int, c317 int, c318 int, c319 int, c320 int, c321 int, c322 int, c323 int, c324 int, c325 int, c326 int, c327 int, c328 int, c329 int, c330 int, c331 int, c332 int, c333 int, c334 int, c335 int, c336 int, c337 int, c338 int, c339 int, c340 int, c341 int, c342 int, c343 int, c344 int, c345 int, c346 int, c347 int, c348 int, c349 int, c350 int, c351 int, c352 int, c353 int, c354 int, c355 int, c356 int, c357 int, c358 int, c359 int, c360 int, c361 int, c362 int, c363 int, c364 int, c365 int, c366 int, c367 int, c368 int, c369 int, c370 int, c371 int, c372 int, c373 int, c374 int, c375 int, c376 int, c377 int, c378 int, c379 int, c380 int, c381 int, c382 int, c383 int, c384 int, c385 int, c386 int, c387 int, c388 int, c389 int, c390 int, c391 int, c392 int, c393 int, c394 int, c395 int, c396 int, c397 int, c398 int, c399 int, c400 int, c401 int, c402 int, c403 int, c404 int, c405 int, c406 int, c407 int, c408 int, c409 int, c410 int, c411 int, c412!
  int, c413 int, c414 int, c415 int, c416 int, c417 int, c418 int, c419
 int, c420 int, c421 int, c422 int, c423 int, c424 int, c425 int, c426 int, c427 int, c428 int, c429 int, c430 int, c431 int, c432 int, c433 int, c434 int, c435 int, c436 int, c437 int, c438 int, c439 int, c440 int, c441 int, c442 int, c443 int, c444 int, c445 int, c446 int, c447 int, c448 int, c449 int, c450 int, c451 int, c452 int, c453 int, c454 int, c455 int, c456 int, c457 int, c458 int, c459 int, c460 int, c461 int, c462 int, c463 int, c464 int, c465 int, c466 int, c467 int, c468 int, c469 int, c470 int, c471 int, c472 int, c473 int, c474 int, c475 int, c476 int, c477 int, c478 int, c479 int, c480 int, c481 int, c482 int, c483 int, c484 int, c485 int, c486 int, c487 int, c488 int, c489 int, c490 int, c491 int, c492 int, c493 int, c494 int, c495 int, c496 int, c497 int, c498 int, c499 int, c500 int, c501 int, c502 int, c503 int, c504 int, c505 int, c506 int, c507 int, c508 int, c509 int, c510 int, c511 int, c512 int, c513 int, c514 int, c515 int, c516 int, c517 int, c51!
 8 int, c519 int, c520 int, c521 int, c522 int, c523 int, c524 int, c525 int, c526 int, c527 int, c528 int, c529 int, c530 int, c531 int, c532 int, c533 int, c534 int, c535 int, c536 int, c537 int, c538 int, c539 int, c540 int, c541 int, c542 int, c543 int, c544 int, c545 int, c546 int, c547 int, c548 int, c549 int, c550 int, c551 int, c552 int, c553 int, c554 int, c555 int, c556 int, c557 int, c558 int, c559 int, c560 int, c561 int, c562 int, c563 int, c564 int, c565 int, c566 int, c567 int, c568 int, c569 int, c570 int, c571 int, c572 int, c573 int, c574 int, c575 int, c576 int, c577 int, c578 int, c579 int, c580 int, c581 int, c582 int, c583 int, c584 int, c585 int, c586 int, c587 int, c588 int, c589 int, c590 int, c591 int, c592 int, c593 int, c594 int, c595 int, c596 int, c597 int, c598 int, c599 int, c600 int, c601 int, c602 int, c603 int, c604 int, c605 int, c606 int, c607 int, c608 int, c609 int, c610 int, c611 int, c612 int, c613 int, c614 int, c615 int, c616 int, c!
 617 int, c618 int, c619 int, c620 int, c621 int, c622 int, c623 int, c
624 int, c625 int, c626 int, c627 int, c628 int, c629 int, c630 int, c631 int, c632 int, c633 int, c634 int, c635 int, c636 int, c637 int, c638 int, c639 int, c640 int, c641 int, c642 int, c643 int, c644 int, c645 int, c646 int, c647 int, c648 int, c649 int, c650 int, c651 int, c652 int, c653 int, c654 int, c655 int, c656 int, c657 int, c658 int, c659 int, c660 int, c661 int, c662 int, c663 int, c664 int, c665 int, c666 int, c667 int, c668 int, c669 int, c670 int, c671 int, c672 int, c673 int, c674 int, c675 int, c676 int, c677 int, c678 int, c679 int, c680 int, c681 int, c682 int, c683 int, c684 int, c685 int, c686 int, c687 int, c688 int, c689 int, c690 int, c691 int, c692 int, c693 int, c694 int, c695 int, c696 int, c697 int, c698 int, c699 int, c700 int, c701 int, c702 int, c703 int, c704 int, c705 int, c706 int, c707 int, c708 int, c709 int, c710 int, c711 int, c712 int, c713 int, c714 int, c715 int, c716 int, c717 int, c718 int, c719 int, c720 int, c721 int, c722 int, !
 c723 int, c724 int, c725 int, c726 int, c727 int, c728 int, c729 int, c730 int, c731 int, c732 int, c733 int, c734 int, c735 int, c736 int, c737 int, c738 int, c739 int, c740 int, c741 int, c742 int, c743 int, c744 int, c745 int, c746 int, c747 int, c748 int, c749 int, c750 int, c751 int, c752 int, c753 int, c754 int, c755 int, c756 int, c757 int, c758 int, c759 int, c760 int, c761 int, c762 int, c763 int, c764 int, c765 int, c766 int, c767 int, c768 int, c769 int, c770 int, c771 int, c772 int, c773 int, c774 int, c775 int, c776 int, c777 int, c778 int, c779 int, c780 int, c781 int, c782 int, c783 int, c784 int, c785 int, c786 int, c787 int, c788 int, c789 int, c790 int, c791 int, c792 int, c793 int, c794 int, c795 int, c796 int, c797 int, c798 int, c799 int, c800 int, c801 int, c802 int, c803 int, c804 int, c805 int, c806 int, c807 int, c808 int, c809 int, c810 int, c811 int, c812 int, c813 int, c814 int, c815 int, c816 int, c817 int, c818 int, c819 int, c820 int, c821 int!
 , c822 int, c823 int, c824 int, c825 int, c826 int, c827 int, c828 int
, c829 int, c830 int, c831 int, c832 int, c833 int, c834 int, c835 int, c836 int, c837 int, c838 int, c839 int, c840 int, c841 int, c842 int, c843 int, c844 int, c845 int, c846 int, c847 int, c848 int, c849 int, c850 int, c851 int, c852 int, c853 int, c854 int, c855 int, c856 int, c857 int, c858 int, c859 int, c860 int, c861 int, c862 int, c863 int, c864 int, c865 int, c866 int, c867 int, c868 int, c869 int, c870 int, c871 int, c872 int, c873 int, c874 int, c875 int, c876 int, c877 int, c878 int, c879 int, c880 int, c881 int, c882 int, c883 int, c884 int, c885 int, c886 int, c887 int, c888 int, c889 int, c890 int, c891 int, c892 int, c893 int, c894 int, c895 int, c896 int, c897 int, c898 int, c899 int, c900 int, c901 int, c902 int, c903 int, c904 int, c905 int, c906 int, c907 int, c908 int, c909 int, c910 int, c911 int, c912 int, c913 int, c914 int, c915 int, c916 int, c917 int, c918 int, c919 int, c920 int, c921 int, c922 int, c923 int, c924 int, c925 int, c926 int, c927 in!
 t, c928 int, c929 int, c930 int, c931 int, c932 int, c933 int, c934 int, c935 int, c936 int, c937 int, c938 int, c939 int, c940 int, c941 int, c942 int, c943 int, c944 int, c945 int, c946 int, c947 int, c948 int, c949 int, c950 int, c951 int, c952 int, c953 int, c954 int, c955 int, c956 int, c957 int, c958 int, c959 int, c960 int, c961 int, c962 int, c963 int, c964 int, c965 int, c966 int, c967 int, c968 int, c969 int, c970 int, c971 int, c972 int, c973 int, c974 int, c975 int, c976 int, c977 int, c978 int, c979 int, c980 int, c981 int, c982 int, c983 int, c984 int, c985 int, c986 int, c987 int, c988 int, c989 int, c990 int, c991 int, c992 int, c993 int, c994 int, c995 int, c996 int, c997 int, c998 int, c999 int, c1000 int, c1001 int, c1002 int, c1003 int, c1004 int, c1005 int, c1006 int, c1007 int, c1008 int, c1009 int, c1010 int, c1011 int, c1012 int, c1013 int, c1014 int, c1015 int, c1016 int, c1017 int, c1018 int, c1019 int, c1020 int, c1021 int, c1022 int, c1023 int, c!
 1024 int, c1025 int, c1026 int, c1027 int, c1028 int, c1029 int, c1030
 int, c1031 int, c1032 int, c1033 int, c1034 int, c1035 int, c1036 int, c1037 int, c1038 int, c1039 int, c1040 int, c1041 int, c1042 int, c1043 int, c1044 int, c1045 int, c1046 int, c1047 int, c1048 int, c1049 int, c1050 int, c1051 int, c1052 int, c1053 int, c1054 int, c1055 int, c1056 int, c1057 int, c1058 int, c1059 int, c1060 int, c1061 int, c1062 int, c1063 int, c1064 int, c1065 int, c1066 int, c1067 int, c1068 int, c1069 int, c1070 int, c1071 int, c1072 int, c1073 int, c1074 int, c1075 int, c1076 int, c1077 int, c1078 int, c1079 int, c1080 int, c1081 int, c1082 int, c1083 int, c1084 int, c1085 int, c1086 int, c1087 int, c1088 int, c1089 int, c1090 int, c1091 int, c1092 int, c1093 int, c1094 int, c1095 int, c1096 int, c1097 int, c1098 int, c1099 int, c1100 int, c1101 int, c1102 int, c1103 int, c1104 int, c1105 int, c1106 int, c1107 int, c1108 int, c1109 int, c1110 int, c1111 int, c1112 int, c1113 int, c1114 int, c1115 int, c1116 int, c1117 int, c1118 int, c1119 int, c112!
 0 int, c1121 int, c1122 int, c1123 int, c1124 int, c1125 int, c1126 int, c1127 int, c1128 int, c1129 int, c1130 int, c1131 int, c1132 int, c1133 int, c1134 int, c1135 int, c1136 int, c1137 int, c1138 int, c1139 int, c1140 int, c1141 int, c1142 int, c1143 int, c1144 int, c1145 int, c1146 int, c1147 int, c1148 int, c1149 int, c1150 int, c1151 int, c1152 int, c1153 int, c1154 int, c1155 int, c1156 int, c1157 int, c1158 int, c1159 int, c1160 int, c1161 int, c1162 int, c1163 int, c1164 int, c1165 int, c1166 int, c1167 int, c1168 int, c1169 int, c1170 int, c1171 int, c1172 int, c1173 int, c1174 int, c1175 int, c1176 int, c1177 int, c1178 int, c1179 int, c1180 int, c1181 int, c1182 int, c1183 int, c1184 int, c1185 int, c1186 int, c1187 int, c1188 int, c1189 int, c1190 int, c1191 int, c1192 int, c1193 int, c1194 int, c1195 int, c1196 int, c1197 int, c1198 int, c1199 int, c1200 int, c1201 int, c1202 int, c1203 int, c1204 int, c1205 int, c1206 int, c1207 int, c1208 int, c1209 int, c1!
 210 int, c1211 int, c1212 int, c1213 int, c1214 int, c1215 int, c1216 
int, c1217 int, c1218 int, c1219 int, c1220 int, c1221 int, c1222 int, c1223 int, c1224 int, c1225 int, c1226 int, c1227 int, c1228 int, c1229 int, c1230 int, c1231 int, c1232 int, c1233 int, c1234 int, c1235 int, c1236 int, c1237 int, c1238 int, c1239 int, c1240 int, c1241 int, c1242 int, c1243 int, c1244 int, c1245 int, c1246 int, c1247 int, c1248 int, c1249 int, c1250 int, c1251 int, c1252 int, c1253 int, c1254 int, c1255 int, c1256 int, c1257 int, c1258 int, c1259 int, c1260 int, c1261 int, c1262 int, c1263 int, c1264 int, c1265 int, c1266 int, c1267 int, c1268 int, c1269 int, c1270 int, c1271 int, c1272 int, c1273 int, c1274 int, c1275 int, c1276 int, c1277 int, c1278 int, c1279 int, c1280 int, c1281 int, c1282 int, c1283 int, c1284 int, c1285 int, c1286 int, c1287 int, c1288 int, c1289 int, c1290 int, c1291 int, c1292 int, c1293 int, c1294 int, c1295 int, c1296 int, c1297 int, c1298 int, c1299 int, c1300 int, c1301 int, c1302 int, c1303 int, c1304 int, c1305 int, c1306!
  int, c1307 int, c1308 int, c1309 int, c1310 int, c1311 int, c1312 int, c1313 int, c1314 int, c1315 int, c1316 int, c1317 int, c1318 int, c1319 int, c1320 int, c1321 int, c1322 int, c1323 int, c1324 int, c1325 int, c1326 int, c1327 int, c1328 int, c1329 int, c1330 int, c1331 int, c1332 int, c1333 int, c1334 int, c1335 int, c1336 int, c1337 int, c1338 int, c1339 int, c1340 int, c1341 int, c1342 int, c1343 int, c1344 int, c1345 int, c1346 int, c1347 int, c1348 int, c1349 int, c1350 int, c1351 int, c1352 int, c1353 int, c1354 int, c1355 int, c1356 int, c1357 int, c1358 int, c1359 int, c1360 int, c1361 int, c1362 int, c1363 int, c1364 int, c1365 int, c1366 int, c1367 int, c1368 int, c1369 int, c1370 int, c1371 int, c1372 int, c1373 int, c1374 int, c1375 int, c1376 int, c1377 int, c1378 int, c1379 int, c1380 int, c1381 int, c1382 int, c1383 int, c1384 int, c1385 int, c1386 int, c1387 int, c1388 int, c1389 int, c1390 int, c1391 int, c1392 int, c1393 int, c1394 int, c1395 int, c13!
 96 int, c1397 int, c1398 int, c1399 int, c1400 int, c1401 int, c1402 i
nt, c1403 int, c1404 int, c1405 int, c1406 int, c1407 int, c1408 int, c1409 int, c1410 int, c1411 int, c1412 int, c1413 int, c1414 int, c1415 int, c1416 int, c1417 int, c1418 int, c1419 int, c1420 int, c1421 int, c1422 int, c1423 int, c1424 int, c1425 int, c1426 int, c1427 int, c1428 int, c1429 int, c1430 int, c1431 int, c1432 int, c1433 int, c1434 int, c1435 int, c1436 int, c1437 int, c1438 int, c1439 int, c1440 int, c1441 int, c1442 int, c1443 int, c1444 int, c1445 int, c1446 int, c1447 int, c1448 int, c1449 int, c1450 int, c1451 int, c1452 int, c1453 int, c1454 int, c1455 int, c1456 int, c1457 int, c1458 int, c1459 int, c1460 int, c1461 int, c1462 int, c1463 int, c1464 int, c1465 int, c1466 int, c1467 int, c1468 int, c1469 int, c1470 int, c1471 int, c1472 int, c1473 int, c1474 int, c1475 int, c1476 int, c1477 int, c1478 int, c1479 int, c1480 int, c1481 int, c1482 int, c1483 int, c1484 int, c1485 int, c1486 int, c1487 int, c1488 int, c1489 int, c1490 int, c1491 int, c1492 !
 int, c1493 int, c1494 int, c1495 int, c1496 int, c1497 int, c1498 int, c1499 int, c1500 int, c text);
+CREATE VIEW view_broken AS SELECT * FROM t1, t2, t3;
+ERROR HY000: Too many columns
+CREATE TABLE table_broken AS SELECT * FROM t1, t2, t3;
+ERROR HY000: Too many columns
+DROP TABLE t1, t2, t3;

=== added file 'mysql-test/suite/rpl/r/rpl_row_corruption.result'
--- a/mysql-test/suite/rpl/r/rpl_row_corruption.result	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_corruption.result	2011-07-14 11:15:24 +0000
@@ -0,0 +1,49 @@
+include/master-slave.inc
+[connection master]
+CREATE TABLE t1_11753004 (c1 INT);
+CREATE TABLE t2_11753004 (c1 INT);
+INSERT INTO t1_11753004 VALUES (1);
+INSERT INTO t2_11753004 VALUES (2);
+call mtr.add_suppression(".*Found table map event mapping table id 0 which was already mapped but with different settings.*");
+include/stop_slave.inc
+SET @save_debug= @@global.debug;
+SET GLOBAL debug="+d,inject_tblmap_same_id_maps_diff_table";
+include/start_slave.inc
+UPDATE t1_11753004, t2_11753004 SET t1_11753004.c1=3, t2_11753004.c1=4 WHERE t1_11753004.c1=1 OR t2_11753004.c1=2;
+include/wait_for_slave_sql_error.inc [errno=1593 ]
+include/stop_slave.inc
+SET GLOBAL debug="-d,inject_tblmap_same_id_maps_diff_table";
+include/start_slave.inc
+include/rpl_reset.inc
+DROP TABLE t1_11753004, t2_11753004;
+include/stop_slave.inc
+SET GLOBAL debug="+d,inject_tblmap_same_id_maps_diff_table";
+include/start_slave.inc
+include/rpl_reset.inc
+CREATE TABLE t1_11753004 (c1 INT);
+CREATE TABLE t2_11753004_ign (c1 INT);
+INSERT INTO t1_11753004 VALUES (1);
+INSERT INTO t2_11753004_ign VALUES (2);
+UPDATE t1_11753004, t2_11753004_ign SET t1_11753004.c1=3, t2_11753004_ign.c1=4 WHERE t1_11753004.c1=1 OR t2_11753004_ign.c1=2;
+CREATE TABLE t1 (c1 INT);
+CREATE TABLE t2 (c1 INT);
+INSERT INTO t1 VALUES (1);
+INSERT INTO t2 VALUES (1);
+BINLOG '
+SOgWTg8BAAAAbgAAAHIAAAAAAAQANS42LjMtbTUtZGVidWctbG9nAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAABI6BZOEzgNAAgAEgAEBAQEEgAAVgAEGggAAAAICAgCAAAAAAVAYI8=
+'/*!*/;
+SET GLOBAL debug="+d,inject_tblmap_same_id_maps_diff_table";
+BINLOG '
+SOgWThMBAAAAKQAAAAYDAAAAAEIAAAAAAAEABHRlc3QAAnQxAAEDAAE=
+SOgWThMBAAAAKQAAAC8DAAAAAEMAAAAAAAEABHRlc3QAAnQyAAEDAAE=
+SOgWThgBAAAAKAAAAFcDAAAAAEIAAAAAAAAAAf///gEAAAD+AwAAAA==
+SOgWThgBAAAAKAAAAH8DAAAAAEMAAAAAAAEAAf///gEAAAD+BAAAAA==
+'/*!*/;
+ERROR HY000: Fatal error: Found table map event mapping table id 0 which was already mapped but with different settings.
+DROP TABLE t1,t2;
+SET GLOBAL debug="-d,inject_tblmap_same_id_maps_diff_table";
+DROP TABLE t1_11753004;
+DROP TABLE t2_11753004_ign;
+SET GLOBAL debug= @save_debug;
+include/rpl_end.inc

=== added file 'mysql-test/suite/rpl/t/rpl_row_corruption-slave.opt'
--- a/mysql-test/suite/rpl/t/rpl_row_corruption-slave.opt	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/rpl/t/rpl_row_corruption-slave.opt	2011-07-14 11:15:24 +0000
@@ -0,0 +1 @@
+--replicate-ignore-table=test.t2_11753004_ign

=== added file 'mysql-test/suite/rpl/t/rpl_row_corruption.test'
--- a/mysql-test/suite/rpl/t/rpl_row_corruption.test	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/rpl/t/rpl_row_corruption.test	2011-07-14 11:15:24 +0000
@@ -0,0 +1,115 @@
+#
+--source include/master-slave.inc
+--source include/have_debug.inc
+--source include/have_binlog_format_row.inc
+
+# BUG#11753004: 44360: REPLICATION FAILED 
+
+## assert that we get an error when checking the
+## identifiers at the slave (instead of a crash or
+## different table being updated)
+
+--let $t1= t1_11753004
+--let $t2= t2_11753004
+--let $t2_ign= t2_11753004_ign
+
+## test #1: assert that we get an error raised when multiple
+##          tables in the same RBR statement are mapped with the
+##          same identifier
+
+--eval CREATE TABLE $t1 (c1 INT)
+--eval CREATE TABLE $t2 (c1 INT)
+--eval INSERT INTO $t1 VALUES (1)
+--eval INSERT INTO $t2 VALUES (2)
+
+--sync_slave_with_master
+call mtr.add_suppression(".*Found table map event mapping table id 0 which was already mapped but with different settings.*");
+
+# stop the slave and inject corruption
+--source include/stop_slave.inc
+SET @save_debug= @@global.debug;
+SET GLOBAL debug="+d,inject_tblmap_same_id_maps_diff_table";
+--source include/start_slave.inc
+--connection master
+# both tables get mapped to 0 (in a way, simulating scenario 
+# originated by BUG#56226)
+--eval UPDATE $t1, $t2 SET $t1.c1=3, $t2.c1=4 WHERE $t1.c1=1 OR $t2.c1=2
+--connection slave
+
+# wait for error 1593 (ER_SLAVE_FATAL_ERROR)
+--let $slave_sql_errno=1593 
+--source include/wait_for_slave_sql_error.inc
+--source include/stop_slave.inc
+
+# clean up
+SET GLOBAL debug="-d,inject_tblmap_same_id_maps_diff_table";
+--source include/start_slave.inc
+--connection master
+--source include/rpl_reset.inc
+--eval DROP TABLE $t1, $t2
+--sync_slave_with_master
+
+## test #2: assert that ignored tables that may have been mapped
+##          with the same identifier are skipped, thus no error
+##          is raised.
+
+--connection slave
+--source include/stop_slave.inc
+SET GLOBAL debug="+d,inject_tblmap_same_id_maps_diff_table";
+--source include/start_slave.inc
+--source include/rpl_reset.inc
+--connection master
+--eval CREATE TABLE $t1 (c1 INT)
+--eval CREATE TABLE $t2_ign (c1 INT)
+--eval INSERT INTO $t1 VALUES (1)
+--eval INSERT INTO $t2_ign VALUES (2)
+--eval UPDATE $t1, $t2_ign SET $t1.c1=3, $t2_ign.c1=4 WHERE $t1.c1=1 OR $t2_ign.c1=2
+
+# must not raise error as second table is filtered
+--sync_slave_with_master
+
+
+## test #3: check that BINLOG statements will also raise an
+##          error if containing table map events mapping different
+##          tables to same table identifier.
+
+CREATE TABLE t1 (c1 INT);
+CREATE TABLE t2 (c1 INT);
+
+INSERT INTO t1 VALUES (1);
+INSERT INTO t2 VALUES (1);
+
+# FD event
+BINLOG '
+SOgWTg8BAAAAbgAAAHIAAAAAAAQANS42LjMtbTUtZGVidWctbG9nAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAABI6BZOEzgNAAgAEgAEBAQEEgAAVgAEGggAAAAICAgCAAAAAAVAYI8=
+'/*!*/;
+
+#110708 12:21:44 server id 1  end_log_pos 774   Table_map: `test`.`t1` mapped to number 66
+# at 774
+#110708 12:21:44 server id 1  end_log_pos 815   Table_map: `test`.`t2` mapped to number 67
+# at 815
+#110708 12:21:44 server id 1  end_log_pos 855   Update_rows: table id 66
+# at 855
+#110708 12:21:44 server id 1  end_log_pos 895   Update_rows: table id 67 flags: STMT_END_F
+SET GLOBAL debug="+d,inject_tblmap_same_id_maps_diff_table";
+--error ER_SLAVE_FATAL_ERROR
+BINLOG '
+SOgWThMBAAAAKQAAAAYDAAAAAEIAAAAAAAEABHRlc3QAAnQxAAEDAAE=
+SOgWThMBAAAAKQAAAC8DAAAAAEMAAAAAAAEABHRlc3QAAnQyAAEDAAE=
+SOgWThgBAAAAKAAAAFcDAAAAAEIAAAAAAAAAAf///gEAAAD+AwAAAA==
+SOgWThgBAAAAKAAAAH8DAAAAAEMAAAAAAAEAAf///gEAAAD+BAAAAA==
+'/*!*/;
+
+
+# clean up
+DROP TABLE t1,t2;
+--connection slave
+SET GLOBAL debug="-d,inject_tblmap_same_id_maps_diff_table";
+--connection master
+--eval DROP TABLE $t1
+--eval DROP TABLE $t2_ign
+--sync_slave_with_master
+SET GLOBAL debug= @save_debug;
+
+--source include/rpl_end.inc

=== modified file 'mysql-test/t/disabled.def'
--- a/mysql-test/t/disabled.def	2011-06-16 13:56:45 +0000
+++ b/mysql-test/t/disabled.def	2011-07-14 12:44:35 +0000
@@ -16,3 +16,4 @@ alter_table-big          : Bug#11748731 
 create-big               : Bug#11748731 2010-11-15 mattiasj was not tested
 archive-big              : Bug#11817185 2011-03-10 Anitha Disabled since this leads to timeout on Solaris Sparc
 log_tables-big           : Bug#11756699 2010-11-15 mattiasj report already exists
+mysql_embedded           : Bug#12561297 2011-05-14 Anitha Dependent on PB2 changes - eventum#41836

=== modified file 'mysql-test/t/grant.test'
--- a/mysql-test/t/grant.test	2011-04-22 12:59:10 +0000
+++ b/mysql-test/t/grant.test	2011-07-14 07:32:01 +0000
@@ -1863,9 +1863,6 @@ revoke select on Foo.* from myuser@local
 delete from mysql.user where User='myuser';
 flush privileges;
 
-# Wait till we reached the initial number of concurrent sessions
---source include/wait_until_count_sessions.inc
-
 --echo #########################################################################
 --echo #
 --echo # Bug#38347: ALTER ROUTINE privilege allows SHOW CREATE TABLE.
@@ -2212,3 +2209,40 @@ grant select on mysqltest_db1.t1 to mysq
 show grants for mysqltest_u1;
 drop database mysqltest_db1;
 drop user mysqltest_u1;
+
+
+--echo #
+--echo # Bug#11756966 - 48958: STORED PROCEDURES CAN BE LEVERAGED TO BYPASS
+--echo #                DATABASE SECURITY
+--echo #
+
+--disable_warnings
+DROP DATABASE IF EXISTS secret;
+DROP DATABASE IF EXISTS no_such_db;
+--enable_warnings
+
+CREATE DATABASE secret;
+GRANT USAGE ON *.* TO 'untrusted'@localhost;
+
+--echo # Connection con1
+connect (con1, localhost, untrusted);
+SHOW GRANTS;
+SHOW DATABASES;
+
+--echo # Both statements below should fail with the same error.
+--echo # They used to give different errors, thereby
+--echo # hinting that the secret database exists.
+--error ER_DBACCESS_DENIED_ERROR
+CREATE PROCEDURE no_such_db.foo() BEGIN END;
+--error ER_DBACCESS_DENIED_ERROR
+CREATE PROCEDURE secret.peek_at_secret() BEGIN END;
+
+--echo # Connection default
+--connection default
+disconnect con1;
+DROP USER 'untrusted'@localhost;
+DROP DATABASE secret;
+
+
+# Wait till we reached the initial number of concurrent sessions
+--source include/wait_until_count_sessions.inc

=== modified file 'mysql-test/t/information_schema.test'
--- a/mysql-test/t/information_schema.test	2011-05-04 09:54:04 +0000
+++ b/mysql-test/t/information_schema.test	2011-07-14 07:32:01 +0000
@@ -750,7 +750,7 @@ create temporary table schemata(f1 char(
 # Bug#10708 SP's can use INFORMATION_SCHEMA as ROUTINE_SCHEMA
 #
 delimiter |;
---error ER_BAD_DB_ERROR
+--error ER_DBACCESS_DENIED_ERROR
 CREATE PROCEDURE p1 ()
 BEGIN
   SELECT 'foo' FROM DUAL;

=== modified file 'mysql-test/t/sp.test'
--- a/mysql-test/t/sp.test	2011-06-21 15:32:01 +0000
+++ b/mysql-test/t/sp.test	2011-07-14 08:05:12 +0000
@@ -8835,3 +8835,32 @@ DROP PROCEDURE p1;
 --echo
 
 --echo # End of 5.5 test
+
+
+--echo #
+--echo # Bug#12663165 SP DEAD CODE REMOVAL DOESN'T UNDERSTAND CONTINUE HANDLERS
+--echo #
+
+--disable_warnings
+DROP FUNCTION IF EXISTS f1;
+--enable_warnings
+
+delimiter $;
+CREATE FUNCTION f1() RETURNS INT
+BEGIN
+  DECLARE CONTINUE HANDLER FOR SQLEXCEPTION BEGIN END;
+  BEGIN
+    DECLARE CONTINUE HANDLER FOR SQLEXCEPTION RETURN f1();
+    BEGIN
+     DECLARE CONTINUE HANDLER FOR SQLEXCEPTION RETURN f1();
+     RETURN f1();
+    END;
+  END;
+RETURN 1;
+END $ 
+delimiter ;$
+
+# This used to cause an assertion.
+SELECT f1();
+
+DROP FUNCTION f1;

=== modified file 'mysql-test/t/view.test'
--- a/mysql-test/t/view.test	2011-04-08 08:15:19 +0000
+++ b/mysql-test/t/view.test	2011-07-13 10:29:51 +0000
@@ -4146,6 +4146,53 @@ disconnect con2;
 disconnect con3;
 
 
+--echo #
+--echo # Bug#11757397 49437: CANNOT DO SHOW FIELDS FOR BIG VIEW 
+--echo #
+
+--disable_warnings
+DROP TABLE IF EXISTS t1, t2, t3, table_broken;
+DROP VIEW IF EXISTS view_broken;
+--enable_warnings
+
+let $colnum= 1500;
+let $str= a text;
+while ($colnum)
+{
+  let $str= a$colnum int, $str;
+  dec $colnum;
+}
+--eval CREATE TABLE t1 ($str)
+
+let $colnum= 1500;
+let $str= b text;
+while ($colnum)
+{
+  let $str= b$colnum int, $str;
+  dec $colnum;
+}
+--eval CREATE TABLE t2 ($str)
+
+let $colnum= 1500;
+let $str= c text;
+while ($colnum)
+{
+  let $str= c$colnum int, $str;
+  dec $colnum;
+}
+--eval CREATE TABLE t3 ($str)
+ 
+# New behavior
+--error ER_TOO_MANY_FIELDS
+CREATE VIEW view_broken AS SELECT * FROM t1, t2, t3;
+
+# Existing behavior
+--error ER_TOO_MANY_FIELDS
+CREATE TABLE table_broken AS SELECT * FROM t1, t2, t3;
+
+DROP TABLE t1, t2, t3;
+
+
 # Check that all connections opened by test cases in this file are really
 # gone so execution of other tests won't be affected by their presence.
 --source include/wait_until_count_sessions.inc

=== modified file 'sql/log_event.cc'
--- a/sql/log_event.cc	2011-07-04 00:25:46 +0000
+++ b/sql/log_event.cc	2011-07-14 12:46:00 +0000
@@ -8846,6 +8846,97 @@ Table_map_log_event::~Table_map_log_even
  */
 
 #if !defined(MYSQL_CLIENT) && defined(HAVE_REPLICATION)
+
+enum enum_tbl_map_status
+{
+  /* no duplicate identifier found */
+  OK_TO_PROCESS= 0,
+
+  /* this table map must be filtered out */
+  FILTERED_OUT= 1,
+
+  /* identifier mapping table with different properties */
+  SAME_ID_MAPPING_DIFFERENT_TABLE= 2,
+  
+  /* a duplicate identifier was found mapping the same table */
+  SAME_ID_MAPPING_SAME_TABLE= 3
+};
+
+/*
+  Checks if this table map event should be processed or not. First
+  it checks the filtering rules, and then looks for duplicate identifiers
+  in the existing list of rli->tables_to_lock.
+
+  It checks that there hasn't been any corruption by verifying that there
+  are no duplicate entries with different properties.
+
+  In some cases, some binary logs could get corrupted, showing several
+  tables mapped to the same table_id, 0 (see: BUG#56226). Thus we do this
+  early sanity check for such cases and avoid that the server crashes 
+  later.
+
+  In some corner cases, the master logs duplicate table map events, i.e.,
+  same id, same database name, same table name (see: BUG#37137). This is
+  different from the above as it's the same table that is mapped again 
+  to the same identifier. Thus we cannot just check for same ids and 
+  assume that the event is corrupted we need to check every property. 
+
+  NOTE: in the event that BUG#37137 ever gets fixed, this extra check 
+        will still be valid because we would need to support old binary 
+        logs anyway.
+
+  @param rli The relay log info reference.
+  @param table_list A list element containing the table to check against.
+  @return OK_TO_PROCESS 
+            if there was no identifier already in rli->tables_to_lock 
+            
+          FILTERED_OUT
+            if the event is filtered according to the filtering rules
+
+          SAME_ID_MAPPING_DIFFERENT_TABLE 
+            if the same identifier already maps a different table in 
+            rli->tables_to_lock
+
+          SAME_ID_MAPPING_SAME_TABLE 
+            if the same identifier already maps the same table in 
+            rli->tables_to_lock.
+*/
+static enum_tbl_map_status
+check_table_map(Relay_log_info const *rli, RPL_TABLE_LIST *table_list)
+{
+  DBUG_ENTER("check_table_map");
+  enum_tbl_map_status res= OK_TO_PROCESS;
+
+  if (rli->info_thd->slave_thread /* filtering is for slave only */ &&
+      (!rpl_filter->db_ok(table_list->db) ||
+       (rpl_filter->is_on() && !rpl_filter->tables_ok("", table_list))))
+    res= FILTERED_OUT;
+  else
+  {
+    for(RPL_TABLE_LIST *ptr= static_cast<RPL_TABLE_LIST*>(rli->tables_to_lock);
+        ptr; 
+        ptr= static_cast<RPL_TABLE_LIST*>(ptr->next_local))
+    {
+      if (ptr->table_id == table_list->table_id)
+      {
+
+        if (strcmp(ptr->db, table_list->db) || 
+            strcmp(ptr->alias, table_list->table_name) || 
+            ptr->lock_type != TL_WRITE) // the ::do_apply_event always sets TL_WRITE
+          res= SAME_ID_MAPPING_DIFFERENT_TABLE;
+        else
+          res= SAME_ID_MAPPING_SAME_TABLE;
+
+        break;
+      }
+    }
+  }
+
+  DBUG_PRINT("debug", ("check of table map ended up with: %u", res));
+
+  DBUG_RETURN(res);
+}
+
 int Table_map_log_event::do_apply_event(Relay_log_info const *rli)
 {
   RPL_TABLE_LIST *table_list;
@@ -8882,18 +8973,11 @@ int Table_map_log_event::do_apply_event(
                              tname_mem, strlen(tname_mem),
                              tname_mem, TL_WRITE);
 
-  table_list->table_id= m_table_id;
+  table_list->table_id= DBUG_EVALUATE_IF("inject_tblmap_same_id_maps_diff_table", 0, m_table_id);
   table_list->updating= 1;
-
-  int error= 0;
-
-  if (rli->info_thd->slave_thread /* filtering is for slave only */ &&
-      (!rpl_filter->db_ok(table_list->db) ||
-       (rpl_filter->is_on() && !rpl_filter->tables_ok("", table_list))))
-  {
-    my_free(memory);
-  }
-  else
+  DBUG_PRINT("debug", ("table: %s is mapped to %u", table_list->table_name, table_list->table_id));
+  enum_tbl_map_status tblmap_status= check_table_map(rli, table_list);
+  if (tblmap_status == OK_TO_PROCESS)
   {
     DBUG_ASSERT(thd->lex->query_tables != table_list);
 
@@ -8923,8 +9007,48 @@ int Table_map_log_event::do_apply_event(
     const_cast<Relay_log_info*>(rli)->tables_to_lock_count++;
     /* 'memory' is freed in clear_tables_to_lock */
   }
+  else  // FILTERED_OUT, SAME_ID_MAPPING_*
+  {
+    /*
+      If mapped already but with different properties, we raise an
+      error.
+      If mapped already but with same properties we skip the event.
+      If filtered out we skip the event.
 
-  DBUG_RETURN(error);
+      In all three cases, we need to free the memory previously 
+      allocated.
+     */
+    if (tblmap_status == SAME_ID_MAPPING_DIFFERENT_TABLE)
+    {
+      /*
+        Something bad has happened. We need to stop the slave as strange things
+        could happen if we proceed: slave crash, wrong table being updated, ...
+        As a consequence we push an error in this case.
+       */
+
+      char buf[256];
+
+      my_snprintf(buf, sizeof(buf), 
+                  "Found table map event mapping table id %u which "
+                  "was already mapped but with different settings.",
+                  table_list->table_id);
+
+      if (thd->slave_thread)
+        rli->report(ERROR_LEVEL, ER_SLAVE_FATAL_ERROR, 
+                    ER(ER_SLAVE_FATAL_ERROR), buf);
+      else
+        /* 
+          For the cases in which a 'BINLOG' statement is set to 
+          execute in a user session 
+         */
+        my_printf_error(ER_SLAVE_FATAL_ERROR, ER(ER_SLAVE_FATAL_ERROR), 
+                        MYF(0), buf);
+    } 
+    
+    my_free(memory);
+  }
+
+  DBUG_RETURN(tblmap_status == SAME_ID_MAPPING_DIFFERENT_TABLE);
 }
 
 Log_event::enum_skip_reason

=== modified file 'sql/sp_head.cc'
--- a/sql/sp_head.cc	2011-07-07 09:45:10 +0000
+++ b/sql/sp_head.cc	2011-07-14 08:05:12 +0000
@@ -3547,6 +3547,23 @@ sp_instr_hpush_jump::opt_mark(sp_head *s
     m_optdest= sp->get_instr(m_dest);
   }
   sp->add_mark_lead(m_dest, leads);
+
+  /*
+    For continue handlers, all instructions in the scope of the handler
+    are possible leads. For example, the instruction after freturn might
+    be executed if the freturn triggers the condition handled by the
+    continue handler.
+
+    m_dest marks the start of the handler scope. It's added as a lead
+    above, so we start on m_dest+1 here.
+    m_opt_hpop is the hpop marking the end of the handler scope.
+  */
+  if (m_type == SP_HANDLER_CONTINUE)
+  {
+    for (uint scope_ip= m_dest+1; scope_ip <= m_opt_hpop; scope_ip++)
+      sp->add_mark_lead(scope_ip, leads);
+  }
+
   return m_ip+1;
 }
 

=== modified file 'sql/sp_head.h'
--- a/sql/sp_head.h	2011-06-30 15:50:45 +0000
+++ b/sql/sp_head.h	2011-07-14 08:05:12 +0000
@@ -1019,7 +1019,7 @@ class sp_instr_hpush_jump : public sp_in
 public:
 
   sp_instr_hpush_jump(uint ip, sp_pcontext *ctx, int htype, uint fp)
-    : sp_instr_jump(ip, ctx), m_type(htype), m_frame(fp)
+    : sp_instr_jump(ip, ctx), m_type(htype), m_frame(fp), m_opt_hpop(0)
   {
     m_cond.empty();
   }
@@ -1041,6 +1041,15 @@ public:
     return m_ip;
   }
 
+  virtual void backpatch(uint dest, sp_pcontext *dst_ctx)
+  {
+    DBUG_ASSERT(!m_dest || !m_opt_hpop);
+    if (!m_dest)
+      m_dest= dest;
+    else
+      m_opt_hpop= dest;
+  }
+
   inline void add_condition(struct sp_cond_type *cond)
   {
     m_cond.push_front(cond);
@@ -1050,6 +1059,7 @@ private:
 
   int m_type;			///< Handler type
   uint m_frame;
+  uint m_opt_hpop;              // hpop marking end of handler scope.
   List<struct sp_cond_type> m_cond;
 
 }; // class sp_instr_hpush_jump : public sp_instr_jump

=== modified file 'sql/sql_insert.cc'
--- a/sql/sql_insert.cc	2011-07-07 12:44:34 +0000
+++ b/sql/sql_insert.cc	2011-07-14 15:53:10 +0000
@@ -1628,9 +1628,6 @@ int write_record(THD *thd, TABLE *table,
           goto before_trg_err;
 
         table->file->restore_auto_increment(prev_insert_id);
-        if (table->next_number_field)
-          table->file->adjust_next_insert_id_after_explicit_value(
-            table->next_number_field->val_int());
         info->touched++;
         if (!records_are_comparable(table) || compare_records(table))
         {
@@ -1667,8 +1664,6 @@ int write_record(THD *thd, TABLE *table,
         if (table->next_number_field)
           table->file->adjust_next_insert_id_after_explicit_value(
             table->next_number_field->val_int());
-        info->touched++;
-
         goto ok_or_after_trg_err;
       }
       else /* DUP_REPLACE */

=== modified file 'sql/sql_parse.cc'
--- a/sql/sql_parse.cc	2011-07-07 12:44:34 +0000
+++ b/sql/sql_parse.cc	2011-07-14 07:32:01 +0000
@@ -3927,6 +3927,10 @@ end_with_restore_list:
       goto create_sp_error;
     }
 
+    if (check_access(thd, CREATE_PROC_ACL, lex->sphead->m_db.str,
+                     NULL, NULL, 0, 0))
+      goto create_sp_error;
+
     /*
       Check that a database directory with this name
       exists. Design note: This won't work on virtual databases
@@ -3938,10 +3942,6 @@ end_with_restore_list:
       goto create_sp_error;
     }
 
-    if (check_access(thd, CREATE_PROC_ACL, lex->sphead->m_db.str,
-                     NULL, NULL, 0, 0))
-      goto create_sp_error;
-
     name= lex->sphead->name(&namelen);
 #ifdef HAVE_DLOPEN
     if (lex->sphead->m_type == TYPE_ENUM_FUNCTION)

=== modified file 'sql/sql_select.cc'
--- a/sql/sql_select.cc	2011-07-07 14:26:36 +0000
+++ b/sql/sql_select.cc	2011-07-13 10:29:51 +0000
@@ -16052,6 +16052,11 @@ void setup_tmp_table_column_bitmaps(TABL
   @param rows_limit
   @param table_alias          possible name of the temporary table that can
                               be used for name resolving; can be "".
+
+  @remark mysql_create_view() checks that views have less than
+          MAX_FIELDS columns. This prevents any MyISAM temp table
+          made when materializing the view from hitting the 64k
+          MyISAM header size limit.
 */
 
 #define STRING_TOTAL_LENGTH_TO_PACK_ROWS 128

=== modified file 'sql/sql_view.cc'
--- a/sql/sql_view.cc	2011-07-07 12:44:34 +0000
+++ b/sql/sql_view.cc	2011-07-13 10:29:51 +0000
@@ -591,6 +591,17 @@ bool mysql_create_view(THD *thd, TABLE_L
     goto err;
   }
 
+  /*
+    Make sure the view doesn't have so many columns that we hit the
+    64k header limit if the view is materialized as a MyISAM table.
+  */
+  if (select_lex->item_list.elements > MAX_FIELDS)
+  {
+    my_error(ER_TOO_MANY_FIELDS, MYF(0));
+    res= TRUE;
+    goto err;
+  }
+
 #ifndef NO_EMBEDDED_ACCESS_CHECKS
   /*
     Compare/check grants on view with grants of underlying tables

=== modified file 'sql/sql_yacc.yy'
--- a/sql/sql_yacc.yy	2011-07-07 12:44:34 +0000
+++ b/sql/sql_yacc.yy	2011-07-14 08:05:12 +0000
@@ -2774,9 +2774,15 @@ sp_decl:
             sp_instr_hpush_jump *i=
               new sp_instr_hpush_jump(sp->instructions(), ctx, $2,
                                       ctx->current_var_count());
-            if (i == NULL ||
-                sp->add_instr(i) ||
-                sp->push_backpatch(i, ctx->push_label((char *)"", 0)))
+            if (i == NULL || sp->add_instr(i))
+              MYSQL_YYABORT;
+
+            /* For continue handlers, mark end of handler scope. */
+            if ($2 == SP_HANDLER_CONTINUE &&
+                sp->push_backpatch(i, ctx->last_label()))
+              MYSQL_YYABORT;
+
+            if (sp->push_backpatch(i, ctx->push_label(empty_c_string, 0)))
               MYSQL_YYABORT;
           }
           sp_hcond_list sp_proc_stmt

=== modified file 'tests/mysql_client_test.c'
--- a/tests/mysql_client_test.c	2011-07-07 11:24:33 +0000
+++ b/tests/mysql_client_test.c	2011-07-14 15:53:10 +0000
@@ -19705,6 +19705,34 @@ static void test_bug54790()
   DBUG_VOID_RETURN;
 }
 
+
+/*
+  BUG 11754979 - 46675: ON DUPLICATE KEY UPDATE AND UPDATECOUNT() POSSIBLY WRONG
+*/
+
+static void test_bug11754979()
+{
+  MYSQL* conn;
+  DBUG_ENTER("test_bug11754979");
+
+  myheader("test_bug11754979");
+  DIE_UNLESS((conn= mysql_client_init(NULL)));
+  DIE_UNLESS(mysql_real_connect(conn, opt_host, opt_user,
+             opt_password, opt_db ? opt_db:"test", opt_port,
+             opt_unix_socket,  CLIENT_FOUND_ROWS));
+  myquery(mysql_query(conn, "DROP TABLE IF EXISTS t1"));
+  myquery(mysql_query(conn, "CREATE TABLE t1(id INT, label CHAR(1), PRIMARY KEY(id))"));
+  myquery(mysql_query(conn, "INSERT INTO t1(id, label) VALUES (1, 'a')"));
+  myquery(mysql_query(conn, "INSERT INTO t1(id, label) VALUES (1, 'a') "
+                            "ON DUPLICATE KEY UPDATE id = 4"));
+  DIE_UNLESS(mysql_affected_rows(conn) == 2);
+  myquery(mysql_query(conn, "DROP TABLE t1"));
+  mysql_close(conn);
+
+  DBUG_VOID_RETURN;
+}
+
+
 /*
   Read and parse arguments and MySQL options from my.cnf
 */
@@ -20051,6 +20079,7 @@ static struct my_tests_st my_tests[]= {
   { "test_bug11766854", test_bug11766854 },
   { "test_bug54790", test_bug54790 },
   { "test_bug12337762", test_bug12337762 },
+  { "test_bug11754979", test_bug11754979 },
   { 0, 0 }
 };
 

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk-wl5342 branch (marc.alff:3380 to 3381) Marc Alff17 Jul