From e2a11cc15e10fa1372e8685b2fc3f7d126809744 Mon Sep 17 00:00:00 2001 From: "jimw@mysql.com" <> Date: Sun, 8 May 2005 12:02:46 -0700 Subject: [PATCH 01/26] Fix crash in mysqldump -c triggered by tables with a large number of long field names. (Bug #10286) --- client/mysqldump.c | 108 +++--- mysql-test/r/mysqldump.result | 705 ++++++++++++++++++++++++++++++++++ mysql-test/t/mysqldump.test | 338 ++++++++++++++++ 3 files changed, 1108 insertions(+), 43 deletions(-) diff --git a/client/mysqldump.c b/client/mysqldump.c index 2573c812067..8cfd76cd64a 100644 --- a/client/mysqldump.c +++ b/client/mysqldump.c @@ -75,7 +75,7 @@ static ulong find_set(TYPELIB *lib, const char *x, uint length, char **err_pos, uint *err_len); static char *field_escape(char *to,const char *from,uint length); -static my_bool verbose=0,tFlag=0,cFlag=0,dFlag=0,quick= 1, extended_insert= 1, +static my_bool verbose=0,tFlag=0,dFlag=0,quick= 1, extended_insert= 1, lock_tables=1,ignore_errors=0,flush_logs=0, opt_drop=1,opt_keywords=0,opt_lock=1,opt_compress=0, opt_delayed=0,create_options=1,opt_quoted=0,opt_databases=0, @@ -83,10 +83,12 @@ static my_bool verbose=0,tFlag=0,cFlag=0,dFlag=0,quick= 1, extended_insert= 1, opt_autocommit=0,opt_disable_keys=1,opt_xml=0, opt_delete_master_logs=0, tty_password=0, opt_single_transaction=0, opt_comments= 0, opt_compact= 0, - opt_hex_blob=0, opt_order_by_primary=0; + opt_hex_blob=0, opt_order_by_primary=0, opt_complete_insert= 0; static ulong opt_max_allowed_packet, opt_net_buffer_length; static MYSQL mysql_connection,*sock=0; -static char insert_pat[12 * 1024],*opt_password=0,*current_user=0, +static my_bool insert_pat_inited=0; +static DYNAMIC_STRING insert_pat; +static char *opt_password=0,*current_user=0, *current_host=0,*path=0,*fields_terminated=0, *lines_terminated=0, *enclosed=0, *opt_enclosed=0, *escaped=0, *where=0, *order_by=0, @@ -178,8 +180,9 @@ static struct my_option my_long_options[] = "Give less verbose output (useful for debugging). Disables structure comments and header/footer constructs. Enables options --skip-add-drop-table --no-set-names --skip-disable-keys --skip-add-locks", (gptr*) &opt_compact, (gptr*) &opt_compact, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0}, - {"complete-insert", 'c', "Use complete insert statements.", (gptr*) &cFlag, - (gptr*) &cFlag, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0}, + {"complete-insert", 'c', "Use complete insert statements.", + (gptr*) &opt_complete_insert, (gptr*) &opt_complete_insert, 0, GET_BOOL, + NO_ARG, 0, 0, 0, 0, 0, 0}, {"compress", 'C', "Use compression in server/client protocol.", (gptr*) &opt_compress, (gptr*) &opt_compress, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0}, @@ -1082,7 +1085,7 @@ static void print_xml_row(FILE *xml_file, const char *row_name, /* - getStructure -- retrievs database structure, prints out corresponding + getTableStructure -- retrievs database structure, prints out corresponding CREATE statement and fills out insert_pat. RETURN @@ -1095,23 +1098,31 @@ static uint getTableStructure(char *table, char* db) MYSQL_ROW row; my_bool init=0; uint numFields; - char *strpos, *result_table, *opt_quoted_table; + char *result_table, *opt_quoted_table; const char *delayed; char name_buff[NAME_LEN+3],table_buff[NAME_LEN*2+3]; char table_buff2[NAME_LEN*2+3]; + char query_buff[512]; FILE *sql_file = md_result_file; DBUG_ENTER("getTableStructure"); + if (!insert_pat_inited) + { + insert_pat_inited= init_dynamic_string(&insert_pat, "", 1024, 1024); + } + else + dynstr_set(&insert_pat, ""); + delayed= opt_delayed ? " DELAYED " : ""; if (verbose) fprintf(stderr, "-- Retrieving table structure for table %s...\n", table); - my_snprintf(insert_pat, sizeof(insert_pat), + my_snprintf(query_buff, sizeof(query_buff), "SET OPTION SQL_QUOTE_SHOW_CREATE=%d", (opt_quoted || opt_keywords)); if (!create_options) - strmov(strend(insert_pat), "/*!40102 ,SQL_MODE=concat(@@sql_mode, _utf8 ',NO_KEY_OPTIONS,NO_TABLE_OPTIONS,NO_FIELD_OPTIONS') */"); + strmov(strend(query_buff), "/*!40102 ,SQL_MODE=concat(@@sql_mode, _utf8 ',NO_KEY_OPTIONS,NO_TABLE_OPTIONS,NO_FIELD_OPTIONS') */"); result_table= quote_name(table, table_buff, 1); opt_quoted_table= quote_name(table, table_buff2, 0); @@ -1119,7 +1130,7 @@ static uint getTableStructure(char *table, char* db) if (opt_order_by_primary) order_by = primary_key_fields(opt_quoted_table); - if (!opt_xml && !mysql_query_with_error_report(sock, 0, insert_pat)) + if (!opt_xml && !mysql_query_with_error_report(sock, 0, query_buff)) { /* using SHOW CREATE statement */ if (!tFlag) @@ -1165,9 +1176,9 @@ static uint getTableStructure(char *table, char* db) check_io(sql_file); mysql_free_result(tableRes); } - my_snprintf(insert_pat, sizeof(insert_pat), "show fields from %s", + my_snprintf(query_buff, sizeof(query_buff), "show fields from %s", result_table); - if (mysql_query_with_error_report(sock, &tableRes, insert_pat)) + if (mysql_query_with_error_report(sock, &tableRes, query_buff)) { if (path) my_fclose(sql_file, MYF(MY_WME)); @@ -1175,28 +1186,32 @@ static uint getTableStructure(char *table, char* db) DBUG_RETURN(0); } - if (cFlag) - my_snprintf(insert_pat, sizeof(insert_pat), "INSERT %sINTO %s (", - delayed, opt_quoted_table); + dynstr_append_mem(&insert_pat, "INSERT ", 7); + dynstr_append(&insert_pat, delayed); + dynstr_append_mem(&insert_pat, "INTO ", 5); + dynstr_append(&insert_pat, opt_quoted_table); + if (opt_complete_insert) + { + dynstr_append_mem(&insert_pat, " (", 2); + } else { - my_snprintf(insert_pat, sizeof(insert_pat), "INSERT %sINTO %s VALUES ", - delayed, opt_quoted_table); + dynstr_append_mem(&insert_pat, " VALUES ", 8); if (!extended_insert) - strcat(insert_pat,"("); + dynstr_append_mem(&insert_pat, "(", 1); } - strpos=strend(insert_pat); while ((row=mysql_fetch_row(tableRes))) { if (init) { - if (cFlag) - strpos=strmov(strpos,", "); + if (opt_complete_insert) + dynstr_append_mem(&insert_pat, ", ", 2); } init=1; - if (cFlag) - strpos=strmov(strpos,quote_name(row[SHOW_FIELDNAME], name_buff, 0)); + if (opt_complete_insert) + dynstr_append(&insert_pat, + quote_name(row[SHOW_FIELDNAME], name_buff, 0)); } numFields = (uint) mysql_num_rows(tableRes); mysql_free_result(tableRes); @@ -1208,9 +1223,9 @@ static uint getTableStructure(char *table, char* db) "%s: Warning: Can't set SQL_QUOTE_SHOW_CREATE option (%s)\n", my_progname, mysql_error(sock)); - my_snprintf(insert_pat, sizeof(insert_pat), "show fields from %s", + my_snprintf(query_buff, sizeof(query_buff), "show fields from %s", result_table); - if (mysql_query_with_error_report(sock, &tableRes, insert_pat)) + if (mysql_query_with_error_report(sock, &tableRes, query_buff)) { safe_exit(EX_MYSQLERR); DBUG_RETURN(0); @@ -1243,18 +1258,22 @@ static uint getTableStructure(char *table, char* db) print_xml_tag1(sql_file, "\t", "table_structure name=", table, "\n"); check_io(sql_file); } - if (cFlag) - my_snprintf(insert_pat, sizeof(insert_pat), "INSERT %sINTO %s (", - delayed, result_table); + + dynstr_append_mem(&insert_pat, "INSERT ", 7); + dynstr_append(&insert_pat, delayed); + dynstr_append_mem(&insert_pat, "INTO ", 5); + dynstr_append(&insert_pat, result_table); + if (opt_complete_insert) + { + dynstr_append_mem(&insert_pat, " (", 2); + } else { - my_snprintf(insert_pat, sizeof(insert_pat), "INSERT %sINTO %s VALUES ", - delayed, result_table); + dynstr_append_mem(&insert_pat, " VALUES ", 8); if (!extended_insert) - strcat(insert_pat,"("); + dynstr_append_mem(&insert_pat, "(", 1); } - strpos=strend(insert_pat); while ((row=mysql_fetch_row(tableRes))) { ulong *lengths=mysql_fetch_lengths(tableRes); @@ -1265,12 +1284,13 @@ static uint getTableStructure(char *table, char* db) fputs(",\n",sql_file); check_io(sql_file); } - if (cFlag) - strpos=strmov(strpos,", "); + if (opt_complete_insert) + dynstr_append_mem(&insert_pat, ", ", 2); } init=1; - if (cFlag) - strpos=strmov(strpos,quote_name(row[SHOW_FIELDNAME], name_buff, 0)); + if (opt_complete_insert) + dynstr_append(&insert_pat, + quote_name(row[SHOW_FIELDNAME], name_buff, 0)); if (!tFlag) { if (opt_xml) @@ -1278,7 +1298,7 @@ static uint getTableStructure(char *table, char* db) print_xml_row(sql_file, "field", tableRes, &row); continue; } - + if (opt_keywords) fprintf(sql_file, " %s.%s %s", result_table, quote_name(row[SHOW_FIELDNAME],name_buff, 0), @@ -1423,11 +1443,11 @@ static uint getTableStructure(char *table, char* db) check_io(sql_file); } } - if (cFlag) + if (opt_complete_insert) { - strpos=strmov(strpos,") VALUES "); + dynstr_append_mem(&insert_pat, ") VALUES ", 9); if (!extended_insert) - strpos=strmov(strpos,"("); + dynstr_append_mem(&insert_pat, "(", 1); } if (sql_file != md_result_file) { @@ -1650,7 +1670,7 @@ static void dumpTable(uint numFields, char *table) total_length= opt_net_buffer_length; /* Force row break */ row_break=0; rownr=0; - init_length=(uint) strlen(insert_pat)+4; + init_length=(uint) insert_pat.length+4; if (opt_xml) print_xml_tag1(md_result_file, "\t", "table_data name=", table, "\n"); @@ -1667,7 +1687,7 @@ static void dumpTable(uint numFields, char *table) rownr++; if (!extended_insert && !opt_xml) { - fputs(insert_pat,md_result_file); + fputs(insert_pat.str,md_result_file); check_io(md_result_file); } mysql_field_seek(res,0); @@ -1864,7 +1884,7 @@ static void dumpTable(uint numFields, char *table) fputs(";\n", md_result_file); row_break=1; /* This is first row */ - fputs(insert_pat,md_result_file); + fputs(insert_pat.str,md_result_file); fputs(extended_row.str,md_result_file); total_length = row_length+init_length; } @@ -2557,6 +2577,8 @@ err: my_free(opt_password, MYF(MY_ALLOW_ZERO_PTR)); if (extended_insert) dynstr_free(&extended_row); + if (insert_pat_inited) + dynstr_free(&insert_pat); my_end(0); return(first_error); } /* main */ diff --git a/mysql-test/r/mysqldump.result b/mysql-test/r/mysqldump.result index 69ca9486d2f..5ebac46205d 100644 --- a/mysql-test/r/mysqldump.result +++ b/mysql-test/r/mysqldump.result @@ -560,3 +560,708 @@ UNLOCK TABLES; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; DROP TABLE t1; +create table t1 ( +F_c4ca4238a0b923820dcc509a6f75849b int, +F_c81e728d9d4c2f636f067f89cc14862c int, +F_eccbc87e4b5ce2fe28308fd9f2a7baf3 int, +F_a87ff679a2f3e71d9181a67b7542122c int, +F_e4da3b7fbbce2345d7772b0674a318d5 int, +F_1679091c5a880faf6fb5e6087eb1b2dc int, +F_8f14e45fceea167a5a36dedd4bea2543 int, +F_c9f0f895fb98ab9159f51fd0297e236d int, +F_45c48cce2e2d7fbdea1afc51c7c6ad26 int, +F_d3d9446802a44259755d38e6d163e820 int, +F_6512bd43d9caa6e02c990b0a82652dca int, +F_c20ad4d76fe97759aa27a0c99bff6710 int, +F_c51ce410c124a10e0db5e4b97fc2af39 int, +F_aab3238922bcc25a6f606eb525ffdc56 int, +F_9bf31c7ff062936a96d3c8bd1f8f2ff3 int, +F_c74d97b01eae257e44aa9d5bade97baf int, +F_70efdf2ec9b086079795c442636b55fb int, +F_6f4922f45568161a8cdf4ad2299f6d23 int, +F_1f0e3dad99908345f7439f8ffabdffc4 int, +F_98f13708210194c475687be6106a3b84 int, +F_3c59dc048e8850243be8079a5c74d079 int, +F_b6d767d2f8ed5d21a44b0e5886680cb9 int, +F_37693cfc748049e45d87b8c7d8b9aacd int, +F_1ff1de774005f8da13f42943881c655f int, +F_8e296a067a37563370ded05f5a3bf3ec int, +F_4e732ced3463d06de0ca9a15b6153677 int, +F_02e74f10e0327ad868d138f2b4fdd6f0 int, +F_33e75ff09dd601bbe69f351039152189 int, +F_6ea9ab1baa0efb9e19094440c317e21b int, +F_34173cb38f07f89ddbebc2ac9128303f int, +F_c16a5320fa475530d9583c34fd356ef5 int, +F_6364d3f0f495b6ab9dcf8d3b5c6e0b01 int, +F_182be0c5cdcd5072bb1864cdee4d3d6e int, +F_e369853df766fa44e1ed0ff613f563bd int, +F_1c383cd30b7c298ab50293adfecb7b18 int, +F_19ca14e7ea6328a42e0eb13d585e4c22 int, +F_a5bfc9e07964f8dddeb95fc584cd965d int, +F_a5771bce93e200c36f7cd9dfd0e5deaa int, +F_d67d8ab4f4c10bf22aa353e27879133c int, +F_d645920e395fedad7bbbed0eca3fe2e0 int, +F_3416a75f4cea9109507cacd8e2f2aefc int, +F_a1d0c6e83f027327d8461063f4ac58a6 int, +F_17e62166fc8586dfa4d1bc0e1742c08b int, +F_f7177163c833dff4b38fc8d2872f1ec6 int, +F_6c8349cc7260ae62e3b1396831a8398f int, +F_d9d4f495e875a2e075a1a4a6e1b9770f int, +F_67c6a1e7ce56d3d6fa748ab6d9af3fd7 int, +F_642e92efb79421734881b53e1e1b18b6 int, +F_f457c545a9ded88f18ecee47145a72c0 int, +F_c0c7c76d30bd3dcaefc96f40275bdc0a int, +F_2838023a778dfaecdc212708f721b788 int, +F_9a1158154dfa42caddbd0694a4e9bdc8 int, +F_d82c8d1619ad8176d665453cfb2e55f0 int, +F_a684eceee76fc522773286a895bc8436 int, +F_b53b3a3d6ab90ce0268229151c9bde11 int, +F_9f61408e3afb633e50cdf1b20de6f466 int, +F_72b32a1f754ba1c09b3695e0cb6cde7f int, +F_66f041e16a60928b05a7e228a89c3799 int, +F_093f65e080a295f8076b1c5722a46aa2 int, +F_072b030ba126b2f4b2374f342be9ed44 int, +F_7f39f8317fbdb1988ef4c628eba02591 int, +F_44f683a84163b3523afe57c2e008bc8c int, +F_03afdbd66e7929b125f8597834fa83a4 int, +F_ea5d2f1c4608232e07d3aa3d998e5135 int, +F_fc490ca45c00b1249bbe3554a4fdf6fb int, +F_3295c76acbf4caaed33c36b1b5fc2cb1 int, +F_735b90b4568125ed6c3f678819b6e058 int, +F_a3f390d88e4c41f2747bfa2f1b5f87db int, +F_14bfa6bb14875e45bba028a21ed38046 int, +F_7cbbc409ec990f19c78c75bd1e06f215 int, +F_e2c420d928d4bf8ce0ff2ec19b371514 int, +F_32bb90e8976aab5298d5da10fe66f21d int, +F_d2ddea18f00665ce8623e36bd4e3c7c5 int, +F_ad61ab143223efbc24c7d2583be69251 int, +F_d09bf41544a3365a46c9077ebb5e35c3 int, +F_fbd7939d674997cdb4692d34de8633c4 int, +F_28dd2c7955ce926456240b2ff0100bde int, +F_35f4a8d465e6e1edc05f3d8ab658c551 int, +F_d1fe173d08e959397adf34b1d77e88d7 int, +F_f033ab37c30201f73f142449d037028d int, +F_43ec517d68b6edd3015b3edc9a11367b int, +F_9778d5d219c5080b9a6a17bef029331c int, +F_fe9fc289c3ff0af142b6d3bead98a923 int, +F_68d30a9594728bc39aa24be94b319d21 int, +F_3ef815416f775098fe977004015c6193 int, +F_93db85ed909c13838ff95ccfa94cebd9 int, +F_c7e1249ffc03eb9ded908c236bd1996d int, +F_2a38a4a9316c49e5a833517c45d31070 int, +F_7647966b7343c29048673252e490f736 int, +F_8613985ec49eb8f757ae6439e879bb2a int, +F_54229abfcfa5649e7003b83dd4755294 int, +F_92cc227532d17e56e07902b254dfad10 int, +F_98dce83da57b0395e163467c9dae521b int, +F_f4b9ec30ad9f68f89b29639786cb62ef int, +F_812b4ba287f5ee0bc9d43bbf5bbe87fb int, +F_26657d5ff9020d2abefe558796b99584 int, +F_e2ef524fbf3d9fe611d5a8e90fefdc9c int, +F_ed3d2c21991e3bef5e069713af9fa6ca int, +F_ac627ab1ccbdb62ec96e702f07f6425b int, +F_f899139df5e1059396431415e770c6dd int, +F_38b3eff8baf56627478ec76a704e9b52 int, +F_ec8956637a99787bd197eacd77acce5e int, +F_6974ce5ac660610b44d9b9fed0ff9548 int, +F_c9e1074f5b3f9fc8ea15d152add07294 int, +F_65b9eea6e1cc6bb9f0cd2a47751a186f int, +F_f0935e4cd5920aa6c7c996a5ee53a70f int, +F_a97da629b098b75c294dffdc3e463904 int, +F_a3c65c2974270fd093ee8a9bf8ae7d0b int, +F_2723d092b63885e0d7c260cc007e8b9d int, +F_5f93f983524def3dca464469d2cf9f3e int, +F_698d51a19d8a121ce581499d7b701668 int, +F_7f6ffaa6bb0b408017b62254211691b5 int, +F_73278a4a86960eeb576a8fd4c9ec6997 int, +F_5fd0b37cd7dbbb00f97ba6ce92bf5add int, +F_2b44928ae11fb9384c4cf38708677c48 int, +F_c45147dee729311ef5b5c3003946c48f int, +F_eb160de1de89d9058fcb0b968dbbbd68 int, +F_5ef059938ba799aaa845e1c2e8a762bd int, +F_07e1cd7dca89a1678042477183b7ac3f int, +F_da4fb5c6e93e74d3df8527599fa62642 int, +F_4c56ff4ce4aaf9573aa5dff913df997a int, +F_a0a080f42e6f13b3a2df133f073095dd int, +F_202cb962ac59075b964b07152d234b70 int, +F_c8ffe9a587b126f152ed3d89a146b445 int, +F_3def184ad8f4755ff269862ea77393dd int, +F_069059b7ef840f0c74a814ec9237b6ec int, +F_ec5decca5ed3d6b8079e2e7e7bacc9f2 int, +F_76dc611d6ebaafc66cc0879c71b5db5c int, +F_d1f491a404d6854880943e5c3cd9ca25 int, +F_9b8619251a19057cff70779273e95aa6 int, +F_1afa34a7f984eeabdbb0a7d494132ee5 int, +F_65ded5353c5ee48d0b7d48c591b8f430 int, +F_9fc3d7152ba9336a670e36d0ed79bc43 int, +F_02522a2b2726fb0a03bb19f2d8d9524d int, +F_7f1de29e6da19d22b51c68001e7e0e54 int, +F_42a0e188f5033bc65bf8d78622277c4e int, +F_3988c7f88ebcb58c6ce932b957b6f332 int, +F_013d407166ec4fa56eb1e1f8cbe183b9 int, +F_e00da03b685a0dd18fb6a08af0923de0 int, +F_1385974ed5904a438616ff7bdb3f7439 int, +F_0f28b5d49b3020afeecd95b4009adf4c int, +F_a8baa56554f96369ab93e4f3bb068c22 int, +F_903ce9225fca3e988c2af215d4e544d3 int, +F_0a09c8844ba8f0936c20bd791130d6b6 int, +F_2b24d495052a8ce66358eb576b8912c8 int, +F_a5e00132373a7031000fd987a3c9f87b int, +F_8d5e957f297893487bd98fa830fa6413 int, +F_47d1e990583c9c67424d369f3414728e int, +F_f2217062e9a397a1dca429e7d70bc6ca int, +F_7ef605fc8dba5425d6965fbd4c8fbe1f int, +F_a8f15eda80c50adb0e71943adc8015cf int, +F_37a749d808e46495a8da1e5352d03cae int, +F_b3e3e393c77e35a4a3f3cbd1e429b5dc int, +F_1d7f7abc18fcb43975065399b0d1e48e int, +F_2a79ea27c279e471f4d180b08d62b00a int, +F_1c9ac0159c94d8d0cbedc973445af2da int, +F_6c4b761a28b734fe93831e3fb400ce87 int, +F_06409663226af2f3114485aa4e0a23b4 int, +F_140f6969d5213fd0ece03148e62e461e int, +F_b73ce398c39f506af761d2277d853a92 int, +F_bd4c9ab730f5513206b999ec0d90d1fb int, +F_82aa4b0af34c2313a562076992e50aa3 int, +F_0777d5c17d4066b82ab86dff8a46af6f int, +F_fa7cdfad1a5aaf8370ebeda47a1ff1c3 int, +F_9766527f2b5d3e95d4a733fcfb77bd7e int, +F_7e7757b1e12abcb736ab9a754ffb617a int, +F_5878a7ab84fb43402106c575658472fa int, +F_006f52e9102a8d3be2fe5614f42ba989 int, +F_3636638817772e42b59d74cff571fbb3 int, +F_149e9677a5989fd342ae44213df68868 int, +F_a4a042cf4fd6bfb47701cbc8a1653ada int, +F_1ff8a7b5dc7a7d1f0ed65aaa29c04b1e int, +F_f7e6c85504ce6e82442c770f7c8606f0 int, +F_bf8229696f7a3bb4700cfddef19fa23f int, +F_82161242827b703e6acf9c726942a1e4 int, +F_38af86134b65d0f10fe33d30dd76442e int, +F_96da2f590cd7246bbde0051047b0d6f7 int, +F_8f85517967795eeef66c225f7883bdcb int, +F_8f53295a73878494e9bc8dd6c3c7104f int, +F_045117b0e0a11a242b9765e79cbf113f int, +F_fc221309746013ac554571fbd180e1c8 int, +F_4c5bde74a8f110656874902f07378009 int, +F_cedebb6e872f539bef8c3f919874e9d7 int, +F_6cdd60ea0045eb7a6ec44c54d29ed402 int, +F_eecca5b6365d9607ee5a9d336962c534 int, +F_9872ed9fc22fc182d371c3e9ed316094 int, +F_31fefc0e570cb3860f2a6d4b38c6490d int, +F_9dcb88e0137649590b755372b040afad int, +F_a2557a7b2e94197ff767970b67041697 int, +F_cfecdb276f634854f3ef915e2e980c31 int, +F_0aa1883c6411f7873cb83dacb17b0afc int, +F_58a2fc6ed39fd083f55d4182bf88826d int, +F_bd686fd640be98efaae0091fa301e613 int, +F_a597e50502f5ff68e3e25b9114205d4a int, +F_0336dcbab05b9d5ad24f4333c7658a0e int, +F_084b6fbb10729ed4da8c3d3f5a3ae7c9 int, +F_85d8ce590ad8981ca2c8286f79f59954 int, +F_0e65972dce68dad4d52d063967f0a705 int, +F_84d9ee44e457ddef7f2c4f25dc8fa865 int, +F_3644a684f98ea8fe223c713b77189a77 int, +F_757b505cfd34c64c85ca5b5690ee5293 int, +F_854d6fae5ee42911677c739ee1734486 int, +F_e2c0be24560d78c5e599c2a9c9d0bbd2 int, +F_274ad4786c3abca69fa097b85867d9a4 int, +F_eae27d77ca20db309e056e3d2dcd7d69 int, +F_7eabe3a1649ffa2b3ff8c02ebfd5659f int, +F_69adc1e107f7f7d035d7baf04342e1ca int, +F_091d584fced301b442654dd8c23b3fc9 int, +F_b1d10e7bafa4421218a51b1e1f1b0ba2 int, +F_6f3ef77ac0e3619e98159e9b6febf557 int, +F_eb163727917cbba1eea208541a643e74 int, +F_1534b76d325a8f591b52d302e7181331 int, +F_979d472a84804b9f647bc185a877a8b5 int, +F_ca46c1b9512a7a8315fa3c5a946e8265 int, +F_3b8a614226a953a8cd9526fca6fe9ba5 int, +F_45fbc6d3e05ebd93369ce542e8f2322d int, +F_63dc7ed1010d3c3b8269faf0ba7491d4 int, +F_e96ed478dab8595a7dbda4cbcbee168f int, +F_c0e190d8267e36708f955d7ab048990d int, +F_ec8ce6abb3e952a85b8551ba726a1227 int, +F_060ad92489947d410d897474079c1477 int, +F_bcbe3365e6ac95ea2c0343a2395834dd int, +F_115f89503138416a242f40fb7d7f338e int, +F_13fe9d84310e77f13a6d184dbf1232f3 int, +F_d1c38a09acc34845c6be3a127a5aacaf int, +F_9cfdf10e8fc047a44b08ed031e1f0ed1 int, +F_705f2172834666788607efbfca35afb3 int, +F_74db120f0a8e5646ef5a30154e9f6deb int, +F_57aeee35c98205091e18d1140e9f38cf int, +F_6da9003b743b65f4c0ccd295cc484e57 int, +F_9b04d152845ec0a378394003c96da594 int, +F_be83ab3ecd0db773eb2dc1b0a17836a1 int, +F_e165421110ba03099a1c0393373c5b43 int, +F_289dff07669d7a23de0ef88d2f7129e7 int, +F_577ef1154f3240ad5b9b413aa7346a1e int, +F_01161aaa0b6d1345dd8fe4e481144d84 int, +F_539fd53b59e3bb12d203f45a912eeaf2 int, +F_ac1dd209cbcc5e5d1c6e28598e8cbbe8 int, +F_555d6702c950ecb729a966504af0a635 int, +F_335f5352088d7d9bf74191e006d8e24c int, +F_f340f1b1f65b6df5b5e3f94d95b11daf int, +F_e4a6222cdb5b34375400904f03d8e6a5 int, +F_cb70ab375662576bd1ac5aaf16b3fca4 int, +F_9188905e74c28e489b44e954ec0b9bca int, +F_0266e33d3f546cb5436a10798e657d97 int, +F_38db3aed920cf82ab059bfccbd02be6a int, +F_3cec07e9ba5f5bb252d13f5f431e4bbb int, +F_621bf66ddb7c962aa0d22ac97d69b793 int, +F_077e29b11be80ab57e1a2ecabb7da330 int, +F_6c9882bbac1c7093bd25041881277658 int, +F_19f3cd308f1455b3fa09a282e0d496f4 int, +F_03c6b06952c750899bb03d998e631860 int, +F_c24cd76e1ce41366a4bbe8a49b02a028 int, +F_c52f1bd66cc19d05628bd8bf27af3ad6 int, +F_fe131d7f5a6b38b23cc967316c13dae2 int, +F_f718499c1c8cef6730f9fd03c8125cab int, +F_d96409bf894217686ba124d7356686c9 int, +F_502e4a16930e414107ee22b6198c578f int, +F_cfa0860e83a4c3a763a7e62d825349f7 int, +F_a4f23670e1833f3fdb077ca70bbd5d66 int, +F_b1a59b315fc9a3002ce38bbe070ec3f5 int, +F_36660e59856b4de58a219bcf4e27eba3 int, +F_8c19f571e251e61cb8dd3612f26d5ecf int, +F_d6baf65e0b240ce177cf70da146c8dc8 int, +F_e56954b4f6347e897f954495eab16a88 int, +F_f7664060cc52bc6f3d620bcedc94a4b6 int, +F_eda80a3d5b344bc40f3bc04f65b7a357 int, +F_8f121ce07d74717e0b1f21d122e04521 int, +F_06138bc5af6023646ede0e1f7c1eac75 int, +F_39059724f73a9969845dfe4146c5660e int, +F_7f100b7b36092fb9b06dfb4fac360931 int, +F_7a614fd06c325499f1680b9896beedeb int, +F_4734ba6f3de83d861c3176a6273cac6d int, +F_d947bf06a885db0d477d707121934ff8 int, +F_63923f49e5241343aa7acb6a06a751e7 int, +F_db8e1af0cb3aca1ae2d0018624204529 int, +F_20f07591c6fcb220ffe637cda29bb3f6 int, +F_07cdfd23373b17c6b337251c22b7ea57 int, +F_d395771085aab05244a4fb8fd91bf4ee int, +F_92c8c96e4c37100777c7190b76d28233 int, +F_e3796ae838835da0b6f6ea37bcf8bcb7 int, +F_6a9aeddfc689c1d0e3b9ccc3ab651bc5 int, +F_0f49c89d1e7298bb9930789c8ed59d48 int, +F_46ba9f2a6976570b0353203ec4474217 int, +F_0e01938fc48a2cfb5f2217fbfb00722d int, +F_16a5cdae362b8d27a1d8f8c7b78b4330 int, +F_918317b57931b6b7a7d29490fe5ec9f9 int, +F_48aedb8880cab8c45637abc7493ecddd int, +F_839ab46820b524afda05122893c2fe8e int, +F_f90f2aca5c640289d0a29417bcb63a37 int, +F_9c838d2e45b2ad1094d42f4ef36764f6 int, +F_1700002963a49da13542e0726b7bb758 int, +F_53c3bce66e43be4f209556518c2fcb54 int, +F_6883966fd8f918a4aa29be29d2c386fb int, +F_49182f81e6a13cf5eaa496d51fea6406 int, +F_d296c101daa88a51f6ca8cfc1ac79b50 int, +F_9fd81843ad7f202f26c1a174c7357585 int, +F_26e359e83860db1d11b6acca57d8ea88 int, +F_ef0d3930a7b6c95bd2b32ed45989c61f int, +F_94f6d7e04a4d452035300f18b984988c int, +F_34ed066df378efacc9b924ec161e7639 int, +F_577bcc914f9e55d5e4e4f82f9f00e7d4 int, +F_11b9842e0a271ff252c1903e7132cd68 int, +F_37bc2f75bf1bcfe8450a1a41c200364c int, +F_496e05e1aea0a9c4655800e8a7b9ea28 int, +F_b2eb7349035754953b57a32e2841bda5 int, +F_8e98d81f8217304975ccb23337bb5761 int, +F_a8c88a0055f636e4a163a5e3d16adab7 int, +F_eddea82ad2755b24c4e168c5fc2ebd40 int, +F_06eb61b839a0cefee4967c67ccb099dc int, +F_9dfcd5e558dfa04aaf37f137a1d9d3e5 int, +F_950a4152c2b4aa3ad78bdd6b366cc179 int, +F_158f3069a435b314a80bdcb024f8e422 int, +F_758874998f5bd0c393da094e1967a72b int, +F_ad13a2a07ca4b7642959dc0c4c740ab6 int, +F_3fe94a002317b5f9259f82690aeea4cd int, +F_5b8add2a5d98b1a652ea7fd72d942dac int, +F_432aca3a1e345e339f35a30c8f65edce int, +F_8d3bba7425e7c98c50f52ca1b52d3735 int, +F_320722549d1751cf3f247855f937b982 int, +F_caf1a3dfb505ffed0d024130f58c5cfa int, +F_5737c6ec2e0716f3d8a7a5c4e0de0d9a int, +F_bc6dc48b743dc5d013b1abaebd2faed2 int, +F_f2fc990265c712c49d51a18a32b39f0c int, +F_89f0fd5c927d466d6ec9a21b9ac34ffa int, +F_a666587afda6e89aec274a3657558a27 int, +F_b83aac23b9528732c23cc7352950e880 int, +F_cd00692c3bfe59267d5ecfac5310286c int, +F_6faa8040da20ef399b63a72d0e4ab575 int, +F_fe73f687e5bc5280214e0486b273a5f9 int); +insert into t1 (F_8d3bba7425e7c98c50f52ca1b52d3735) values (1); +-- MySQL dump 10.9 +-- +-- Host: localhost Database: test +-- ------------------------------------------------------ +-- Server version 4.1.12-debug-log + +/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; +/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; +/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; +/*!40101 SET NAMES utf8 */; +/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */; +/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */; +/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; +/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; + +-- +-- Table structure for table `t1` +-- + +DROP TABLE IF EXISTS `t1`; +CREATE TABLE `t1` ( + `F_c4ca4238a0b923820dcc509a6f75849b` int(11) default NULL, + `F_c81e728d9d4c2f636f067f89cc14862c` int(11) default NULL, + `F_eccbc87e4b5ce2fe28308fd9f2a7baf3` int(11) default NULL, + `F_a87ff679a2f3e71d9181a67b7542122c` int(11) default NULL, + `F_e4da3b7fbbce2345d7772b0674a318d5` int(11) default NULL, + `F_1679091c5a880faf6fb5e6087eb1b2dc` int(11) default NULL, + `F_8f14e45fceea167a5a36dedd4bea2543` int(11) default NULL, + `F_c9f0f895fb98ab9159f51fd0297e236d` int(11) default NULL, + `F_45c48cce2e2d7fbdea1afc51c7c6ad26` int(11) default NULL, + `F_d3d9446802a44259755d38e6d163e820` int(11) default NULL, + `F_6512bd43d9caa6e02c990b0a82652dca` int(11) default NULL, + `F_c20ad4d76fe97759aa27a0c99bff6710` int(11) default NULL, + `F_c51ce410c124a10e0db5e4b97fc2af39` int(11) default NULL, + `F_aab3238922bcc25a6f606eb525ffdc56` int(11) default NULL, + `F_9bf31c7ff062936a96d3c8bd1f8f2ff3` int(11) default NULL, + `F_c74d97b01eae257e44aa9d5bade97baf` int(11) default NULL, + `F_70efdf2ec9b086079795c442636b55fb` int(11) default NULL, + `F_6f4922f45568161a8cdf4ad2299f6d23` int(11) default NULL, + `F_1f0e3dad99908345f7439f8ffabdffc4` int(11) default NULL, + `F_98f13708210194c475687be6106a3b84` int(11) default NULL, + `F_3c59dc048e8850243be8079a5c74d079` int(11) default NULL, + `F_b6d767d2f8ed5d21a44b0e5886680cb9` int(11) default NULL, + `F_37693cfc748049e45d87b8c7d8b9aacd` int(11) default NULL, + `F_1ff1de774005f8da13f42943881c655f` int(11) default NULL, + `F_8e296a067a37563370ded05f5a3bf3ec` int(11) default NULL, + `F_4e732ced3463d06de0ca9a15b6153677` int(11) default NULL, + `F_02e74f10e0327ad868d138f2b4fdd6f0` int(11) default NULL, + `F_33e75ff09dd601bbe69f351039152189` int(11) default NULL, + `F_6ea9ab1baa0efb9e19094440c317e21b` int(11) default NULL, + `F_34173cb38f07f89ddbebc2ac9128303f` int(11) default NULL, + `F_c16a5320fa475530d9583c34fd356ef5` int(11) default NULL, + `F_6364d3f0f495b6ab9dcf8d3b5c6e0b01` int(11) default NULL, + `F_182be0c5cdcd5072bb1864cdee4d3d6e` int(11) default NULL, + `F_e369853df766fa44e1ed0ff613f563bd` int(11) default NULL, + `F_1c383cd30b7c298ab50293adfecb7b18` int(11) default NULL, + `F_19ca14e7ea6328a42e0eb13d585e4c22` int(11) default NULL, + `F_a5bfc9e07964f8dddeb95fc584cd965d` int(11) default NULL, + `F_a5771bce93e200c36f7cd9dfd0e5deaa` int(11) default NULL, + `F_d67d8ab4f4c10bf22aa353e27879133c` int(11) default NULL, + `F_d645920e395fedad7bbbed0eca3fe2e0` int(11) default NULL, + `F_3416a75f4cea9109507cacd8e2f2aefc` int(11) default NULL, + `F_a1d0c6e83f027327d8461063f4ac58a6` int(11) default NULL, + `F_17e62166fc8586dfa4d1bc0e1742c08b` int(11) default NULL, + `F_f7177163c833dff4b38fc8d2872f1ec6` int(11) default NULL, + `F_6c8349cc7260ae62e3b1396831a8398f` int(11) default NULL, + `F_d9d4f495e875a2e075a1a4a6e1b9770f` int(11) default NULL, + `F_67c6a1e7ce56d3d6fa748ab6d9af3fd7` int(11) default NULL, + `F_642e92efb79421734881b53e1e1b18b6` int(11) default NULL, + `F_f457c545a9ded88f18ecee47145a72c0` int(11) default NULL, + `F_c0c7c76d30bd3dcaefc96f40275bdc0a` int(11) default NULL, + `F_2838023a778dfaecdc212708f721b788` int(11) default NULL, + `F_9a1158154dfa42caddbd0694a4e9bdc8` int(11) default NULL, + `F_d82c8d1619ad8176d665453cfb2e55f0` int(11) default NULL, + `F_a684eceee76fc522773286a895bc8436` int(11) default NULL, + `F_b53b3a3d6ab90ce0268229151c9bde11` int(11) default NULL, + `F_9f61408e3afb633e50cdf1b20de6f466` int(11) default NULL, + `F_72b32a1f754ba1c09b3695e0cb6cde7f` int(11) default NULL, + `F_66f041e16a60928b05a7e228a89c3799` int(11) default NULL, + `F_093f65e080a295f8076b1c5722a46aa2` int(11) default NULL, + `F_072b030ba126b2f4b2374f342be9ed44` int(11) default NULL, + `F_7f39f8317fbdb1988ef4c628eba02591` int(11) default NULL, + `F_44f683a84163b3523afe57c2e008bc8c` int(11) default NULL, + `F_03afdbd66e7929b125f8597834fa83a4` int(11) default NULL, + `F_ea5d2f1c4608232e07d3aa3d998e5135` int(11) default NULL, + `F_fc490ca45c00b1249bbe3554a4fdf6fb` int(11) default NULL, + `F_3295c76acbf4caaed33c36b1b5fc2cb1` int(11) default NULL, + `F_735b90b4568125ed6c3f678819b6e058` int(11) default NULL, + `F_a3f390d88e4c41f2747bfa2f1b5f87db` int(11) default NULL, + `F_14bfa6bb14875e45bba028a21ed38046` int(11) default NULL, + `F_7cbbc409ec990f19c78c75bd1e06f215` int(11) default NULL, + `F_e2c420d928d4bf8ce0ff2ec19b371514` int(11) default NULL, + `F_32bb90e8976aab5298d5da10fe66f21d` int(11) default NULL, + `F_d2ddea18f00665ce8623e36bd4e3c7c5` int(11) default NULL, + `F_ad61ab143223efbc24c7d2583be69251` int(11) default NULL, + `F_d09bf41544a3365a46c9077ebb5e35c3` int(11) default NULL, + `F_fbd7939d674997cdb4692d34de8633c4` int(11) default NULL, + `F_28dd2c7955ce926456240b2ff0100bde` int(11) default NULL, + `F_35f4a8d465e6e1edc05f3d8ab658c551` int(11) default NULL, + `F_d1fe173d08e959397adf34b1d77e88d7` int(11) default NULL, + `F_f033ab37c30201f73f142449d037028d` int(11) default NULL, + `F_43ec517d68b6edd3015b3edc9a11367b` int(11) default NULL, + `F_9778d5d219c5080b9a6a17bef029331c` int(11) default NULL, + `F_fe9fc289c3ff0af142b6d3bead98a923` int(11) default NULL, + `F_68d30a9594728bc39aa24be94b319d21` int(11) default NULL, + `F_3ef815416f775098fe977004015c6193` int(11) default NULL, + `F_93db85ed909c13838ff95ccfa94cebd9` int(11) default NULL, + `F_c7e1249ffc03eb9ded908c236bd1996d` int(11) default NULL, + `F_2a38a4a9316c49e5a833517c45d31070` int(11) default NULL, + `F_7647966b7343c29048673252e490f736` int(11) default NULL, + `F_8613985ec49eb8f757ae6439e879bb2a` int(11) default NULL, + `F_54229abfcfa5649e7003b83dd4755294` int(11) default NULL, + `F_92cc227532d17e56e07902b254dfad10` int(11) default NULL, + `F_98dce83da57b0395e163467c9dae521b` int(11) default NULL, + `F_f4b9ec30ad9f68f89b29639786cb62ef` int(11) default NULL, + `F_812b4ba287f5ee0bc9d43bbf5bbe87fb` int(11) default NULL, + `F_26657d5ff9020d2abefe558796b99584` int(11) default NULL, + `F_e2ef524fbf3d9fe611d5a8e90fefdc9c` int(11) default NULL, + `F_ed3d2c21991e3bef5e069713af9fa6ca` int(11) default NULL, + `F_ac627ab1ccbdb62ec96e702f07f6425b` int(11) default NULL, + `F_f899139df5e1059396431415e770c6dd` int(11) default NULL, + `F_38b3eff8baf56627478ec76a704e9b52` int(11) default NULL, + `F_ec8956637a99787bd197eacd77acce5e` int(11) default NULL, + `F_6974ce5ac660610b44d9b9fed0ff9548` int(11) default NULL, + `F_c9e1074f5b3f9fc8ea15d152add07294` int(11) default NULL, + `F_65b9eea6e1cc6bb9f0cd2a47751a186f` int(11) default NULL, + `F_f0935e4cd5920aa6c7c996a5ee53a70f` int(11) default NULL, + `F_a97da629b098b75c294dffdc3e463904` int(11) default NULL, + `F_a3c65c2974270fd093ee8a9bf8ae7d0b` int(11) default NULL, + `F_2723d092b63885e0d7c260cc007e8b9d` int(11) default NULL, + `F_5f93f983524def3dca464469d2cf9f3e` int(11) default NULL, + `F_698d51a19d8a121ce581499d7b701668` int(11) default NULL, + `F_7f6ffaa6bb0b408017b62254211691b5` int(11) default NULL, + `F_73278a4a86960eeb576a8fd4c9ec6997` int(11) default NULL, + `F_5fd0b37cd7dbbb00f97ba6ce92bf5add` int(11) default NULL, + `F_2b44928ae11fb9384c4cf38708677c48` int(11) default NULL, + `F_c45147dee729311ef5b5c3003946c48f` int(11) default NULL, + `F_eb160de1de89d9058fcb0b968dbbbd68` int(11) default NULL, + `F_5ef059938ba799aaa845e1c2e8a762bd` int(11) default NULL, + `F_07e1cd7dca89a1678042477183b7ac3f` int(11) default NULL, + `F_da4fb5c6e93e74d3df8527599fa62642` int(11) default NULL, + `F_4c56ff4ce4aaf9573aa5dff913df997a` int(11) default NULL, + `F_a0a080f42e6f13b3a2df133f073095dd` int(11) default NULL, + `F_202cb962ac59075b964b07152d234b70` int(11) default NULL, + `F_c8ffe9a587b126f152ed3d89a146b445` int(11) default NULL, + `F_3def184ad8f4755ff269862ea77393dd` int(11) default NULL, + `F_069059b7ef840f0c74a814ec9237b6ec` int(11) default NULL, + `F_ec5decca5ed3d6b8079e2e7e7bacc9f2` int(11) default NULL, + `F_76dc611d6ebaafc66cc0879c71b5db5c` int(11) default NULL, + `F_d1f491a404d6854880943e5c3cd9ca25` int(11) default NULL, + `F_9b8619251a19057cff70779273e95aa6` int(11) default NULL, + `F_1afa34a7f984eeabdbb0a7d494132ee5` int(11) default NULL, + `F_65ded5353c5ee48d0b7d48c591b8f430` int(11) default NULL, + `F_9fc3d7152ba9336a670e36d0ed79bc43` int(11) default NULL, + `F_02522a2b2726fb0a03bb19f2d8d9524d` int(11) default NULL, + `F_7f1de29e6da19d22b51c68001e7e0e54` int(11) default NULL, + `F_42a0e188f5033bc65bf8d78622277c4e` int(11) default NULL, + `F_3988c7f88ebcb58c6ce932b957b6f332` int(11) default NULL, + `F_013d407166ec4fa56eb1e1f8cbe183b9` int(11) default NULL, + `F_e00da03b685a0dd18fb6a08af0923de0` int(11) default NULL, + `F_1385974ed5904a438616ff7bdb3f7439` int(11) default NULL, + `F_0f28b5d49b3020afeecd95b4009adf4c` int(11) default NULL, + `F_a8baa56554f96369ab93e4f3bb068c22` int(11) default NULL, + `F_903ce9225fca3e988c2af215d4e544d3` int(11) default NULL, + `F_0a09c8844ba8f0936c20bd791130d6b6` int(11) default NULL, + `F_2b24d495052a8ce66358eb576b8912c8` int(11) default NULL, + `F_a5e00132373a7031000fd987a3c9f87b` int(11) default NULL, + `F_8d5e957f297893487bd98fa830fa6413` int(11) default NULL, + `F_47d1e990583c9c67424d369f3414728e` int(11) default NULL, + `F_f2217062e9a397a1dca429e7d70bc6ca` int(11) default NULL, + `F_7ef605fc8dba5425d6965fbd4c8fbe1f` int(11) default NULL, + `F_a8f15eda80c50adb0e71943adc8015cf` int(11) default NULL, + `F_37a749d808e46495a8da1e5352d03cae` int(11) default NULL, + `F_b3e3e393c77e35a4a3f3cbd1e429b5dc` int(11) default NULL, + `F_1d7f7abc18fcb43975065399b0d1e48e` int(11) default NULL, + `F_2a79ea27c279e471f4d180b08d62b00a` int(11) default NULL, + `F_1c9ac0159c94d8d0cbedc973445af2da` int(11) default NULL, + `F_6c4b761a28b734fe93831e3fb400ce87` int(11) default NULL, + `F_06409663226af2f3114485aa4e0a23b4` int(11) default NULL, + `F_140f6969d5213fd0ece03148e62e461e` int(11) default NULL, + `F_b73ce398c39f506af761d2277d853a92` int(11) default NULL, + `F_bd4c9ab730f5513206b999ec0d90d1fb` int(11) default NULL, + `F_82aa4b0af34c2313a562076992e50aa3` int(11) default NULL, + `F_0777d5c17d4066b82ab86dff8a46af6f` int(11) default NULL, + `F_fa7cdfad1a5aaf8370ebeda47a1ff1c3` int(11) default NULL, + `F_9766527f2b5d3e95d4a733fcfb77bd7e` int(11) default NULL, + `F_7e7757b1e12abcb736ab9a754ffb617a` int(11) default NULL, + `F_5878a7ab84fb43402106c575658472fa` int(11) default NULL, + `F_006f52e9102a8d3be2fe5614f42ba989` int(11) default NULL, + `F_3636638817772e42b59d74cff571fbb3` int(11) default NULL, + `F_149e9677a5989fd342ae44213df68868` int(11) default NULL, + `F_a4a042cf4fd6bfb47701cbc8a1653ada` int(11) default NULL, + `F_1ff8a7b5dc7a7d1f0ed65aaa29c04b1e` int(11) default NULL, + `F_f7e6c85504ce6e82442c770f7c8606f0` int(11) default NULL, + `F_bf8229696f7a3bb4700cfddef19fa23f` int(11) default NULL, + `F_82161242827b703e6acf9c726942a1e4` int(11) default NULL, + `F_38af86134b65d0f10fe33d30dd76442e` int(11) default NULL, + `F_96da2f590cd7246bbde0051047b0d6f7` int(11) default NULL, + `F_8f85517967795eeef66c225f7883bdcb` int(11) default NULL, + `F_8f53295a73878494e9bc8dd6c3c7104f` int(11) default NULL, + `F_045117b0e0a11a242b9765e79cbf113f` int(11) default NULL, + `F_fc221309746013ac554571fbd180e1c8` int(11) default NULL, + `F_4c5bde74a8f110656874902f07378009` int(11) default NULL, + `F_cedebb6e872f539bef8c3f919874e9d7` int(11) default NULL, + `F_6cdd60ea0045eb7a6ec44c54d29ed402` int(11) default NULL, + `F_eecca5b6365d9607ee5a9d336962c534` int(11) default NULL, + `F_9872ed9fc22fc182d371c3e9ed316094` int(11) default NULL, + `F_31fefc0e570cb3860f2a6d4b38c6490d` int(11) default NULL, + `F_9dcb88e0137649590b755372b040afad` int(11) default NULL, + `F_a2557a7b2e94197ff767970b67041697` int(11) default NULL, + `F_cfecdb276f634854f3ef915e2e980c31` int(11) default NULL, + `F_0aa1883c6411f7873cb83dacb17b0afc` int(11) default NULL, + `F_58a2fc6ed39fd083f55d4182bf88826d` int(11) default NULL, + `F_bd686fd640be98efaae0091fa301e613` int(11) default NULL, + `F_a597e50502f5ff68e3e25b9114205d4a` int(11) default NULL, + `F_0336dcbab05b9d5ad24f4333c7658a0e` int(11) default NULL, + `F_084b6fbb10729ed4da8c3d3f5a3ae7c9` int(11) default NULL, + `F_85d8ce590ad8981ca2c8286f79f59954` int(11) default NULL, + `F_0e65972dce68dad4d52d063967f0a705` int(11) default NULL, + `F_84d9ee44e457ddef7f2c4f25dc8fa865` int(11) default NULL, + `F_3644a684f98ea8fe223c713b77189a77` int(11) default NULL, + `F_757b505cfd34c64c85ca5b5690ee5293` int(11) default NULL, + `F_854d6fae5ee42911677c739ee1734486` int(11) default NULL, + `F_e2c0be24560d78c5e599c2a9c9d0bbd2` int(11) default NULL, + `F_274ad4786c3abca69fa097b85867d9a4` int(11) default NULL, + `F_eae27d77ca20db309e056e3d2dcd7d69` int(11) default NULL, + `F_7eabe3a1649ffa2b3ff8c02ebfd5659f` int(11) default NULL, + `F_69adc1e107f7f7d035d7baf04342e1ca` int(11) default NULL, + `F_091d584fced301b442654dd8c23b3fc9` int(11) default NULL, + `F_b1d10e7bafa4421218a51b1e1f1b0ba2` int(11) default NULL, + `F_6f3ef77ac0e3619e98159e9b6febf557` int(11) default NULL, + `F_eb163727917cbba1eea208541a643e74` int(11) default NULL, + `F_1534b76d325a8f591b52d302e7181331` int(11) default NULL, + `F_979d472a84804b9f647bc185a877a8b5` int(11) default NULL, + `F_ca46c1b9512a7a8315fa3c5a946e8265` int(11) default NULL, + `F_3b8a614226a953a8cd9526fca6fe9ba5` int(11) default NULL, + `F_45fbc6d3e05ebd93369ce542e8f2322d` int(11) default NULL, + `F_63dc7ed1010d3c3b8269faf0ba7491d4` int(11) default NULL, + `F_e96ed478dab8595a7dbda4cbcbee168f` int(11) default NULL, + `F_c0e190d8267e36708f955d7ab048990d` int(11) default NULL, + `F_ec8ce6abb3e952a85b8551ba726a1227` int(11) default NULL, + `F_060ad92489947d410d897474079c1477` int(11) default NULL, + `F_bcbe3365e6ac95ea2c0343a2395834dd` int(11) default NULL, + `F_115f89503138416a242f40fb7d7f338e` int(11) default NULL, + `F_13fe9d84310e77f13a6d184dbf1232f3` int(11) default NULL, + `F_d1c38a09acc34845c6be3a127a5aacaf` int(11) default NULL, + `F_9cfdf10e8fc047a44b08ed031e1f0ed1` int(11) default NULL, + `F_705f2172834666788607efbfca35afb3` int(11) default NULL, + `F_74db120f0a8e5646ef5a30154e9f6deb` int(11) default NULL, + `F_57aeee35c98205091e18d1140e9f38cf` int(11) default NULL, + `F_6da9003b743b65f4c0ccd295cc484e57` int(11) default NULL, + `F_9b04d152845ec0a378394003c96da594` int(11) default NULL, + `F_be83ab3ecd0db773eb2dc1b0a17836a1` int(11) default NULL, + `F_e165421110ba03099a1c0393373c5b43` int(11) default NULL, + `F_289dff07669d7a23de0ef88d2f7129e7` int(11) default NULL, + `F_577ef1154f3240ad5b9b413aa7346a1e` int(11) default NULL, + `F_01161aaa0b6d1345dd8fe4e481144d84` int(11) default NULL, + `F_539fd53b59e3bb12d203f45a912eeaf2` int(11) default NULL, + `F_ac1dd209cbcc5e5d1c6e28598e8cbbe8` int(11) default NULL, + `F_555d6702c950ecb729a966504af0a635` int(11) default NULL, + `F_335f5352088d7d9bf74191e006d8e24c` int(11) default NULL, + `F_f340f1b1f65b6df5b5e3f94d95b11daf` int(11) default NULL, + `F_e4a6222cdb5b34375400904f03d8e6a5` int(11) default NULL, + `F_cb70ab375662576bd1ac5aaf16b3fca4` int(11) default NULL, + `F_9188905e74c28e489b44e954ec0b9bca` int(11) default NULL, + `F_0266e33d3f546cb5436a10798e657d97` int(11) default NULL, + `F_38db3aed920cf82ab059bfccbd02be6a` int(11) default NULL, + `F_3cec07e9ba5f5bb252d13f5f431e4bbb` int(11) default NULL, + `F_621bf66ddb7c962aa0d22ac97d69b793` int(11) default NULL, + `F_077e29b11be80ab57e1a2ecabb7da330` int(11) default NULL, + `F_6c9882bbac1c7093bd25041881277658` int(11) default NULL, + `F_19f3cd308f1455b3fa09a282e0d496f4` int(11) default NULL, + `F_03c6b06952c750899bb03d998e631860` int(11) default NULL, + `F_c24cd76e1ce41366a4bbe8a49b02a028` int(11) default NULL, + `F_c52f1bd66cc19d05628bd8bf27af3ad6` int(11) default NULL, + `F_fe131d7f5a6b38b23cc967316c13dae2` int(11) default NULL, + `F_f718499c1c8cef6730f9fd03c8125cab` int(11) default NULL, + `F_d96409bf894217686ba124d7356686c9` int(11) default NULL, + `F_502e4a16930e414107ee22b6198c578f` int(11) default NULL, + `F_cfa0860e83a4c3a763a7e62d825349f7` int(11) default NULL, + `F_a4f23670e1833f3fdb077ca70bbd5d66` int(11) default NULL, + `F_b1a59b315fc9a3002ce38bbe070ec3f5` int(11) default NULL, + `F_36660e59856b4de58a219bcf4e27eba3` int(11) default NULL, + `F_8c19f571e251e61cb8dd3612f26d5ecf` int(11) default NULL, + `F_d6baf65e0b240ce177cf70da146c8dc8` int(11) default NULL, + `F_e56954b4f6347e897f954495eab16a88` int(11) default NULL, + `F_f7664060cc52bc6f3d620bcedc94a4b6` int(11) default NULL, + `F_eda80a3d5b344bc40f3bc04f65b7a357` int(11) default NULL, + `F_8f121ce07d74717e0b1f21d122e04521` int(11) default NULL, + `F_06138bc5af6023646ede0e1f7c1eac75` int(11) default NULL, + `F_39059724f73a9969845dfe4146c5660e` int(11) default NULL, + `F_7f100b7b36092fb9b06dfb4fac360931` int(11) default NULL, + `F_7a614fd06c325499f1680b9896beedeb` int(11) default NULL, + `F_4734ba6f3de83d861c3176a6273cac6d` int(11) default NULL, + `F_d947bf06a885db0d477d707121934ff8` int(11) default NULL, + `F_63923f49e5241343aa7acb6a06a751e7` int(11) default NULL, + `F_db8e1af0cb3aca1ae2d0018624204529` int(11) default NULL, + `F_20f07591c6fcb220ffe637cda29bb3f6` int(11) default NULL, + `F_07cdfd23373b17c6b337251c22b7ea57` int(11) default NULL, + `F_d395771085aab05244a4fb8fd91bf4ee` int(11) default NULL, + `F_92c8c96e4c37100777c7190b76d28233` int(11) default NULL, + `F_e3796ae838835da0b6f6ea37bcf8bcb7` int(11) default NULL, + `F_6a9aeddfc689c1d0e3b9ccc3ab651bc5` int(11) default NULL, + `F_0f49c89d1e7298bb9930789c8ed59d48` int(11) default NULL, + `F_46ba9f2a6976570b0353203ec4474217` int(11) default NULL, + `F_0e01938fc48a2cfb5f2217fbfb00722d` int(11) default NULL, + `F_16a5cdae362b8d27a1d8f8c7b78b4330` int(11) default NULL, + `F_918317b57931b6b7a7d29490fe5ec9f9` int(11) default NULL, + `F_48aedb8880cab8c45637abc7493ecddd` int(11) default NULL, + `F_839ab46820b524afda05122893c2fe8e` int(11) default NULL, + `F_f90f2aca5c640289d0a29417bcb63a37` int(11) default NULL, + `F_9c838d2e45b2ad1094d42f4ef36764f6` int(11) default NULL, + `F_1700002963a49da13542e0726b7bb758` int(11) default NULL, + `F_53c3bce66e43be4f209556518c2fcb54` int(11) default NULL, + `F_6883966fd8f918a4aa29be29d2c386fb` int(11) default NULL, + `F_49182f81e6a13cf5eaa496d51fea6406` int(11) default NULL, + `F_d296c101daa88a51f6ca8cfc1ac79b50` int(11) default NULL, + `F_9fd81843ad7f202f26c1a174c7357585` int(11) default NULL, + `F_26e359e83860db1d11b6acca57d8ea88` int(11) default NULL, + `F_ef0d3930a7b6c95bd2b32ed45989c61f` int(11) default NULL, + `F_94f6d7e04a4d452035300f18b984988c` int(11) default NULL, + `F_34ed066df378efacc9b924ec161e7639` int(11) default NULL, + `F_577bcc914f9e55d5e4e4f82f9f00e7d4` int(11) default NULL, + `F_11b9842e0a271ff252c1903e7132cd68` int(11) default NULL, + `F_37bc2f75bf1bcfe8450a1a41c200364c` int(11) default NULL, + `F_496e05e1aea0a9c4655800e8a7b9ea28` int(11) default NULL, + `F_b2eb7349035754953b57a32e2841bda5` int(11) default NULL, + `F_8e98d81f8217304975ccb23337bb5761` int(11) default NULL, + `F_a8c88a0055f636e4a163a5e3d16adab7` int(11) default NULL, + `F_eddea82ad2755b24c4e168c5fc2ebd40` int(11) default NULL, + `F_06eb61b839a0cefee4967c67ccb099dc` int(11) default NULL, + `F_9dfcd5e558dfa04aaf37f137a1d9d3e5` int(11) default NULL, + `F_950a4152c2b4aa3ad78bdd6b366cc179` int(11) default NULL, + `F_158f3069a435b314a80bdcb024f8e422` int(11) default NULL, + `F_758874998f5bd0c393da094e1967a72b` int(11) default NULL, + `F_ad13a2a07ca4b7642959dc0c4c740ab6` int(11) default NULL, + `F_3fe94a002317b5f9259f82690aeea4cd` int(11) default NULL, + `F_5b8add2a5d98b1a652ea7fd72d942dac` int(11) default NULL, + `F_432aca3a1e345e339f35a30c8f65edce` int(11) default NULL, + `F_8d3bba7425e7c98c50f52ca1b52d3735` int(11) default NULL, + `F_320722549d1751cf3f247855f937b982` int(11) default NULL, + `F_caf1a3dfb505ffed0d024130f58c5cfa` int(11) default NULL, + `F_5737c6ec2e0716f3d8a7a5c4e0de0d9a` int(11) default NULL, + `F_bc6dc48b743dc5d013b1abaebd2faed2` int(11) default NULL, + `F_f2fc990265c712c49d51a18a32b39f0c` int(11) default NULL, + `F_89f0fd5c927d466d6ec9a21b9ac34ffa` int(11) default NULL, + `F_a666587afda6e89aec274a3657558a27` int(11) default NULL, + `F_b83aac23b9528732c23cc7352950e880` int(11) default NULL, + `F_cd00692c3bfe59267d5ecfac5310286c` int(11) default NULL, + `F_6faa8040da20ef399b63a72d0e4ab575` int(11) default NULL, + `F_fe73f687e5bc5280214e0486b273a5f9` int(11) default NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1; + +-- +-- Dumping data for table `t1` +-- + + +/*!40000 ALTER TABLE `t1` DISABLE KEYS */; +LOCK TABLES `t1` WRITE; +INSERT INTO `t1` (`F_c4ca4238a0b923820dcc509a6f75849b`, `F_c81e728d9d4c2f636f067f89cc14862c`, `F_eccbc87e4b5ce2fe28308fd9f2a7baf3`, `F_a87ff679a2f3e71d9181a67b7542122c`, `F_e4da3b7fbbce2345d7772b0674a318d5`, `F_1679091c5a880faf6fb5e6087eb1b2dc`, `F_8f14e45fceea167a5a36dedd4bea2543`, `F_c9f0f895fb98ab9159f51fd0297e236d`, `F_45c48cce2e2d7fbdea1afc51c7c6ad26`, `F_d3d9446802a44259755d38e6d163e820`, `F_6512bd43d9caa6e02c990b0a82652dca`, `F_c20ad4d76fe97759aa27a0c99bff6710`, `F_c51ce410c124a10e0db5e4b97fc2af39`, `F_aab3238922bcc25a6f606eb525ffdc56`, `F_9bf31c7ff062936a96d3c8bd1f8f2ff3`, `F_c74d97b01eae257e44aa9d5bade97baf`, `F_70efdf2ec9b086079795c442636b55fb`, `F_6f4922f45568161a8cdf4ad2299f6d23`, `F_1f0e3dad99908345f7439f8ffabdffc4`, `F_98f13708210194c475687be6106a3b84`, `F_3c59dc048e8850243be8079a5c74d079`, `F_b6d767d2f8ed5d21a44b0e5886680cb9`, `F_37693cfc748049e45d87b8c7d8b9aacd`, `F_1ff1de774005f8da13f42943881c655f`, `F_8e296a067a37563370ded05f5a3bf3ec`, `F_4e732ced3463d06de0ca9a15b6153677`, `F_02e74f10e0327ad868d138f2b4fdd6f0`, `F_33e75ff09dd601bbe69f351039152189`, `F_6ea9ab1baa0efb9e19094440c317e21b`, `F_34173cb38f07f89ddbebc2ac9128303f`, `F_c16a5320fa475530d9583c34fd356ef5`, `F_6364d3f0f495b6ab9dcf8d3b5c6e0b01`, `F_182be0c5cdcd5072bb1864cdee4d3d6e`, `F_e369853df766fa44e1ed0ff613f563bd`, `F_1c383cd30b7c298ab50293adfecb7b18`, `F_19ca14e7ea6328a42e0eb13d585e4c22`, `F_a5bfc9e07964f8dddeb95fc584cd965d`, `F_a5771bce93e200c36f7cd9dfd0e5deaa`, `F_d67d8ab4f4c10bf22aa353e27879133c`, `F_d645920e395fedad7bbbed0eca3fe2e0`, `F_3416a75f4cea9109507cacd8e2f2aefc`, `F_a1d0c6e83f027327d8461063f4ac58a6`, `F_17e62166fc8586dfa4d1bc0e1742c08b`, `F_f7177163c833dff4b38fc8d2872f1ec6`, `F_6c8349cc7260ae62e3b1396831a8398f`, `F_d9d4f495e875a2e075a1a4a6e1b9770f`, `F_67c6a1e7ce56d3d6fa748ab6d9af3fd7`, `F_642e92efb79421734881b53e1e1b18b6`, `F_f457c545a9ded88f18ecee47145a72c0`, `F_c0c7c76d30bd3dcaefc96f40275bdc0a`, `F_2838023a778dfaecdc212708f721b788`, `F_9a1158154dfa42caddbd0694a4e9bdc8`, `F_d82c8d1619ad8176d665453cfb2e55f0`, `F_a684eceee76fc522773286a895bc8436`, `F_b53b3a3d6ab90ce0268229151c9bde11`, `F_9f61408e3afb633e50cdf1b20de6f466`, `F_72b32a1f754ba1c09b3695e0cb6cde7f`, `F_66f041e16a60928b05a7e228a89c3799`, `F_093f65e080a295f8076b1c5722a46aa2`, `F_072b030ba126b2f4b2374f342be9ed44`, `F_7f39f8317fbdb1988ef4c628eba02591`, `F_44f683a84163b3523afe57c2e008bc8c`, `F_03afdbd66e7929b125f8597834fa83a4`, `F_ea5d2f1c4608232e07d3aa3d998e5135`, `F_fc490ca45c00b1249bbe3554a4fdf6fb`, `F_3295c76acbf4caaed33c36b1b5fc2cb1`, `F_735b90b4568125ed6c3f678819b6e058`, `F_a3f390d88e4c41f2747bfa2f1b5f87db`, `F_14bfa6bb14875e45bba028a21ed38046`, `F_7cbbc409ec990f19c78c75bd1e06f215`, `F_e2c420d928d4bf8ce0ff2ec19b371514`, `F_32bb90e8976aab5298d5da10fe66f21d`, `F_d2ddea18f00665ce8623e36bd4e3c7c5`, `F_ad61ab143223efbc24c7d2583be69251`, `F_d09bf41544a3365a46c9077ebb5e35c3`, `F_fbd7939d674997cdb4692d34de8633c4`, `F_28dd2c7955ce926456240b2ff0100bde`, `F_35f4a8d465e6e1edc05f3d8ab658c551`, `F_d1fe173d08e959397adf34b1d77e88d7`, `F_f033ab37c30201f73f142449d037028d`, `F_43ec517d68b6edd3015b3edc9a11367b`, `F_9778d5d219c5080b9a6a17bef029331c`, `F_fe9fc289c3ff0af142b6d3bead98a923`, `F_68d30a9594728bc39aa24be94b319d21`, `F_3ef815416f775098fe977004015c6193`, `F_93db85ed909c13838ff95ccfa94cebd9`, `F_c7e1249ffc03eb9ded908c236bd1996d`, `F_2a38a4a9316c49e5a833517c45d31070`, `F_7647966b7343c29048673252e490f736`, `F_8613985ec49eb8f757ae6439e879bb2a`, `F_54229abfcfa5649e7003b83dd4755294`, `F_92cc227532d17e56e07902b254dfad10`, `F_98dce83da57b0395e163467c9dae521b`, `F_f4b9ec30ad9f68f89b29639786cb62ef`, `F_812b4ba287f5ee0bc9d43bbf5bbe87fb`, `F_26657d5ff9020d2abefe558796b99584`, `F_e2ef524fbf3d9fe611d5a8e90fefdc9c`, `F_ed3d2c21991e3bef5e069713af9fa6ca`, `F_ac627ab1ccbdb62ec96e702f07f6425b`, `F_f899139df5e1059396431415e770c6dd`, `F_38b3eff8baf56627478ec76a704e9b52`, `F_ec8956637a99787bd197eacd77acce5e`, `F_6974ce5ac660610b44d9b9fed0ff9548`, `F_c9e1074f5b3f9fc8ea15d152add07294`, `F_65b9eea6e1cc6bb9f0cd2a47751a186f`, `F_f0935e4cd5920aa6c7c996a5ee53a70f`, `F_a97da629b098b75c294dffdc3e463904`, `F_a3c65c2974270fd093ee8a9bf8ae7d0b`, `F_2723d092b63885e0d7c260cc007e8b9d`, `F_5f93f983524def3dca464469d2cf9f3e`, `F_698d51a19d8a121ce581499d7b701668`, `F_7f6ffaa6bb0b408017b62254211691b5`, `F_73278a4a86960eeb576a8fd4c9ec6997`, `F_5fd0b37cd7dbbb00f97ba6ce92bf5add`, `F_2b44928ae11fb9384c4cf38708677c48`, `F_c45147dee729311ef5b5c3003946c48f`, `F_eb160de1de89d9058fcb0b968dbbbd68`, `F_5ef059938ba799aaa845e1c2e8a762bd`, `F_07e1cd7dca89a1678042477183b7ac3f`, `F_da4fb5c6e93e74d3df8527599fa62642`, `F_4c56ff4ce4aaf9573aa5dff913df997a`, `F_a0a080f42e6f13b3a2df133f073095dd`, `F_202cb962ac59075b964b07152d234b70`, `F_c8ffe9a587b126f152ed3d89a146b445`, `F_3def184ad8f4755ff269862ea77393dd`, `F_069059b7ef840f0c74a814ec9237b6ec`, `F_ec5decca5ed3d6b8079e2e7e7bacc9f2`, `F_76dc611d6ebaafc66cc0879c71b5db5c`, `F_d1f491a404d6854880943e5c3cd9ca25`, `F_9b8619251a19057cff70779273e95aa6`, `F_1afa34a7f984eeabdbb0a7d494132ee5`, `F_65ded5353c5ee48d0b7d48c591b8f430`, `F_9fc3d7152ba9336a670e36d0ed79bc43`, `F_02522a2b2726fb0a03bb19f2d8d9524d`, `F_7f1de29e6da19d22b51c68001e7e0e54`, `F_42a0e188f5033bc65bf8d78622277c4e`, `F_3988c7f88ebcb58c6ce932b957b6f332`, `F_013d407166ec4fa56eb1e1f8cbe183b9`, `F_e00da03b685a0dd18fb6a08af0923de0`, `F_1385974ed5904a438616ff7bdb3f7439`, `F_0f28b5d49b3020afeecd95b4009adf4c`, `F_a8baa56554f96369ab93e4f3bb068c22`, `F_903ce9225fca3e988c2af215d4e544d3`, `F_0a09c8844ba8f0936c20bd791130d6b6`, `F_2b24d495052a8ce66358eb576b8912c8`, `F_a5e00132373a7031000fd987a3c9f87b`, `F_8d5e957f297893487bd98fa830fa6413`, `F_47d1e990583c9c67424d369f3414728e`, `F_f2217062e9a397a1dca429e7d70bc6ca`, `F_7ef605fc8dba5425d6965fbd4c8fbe1f`, `F_a8f15eda80c50adb0e71943adc8015cf`, `F_37a749d808e46495a8da1e5352d03cae`, `F_b3e3e393c77e35a4a3f3cbd1e429b5dc`, `F_1d7f7abc18fcb43975065399b0d1e48e`, `F_2a79ea27c279e471f4d180b08d62b00a`, `F_1c9ac0159c94d8d0cbedc973445af2da`, `F_6c4b761a28b734fe93831e3fb400ce87`, `F_06409663226af2f3114485aa4e0a23b4`, `F_140f6969d5213fd0ece03148e62e461e`, `F_b73ce398c39f506af761d2277d853a92`, `F_bd4c9ab730f5513206b999ec0d90d1fb`, `F_82aa4b0af34c2313a562076992e50aa3`, `F_0777d5c17d4066b82ab86dff8a46af6f`, `F_fa7cdfad1a5aaf8370ebeda47a1ff1c3`, `F_9766527f2b5d3e95d4a733fcfb77bd7e`, `F_7e7757b1e12abcb736ab9a754ffb617a`, `F_5878a7ab84fb43402106c575658472fa`, `F_006f52e9102a8d3be2fe5614f42ba989`, `F_3636638817772e42b59d74cff571fbb3`, `F_149e9677a5989fd342ae44213df68868`, `F_a4a042cf4fd6bfb47701cbc8a1653ada`, `F_1ff8a7b5dc7a7d1f0ed65aaa29c04b1e`, `F_f7e6c85504ce6e82442c770f7c8606f0`, `F_bf8229696f7a3bb4700cfddef19fa23f`, `F_82161242827b703e6acf9c726942a1e4`, `F_38af86134b65d0f10fe33d30dd76442e`, `F_96da2f590cd7246bbde0051047b0d6f7`, `F_8f85517967795eeef66c225f7883bdcb`, `F_8f53295a73878494e9bc8dd6c3c7104f`, `F_045117b0e0a11a242b9765e79cbf113f`, `F_fc221309746013ac554571fbd180e1c8`, `F_4c5bde74a8f110656874902f07378009`, `F_cedebb6e872f539bef8c3f919874e9d7`, `F_6cdd60ea0045eb7a6ec44c54d29ed402`, `F_eecca5b6365d9607ee5a9d336962c534`, `F_9872ed9fc22fc182d371c3e9ed316094`, `F_31fefc0e570cb3860f2a6d4b38c6490d`, `F_9dcb88e0137649590b755372b040afad`, `F_a2557a7b2e94197ff767970b67041697`, `F_cfecdb276f634854f3ef915e2e980c31`, `F_0aa1883c6411f7873cb83dacb17b0afc`, `F_58a2fc6ed39fd083f55d4182bf88826d`, `F_bd686fd640be98efaae0091fa301e613`, `F_a597e50502f5ff68e3e25b9114205d4a`, `F_0336dcbab05b9d5ad24f4333c7658a0e`, `F_084b6fbb10729ed4da8c3d3f5a3ae7c9`, `F_85d8ce590ad8981ca2c8286f79f59954`, `F_0e65972dce68dad4d52d063967f0a705`, `F_84d9ee44e457ddef7f2c4f25dc8fa865`, `F_3644a684f98ea8fe223c713b77189a77`, `F_757b505cfd34c64c85ca5b5690ee5293`, `F_854d6fae5ee42911677c739ee1734486`, `F_e2c0be24560d78c5e599c2a9c9d0bbd2`, `F_274ad4786c3abca69fa097b85867d9a4`, `F_eae27d77ca20db309e056e3d2dcd7d69`, `F_7eabe3a1649ffa2b3ff8c02ebfd5659f`, `F_69adc1e107f7f7d035d7baf04342e1ca`, `F_091d584fced301b442654dd8c23b3fc9`, `F_b1d10e7bafa4421218a51b1e1f1b0ba2`, `F_6f3ef77ac0e3619e98159e9b6febf557`, `F_eb163727917cbba1eea208541a643e74`, `F_1534b76d325a8f591b52d302e7181331`, `F_979d472a84804b9f647bc185a877a8b5`, `F_ca46c1b9512a7a8315fa3c5a946e8265`, `F_3b8a614226a953a8cd9526fca6fe9ba5`, `F_45fbc6d3e05ebd93369ce542e8f2322d`, `F_63dc7ed1010d3c3b8269faf0ba7491d4`, `F_e96ed478dab8595a7dbda4cbcbee168f`, `F_c0e190d8267e36708f955d7ab048990d`, `F_ec8ce6abb3e952a85b8551ba726a1227`, `F_060ad92489947d410d897474079c1477`, `F_bcbe3365e6ac95ea2c0343a2395834dd`, `F_115f89503138416a242f40fb7d7f338e`, `F_13fe9d84310e77f13a6d184dbf1232f3`, `F_d1c38a09acc34845c6be3a127a5aacaf`, `F_9cfdf10e8fc047a44b08ed031e1f0ed1`, `F_705f2172834666788607efbfca35afb3`, `F_74db120f0a8e5646ef5a30154e9f6deb`, `F_57aeee35c98205091e18d1140e9f38cf`, `F_6da9003b743b65f4c0ccd295cc484e57`, `F_9b04d152845ec0a378394003c96da594`, `F_be83ab3ecd0db773eb2dc1b0a17836a1`, `F_e165421110ba03099a1c0393373c5b43`, `F_289dff07669d7a23de0ef88d2f7129e7`, `F_577ef1154f3240ad5b9b413aa7346a1e`, `F_01161aaa0b6d1345dd8fe4e481144d84`, `F_539fd53b59e3bb12d203f45a912eeaf2`, `F_ac1dd209cbcc5e5d1c6e28598e8cbbe8`, `F_555d6702c950ecb729a966504af0a635`, `F_335f5352088d7d9bf74191e006d8e24c`, `F_f340f1b1f65b6df5b5e3f94d95b11daf`, `F_e4a6222cdb5b34375400904f03d8e6a5`, `F_cb70ab375662576bd1ac5aaf16b3fca4`, `F_9188905e74c28e489b44e954ec0b9bca`, `F_0266e33d3f546cb5436a10798e657d97`, `F_38db3aed920cf82ab059bfccbd02be6a`, `F_3cec07e9ba5f5bb252d13f5f431e4bbb`, `F_621bf66ddb7c962aa0d22ac97d69b793`, `F_077e29b11be80ab57e1a2ecabb7da330`, `F_6c9882bbac1c7093bd25041881277658`, `F_19f3cd308f1455b3fa09a282e0d496f4`, `F_03c6b06952c750899bb03d998e631860`, `F_c24cd76e1ce41366a4bbe8a49b02a028`, `F_c52f1bd66cc19d05628bd8bf27af3ad6`, `F_fe131d7f5a6b38b23cc967316c13dae2`, `F_f718499c1c8cef6730f9fd03c8125cab`, `F_d96409bf894217686ba124d7356686c9`, `F_502e4a16930e414107ee22b6198c578f`, `F_cfa0860e83a4c3a763a7e62d825349f7`, `F_a4f23670e1833f3fdb077ca70bbd5d66`, `F_b1a59b315fc9a3002ce38bbe070ec3f5`, `F_36660e59856b4de58a219bcf4e27eba3`, `F_8c19f571e251e61cb8dd3612f26d5ecf`, `F_d6baf65e0b240ce177cf70da146c8dc8`, `F_e56954b4f6347e897f954495eab16a88`, `F_f7664060cc52bc6f3d620bcedc94a4b6`, `F_eda80a3d5b344bc40f3bc04f65b7a357`, `F_8f121ce07d74717e0b1f21d122e04521`, `F_06138bc5af6023646ede0e1f7c1eac75`, `F_39059724f73a9969845dfe4146c5660e`, `F_7f100b7b36092fb9b06dfb4fac360931`, `F_7a614fd06c325499f1680b9896beedeb`, `F_4734ba6f3de83d861c3176a6273cac6d`, `F_d947bf06a885db0d477d707121934ff8`, `F_63923f49e5241343aa7acb6a06a751e7`, `F_db8e1af0cb3aca1ae2d0018624204529`, `F_20f07591c6fcb220ffe637cda29bb3f6`, `F_07cdfd23373b17c6b337251c22b7ea57`, `F_d395771085aab05244a4fb8fd91bf4ee`, `F_92c8c96e4c37100777c7190b76d28233`, `F_e3796ae838835da0b6f6ea37bcf8bcb7`, `F_6a9aeddfc689c1d0e3b9ccc3ab651bc5`, `F_0f49c89d1e7298bb9930789c8ed59d48`, `F_46ba9f2a6976570b0353203ec4474217`, `F_0e01938fc48a2cfb5f2217fbfb00722d`, `F_16a5cdae362b8d27a1d8f8c7b78b4330`, `F_918317b57931b6b7a7d29490fe5ec9f9`, `F_48aedb8880cab8c45637abc7493ecddd`, `F_839ab46820b524afda05122893c2fe8e`, `F_f90f2aca5c640289d0a29417bcb63a37`, `F_9c838d2e45b2ad1094d42f4ef36764f6`, `F_1700002963a49da13542e0726b7bb758`, `F_53c3bce66e43be4f209556518c2fcb54`, `F_6883966fd8f918a4aa29be29d2c386fb`, `F_49182f81e6a13cf5eaa496d51fea6406`, `F_d296c101daa88a51f6ca8cfc1ac79b50`, `F_9fd81843ad7f202f26c1a174c7357585`, `F_26e359e83860db1d11b6acca57d8ea88`, `F_ef0d3930a7b6c95bd2b32ed45989c61f`, `F_94f6d7e04a4d452035300f18b984988c`, `F_34ed066df378efacc9b924ec161e7639`, `F_577bcc914f9e55d5e4e4f82f9f00e7d4`, `F_11b9842e0a271ff252c1903e7132cd68`, `F_37bc2f75bf1bcfe8450a1a41c200364c`, `F_496e05e1aea0a9c4655800e8a7b9ea28`, `F_b2eb7349035754953b57a32e2841bda5`, `F_8e98d81f8217304975ccb23337bb5761`, `F_a8c88a0055f636e4a163a5e3d16adab7`, `F_eddea82ad2755b24c4e168c5fc2ebd40`, `F_06eb61b839a0cefee4967c67ccb099dc`, `F_9dfcd5e558dfa04aaf37f137a1d9d3e5`, `F_950a4152c2b4aa3ad78bdd6b366cc179`, `F_158f3069a435b314a80bdcb024f8e422`, `F_758874998f5bd0c393da094e1967a72b`, `F_ad13a2a07ca4b7642959dc0c4c740ab6`, `F_3fe94a002317b5f9259f82690aeea4cd`, `F_5b8add2a5d98b1a652ea7fd72d942dac`, `F_432aca3a1e345e339f35a30c8f65edce`, `F_8d3bba7425e7c98c50f52ca1b52d3735`, `F_320722549d1751cf3f247855f937b982`, `F_caf1a3dfb505ffed0d024130f58c5cfa`, `F_5737c6ec2e0716f3d8a7a5c4e0de0d9a`, `F_bc6dc48b743dc5d013b1abaebd2faed2`, `F_f2fc990265c712c49d51a18a32b39f0c`, `F_89f0fd5c927d466d6ec9a21b9ac34ffa`, `F_a666587afda6e89aec274a3657558a27`, `F_b83aac23b9528732c23cc7352950e880`, `F_cd00692c3bfe59267d5ecfac5310286c`, `F_6faa8040da20ef399b63a72d0e4ab575`, `F_fe73f687e5bc5280214e0486b273a5f9`) VALUES (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL); +UNLOCK TABLES; +/*!40000 ALTER TABLE `t1` ENABLE KEYS */; + +/*!40101 SET SQL_MODE=@OLD_SQL_MODE */; +/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */; +/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */; +/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; +/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */; +/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; +/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; + +drop table t1; diff --git a/mysql-test/t/mysqldump.test b/mysql-test/t/mysqldump.test index c321fb9c6b7..961c0f3e9d4 100644 --- a/mysql-test/t/mysqldump.test +++ b/mysql-test/t/mysqldump.test @@ -185,3 +185,341 @@ INSERT INTO `t1` VALUES (0x602010000280100005E71A); --exec $MYSQL_DUMP --skip-extended-insert --hex-blob test --skip-comments t1 DROP TABLE t1; +# +# Bug #10286: mysqldump -c crashes on table that has many fields with long +# names +# +create table t1 ( + F_c4ca4238a0b923820dcc509a6f75849b int, + F_c81e728d9d4c2f636f067f89cc14862c int, + F_eccbc87e4b5ce2fe28308fd9f2a7baf3 int, + F_a87ff679a2f3e71d9181a67b7542122c int, + F_e4da3b7fbbce2345d7772b0674a318d5 int, + F_1679091c5a880faf6fb5e6087eb1b2dc int, + F_8f14e45fceea167a5a36dedd4bea2543 int, + F_c9f0f895fb98ab9159f51fd0297e236d int, + F_45c48cce2e2d7fbdea1afc51c7c6ad26 int, + F_d3d9446802a44259755d38e6d163e820 int, + F_6512bd43d9caa6e02c990b0a82652dca int, + F_c20ad4d76fe97759aa27a0c99bff6710 int, + F_c51ce410c124a10e0db5e4b97fc2af39 int, + F_aab3238922bcc25a6f606eb525ffdc56 int, + F_9bf31c7ff062936a96d3c8bd1f8f2ff3 int, + F_c74d97b01eae257e44aa9d5bade97baf int, + F_70efdf2ec9b086079795c442636b55fb int, + F_6f4922f45568161a8cdf4ad2299f6d23 int, + F_1f0e3dad99908345f7439f8ffabdffc4 int, + F_98f13708210194c475687be6106a3b84 int, + F_3c59dc048e8850243be8079a5c74d079 int, + F_b6d767d2f8ed5d21a44b0e5886680cb9 int, + F_37693cfc748049e45d87b8c7d8b9aacd int, + F_1ff1de774005f8da13f42943881c655f int, + F_8e296a067a37563370ded05f5a3bf3ec int, + F_4e732ced3463d06de0ca9a15b6153677 int, + F_02e74f10e0327ad868d138f2b4fdd6f0 int, + F_33e75ff09dd601bbe69f351039152189 int, + F_6ea9ab1baa0efb9e19094440c317e21b int, + F_34173cb38f07f89ddbebc2ac9128303f int, + F_c16a5320fa475530d9583c34fd356ef5 int, + F_6364d3f0f495b6ab9dcf8d3b5c6e0b01 int, + F_182be0c5cdcd5072bb1864cdee4d3d6e int, + F_e369853df766fa44e1ed0ff613f563bd int, + F_1c383cd30b7c298ab50293adfecb7b18 int, + F_19ca14e7ea6328a42e0eb13d585e4c22 int, + F_a5bfc9e07964f8dddeb95fc584cd965d int, + F_a5771bce93e200c36f7cd9dfd0e5deaa int, + F_d67d8ab4f4c10bf22aa353e27879133c int, + F_d645920e395fedad7bbbed0eca3fe2e0 int, + F_3416a75f4cea9109507cacd8e2f2aefc int, + F_a1d0c6e83f027327d8461063f4ac58a6 int, + F_17e62166fc8586dfa4d1bc0e1742c08b int, + F_f7177163c833dff4b38fc8d2872f1ec6 int, + F_6c8349cc7260ae62e3b1396831a8398f int, + F_d9d4f495e875a2e075a1a4a6e1b9770f int, + F_67c6a1e7ce56d3d6fa748ab6d9af3fd7 int, + F_642e92efb79421734881b53e1e1b18b6 int, + F_f457c545a9ded88f18ecee47145a72c0 int, + F_c0c7c76d30bd3dcaefc96f40275bdc0a int, + F_2838023a778dfaecdc212708f721b788 int, + F_9a1158154dfa42caddbd0694a4e9bdc8 int, + F_d82c8d1619ad8176d665453cfb2e55f0 int, + F_a684eceee76fc522773286a895bc8436 int, + F_b53b3a3d6ab90ce0268229151c9bde11 int, + F_9f61408e3afb633e50cdf1b20de6f466 int, + F_72b32a1f754ba1c09b3695e0cb6cde7f int, + F_66f041e16a60928b05a7e228a89c3799 int, + F_093f65e080a295f8076b1c5722a46aa2 int, + F_072b030ba126b2f4b2374f342be9ed44 int, + F_7f39f8317fbdb1988ef4c628eba02591 int, + F_44f683a84163b3523afe57c2e008bc8c int, + F_03afdbd66e7929b125f8597834fa83a4 int, + F_ea5d2f1c4608232e07d3aa3d998e5135 int, + F_fc490ca45c00b1249bbe3554a4fdf6fb int, + F_3295c76acbf4caaed33c36b1b5fc2cb1 int, + F_735b90b4568125ed6c3f678819b6e058 int, + F_a3f390d88e4c41f2747bfa2f1b5f87db int, + F_14bfa6bb14875e45bba028a21ed38046 int, + F_7cbbc409ec990f19c78c75bd1e06f215 int, + F_e2c420d928d4bf8ce0ff2ec19b371514 int, + F_32bb90e8976aab5298d5da10fe66f21d int, + F_d2ddea18f00665ce8623e36bd4e3c7c5 int, + F_ad61ab143223efbc24c7d2583be69251 int, + F_d09bf41544a3365a46c9077ebb5e35c3 int, + F_fbd7939d674997cdb4692d34de8633c4 int, + F_28dd2c7955ce926456240b2ff0100bde int, + F_35f4a8d465e6e1edc05f3d8ab658c551 int, + F_d1fe173d08e959397adf34b1d77e88d7 int, + F_f033ab37c30201f73f142449d037028d int, + F_43ec517d68b6edd3015b3edc9a11367b int, + F_9778d5d219c5080b9a6a17bef029331c int, + F_fe9fc289c3ff0af142b6d3bead98a923 int, + F_68d30a9594728bc39aa24be94b319d21 int, + F_3ef815416f775098fe977004015c6193 int, + F_93db85ed909c13838ff95ccfa94cebd9 int, + F_c7e1249ffc03eb9ded908c236bd1996d int, + F_2a38a4a9316c49e5a833517c45d31070 int, + F_7647966b7343c29048673252e490f736 int, + F_8613985ec49eb8f757ae6439e879bb2a int, + F_54229abfcfa5649e7003b83dd4755294 int, + F_92cc227532d17e56e07902b254dfad10 int, + F_98dce83da57b0395e163467c9dae521b int, + F_f4b9ec30ad9f68f89b29639786cb62ef int, + F_812b4ba287f5ee0bc9d43bbf5bbe87fb int, + F_26657d5ff9020d2abefe558796b99584 int, + F_e2ef524fbf3d9fe611d5a8e90fefdc9c int, + F_ed3d2c21991e3bef5e069713af9fa6ca int, + F_ac627ab1ccbdb62ec96e702f07f6425b int, + F_f899139df5e1059396431415e770c6dd int, + F_38b3eff8baf56627478ec76a704e9b52 int, + F_ec8956637a99787bd197eacd77acce5e int, + F_6974ce5ac660610b44d9b9fed0ff9548 int, + F_c9e1074f5b3f9fc8ea15d152add07294 int, + F_65b9eea6e1cc6bb9f0cd2a47751a186f int, + F_f0935e4cd5920aa6c7c996a5ee53a70f int, + F_a97da629b098b75c294dffdc3e463904 int, + F_a3c65c2974270fd093ee8a9bf8ae7d0b int, + F_2723d092b63885e0d7c260cc007e8b9d int, + F_5f93f983524def3dca464469d2cf9f3e int, + F_698d51a19d8a121ce581499d7b701668 int, + F_7f6ffaa6bb0b408017b62254211691b5 int, + F_73278a4a86960eeb576a8fd4c9ec6997 int, + F_5fd0b37cd7dbbb00f97ba6ce92bf5add int, + F_2b44928ae11fb9384c4cf38708677c48 int, + F_c45147dee729311ef5b5c3003946c48f int, + F_eb160de1de89d9058fcb0b968dbbbd68 int, + F_5ef059938ba799aaa845e1c2e8a762bd int, + F_07e1cd7dca89a1678042477183b7ac3f int, + F_da4fb5c6e93e74d3df8527599fa62642 int, + F_4c56ff4ce4aaf9573aa5dff913df997a int, + F_a0a080f42e6f13b3a2df133f073095dd int, + F_202cb962ac59075b964b07152d234b70 int, + F_c8ffe9a587b126f152ed3d89a146b445 int, + F_3def184ad8f4755ff269862ea77393dd int, + F_069059b7ef840f0c74a814ec9237b6ec int, + F_ec5decca5ed3d6b8079e2e7e7bacc9f2 int, + F_76dc611d6ebaafc66cc0879c71b5db5c int, + F_d1f491a404d6854880943e5c3cd9ca25 int, + F_9b8619251a19057cff70779273e95aa6 int, + F_1afa34a7f984eeabdbb0a7d494132ee5 int, + F_65ded5353c5ee48d0b7d48c591b8f430 int, + F_9fc3d7152ba9336a670e36d0ed79bc43 int, + F_02522a2b2726fb0a03bb19f2d8d9524d int, + F_7f1de29e6da19d22b51c68001e7e0e54 int, + F_42a0e188f5033bc65bf8d78622277c4e int, + F_3988c7f88ebcb58c6ce932b957b6f332 int, + F_013d407166ec4fa56eb1e1f8cbe183b9 int, + F_e00da03b685a0dd18fb6a08af0923de0 int, + F_1385974ed5904a438616ff7bdb3f7439 int, + F_0f28b5d49b3020afeecd95b4009adf4c int, + F_a8baa56554f96369ab93e4f3bb068c22 int, + F_903ce9225fca3e988c2af215d4e544d3 int, + F_0a09c8844ba8f0936c20bd791130d6b6 int, + F_2b24d495052a8ce66358eb576b8912c8 int, + F_a5e00132373a7031000fd987a3c9f87b int, + F_8d5e957f297893487bd98fa830fa6413 int, + F_47d1e990583c9c67424d369f3414728e int, + F_f2217062e9a397a1dca429e7d70bc6ca int, + F_7ef605fc8dba5425d6965fbd4c8fbe1f int, + F_a8f15eda80c50adb0e71943adc8015cf int, + F_37a749d808e46495a8da1e5352d03cae int, + F_b3e3e393c77e35a4a3f3cbd1e429b5dc int, + F_1d7f7abc18fcb43975065399b0d1e48e int, + F_2a79ea27c279e471f4d180b08d62b00a int, + F_1c9ac0159c94d8d0cbedc973445af2da int, + F_6c4b761a28b734fe93831e3fb400ce87 int, + F_06409663226af2f3114485aa4e0a23b4 int, + F_140f6969d5213fd0ece03148e62e461e int, + F_b73ce398c39f506af761d2277d853a92 int, + F_bd4c9ab730f5513206b999ec0d90d1fb int, + F_82aa4b0af34c2313a562076992e50aa3 int, + F_0777d5c17d4066b82ab86dff8a46af6f int, + F_fa7cdfad1a5aaf8370ebeda47a1ff1c3 int, + F_9766527f2b5d3e95d4a733fcfb77bd7e int, + F_7e7757b1e12abcb736ab9a754ffb617a int, + F_5878a7ab84fb43402106c575658472fa int, + F_006f52e9102a8d3be2fe5614f42ba989 int, + F_3636638817772e42b59d74cff571fbb3 int, + F_149e9677a5989fd342ae44213df68868 int, + F_a4a042cf4fd6bfb47701cbc8a1653ada int, + F_1ff8a7b5dc7a7d1f0ed65aaa29c04b1e int, + F_f7e6c85504ce6e82442c770f7c8606f0 int, + F_bf8229696f7a3bb4700cfddef19fa23f int, + F_82161242827b703e6acf9c726942a1e4 int, + F_38af86134b65d0f10fe33d30dd76442e int, + F_96da2f590cd7246bbde0051047b0d6f7 int, + F_8f85517967795eeef66c225f7883bdcb int, + F_8f53295a73878494e9bc8dd6c3c7104f int, + F_045117b0e0a11a242b9765e79cbf113f int, + F_fc221309746013ac554571fbd180e1c8 int, + F_4c5bde74a8f110656874902f07378009 int, + F_cedebb6e872f539bef8c3f919874e9d7 int, + F_6cdd60ea0045eb7a6ec44c54d29ed402 int, + F_eecca5b6365d9607ee5a9d336962c534 int, + F_9872ed9fc22fc182d371c3e9ed316094 int, + F_31fefc0e570cb3860f2a6d4b38c6490d int, + F_9dcb88e0137649590b755372b040afad int, + F_a2557a7b2e94197ff767970b67041697 int, + F_cfecdb276f634854f3ef915e2e980c31 int, + F_0aa1883c6411f7873cb83dacb17b0afc int, + F_58a2fc6ed39fd083f55d4182bf88826d int, + F_bd686fd640be98efaae0091fa301e613 int, + F_a597e50502f5ff68e3e25b9114205d4a int, + F_0336dcbab05b9d5ad24f4333c7658a0e int, + F_084b6fbb10729ed4da8c3d3f5a3ae7c9 int, + F_85d8ce590ad8981ca2c8286f79f59954 int, + F_0e65972dce68dad4d52d063967f0a705 int, + F_84d9ee44e457ddef7f2c4f25dc8fa865 int, + F_3644a684f98ea8fe223c713b77189a77 int, + F_757b505cfd34c64c85ca5b5690ee5293 int, + F_854d6fae5ee42911677c739ee1734486 int, + F_e2c0be24560d78c5e599c2a9c9d0bbd2 int, + F_274ad4786c3abca69fa097b85867d9a4 int, + F_eae27d77ca20db309e056e3d2dcd7d69 int, + F_7eabe3a1649ffa2b3ff8c02ebfd5659f int, + F_69adc1e107f7f7d035d7baf04342e1ca int, + F_091d584fced301b442654dd8c23b3fc9 int, + F_b1d10e7bafa4421218a51b1e1f1b0ba2 int, + F_6f3ef77ac0e3619e98159e9b6febf557 int, + F_eb163727917cbba1eea208541a643e74 int, + F_1534b76d325a8f591b52d302e7181331 int, + F_979d472a84804b9f647bc185a877a8b5 int, + F_ca46c1b9512a7a8315fa3c5a946e8265 int, + F_3b8a614226a953a8cd9526fca6fe9ba5 int, + F_45fbc6d3e05ebd93369ce542e8f2322d int, + F_63dc7ed1010d3c3b8269faf0ba7491d4 int, + F_e96ed478dab8595a7dbda4cbcbee168f int, + F_c0e190d8267e36708f955d7ab048990d int, + F_ec8ce6abb3e952a85b8551ba726a1227 int, + F_060ad92489947d410d897474079c1477 int, + F_bcbe3365e6ac95ea2c0343a2395834dd int, + F_115f89503138416a242f40fb7d7f338e int, + F_13fe9d84310e77f13a6d184dbf1232f3 int, + F_d1c38a09acc34845c6be3a127a5aacaf int, + F_9cfdf10e8fc047a44b08ed031e1f0ed1 int, + F_705f2172834666788607efbfca35afb3 int, + F_74db120f0a8e5646ef5a30154e9f6deb int, + F_57aeee35c98205091e18d1140e9f38cf int, + F_6da9003b743b65f4c0ccd295cc484e57 int, + F_9b04d152845ec0a378394003c96da594 int, + F_be83ab3ecd0db773eb2dc1b0a17836a1 int, + F_e165421110ba03099a1c0393373c5b43 int, + F_289dff07669d7a23de0ef88d2f7129e7 int, + F_577ef1154f3240ad5b9b413aa7346a1e int, + F_01161aaa0b6d1345dd8fe4e481144d84 int, + F_539fd53b59e3bb12d203f45a912eeaf2 int, + F_ac1dd209cbcc5e5d1c6e28598e8cbbe8 int, + F_555d6702c950ecb729a966504af0a635 int, + F_335f5352088d7d9bf74191e006d8e24c int, + F_f340f1b1f65b6df5b5e3f94d95b11daf int, + F_e4a6222cdb5b34375400904f03d8e6a5 int, + F_cb70ab375662576bd1ac5aaf16b3fca4 int, + F_9188905e74c28e489b44e954ec0b9bca int, + F_0266e33d3f546cb5436a10798e657d97 int, + F_38db3aed920cf82ab059bfccbd02be6a int, + F_3cec07e9ba5f5bb252d13f5f431e4bbb int, + F_621bf66ddb7c962aa0d22ac97d69b793 int, + F_077e29b11be80ab57e1a2ecabb7da330 int, + F_6c9882bbac1c7093bd25041881277658 int, + F_19f3cd308f1455b3fa09a282e0d496f4 int, + F_03c6b06952c750899bb03d998e631860 int, + F_c24cd76e1ce41366a4bbe8a49b02a028 int, + F_c52f1bd66cc19d05628bd8bf27af3ad6 int, + F_fe131d7f5a6b38b23cc967316c13dae2 int, + F_f718499c1c8cef6730f9fd03c8125cab int, + F_d96409bf894217686ba124d7356686c9 int, + F_502e4a16930e414107ee22b6198c578f int, + F_cfa0860e83a4c3a763a7e62d825349f7 int, + F_a4f23670e1833f3fdb077ca70bbd5d66 int, + F_b1a59b315fc9a3002ce38bbe070ec3f5 int, + F_36660e59856b4de58a219bcf4e27eba3 int, + F_8c19f571e251e61cb8dd3612f26d5ecf int, + F_d6baf65e0b240ce177cf70da146c8dc8 int, + F_e56954b4f6347e897f954495eab16a88 int, + F_f7664060cc52bc6f3d620bcedc94a4b6 int, + F_eda80a3d5b344bc40f3bc04f65b7a357 int, + F_8f121ce07d74717e0b1f21d122e04521 int, + F_06138bc5af6023646ede0e1f7c1eac75 int, + F_39059724f73a9969845dfe4146c5660e int, + F_7f100b7b36092fb9b06dfb4fac360931 int, + F_7a614fd06c325499f1680b9896beedeb int, + F_4734ba6f3de83d861c3176a6273cac6d int, + F_d947bf06a885db0d477d707121934ff8 int, + F_63923f49e5241343aa7acb6a06a751e7 int, + F_db8e1af0cb3aca1ae2d0018624204529 int, + F_20f07591c6fcb220ffe637cda29bb3f6 int, + F_07cdfd23373b17c6b337251c22b7ea57 int, + F_d395771085aab05244a4fb8fd91bf4ee int, + F_92c8c96e4c37100777c7190b76d28233 int, + F_e3796ae838835da0b6f6ea37bcf8bcb7 int, + F_6a9aeddfc689c1d0e3b9ccc3ab651bc5 int, + F_0f49c89d1e7298bb9930789c8ed59d48 int, + F_46ba9f2a6976570b0353203ec4474217 int, + F_0e01938fc48a2cfb5f2217fbfb00722d int, + F_16a5cdae362b8d27a1d8f8c7b78b4330 int, + F_918317b57931b6b7a7d29490fe5ec9f9 int, + F_48aedb8880cab8c45637abc7493ecddd int, + F_839ab46820b524afda05122893c2fe8e int, + F_f90f2aca5c640289d0a29417bcb63a37 int, + F_9c838d2e45b2ad1094d42f4ef36764f6 int, + F_1700002963a49da13542e0726b7bb758 int, + F_53c3bce66e43be4f209556518c2fcb54 int, + F_6883966fd8f918a4aa29be29d2c386fb int, + F_49182f81e6a13cf5eaa496d51fea6406 int, + F_d296c101daa88a51f6ca8cfc1ac79b50 int, + F_9fd81843ad7f202f26c1a174c7357585 int, + F_26e359e83860db1d11b6acca57d8ea88 int, + F_ef0d3930a7b6c95bd2b32ed45989c61f int, + F_94f6d7e04a4d452035300f18b984988c int, + F_34ed066df378efacc9b924ec161e7639 int, + F_577bcc914f9e55d5e4e4f82f9f00e7d4 int, + F_11b9842e0a271ff252c1903e7132cd68 int, + F_37bc2f75bf1bcfe8450a1a41c200364c int, + F_496e05e1aea0a9c4655800e8a7b9ea28 int, + F_b2eb7349035754953b57a32e2841bda5 int, + F_8e98d81f8217304975ccb23337bb5761 int, + F_a8c88a0055f636e4a163a5e3d16adab7 int, + F_eddea82ad2755b24c4e168c5fc2ebd40 int, + F_06eb61b839a0cefee4967c67ccb099dc int, + F_9dfcd5e558dfa04aaf37f137a1d9d3e5 int, + F_950a4152c2b4aa3ad78bdd6b366cc179 int, + F_158f3069a435b314a80bdcb024f8e422 int, + F_758874998f5bd0c393da094e1967a72b int, + F_ad13a2a07ca4b7642959dc0c4c740ab6 int, + F_3fe94a002317b5f9259f82690aeea4cd int, + F_5b8add2a5d98b1a652ea7fd72d942dac int, + F_432aca3a1e345e339f35a30c8f65edce int, + F_8d3bba7425e7c98c50f52ca1b52d3735 int, + F_320722549d1751cf3f247855f937b982 int, + F_caf1a3dfb505ffed0d024130f58c5cfa int, + F_5737c6ec2e0716f3d8a7a5c4e0de0d9a int, + F_bc6dc48b743dc5d013b1abaebd2faed2 int, + F_f2fc990265c712c49d51a18a32b39f0c int, + F_89f0fd5c927d466d6ec9a21b9ac34ffa int, + F_a666587afda6e89aec274a3657558a27 int, + F_b83aac23b9528732c23cc7352950e880 int, + F_cd00692c3bfe59267d5ecfac5310286c int, + F_6faa8040da20ef399b63a72d0e4ab575 int, + F_fe73f687e5bc5280214e0486b273a5f9 int); +insert into t1 (F_8d3bba7425e7c98c50f52ca1b52d3735) values (1); +--exec $MYSQL_DUMP -c test +drop table t1; From da2206d02bdcc68572f47267cee66370724283e0 Mon Sep 17 00:00:00 2001 From: "lenz@mysql.com" <> Date: Tue, 10 May 2005 14:44:03 +0200 Subject: [PATCH 02/26] Applied two patches already commited to the main tree to resolve bugs found during the build: - removed an "#error PRAGMA" from sql/item_strfunc.h (msvensson) - Fixed BUG#10070 (range test failed if InnoDB is not available) (sergefp) --- mysql-test/t/range.test | 2 ++ sql/item_strfunc.h | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/mysql-test/t/range.test b/mysql-test/t/range.test index b8412b6624e..8c27d876bc8 100644 --- a/mysql-test/t/range.test +++ b/mysql-test/t/range.test @@ -450,6 +450,7 @@ explain select * from t1 where a='aaa' collate latin1_german1_ci; drop table t1; # Test for BUG#9348 "result for WHERE A AND (B OR C) differs from WHERE a AND (C OR B)" +--disable_warnings CREATE TABLE t1 ( `CLIENT` char(3) character set latin1 collate latin1_bin NOT NULL default '000', `ARG1` char(3) character set latin1 collate latin1_bin NOT NULL default '', @@ -458,6 +459,7 @@ CREATE TABLE t1 ( `FUNCTINT` int(11) NOT NULL default '0', KEY `VERI_CLNT~2` (`ARG1`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1; +--enable_warnings INSERT INTO t1 VALUES ('000',' 0',' 0','Text 001',0), ('000',' 0',' 1','Text 002',0), ('000',' 1',' 2','Text 003',0), ('000',' 2',' 3','Text 004',0), diff --git a/sql/item_strfunc.h b/sql/item_strfunc.h index e576b2c2a7e..6f6af415086 100644 --- a/sql/item_strfunc.h +++ b/sql/item_strfunc.h @@ -18,7 +18,6 @@ /* This file defines all string functions */ #ifdef USE_PRAGMA_INTERFACE -#error PRAGMA #pragma interface /* gcc class implementation */ #endif From f6593cb7d418b72ed60c77c32aa9062b2b2ee0f1 Mon Sep 17 00:00:00 2001 From: "lenz@mysql.com" <> Date: Thu, 12 May 2005 18:18:37 +0200 Subject: [PATCH 03/26] - added a check for "u_int32_t" to configure.in that will define HAVE_U_INT32_T when available (needed to fix a double typedef in libedit) --- configure.in | 1 + 1 file changed, 1 insertion(+) diff --git a/configure.in b/configure.in index 00ec737e76f..52f368f0c2d 100644 --- a/configure.in +++ b/configure.in @@ -1881,6 +1881,7 @@ fi fi AC_CHECK_TYPES([sigset_t, off_t], [], [], [#include ]) AC_CHECK_TYPES([size_t], [], [], [#include ]) +AC_CHECK_TYPES([u_int32_t]) MYSQL_PTHREAD_YIELD From 7209906093edf9209896b383dfc74d0946cc8cec Mon Sep 17 00:00:00 2001 From: "kent@mysql.com" <> Date: Thu, 12 May 2005 19:02:26 +0200 Subject: [PATCH 04/26] readline.c: Include readline/readline.h earlier, to avoid redifinition of term.h macros on AIX 5.2 search.c: FreeBSD needs to get 'off_t' defined --- cmd-line-utils/libedit/readline.c | 2 +- cmd-line-utils/libedit/search.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/cmd-line-utils/libedit/readline.c b/cmd-line-utils/libedit/readline.c index 3a38e8a99ab..616b55a877e 100644 --- a/cmd-line-utils/libedit/readline.c +++ b/cmd-line-utils/libedit/readline.c @@ -70,10 +70,10 @@ extern char *alloca (); #include #include +#include "readline/readline.h" #include "el.h" #include "fcns.h" /* for EL_NUM_FCNS */ #include "histedit.h" -#include "readline/readline.h" /* for rl_complete() */ #define TAB '\r' diff --git a/cmd-line-utils/libedit/search.c b/cmd-line-utils/libedit/search.c index 848429e091b..850c5f27140 100644 --- a/cmd-line-utils/libedit/search.c +++ b/cmd-line-utils/libedit/search.c @@ -37,6 +37,7 @@ /* * search.c: History and character search functions */ +#include #include #if defined(REGEX) #include From 27ab139dfa897513db7ff100d7fec415f6662010 Mon Sep 17 00:00:00 2001 From: "lenz@mysql.com" <> Date: Fri, 13 May 2005 10:04:35 +0200 Subject: [PATCH 05/26] - don't include sys.h directly in the autogenerated libedit source files - include config.h instead (compile fix for FreeBSD and AIX 4.3/5.2) --- cmd-line-utils/libedit/makelist.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd-line-utils/libedit/makelist.sh b/cmd-line-utils/libedit/makelist.sh index 502604791f5..f15b3d1eb9f 100644 --- a/cmd-line-utils/libedit/makelist.sh +++ b/cmd-line-utils/libedit/makelist.sh @@ -87,7 +87,7 @@ case $FLAG in cat $FILES | $AWK ' BEGIN { printf("/* Automatically generated file, do not edit */\n"); - printf("#include \"sys.h\"\n#include \"el.h\"\n"); + printf("#include \"config.h\"\n#include \"el.h\"\n"); printf("private const struct el_bindings_t el_func_help[] = {\n"); low = "abcdefghijklmnopqrstuvwxyz_"; high = "ABCDEFGHIJKLMNOPQRSTUVWXYZ_"; @@ -170,7 +170,7 @@ case $FLAG in cat $FILES | $AWK '/el_action_t/ { print $3 }' | sort | $AWK ' BEGIN { printf("/* Automatically generated file, do not edit */\n"); - printf("#include \"sys.h\"\n#include \"el.h\"\n"); + printf("#include \"config.h\"\n#include \"el.h\"\n"); printf("private const el_func_t el_func[] = {"); maxlen = 80; needn = 1; From 480957e7e6b58acfd0bf2cf6bb58b86cb77b2ac2 Mon Sep 17 00:00:00 2001 From: "sergefp@mysql.com" <> Date: Sat, 14 May 2005 00:21:53 +0200 Subject: [PATCH 06/26] Fix for BUG#9622: Make index statistics collection in MyISAM behave the same way in ALTER TABLE ... ENABLE KEYS, ANALYZE TABLE and after bulk insert: now statistics collection always assumes NULLs are inequal. --- myisam/mi_check.c | 36 +++++++++++++++++++++++++++++++++++- mysql-test/r/myisam.result | 14 ++++++++++++++ mysql-test/t/myisam.test | 15 +++++++++++++++ 3 files changed, 64 insertions(+), 1 deletion(-) diff --git a/myisam/mi_check.c b/myisam/mi_check.c index f710d3a8454..d59c9b9c697 100644 --- a/myisam/mi_check.c +++ b/myisam/mi_check.c @@ -3243,6 +3243,9 @@ static int sort_key_write(MI_SORT_PARAM *sort_param, const void *a) cmp=ha_key_cmp(sort_param->seg,sort_info->key_block->lastkey, (uchar*) a, USE_WHOLE_KEY,SEARCH_FIND | SEARCH_UPDATE, &diff_pos); + ha_key_cmp(sort_param->seg,sort_info->key_block->lastkey, + (uchar*) a, USE_WHOLE_KEY,SEARCH_FIND | SEARCH_NULL_ARE_NOT_EQUAL, + &diff_pos); sort_param->unique[diff_pos-1]++; } else @@ -3955,7 +3958,38 @@ void update_auto_increment_key(MI_CHECK *param, MI_INFO *info, return; } - /* calculate unique keys for each part key */ + +/* + Update statistics for each part of an index + + SYNOPSIS + update_key_parts() + keyinfo Index information (only key->keysegs used) + rec_per_key_part OUT Store statistics here + unique IN Array of #distinct values collected over index + run. + records Number of records in the table + + NOTES + Unique is an array: + unique[0]= (#different values of {keypart1}) - 1 + unique[1]= (#different values of {keypart2,keypart1} tuple) - unique[0] - 1 + ... + Here we assume that NULL != NULL (see SEARCH_NULL_ARE_NOT_EQUAL). The + 'unique' array is collected in one sequential scan through the entire + index. This is done in two places: in chk_index() and in sort_key_write(). + + Output is an array: + rec_per_key_part[k] = + = E(#records in the table such that keypart_1=c_1 AND ... AND + keypart_k=c_k for arbitrary constants c_1 ... c_k) + + = {assuming that values have uniform distribution and index contains all + tuples from the domain (or that {c_1, ..., c_k} tuple is choosen from + index tuples} + + = #tuples-in-the-index / #distinct-tuples-in-the-index. +*/ void update_key_parts(MI_KEYDEF *keyinfo, ulong *rec_per_key_part, ulonglong *unique, ulonglong records) diff --git a/mysql-test/r/myisam.result b/mysql-test/r/myisam.result index 5b69ce68a79..4def82e5752 100644 --- a/mysql-test/r/myisam.result +++ b/mysql-test/r/myisam.result @@ -581,3 +581,17 @@ check table t1; Table Op Msg_type Msg_text test.t1 check status OK drop table t1; +create table t1 (a int, key(a)); +insert into t1 values (1),(2),(3),(4),(NULL),(NULL),(NULL),(NULL); +analyze table t1; +Table Op Msg_type Msg_text +test.t1 analyze status OK +show keys from t1; +Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment +t1 1 a 1 a A 8 NULL NULL YES BTREE +alter table t1 disable keys; +alter table t1 enable keys; +show keys from t1; +Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment +t1 1 a 1 a A 8 NULL NULL YES BTREE +drop table t1; diff --git a/mysql-test/t/myisam.test b/mysql-test/t/myisam.test index 46a6499adad..7d7985fd8ac 100644 --- a/mysql-test/t/myisam.test +++ b/mysql-test/t/myisam.test @@ -560,3 +560,18 @@ update t1 set c2='A B' where c1=2; check table t1; drop table t1; + +# BUG#9622 - ANALYZE TABLE and ALTER TABLE .. ENABLE INDEX produce +# different statistics on the same table with NULL values. +create table t1 (a int, key(a)); + +insert into t1 values (1),(2),(3),(4),(NULL),(NULL),(NULL),(NULL); +analyze table t1; +show keys from t1; + +alter table t1 disable keys; +alter table t1 enable keys; +show keys from t1; + +drop table t1; + From 1ff9f5592008ed8182c0afe84ebfc03be086ecfa Mon Sep 17 00:00:00 2001 From: "bell@book.sanja.is.com.ua" <> Date: Mon, 16 May 2005 12:19:10 +0300 Subject: [PATCH 07/26] relaxed DBUG_ASSERT in Item_int_with_ref::new_item() to "any constant" (BUG#10020) --- BitKeeper/etc/logging_ok | 1 + mysql-test/r/subselect.result | 24 ++++++++++++++++++++++++ mysql-test/t/subselect.test | 24 ++++++++++++++++++++++++ sql/item.cc | 2 +- 4 files changed, 50 insertions(+), 1 deletion(-) diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index 246de2fffa2..daacb337570 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -29,6 +29,7 @@ bar@gw.udmsearch.izhnet.ru bar@mysql.com bar@noter.intranet.mysql.r18.ru bell@51.0.168.192.in-addr.arpa +bell@book.sanja.is.com.ua bell@laptop.sanja.is.com.ua bell@sanja.is.com.ua bk@admin.bk diff --git a/mysql-test/r/subselect.result b/mysql-test/r/subselect.result index 8f17f545d1a..1f3542802a7 100644 --- a/mysql-test/r/subselect.result +++ b/mysql-test/r/subselect.result @@ -2697,3 +2697,27 @@ select (1,2,3) = (select * from t1); ERROR 21000: Operand should contain 3 column(s) select (select * from t1) = (1,2,3); ERROR 21000: Operand should contain 2 column(s) +drop table t1 +#; +CREATE TABLE `t1` ( +`itemid` bigint(20) unsigned NOT NULL auto_increment, +`sessionid` bigint(20) unsigned default NULL, +`time` int(10) unsigned NOT NULL default '0', +`type` set('A','D','E','F','G','I','L','N','U') collate latin1_general_ci NOT +NULL default '', +`data` text collate latin1_general_ci NOT NULL, +PRIMARY KEY (`itemid`) +) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci; +INSERT INTO `t1` VALUES (1, 1, 1, 'D', ''); +CREATE TABLE `t2` ( +`sessionid` bigint(20) unsigned NOT NULL auto_increment, +`pid` int(10) unsigned NOT NULL default '0', +`date` int(10) unsigned NOT NULL default '0', +`ip` varchar(15) collate latin1_general_ci NOT NULL default '', +PRIMARY KEY (`sessionid`) +) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci; +INSERT INTO `t2` VALUES (1, 1, 1, '10.10.10.1'); +SELECT s.ip, count( e.itemid ) FROM `t1` e JOIN t2 s ON s.sessionid = e.sessionid WHERE e.sessionid = ( SELECT sessionid FROM t2 ORDER BY sessionid DESC LIMIT 1 ) GROUP BY s.ip HAVING count( e.itemid ) >0 LIMIT 0 , 30; +ip count( e.itemid ) +10.10.10.1 1 +drop tables t1,t2; diff --git a/mysql-test/t/subselect.test b/mysql-test/t/subselect.test index 1882a04936c..e585022563f 100644 --- a/mysql-test/t/subselect.test +++ b/mysql-test/t/subselect.test @@ -1722,3 +1722,27 @@ select (1,2,3) = (select * from t1); -- error 1241 select (select * from t1) = (1,2,3); drop table t1 + +# +# Item_int_with_ref check (BUG#10020) +# +CREATE TABLE `t1` ( + `itemid` bigint(20) unsigned NOT NULL auto_increment, + `sessionid` bigint(20) unsigned default NULL, + `time` int(10) unsigned NOT NULL default '0', + `type` set('A','D','E','F','G','I','L','N','U') collate latin1_general_ci NOT +NULL default '', + `data` text collate latin1_general_ci NOT NULL, + PRIMARY KEY (`itemid`) +) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci; +INSERT INTO `t1` VALUES (1, 1, 1, 'D', ''); +CREATE TABLE `t2` ( + `sessionid` bigint(20) unsigned NOT NULL auto_increment, + `pid` int(10) unsigned NOT NULL default '0', + `date` int(10) unsigned NOT NULL default '0', + `ip` varchar(15) collate latin1_general_ci NOT NULL default '', + PRIMARY KEY (`sessionid`) +) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci; +INSERT INTO `t2` VALUES (1, 1, 1, '10.10.10.1'); +SELECT s.ip, count( e.itemid ) FROM `t1` e JOIN t2 s ON s.sessionid = e.sessionid WHERE e.sessionid = ( SELECT sessionid FROM t2 ORDER BY sessionid DESC LIMIT 1 ) GROUP BY s.ip HAVING count( e.itemid ) >0 LIMIT 0 , 30; +drop tables t1,t2; diff --git a/sql/item.cc b/sql/item.cc index 6c1506e10e8..59785813566 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -2034,7 +2034,7 @@ bool Item_int::eq(const Item *arg, bool binary_cmp) const Item *Item_int_with_ref::new_item() { - DBUG_ASSERT(ref->basic_const_item()); + DBUG_ASSERT(ref->const_item()); /* We need to evaluate the constant to make sure it works with parameter markers. From 13bbb3dbb3b5563ba56abaa53ed9001b0d8dc50e Mon Sep 17 00:00:00 2001 From: "tulin@dl145c.mysql.com" <> Date: Wed, 18 May 2005 10:22:27 +0200 Subject: [PATCH 08/26] ndberror.c: updated error message for ndb --- BitKeeper/etc/logging_ok | 1 + ndb/src/ndbapi/ndberror.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index daacb337570..2ed4bf2a5d3 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -250,6 +250,7 @@ tonu@x3.internalnet tsmith@build.mysql.com tulin@build.mysql.com tulin@dl145b.mysql.com +tulin@dl145c.mysql.com tulin@mysql.com ulli@morbus.(none) venu@hundin.mysql.fi diff --git a/ndb/src/ndbapi/ndberror.c b/ndb/src/ndbapi/ndberror.c index 71b0ed6a82f..04c25f31387 100644 --- a/ndb/src/ndbapi/ndberror.c +++ b/ndb/src/ndbapi/ndberror.c @@ -298,8 +298,8 @@ ErrorBundle ErrorCodes[] = { { 703, SE, "Invalid table format" }, { 704, SE, "Attribute name too long" }, { 705, SE, "Table name too long" }, - { 707, SE, "No more table metadata records" }, - { 708, SE, "No more attribute metadata records" }, + { 707, SE, "No more table metadata records (increase MaxNoOfTables)" }, + { 708, SE, "No more attribute metadata records (increase MaxNoOfAttributes)" }, { 709, SE, "No such table existed" }, { 721, SE, "Table or index with given name already exists" }, { 723, SE, "No such table existed" }, From 48377eb7c4fb5064cccf6fd4f2ce30e3b6a0fa60 Mon Sep 17 00:00:00 2001 From: "serg@serg.mylan" <> Date: Wed, 18 May 2005 10:57:07 +0200 Subject: [PATCH 09/26] test fixes --- mysql-test/mysql-test-run.sh | 2 +- mysql-test/t/range.test | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh index 581c6c66fdd..4fee560ee44 100644 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run.sh @@ -691,7 +691,7 @@ fi MYSQL_DUMP="$MYSQL_DUMP --no-defaults -uroot --socket=$MASTER_MYSOCK --password=$DBPASSWD $EXTRA_MYSQLDUMP_OPT" MYSQL_BINLOG="$MYSQL_BINLOG --no-defaults --local-load=$MYSQL_TMP_DIR $EXTRA_MYSQLBINLOG_OPT" MYSQL_FIX_SYSTEM_TABLES="$MYSQL_FIX_SYSTEM_TABLES --no-defaults --host=localhost --port=$MASTER_MYPORT --socket=$MASTER_MYSOCK --user=root --password=$DBPASSWD --basedir=$BASEDIR --bindir=$CLIENT_BINDIR --verbose" -MYSQL="$MYSQL --host=localhost --port=$MASTER_MYPORT --socket=$MASTER_MYSOCK --user=root --password=$DBPASSWD" +MYSQL="$MYSQL --no-defaults --host=localhost --port=$MASTER_MYPORT --socket=$MASTER_MYSOCK --user=root --password=$DBPASSWD" export MYSQL MYSQL_DUMP MYSQL_BINLOG MYSQL_FIX_SYSTEM_TABLES export CLIENT_BINDIR MYSQL_CLIENT_TEST CHARSETSDIR export NDB_TOOLS_DIR diff --git a/mysql-test/t/range.test b/mysql-test/t/range.test index 8c27d876bc8..b51a79fba77 100644 --- a/mysql-test/t/range.test +++ b/mysql-test/t/range.test @@ -1,5 +1,3 @@ --- source include/have_innodb.inc - # # Problem with range optimizer # From 318c41e94d07975bd5f4d727819f5a16aa94a176 Mon Sep 17 00:00:00 2001 From: "kent@mysql.com" <> Date: Wed, 18 May 2005 12:15:28 +0200 Subject: [PATCH 10/26] default.c: Disabled use of GetSystemWindowsDirectory() when compiled with VC6 mysql.cc: Removed unused variable 'field' from print_warnings() libmysql.dsp: Added "my_chsize.c" and "my_seek.c" mysqlclient.dsp: Added "my_chsize.c" --- VC++Files/client/mysqlclient.dsp | 4 ++++ VC++Files/libmysql/libmysql.dsp | 8 ++++++++ client/mysql.cc | 1 - mysys/default.c | 3 +++ 4 files changed, 15 insertions(+), 1 deletion(-) diff --git a/VC++Files/client/mysqlclient.dsp b/VC++Files/client/mysqlclient.dsp index 157c576b187..1f76ea3be92 100644 --- a/VC++Files/client/mysqlclient.dsp +++ b/VC++Files/client/mysqlclient.dsp @@ -330,6 +330,10 @@ SOURCE=..\mysys\my_alloc.c # End Source File # Begin Source File +SOURCE=..\mysys\my_chsize.c +# End Source File +# Begin Source File + SOURCE=..\mysys\my_compress.c # ADD CPP /I "../zlib" # End Source File diff --git a/VC++Files/libmysql/libmysql.dsp b/VC++Files/libmysql/libmysql.dsp index 34c479c73b4..b94aaf07bed 100644 --- a/VC++Files/libmysql/libmysql.dsp +++ b/VC++Files/libmysql/libmysql.dsp @@ -303,6 +303,10 @@ SOURCE=..\mysys\my_alloc.c # End Source File # Begin Source File +SOURCE=..\mysys\my_chsize.c +# End Source File +# Begin Source File + SOURCE=..\mysys\my_compress.c # End Source File # Begin Source File @@ -387,6 +391,10 @@ SOURCE=..\mysys\my_rename.c # End Source File # Begin Source File +SOURCE=..\mysys\my_seek.c +# End Source File +# Begin Source File + SOURCE=..\mysys\my_static.c # End Source File # Begin Source File diff --git a/client/mysql.cc b/client/mysql.cc index c3e79384938..9cdc270e8ed 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -2244,7 +2244,6 @@ print_warnings() char query[30]; MYSQL_RES *result; MYSQL_ROW cur; - MYSQL_FIELD *field; /* Get the warnings */ strmov(query,"show warnings"); diff --git a/mysys/default.c b/mysys/default.c index ba1a6c1513b..9d61401f3c1 100644 --- a/mysys/default.c +++ b/mysys/default.c @@ -986,10 +986,13 @@ static void init_default_directories() if (GetWindowsDirectory(system_dir,sizeof(system_dir))) *ptr++= &system_dir; +#if defined(_MSC_VER) && (_MSC_VER >= 1300) + /* Only VC7 and up */ /* Only add shared system directory if different from default. */ if (GetSystemWindowsDirectory(shared_system_dir,sizeof(shared_system_dir)) && strcmp(system_dir, shared_system_dir)) *ptr++= &shared_system_dir; +#endif #elif defined(__NETWARE__) *ptr++= "sys:/etc/"; From 72ce7299a9fb8cccdc62d5e638c6c3f4aae24c9d Mon Sep 17 00:00:00 2001 From: "kent@mysql.com" <> Date: Wed, 18 May 2005 12:34:38 +0200 Subject: [PATCH 11/26] commands.cc, parse.h, parse.cc, instance_options.cc: Prefix enum symbols LOG_* with IM_, not to clash with system headers --- server-tools/instance-manager/commands.cc | 6 +++--- server-tools/instance-manager/instance_options.cc | 6 +++--- server-tools/instance-manager/parse.cc | 6 +++--- server-tools/instance-manager/parse.h | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/server-tools/instance-manager/commands.cc b/server-tools/instance-manager/commands.cc index d6d4370fb7f..4aed9800803 100644 --- a/server-tools/instance-manager/commands.cc +++ b/server-tools/instance-manager/commands.cc @@ -573,9 +573,9 @@ int Show_instance_log_files::execute(struct st_net *net, ulong connection_id) const char *value; } logs[]= { - {"ERROR LOG", instance->options.logs[LOG_ERROR]}, - {"GENERAL LOG", instance->options.logs[LOG_GENERAL]}, - {"SLOW LOG", instance->options.logs[LOG_SLOW]}, + {"ERROR LOG", instance->options.logs[IM_LOG_ERROR]}, + {"GENERAL LOG", instance->options.logs[IM_LOG_GENERAL]}, + {"SLOW LOG", instance->options.logs[IM_LOG_SLOW]}, {NULL, NULL} }; struct log_files_st *log_files; diff --git a/server-tools/instance-manager/instance_options.cc b/server-tools/instance-manager/instance_options.cc index b2602af6066..c8288c35a6f 100644 --- a/server-tools/instance-manager/instance_options.cc +++ b/server-tools/instance-manager/instance_options.cc @@ -111,9 +111,9 @@ int Instance_options::fill_log_options() const char *default_suffix; } logs_st[]= { - {"--log-error", 11, &(logs[LOG_ERROR]), ".err"}, - {"--log", 5, &(logs[LOG_GENERAL]), ".log"}, - {"--log-slow-queries", 18, &(logs[LOG_SLOW]), "-slow.log"}, + {"--log-error", 11, &(logs[IM_LOG_ERROR]), ".err"}, + {"--log", 5, &(logs[IM_LOG_GENERAL]), ".log"}, + {"--log-slow-queries", 18, &(logs[IM_LOG_SLOW]), "-slow.log"}, {NULL, 0, NULL, NULL} }; struct log_files_st *log_files; diff --git a/server-tools/instance-manager/parse.cc b/server-tools/instance-manager/parse.cc index fae69375b61..ed3bfd6bba0 100644 --- a/server-tools/instance-manager/parse.cc +++ b/server-tools/instance-manager/parse.cc @@ -262,13 +262,13 @@ Command *parse_command(Command_factory *factory, const char *text) /* define a log type */ switch (tok3) { case TOK_ERROR: - log_type= LOG_ERROR; + log_type= IM_LOG_ERROR; break; case TOK_GENERAL: - log_type= LOG_GENERAL; + log_type= IM_LOG_GENERAL; break; case TOK_SLOW: - log_type= LOG_SLOW; + log_type= IM_LOG_SLOW; break; default: goto syntax_error; diff --git a/server-tools/instance-manager/parse.h b/server-tools/instance-manager/parse.h index 0cfa33723c9..7d13691e7eb 100644 --- a/server-tools/instance-manager/parse.h +++ b/server-tools/instance-manager/parse.h @@ -24,9 +24,9 @@ class Command_factory; enum Log_type { - LOG_ERROR= 0, - LOG_GENERAL, - LOG_SLOW + IM_LOG_ERROR= 0, + IM_LOG_GENERAL, + IM_LOG_SLOW }; Command *parse_command(Command_factory *factory, const char *text); From f81e6248d23e1acc25120b48808bbba1ee9d636e Mon Sep 17 00:00:00 2001 From: "kent@mysql.com" <> Date: Wed, 18 May 2005 12:49:43 +0200 Subject: [PATCH 12/26] make_binary_distribution.sh: To be safe, put "..." around variables to the test command --- scripts/make_binary_distribution.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/make_binary_distribution.sh b/scripts/make_binary_distribution.sh index d273e67ec01..ecfe9e8be88 100644 --- a/scripts/make_binary_distribution.sh +++ b/scripts/make_binary_distribution.sh @@ -315,7 +315,7 @@ system=`echo $system | sed -e 's/solaris2.\([0-9]*\)/solaris\1/g'` system=`echo $system | sed -e 's/sco3.2v\(.*\)/openserver\1/g'` # Use the override --machine if present -if [ -n $MACHINE ] ; then +if [ -n "$MACHINE" ] ; then machine=$MACHINE fi From 3199272e65cdc21d92d6863f189f77219666bcc8 Mon Sep 17 00:00:00 2001 From: "igor@rurik.mysql.com" <> Date: Wed, 18 May 2005 04:17:13 -0700 Subject: [PATCH 13/26] sql_yacc.yy: Added missing ';'. --- sql/sql_yacc.yy | 1 + 1 file changed, 1 insertion(+) diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 28d3560e5f0..2edad446499 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -2475,6 +2475,7 @@ select_options: YYABORT; } } + ; select_option_list: select_option_list select_option From 80aa0062db799d6066516d6edcea1794479ef081 Mon Sep 17 00:00:00 2001 From: "igor@rurik.mysql.com" <> Date: Wed, 18 May 2005 05:15:48 -0700 Subject: [PATCH 14/26] olap.result, olap.test: Added test cases for bug #7914. sql_select.cc: Fixed bug #7914: rollup over expresssions such as sum(a)+1. --- mysql-test/r/olap.result | 33 +++++++++++++++++++++++++++++++++ mysql-test/t/olap.test | 24 ++++++++++++++++++++++++ sql/sql_select.cc | 6 +++--- 3 files changed, 60 insertions(+), 3 deletions(-) diff --git a/mysql-test/r/olap.result b/mysql-test/r/olap.result index 341d51033f2..013952403d7 100644 --- a/mysql-test/r/olap.result +++ b/mysql-test/r/olap.result @@ -405,3 +405,36 @@ a m 2 2 NULL 3 DROP TABLE t1; +CREATE TABLE t1 (a int(11)); +INSERT INTO t1 VALUES (1),(2); +SELECT a, SUM(a), SUM(a)+1 FROM (SELECT a FROM t1 UNION select 2) d +GROUP BY a; +a SUM(a) SUM(a)+1 +1 1 2 +2 2 3 +SELECT a, SUM(a), SUM(a)+1 FROM (SELECT a FROM t1 UNION select 2) d +GROUP BY a WITH ROLLUP; +a SUM(a) SUM(a)+1 +1 1 2 +2 2 3 +NULL 3 4 +SELECT a, SUM(a), SUM(a)+1 FROM (SELECT 1 a UNION select 2) d +GROUP BY a; +a SUM(a) SUM(a)+1 +1 1 2 +2 2 3 +SELECT a, SUM(a), SUM(a)+1 FROM (SELECT 1 a UNION select 2) d +GROUP BY a WITH ROLLUP; +a SUM(a) SUM(a)+1 +1 1 2 +2 2 3 +NULL 3 4 +SELECT a, SUM(a), SUM(a)+1, CONCAT(SUM(a),'x'), SUM(a)+SUM(a), SUM(a) +FROM (SELECT 1 a, 2 b UNION SELECT 2,3 UNION SELECT 5,6 ) d +GROUP BY a WITH ROLLUP; +a SUM(a) SUM(a)+1 CONCAT(SUM(a),'x') SUM(a)+SUM(a) SUM(a) +1 1 2 1x 2 1 +2 2 3 2x 4 2 +5 5 6 5x 10 5 +NULL 8 9 8x 16 8 +DROP TABLE t1; diff --git a/mysql-test/t/olap.test b/mysql-test/t/olap.test index 4f3b0f51286..09ba537bf3b 100644 --- a/mysql-test/t/olap.test +++ b/mysql-test/t/olap.test @@ -184,3 +184,27 @@ SELECT a, SUM(a) m FROM t1 GROUP BY a WITH ROLLUP; SELECT * FROM ( SELECT a, SUM(a) m FROM t1 GROUP BY a WITH ROLLUP ) t2; DROP TABLE t1; + +# +# Tests for bug #7914: ROLLUP over expressions on temporary table +# + +CREATE TABLE t1 (a int(11)); +INSERT INTO t1 VALUES (1),(2); + +SELECT a, SUM(a), SUM(a)+1 FROM (SELECT a FROM t1 UNION select 2) d + GROUP BY a; +SELECT a, SUM(a), SUM(a)+1 FROM (SELECT a FROM t1 UNION select 2) d + GROUP BY a WITH ROLLUP; + +SELECT a, SUM(a), SUM(a)+1 FROM (SELECT 1 a UNION select 2) d + GROUP BY a; +SELECT a, SUM(a), SUM(a)+1 FROM (SELECT 1 a UNION select 2) d + GROUP BY a WITH ROLLUP; + +SELECT a, SUM(a), SUM(a)+1, CONCAT(SUM(a),'x'), SUM(a)+SUM(a), SUM(a) + FROM (SELECT 1 a, 2 b UNION SELECT 2,3 UNION SELECT 5,6 ) d + GROUP BY a WITH ROLLUP; + +DROP TABLE t1; + diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 1ff3328b8a8..fb7f10abb52 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -1181,7 +1181,7 @@ JOIN::exec() } curr_all_fields= &tmp_all_fields1; curr_fields_list= &tmp_fields_list1; - set_items_ref_array(items1); + curr_join->set_items_ref_array(items1); if (sort_and_group || curr_tmp_table->group) { @@ -1314,7 +1314,7 @@ JOIN::exec() } curr_fields_list= &curr_join->tmp_fields_list2; curr_all_fields= &curr_join->tmp_all_fields2; - set_items_ref_array(items2); + curr_join->set_items_ref_array(items2); curr_join->tmp_table_param.field_count+= curr_join->tmp_table_param.sum_func_count; curr_join->tmp_table_param.sum_func_count= 0; @@ -1375,7 +1375,7 @@ JOIN::exec() } curr_fields_list= &tmp_fields_list3; curr_all_fields= &tmp_all_fields3; - set_items_ref_array(items3); + curr_join->set_items_ref_array(items3); if (curr_join->make_sum_func_list(*curr_all_fields, *curr_fields_list, 1) || thd->is_fatal_error) From 203881d9a9766e08d59197c71591b985b191016c Mon Sep 17 00:00:00 2001 From: "bell@book.sanja.is.com.ua" <> Date: Wed, 18 May 2005 16:41:32 +0300 Subject: [PATCH 15/26] reduced 1 server reloding during test --- mysql-test/r/grant_cache.result | 2 ++ mysql-test/t/grant_cache-master.opt | 1 - mysql-test/t/grant_cache.test | 4 ++++ 3 files changed, 6 insertions(+), 1 deletion(-) delete mode 100644 mysql-test/t/grant_cache-master.opt diff --git a/mysql-test/r/grant_cache.result b/mysql-test/r/grant_cache.result index d905e9319fd..2c6840d77d0 100644 --- a/mysql-test/r/grant_cache.result +++ b/mysql-test/r/grant_cache.result @@ -1,5 +1,6 @@ drop table if exists test.t1,mysqltest.t1,mysqltest.t2; drop database if exists mysqltest; +set GLOBAL query_cache_size=1355776; reset query cache; flush status; show grants for current_user; @@ -206,3 +207,4 @@ delete from mysql.columns_priv where user in ("mysqltest_1","mysqltest_2","mysql flush privileges; drop table test.t1,mysqltest.t1,mysqltest.t2; drop database mysqltest; +set GLOBAL query_cache_size=default; diff --git a/mysql-test/t/grant_cache-master.opt b/mysql-test/t/grant_cache-master.opt deleted file mode 100644 index cfdce628e74..00000000000 --- a/mysql-test/t/grant_cache-master.opt +++ /dev/null @@ -1 +0,0 @@ ---set-variable=query_cache_size=1355776 diff --git a/mysql-test/t/grant_cache.test b/mysql-test/t/grant_cache.test index 7d6f7262f0a..0fb0b3c2fc0 100644 --- a/mysql-test/t/grant_cache.test +++ b/mysql-test/t/grant_cache.test @@ -10,6 +10,8 @@ drop table if exists test.t1,mysqltest.t1,mysqltest.t2; drop database if exists mysqltest; --enable_warnings +set GLOBAL query_cache_size=1355776; + reset query cache; flush status; connect (root,localhost,root,,test,$MASTER_MYPORT,master.sock); @@ -145,3 +147,5 @@ delete from mysql.columns_priv where user in ("mysqltest_1","mysqltest_2","mysql flush privileges; drop table test.t1,mysqltest.t1,mysqltest.t2; drop database mysqltest; + +set GLOBAL query_cache_size=default; From 2b5f9fad811752c93580ae90ac37313ade345b7c Mon Sep 17 00:00:00 2001 From: "kent@mysql.com" <> Date: Wed, 18 May 2005 16:04:44 +0200 Subject: [PATCH 16/26] make_win_src_distribution.sh: Add YASSL to Windows source distribution Skip .deps, and remove .o files from source dist --- scripts/make_win_src_distribution.sh | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/scripts/make_win_src_distribution.sh b/scripts/make_win_src_distribution.sh index 8fdf23f3119..6165a31fac2 100644 --- a/scripts/make_win_src_distribution.sh +++ b/scripts/make_win_src_distribution.sh @@ -199,11 +199,10 @@ copy_dir_files() print_debug "Creating directory '$arg'" mkdir $BASE/$arg fi - for i in *.c *.cpp *.h *.ih *.i *.ic *.asm *.def *.hpp *.dsp \ - README INSTALL* LICENSE *.inc *.test *.result \ - *.pem Moscow_leap des_key_file *.dat *.000001 \ - *.require *.opt - + for i in *.c *.cpp *.h *.ih *.i *.ic *.asm *.def *.hpp *.dsp *.dsw \ + README INSTALL* LICENSE AUTHORS NEWS ChangeLog \ + *.inc *.test *.result *.pem Moscow_leap des_key_file \ + *.dat *.000001 *.require *.opt do if [ -f $i ] then @@ -234,6 +233,7 @@ copy_dir_dirs() { find $arg -type d \ -and -not -path \*SCCS\* \ -and -not -path \*.deps\* \ + -and -not -path \*.libs\* \ -and -not -path \*autom4te.cache -print )|( while read v @@ -266,7 +266,7 @@ make -C $SOURCE/ndb windoze # Input directories to be copied recursively # -for i in bdb innobase ndb +for i in bdb innobase ndb extra/yassl do copy_dir_dirs $i done @@ -328,6 +328,8 @@ do $CP -R $i $BASE/$i fi fi + # But remove object files from destination + find $BASE/$i -type f -name \*.o | xargs rm -f done # From c054f84ae3c1c0b1a0245844e5c035e0cd40bccc Mon Sep 17 00:00:00 2001 From: "pekka@mysql.com" <> Date: Wed, 18 May 2005 17:47:43 +0200 Subject: [PATCH 17/26] ndb - allow upgrade 4.1.10->4.1.12 --- ndb/src/common/util/version.c | 1 + 1 file changed, 1 insertion(+) diff --git a/ndb/src/common/util/version.c b/ndb/src/common/util/version.c index 8cc6de0fc24..ed2e2565eea 100644 --- a/ndb/src/common/util/version.c +++ b/ndb/src/common/util/version.c @@ -90,6 +90,7 @@ void ndbSetOwnVersion() {} #ifndef TEST_VERSION struct NdbUpGradeCompatible ndbCompatibleTable_full[] = { + { MAKE_VERSION(4,1,12), MAKE_VERSION(4,1,10), UG_Range }, { MAKE_VERSION(4,1,10), MAKE_VERSION(4,1,9), UG_Exact }, { MAKE_VERSION(4,1,9), MAKE_VERSION(4,1,8), UG_Exact }, { MAKE_VERSION(3,5,2), MAKE_VERSION(3,5,1), UG_Exact }, From be221cc0120f4be50627b983ef47a8c782a86628 Mon Sep 17 00:00:00 2001 From: "jimw@mysql.com" <> Date: Wed, 18 May 2005 09:12:37 -0700 Subject: [PATCH 18/26] Small optimization to bug fix, from Monty. --- client/mysqldump.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/client/mysqldump.c b/client/mysqldump.c index 8cfd76cd64a..a3487ed6f50 100644 --- a/client/mysqldump.c +++ b/client/mysqldump.c @@ -1104,6 +1104,7 @@ static uint getTableStructure(char *table, char* db) char table_buff2[NAME_LEN*2+3]; char query_buff[512]; FILE *sql_file = md_result_file; + int len; DBUG_ENTER("getTableStructure"); if (!insert_pat_inited) @@ -1118,11 +1119,11 @@ static uint getTableStructure(char *table, char* db) if (verbose) fprintf(stderr, "-- Retrieving table structure for table %s...\n", table); - my_snprintf(query_buff, sizeof(query_buff), - "SET OPTION SQL_QUOTE_SHOW_CREATE=%d", - (opt_quoted || opt_keywords)); + len= my_snprintf(query_buff, sizeof(query_buff), + "SET OPTION SQL_QUOTE_SHOW_CREATE=%d", + (opt_quoted || opt_keywords)); if (!create_options) - strmov(strend(query_buff), "/*!40102 ,SQL_MODE=concat(@@sql_mode, _utf8 ',NO_KEY_OPTIONS,NO_TABLE_OPTIONS,NO_FIELD_OPTIONS') */"); + strmov(query_buff+len, "/*!40102 ,SQL_MODE=concat(@@sql_mode, _utf8 ',NO_KEY_OPTIONS,NO_TABLE_OPTIONS,NO_FIELD_OPTIONS') */"); result_table= quote_name(table, table_buff, 1); opt_quoted_table= quote_name(table, table_buff2, 0); From 9ef20027a60de90323bff4d8dfc68b90bc9d2dd4 Mon Sep 17 00:00:00 2001 From: "jimw@mysql.com" <> Date: Wed, 18 May 2005 09:40:12 -0700 Subject: [PATCH 19/26] Update mysqldump test and results --- mysql-test/r/mysqldump.result | 134 +++++++++++++++------------------- mysql-test/t/mysqldump.test | 2 +- 2 files changed, 61 insertions(+), 75 deletions(-) diff --git a/mysql-test/r/mysqldump.result b/mysql-test/r/mysqldump.result index 43741b244cd..493c6d6404a 100644 --- a/mysql-test/r/mysqldump.result +++ b/mysql-test/r/mysqldump.result @@ -559,6 +559,66 @@ UNLOCK TABLES; /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; +DROP TABLE t1; +CREATE TABLE t1 (a decimal(240, 20)); +INSERT INTO t1 VALUES ("1234567890123456789012345678901234567890"), +("0987654321098765432109876543210987654321"); + +/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; +/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; +/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; +/*!40101 SET NAMES utf8 */; +/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */; +/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */; +/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; +/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; +DROP TABLE IF EXISTS `t1`; +CREATE TABLE `t1` ( + `a` decimal(240,20) default NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1; + + +/*!40000 ALTER TABLE `t1` DISABLE KEYS */; +LOCK TABLES `t1` WRITE; +INSERT IGNORE INTO `t1` VALUES ('1234567890123456789012345678901234567890.00000000000000000000'),('0987654321098765432109876543210987654321.00000000000000000000'); +UNLOCK TABLES; +/*!40000 ALTER TABLE `t1` ENABLE KEYS */; + +/*!40101 SET SQL_MODE=@OLD_SQL_MODE */; +/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */; +/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */; +/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; +/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */; +/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; +/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; + + +/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; +/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; +/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; +/*!40101 SET NAMES utf8 */; +/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */; +/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */; +/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; +/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; +DROP TABLE IF EXISTS `t1`; +CREATE TABLE `t1` ( + `a` decimal(240,20) default NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1; + + +/*!40000 ALTER TABLE `t1` DISABLE KEYS */; +INSERT DELAYED IGNORE INTO `t1` VALUES ('1234567890123456789012345678901234567890.00000000000000000000'),('0987654321098765432109876543210987654321.00000000000000000000'); +/*!40000 ALTER TABLE `t1` ENABLE KEYS */; + +/*!40101 SET SQL_MODE=@OLD_SQL_MODE */; +/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */; +/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */; +/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; +/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */; +/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; +/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; + DROP TABLE t1; create table t1 ( F_c4ca4238a0b923820dcc509a6f75849b int, @@ -892,11 +952,6 @@ F_cd00692c3bfe59267d5ecfac5310286c int, F_6faa8040da20ef399b63a72d0e4ab575 int, F_fe73f687e5bc5280214e0486b273a5f9 int); insert into t1 (F_8d3bba7425e7c98c50f52ca1b52d3735) values (1); --- MySQL dump 10.9 --- --- Host: localhost Database: test --- ------------------------------------------------------ --- Server version 4.1.12-debug-log /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; @@ -906,11 +961,6 @@ insert into t1 (F_8d3bba7425e7c98c50f52ca1b52d3735) values (1); /*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */; /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; - --- --- Table structure for table `t1` --- - DROP TABLE IF EXISTS `t1`; CREATE TABLE `t1` ( `F_c4ca4238a0b923820dcc509a6f75849b` int(11) default NULL, @@ -1245,10 +1295,6 @@ CREATE TABLE `t1` ( `F_fe73f687e5bc5280214e0486b273a5f9` int(11) default NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1; --- --- Dumping data for table `t1` --- - /*!40000 ALTER TABLE `t1` DISABLE KEYS */; LOCK TABLES `t1` WRITE; @@ -1265,63 +1311,3 @@ UNLOCK TABLES; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; drop table t1; -CREATE TABLE t1 (a decimal(240, 20)); -INSERT INTO t1 VALUES ("1234567890123456789012345678901234567890"), -("0987654321098765432109876543210987654321"); - -/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; -/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; -/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; -/*!40101 SET NAMES utf8 */; -/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */; -/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */; -/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; -/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; -DROP TABLE IF EXISTS `t1`; -CREATE TABLE `t1` ( - `a` decimal(240,20) default NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1; - - -/*!40000 ALTER TABLE `t1` DISABLE KEYS */; -LOCK TABLES `t1` WRITE; -INSERT IGNORE INTO `t1` VALUES ('1234567890123456789012345678901234567890.00000000000000000000'),('0987654321098765432109876543210987654321.00000000000000000000'); -UNLOCK TABLES; -/*!40000 ALTER TABLE `t1` ENABLE KEYS */; - -/*!40101 SET SQL_MODE=@OLD_SQL_MODE */; -/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */; -/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */; -/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; -/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */; -/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; -/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; - - -/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; -/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; -/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; -/*!40101 SET NAMES utf8 */; -/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */; -/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */; -/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; -/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; -DROP TABLE IF EXISTS `t1`; -CREATE TABLE `t1` ( - `a` decimal(240,20) default NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1; - - -/*!40000 ALTER TABLE `t1` DISABLE KEYS */; -INSERT DELAYED IGNORE INTO `t1` VALUES ('1234567890123456789012345678901234567890.00000000000000000000'),('0987654321098765432109876543210987654321.00000000000000000000'); -/*!40000 ALTER TABLE `t1` ENABLE KEYS */; - -/*!40101 SET SQL_MODE=@OLD_SQL_MODE */; -/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */; -/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */; -/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; -/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */; -/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; -/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; - -DROP TABLE t1; diff --git a/mysql-test/t/mysqldump.test b/mysql-test/t/mysqldump.test index 6237279f8a2..2681e690ff5 100644 --- a/mysql-test/t/mysqldump.test +++ b/mysql-test/t/mysqldump.test @@ -532,5 +532,5 @@ create table t1 ( F_6faa8040da20ef399b63a72d0e4ab575 int, F_fe73f687e5bc5280214e0486b273a5f9 int); insert into t1 (F_8d3bba7425e7c98c50f52ca1b52d3735) values (1); ---exec $MYSQL_DUMP -c test +--exec $MYSQL_DUMP --skip-comments -c test drop table t1; From 26f2e57ecbda0ffe0d4066d4abc8b9f65c51c0f4 Mon Sep 17 00:00:00 2001 From: "ingo@mysql.com" <> Date: Wed, 18 May 2005 19:40:39 +0200 Subject: [PATCH 20/26] Bug#10400 - Improperly-defined MERGE table crashes with INSERT ... ON DUPLICATE KEY UPDATE After review version. Added a condition for MERGE tables. These do not have unique indexes. But every key could be a unique key on the underlying MyISAM table. So get the maximum key length for MERGE tables instead of the maximum unique key length. This is used for buffer allocation in write_record(). --- mysql-test/r/merge.result | 10 ++++++++++ mysql-test/t/merge.test | 12 ++++++++++++ sql/ha_myisammrg.h | 2 +- sql/handler.h | 1 + sql/sql_insert.cc | 2 +- sql/table.cc | 7 ++++++- 6 files changed, 31 insertions(+), 3 deletions(-) diff --git a/mysql-test/r/merge.result b/mysql-test/r/merge.result index 79d8f019ce3..6e14e9a56a8 100644 --- a/mysql-test/r/merge.result +++ b/mysql-test/r/merge.result @@ -681,3 +681,13 @@ t3 1 a 1 a A NULL NULL NULL YES BTREE t3 1 a 2 b A NULL NULL NULL YES BTREE t3 1 a 3 c A NULL NULL NULL YES BTREE drop table t1, t2, t3; +CREATE TABLE t1 ( a INT AUTO_INCREMENT PRIMARY KEY, b VARCHAR(10), UNIQUE (b) ) +ENGINE=MyISAM; +CREATE TABLE t2 ( a INT AUTO_INCREMENT, b VARCHAR(10), INDEX (a), INDEX (b) ) +ENGINE=MERGE UNION (t1) INSERT_METHOD=FIRST; +INSERT INTO t2 (b) VALUES (1) ON DUPLICATE KEY UPDATE b=2; +INSERT INTO t2 (b) VALUES (1) ON DUPLICATE KEY UPDATE b=3; +SELECT b FROM t2; +b +3 +DROP TABLE t1, t2; diff --git a/mysql-test/t/merge.test b/mysql-test/t/merge.test index 508f9da225e..999dd2bed9b 100644 --- a/mysql-test/t/merge.test +++ b/mysql-test/t/merge.test @@ -306,3 +306,15 @@ show index from t3; drop table t1, t2, t3; +# +# Bug#10400 - Improperly-defined MERGE table crashes with INSERT ... ON DUPLICATE KEY UPDATE +# +CREATE TABLE t1 ( a INT AUTO_INCREMENT PRIMARY KEY, b VARCHAR(10), UNIQUE (b) ) + ENGINE=MyISAM; +CREATE TABLE t2 ( a INT AUTO_INCREMENT, b VARCHAR(10), INDEX (a), INDEX (b) ) + ENGINE=MERGE UNION (t1) INSERT_METHOD=FIRST; +INSERT INTO t2 (b) VALUES (1) ON DUPLICATE KEY UPDATE b=2; +INSERT INTO t2 (b) VALUES (1) ON DUPLICATE KEY UPDATE b=3; +SELECT b FROM t2; +DROP TABLE t1, t2; + diff --git a/sql/ha_myisammrg.h b/sql/ha_myisammrg.h index 3bc9c11d4be..7348096b695 100644 --- a/sql/ha_myisammrg.h +++ b/sql/ha_myisammrg.h @@ -37,7 +37,7 @@ class ha_myisammrg: public handler { return (HA_REC_NOT_IN_SEQ | HA_AUTO_PART_KEY | HA_READ_RND_SAME | HA_NULL_IN_KEY | HA_CAN_INDEX_BLOBS | HA_FILE_BASED | - HA_CAN_INSERT_DELAYED); + HA_CAN_INSERT_DELAYED | HA_ANY_INDEX_MAY_BE_UNIQUE); } ulong index_flags(uint inx, uint part, bool all_parts) const { diff --git a/sql/handler.h b/sql/handler.h index de932cd51a4..75e83082d10 100644 --- a/sql/handler.h +++ b/sql/handler.h @@ -73,6 +73,7 @@ #define HA_HAS_CHECKSUM (1 << 24) /* Table data are stored in separate files (for lower_case_table_names) */ #define HA_FILE_BASED (1 << 26) +#define HA_ANY_INDEX_MAY_BE_UNIQUE (1 << 30) /* bits in index_flags(index_number) for what you can do with index */ diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index a3a42ce385d..0258f2c3e07 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -682,7 +682,7 @@ int write_record(TABLE *table,COPY_INFO *info) err: if (key) - my_afree(key); + my_safe_afree(key,table->max_unique_length,MAX_KEY_LENGTH); info->last_errno= error; table->file->print_error(error,MYF(0)); DBUG_RETURN(1); diff --git a/sql/table.cc b/sql/table.cc index 012defa116d..d9000933ee0 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -688,7 +688,12 @@ int openfrm(const char *name, const char *alias, uint db_stat, uint prgflag, set_if_bigger(outparam->max_key_length,keyinfo->key_length+ keyinfo->key_parts); outparam->total_key_length+= keyinfo->key_length; - if (keyinfo->flags & HA_NOSAME) + /* + MERGE tables do not have unique indexes. But every key could be + an unique index on the underlying MyISAM table. (Bug #10400) + */ + if ((keyinfo->flags & HA_NOSAME) || + (ha_option & HA_ANY_INDEX_MAY_BE_UNIQUE)) set_if_bigger(outparam->max_unique_length,keyinfo->key_length); } if (primary_key < MAX_KEY && From a9c4379c15687e5c75561d84f95e6ed594bd3f1e Mon Sep 17 00:00:00 2001 From: "monty@mysql.com" <> Date: Wed, 18 May 2005 21:12:59 +0300 Subject: [PATCH 21/26] Fixed bug from last push --- include/my_dbug.h | 2 +- sql/mysqld.cc | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/include/my_dbug.h b/include/my_dbug.h index ab018e26b02..b76a3fcc8c9 100644 --- a/include/my_dbug.h +++ b/include/my_dbug.h @@ -39,7 +39,7 @@ extern void _db_pargs_(uint _line_,const char *keyword); extern void _db_doprnt_ _VARARGS((const char *format,...)); extern void _db_dump_(uint _line_,const char *keyword,const char *memory, uint length); -extern void _db_output_(void); +extern void _db_output_(uint flag); extern void _db_lock_file(void); extern void _db_unlock_file(void); diff --git a/sql/mysqld.cc b/sql/mysqld.cc index e5103bb583e..8c5ce22f7a6 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -39,11 +39,7 @@ #else #define OPT_INNODB_DEFAULT 0 #endif -#ifdef HAVE_BERKLEY_DB -#define OPT_BDB_DEFAULT 1 -#else #define OPT_BDB_DEFAULT 0 -#endif #ifdef HAVE_NDBCLUSTER_DB #define OPT_NDBCLUSTER_DEFAULT 0 #if defined(NOT_ENOUGH_TESTED) \ @@ -294,7 +290,7 @@ static I_List thread_cache; static pthread_cond_t COND_thread_cache, COND_flush_thread_cache; -#ifdef HAVE_BERKLEY_DB +#ifdef HAVE_BERKELEY_DB static my_bool opt_sync_bdb_logs; #endif From d5ee234917dba18b7c263daf5edc42d901ae143c Mon Sep 17 00:00:00 2001 From: "jimw@mysql.com" <> Date: Wed, 18 May 2005 15:40:34 -0700 Subject: [PATCH 22/26] Fixes to merge from 4.1 --- client/mysqldump.c | 3 + mysql-test/r/group_min_max.result | 96 +++-- mysql-test/r/mysqldump.result | 691 ++++++++++++++++++++++++++++++ mysql-test/r/subselect.result | 2 - mysql-test/t/group_min_max.test | 48 ++- sql/sql_insert.cc | 2 +- 6 files changed, 791 insertions(+), 51 deletions(-) diff --git a/client/mysqldump.c b/client/mysqldump.c index 4a84bc3f250..953e690f083 100644 --- a/client/mysqldump.c +++ b/client/mysqldump.c @@ -2694,8 +2694,11 @@ static my_bool get_view_structure(char *table, char* db) if (verbose) fprintf(stderr, "-- Retrieving view structure for table %s...\n", table); +#ifdef NOT_REALLY_USED_YET sprintf(insert_pat,"SET OPTION SQL_QUOTE_SHOW_CREATE=%d", (opt_quoted || opt_keywords)); +#endif + result_table= quote_name(table, table_buff, 1); opt_quoted_table= quote_name(table, table_buff2, 0); diff --git a/mysql-test/r/group_min_max.result b/mysql-test/r/group_min_max.result index c03d4125018..09555bf3725 100644 --- a/mysql-test/r/group_min_max.result +++ b/mysql-test/r/group_min_max.result @@ -148,7 +148,7 @@ id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE t1 range NULL idx_t1_1 147 NULL 17 Using index for group-by explain select a1,a2,b,max(c),min(c) from t2 group by a1,a2,b; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t2 range NULL idx_t2_1 # NULL 21 Using index for group-by +1 SIMPLE t2 range NULL idx_t2_1 146 NULL # Using index for group-by explain select min(a2), a1, max(a2), min(a2), a1 from t1 group by a1; id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE t1 range NULL idx_t1_1 65 NULL 5 Using index for group-by @@ -320,40 +320,40 @@ id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE t1 range idx_t1_0,idx_t1_1,idx_t1_2 idx_t1_1 147 NULL 14 Using where; Using index for group-by explain select a1,a2,b, max(c) from t2 where a1 < 'd' group by a1,a2,b; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t2 range idx_t2_0,idx_t2_1,idx_t2_2 idx_t2_1 146 NULL 14 Using where; Using index for group-by +1 SIMPLE t2 range idx_t2_0,idx_t2_1,idx_t2_2 idx_t2_1 146 NULL # Using where; Using index for group-by explain select a1,a2,b,min(c),max(c) from t2 where a1 < 'd' group by a1,a2,b; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t2 range idx_t2_0,idx_t2_1,idx_t2_2 idx_t2_1 163 NULL 14 Using where; Using index for group-by +1 SIMPLE t2 range idx_t2_0,idx_t2_1,idx_t2_2 idx_t2_1 163 NULL # Using where; Using index for group-by explain select a1,a2,b,min(c),max(c) from t2 where a1 >= 'b' group by a1,a2,b; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t2 range idx_t2_0,idx_t2_1,idx_t2_2 idx_t2_1 163 NULL 16 Using where; Using index for group-by +1 SIMPLE t2 range idx_t2_0,idx_t2_1,idx_t2_2 idx_t2_1 163 NULL # Using where; Using index for group-by explain select a1,a2,b, max(c) from t2 where a1 >= 'c' or a1 < 'b' group by a1,a2,b; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t2 range idx_t2_0,idx_t2_1,idx_t2_2 idx_t2_1 146 NULL 17 Using where; Using index for group-by +1 SIMPLE t2 range idx_t2_0,idx_t2_1,idx_t2_2 idx_t2_1 146 NULL # Using where; Using index for group-by explain select a1, max(c) from t2 where a1 >= 'c' or a1 < 'b' group by a1,a2,b; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t2 range idx_t2_0,idx_t2_1,idx_t2_2 idx_t2_1 146 NULL 17 Using where; Using index for group-by +1 SIMPLE t2 range idx_t2_0,idx_t2_1,idx_t2_2 idx_t2_1 146 NULL # Using where; Using index for group-by explain select a1,a2,b,min(c),max(c) from t2 where a1 >= 'c' or a2 < 'b' group by a1,a2,b; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t2 range idx_t2_0,idx_t2_1,idx_t2_2 idx_t2_1 163 NULL 21 Using where; Using index for group-by +1 SIMPLE t2 range idx_t2_0,idx_t2_1,idx_t2_2 idx_t2_1 163 NULL # Using where; Using index for group-by explain select a1,a2,b, max(c) from t2 where a1 = 'z' or a1 = 'b' or a1 = 'd' group by a1,a2,b; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t2 range idx_t2_0,idx_t2_1,idx_t2_2 idx_t2_1 146 NULL 9 Using where; Using index for group-by +1 SIMPLE t2 range idx_t2_0,idx_t2_1,idx_t2_2 idx_t2_1 146 NULL # Using where; Using index for group-by explain select a1,a2,b,min(c),max(c) from t2 where a1 = 'z' or a1 = 'b' or a1 = 'd' group by a1,a2,b; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t2 range idx_t2_0,idx_t2_1,idx_t2_2 idx_t2_1 163 NULL 9 Using where; Using index for group-by +1 SIMPLE t2 range idx_t2_0,idx_t2_1,idx_t2_2 idx_t2_1 163 NULL # Using where; Using index for group-by explain select a1,a2,b, max(c) from t2 where (a1 = 'b' or a1 = 'd' or a1 = 'a' or a1 = 'c') and (a2 > 'a') group by a1,a2,b; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t2 range idx_t2_0,idx_t2_1,idx_t2_2 idx_t2_1 146 NULL 9 Using where; Using index for group-by +1 SIMPLE t2 range idx_t2_0,idx_t2_1,idx_t2_2 idx_t2_1 146 NULL # Using where; Using index for group-by explain select a1,a2,b,min(c),max(c) from t2 where (a1 = 'b' or a1 = 'd' or a1 = 'a' or a1 = 'c') and (a2 > 'a') group by a1,a2,b; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t2 range idx_t2_0,idx_t2_1,idx_t2_2 idx_t2_1 163 NULL 9 Using where; Using index for group-by +1 SIMPLE t2 range idx_t2_0,idx_t2_1,idx_t2_2 idx_t2_1 163 NULL # Using where; Using index for group-by explain select a1,min(c),max(c) from t2 where a1 >= 'b' group by a1,a2,b; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t2 range idx_t2_0,idx_t2_1,idx_t2_2 idx_t2_1 163 NULL 16 Using where; Using index for group-by +1 SIMPLE t2 range idx_t2_0,idx_t2_1,idx_t2_2 idx_t2_1 163 NULL # Using where; Using index for group-by explain select a1, max(c) from t2 where a1 in ('a','b','d') group by a1,a2,b; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t2 range idx_t2_0,idx_t2_1,idx_t2_2 idx_t2_1 146 NULL 14 Using where; Using index for group-by +1 SIMPLE t2 range idx_t2_0,idx_t2_1,idx_t2_2 idx_t2_1 146 NULL # Using where; Using index for group-by select a1,a2,b,min(c),max(c) from t1 where a1 < 'd' group by a1,a2,b; a1 a2 b min(c) max(c) a a a a111 d111 @@ -846,7 +846,7 @@ a a NULL a777 a999 c a NULL c777 c999 explain select a1,a2,b, max(c) from t1 where (c > 'b1') group by a1,a2,b; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 range NULL idx_t1_1 147 NULL 17 Using where; Using index for group-by +1 SIMPLE t1 range NULL idx_t1_1 147 NULL # Using where; Using index for group-by explain select a1,a2,b,min(c),max(c) from t1 where (c > 'b1') group by a1,a2,b; id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE t1 range NULL idx_t1_1 163 NULL 17 Using where; Using index for group-by @@ -894,49 +894,49 @@ id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE t1 range NULL idx_t1_1 163 NULL 17 Using where; Using index for group-by explain select a1,a2,b, max(c) from t2 where (c > 'b1') group by a1,a2,b; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t2 range NULL idx_t2_1 146 NULL 21 Using where; Using index for group-by +1 SIMPLE t2 range NULL idx_t2_1 146 NULL # Using where; Using index for group-by explain select a1,a2,b,min(c),max(c) from t2 where (c > 'b1') group by a1,a2,b; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t2 range NULL idx_t2_1 163 NULL 21 Using where; Using index for group-by +1 SIMPLE t2 range NULL idx_t2_1 163 NULL # Using where; Using index for group-by explain select a1,a2,b, max(c) from t2 where (c > 'f123') group by a1,a2,b; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t2 range NULL idx_t2_1 146 NULL 21 Using where; Using index for group-by +1 SIMPLE t2 range NULL idx_t2_1 146 NULL # Using where; Using index for group-by explain select a1,a2,b,min(c),max(c) from t2 where (c > 'f123') group by a1,a2,b; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t2 range NULL idx_t2_1 163 NULL 21 Using where; Using index for group-by +1 SIMPLE t2 range NULL idx_t2_1 163 NULL # Using where; Using index for group-by explain select a1,a2,b, max(c) from t2 where (c < 'a0') group by a1,a2,b; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t2 range NULL idx_t2_1 163 NULL 21 Using where; Using index for group-by +1 SIMPLE t2 range NULL idx_t2_1 163 NULL # Using where; Using index for group-by explain select a1,a2,b,min(c),max(c) from t2 where (c < 'a0') group by a1,a2,b; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t2 range NULL idx_t2_1 163 NULL 21 Using where; Using index for group-by +1 SIMPLE t2 range NULL idx_t2_1 163 NULL # Using where; Using index for group-by explain select a1,a2,b, max(c) from t2 where (c < 'k321') group by a1,a2,b; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t2 range NULL idx_t2_1 163 NULL 21 Using where; Using index for group-by +1 SIMPLE t2 range NULL idx_t2_1 163 NULL # Using where; Using index for group-by explain select a1,a2,b,min(c),max(c) from t2 where (c < 'k321') group by a1,a2,b; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t2 range NULL idx_t2_1 163 NULL 21 Using where; Using index for group-by +1 SIMPLE t2 range NULL idx_t2_1 163 NULL # Using where; Using index for group-by explain select a1,a2,b, max(c) from t2 where (c < 'a0') or (c > 'b1') group by a1,a2,b; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t2 range NULL idx_t2_1 163 NULL 21 Using where; Using index for group-by +1 SIMPLE t2 range NULL idx_t2_1 163 NULL # Using where; Using index for group-by explain select a1,a2,b,min(c),max(c) from t2 where (c < 'a0') or (c > 'b1') group by a1,a2,b; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t2 range NULL idx_t2_1 163 NULL 21 Using where; Using index for group-by +1 SIMPLE t2 range NULL idx_t2_1 163 NULL # Using where; Using index for group-by explain select a1,a2,b, max(c) from t2 where (c > 'b1') or (c <= 'g1') group by a1,a2,b; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t2 range NULL idx_t2_1 146 NULL 21 Using where; Using index for group-by +1 SIMPLE t2 range NULL idx_t2_1 146 NULL # Using where; Using index for group-by explain select a1,a2,b,min(c),max(c) from t2 where (c > 'b1') or (c <= 'g1') group by a1,a2,b; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t2 range NULL idx_t2_1 163 NULL 21 Using where; Using index for group-by +1 SIMPLE t2 range NULL idx_t2_1 163 NULL # Using where; Using index for group-by explain select a1,a2,b,min(c),max(c) from t2 where (c > 'b111') and (c <= 'g112') group by a1,a2,b; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t2 range NULL idx_t2_1 163 NULL 21 Using where; Using index for group-by +1 SIMPLE t2 range NULL idx_t2_1 163 NULL # Using where; Using index for group-by explain select a1,a2,b,min(c),max(c) from t2 where (c < 'c5') or (c = 'g412') or (c = 'k421') group by a1,a2,b; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t2 range NULL idx_t2_1 163 NULL 21 Using where; Using index for group-by +1 SIMPLE t2 range NULL idx_t2_1 163 NULL # Using where; Using index for group-by explain select a1,a2,b,min(c),max(c) from t2 where ((c > 'b111') and (c <= 'g112')) or ((c > 'd000') and (c <= 'i110')) group by a1,a2,b; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t2 range NULL idx_t2_1 163 NULL 21 Using where; Using index for group-by +1 SIMPLE t2 range NULL idx_t2_1 163 NULL # Using where; Using index for group-by select a1,a2,b, max(c) from t1 where (c > 'b1') group by a1,a2,b; a1 a2 b max(c) a a a d111 @@ -1389,22 +1389,22 @@ id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE t1 range NULL idx_t1_1 147 NULL 17 Using where; Using index for group-by explain select a1,a2,b,min(c),max(c) from t2 where (a1 >= 'c' or a2 < 'b') and (b > 'a') group by a1,a2,b; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t2 range idx_t2_0,idx_t2_1,idx_t2_2 idx_t2_1 163 NULL 21 Using where; Using index for group-by +1 SIMPLE t2 range idx_t2_0,idx_t2_1,idx_t2_2 idx_t2_1 163 NULL # Using where; Using index for group-by explain select a1,a2,b,min(c),max(c) from t2 where (a1 >= 'c' or a2 < 'b') and (c > 'b111') group by a1,a2,b; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t2 range idx_t2_0,idx_t2_1,idx_t2_2 idx_t2_1 163 NULL 21 Using where; Using index for group-by +1 SIMPLE t2 range idx_t2_0,idx_t2_1,idx_t2_2 idx_t2_1 163 NULL # Using where; Using index for group-by explain select a1,a2,b,min(c),max(c) from t2 where (a2 >= 'b') and (b = 'a') and (c > 'b111') group by a1,a2,b; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t2 range NULL idx_t2_1 163 NULL 21 Using where; Using index for group-by +1 SIMPLE t2 range NULL idx_t2_1 163 NULL # Using where; Using index for group-by explain select a1,a2,b,min(c) from t2 where ((a1 > 'a') or (a1 < '9')) and ((a2 >= 'b') and (a2 < 'z')) and (b = 'a') and ((c < 'h112') or (c = 'j121') or (c > 'k121' and c < 'm122') or (c > 'o122')) group by a1,a2,b; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t2 range idx_t2_0,idx_t2_1,idx_t2_2 idx_t2_1 163 NULL 16 Using where; Using index for group-by +1 SIMPLE t2 range idx_t2_0,idx_t2_1,idx_t2_2 idx_t2_1 163 NULL # Using where; Using index for group-by explain select a1,a2,b,min(c) from t2 where ((a1 > 'a') or (a1 < '9')) and ((a2 >= 'b') and (a2 < 'z')) and (b = 'a') and ((c = 'j121') or (c > 'k121' and c < 'm122') or (c > 'o122') or (c < 'h112') or (c = 'c111')) group by a1,a2,b; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t2 range idx_t2_0,idx_t2_1,idx_t2_2 idx_t2_1 163 NULL 16 Using where; Using index for group-by +1 SIMPLE t2 range idx_t2_0,idx_t2_1,idx_t2_2 idx_t2_1 163 NULL # Using where; Using index for group-by explain select a1,a2,b,min(c) from t2 where (a1 > 'a') and (a2 > 'a') and (b = 'c') group by a1,a2,b; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t2 range idx_t2_0,idx_t2_1,idx_t2_2 idx_t2_1 146 NULL 16 Using where; Using index for group-by +1 SIMPLE t2 range idx_t2_0,idx_t2_1,idx_t2_2 idx_t2_1 146 NULL # Using where; Using index for group-by select a1,a2,b,min(c),max(c) from t1 where (a1 >= 'c' or a2 < 'b') and (b > 'a') group by a1,a2,b; a1 a2 b min(c) max(c) a a b e112 h112 @@ -1503,16 +1503,16 @@ id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE t1 range idx_t1_0,idx_t1_1,idx_t1_2 idx_t1_1 147 NULL 14 Using where; Using index for group-by explain select a1,a2,b from t2 where (a1 >= 'c' or a2 < 'b') and (b > 'a') group by a1,a2,b; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t2 range idx_t2_0,idx_t2_1,idx_t2_2 idx_t2_1 146 NULL 21 Using where; Using index for group-by +1 SIMPLE t2 range idx_t2_0,idx_t2_1,idx_t2_2 idx_t2_1 146 NULL # Using where; Using index for group-by explain select a1,a2,b from t2 where (a2 >= 'b') and (b = 'a') group by a1,a2,b; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t2 range NULL idx_t2_1 146 NULL 21 Using where; Using index for group-by +1 SIMPLE t2 range NULL idx_t2_1 146 NULL # Using where; Using index for group-by explain select a1,a2,b,c from t2 where (a2 >= 'b') and (b = 'a') and (c = 'i121') group by a1,a2,b; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t2 range NULL idx_t2_1 163 NULL 21 Using where; Using index for group-by +1 SIMPLE t2 index NULL idx_t2_1 163 NULL # Using where; Using index explain select a1,a2,b from t2 where (a1 > 'a') and (a2 > 'a') and (b = 'c') group by a1,a2,b; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t2 range idx_t2_0,idx_t2_1,idx_t2_2 idx_t2_1 146 NULL 16 Using where; Using index for group-by +1 SIMPLE t2 range idx_t2_0,idx_t2_1,idx_t2_2 idx_t2_1 146 NULL # Using where; Using index for group-by select a1,a2,b from t1 where (a1 >= 'c' or a2 < 'b') and (b > 'a') group by a1,a2,b; a1 a2 b a a b @@ -1549,6 +1549,7 @@ c b a d b a select a1,a2,b,c from t2 where (a2 >= 'b') and (b = 'a') and (c = 'i121') group by a1,a2,b; a1 a2 b c +a b a i121 select a1,a2,b from t2 where (a1 > 'a') and (a2 > 'a') and (b = 'c') group by a1,a2,b; a1 a2 b explain select distinct a1,a2,b from t1; @@ -1568,16 +1569,16 @@ id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE t1 index NULL idx_t1_2 147 NULL 128 Using where; Using index explain select distinct a1,a2,b from t2; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t2 range NULL idx_t2_1 146 NULL 21 Using index for group-by +1 SIMPLE t2 range NULL idx_t2_1 146 NULL # Using index for group-by explain select distinct a1,a2,b from t2 where (a2 >= 'b') and (b = 'a'); id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t2 range NULL idx_t2_1 146 NULL 21 Using where; Using index for group-by +1 SIMPLE t2 range NULL idx_t2_1 146 NULL # Using where; Using index for group-by explain select distinct a1,a2,b,c from t2 where (a2 >= 'b') and (b = 'a') and (c = 'i121'); id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE t2 index NULL idx_t2_1 163 NULL 164 Using where; Using index explain select distinct a1,a2,b from t2 where (a1 > 'a') and (a2 > 'a') and (b = 'c'); id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t2 range idx_t2_0,idx_t2_1,idx_t2_2 idx_t2_1 146 NULL 16 Using where; Using index for group-by +1 SIMPLE t2 range idx_t2_0,idx_t2_1,idx_t2_2 idx_t2_1 146 NULL # Using where; Using index for group-by explain select distinct b from t2 where (a2 >= 'b') and (b = 'a'); id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE t2 index NULL idx_t2_2 146 NULL 164 Using where; Using index @@ -1712,19 +1713,19 @@ id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE t1 range NULL idx_t1_1 147 NULL 17 Using where; Using index for group-by; Using temporary; Using filesort explain select distinct a1,a2,b from t2; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t2 range NULL idx_t2_1 146 NULL 21 Using index for group-by +1 SIMPLE t2 range NULL idx_t2_1 146 NULL # Using index for group-by explain select distinct a1,a2,b from t2 where (a2 >= 'b') and (b = 'a') group by a1,a2,b; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t2 range NULL idx_t2_1 146 NULL 21 Using where; Using index for group-by +1 SIMPLE t2 range NULL idx_t2_1 146 NULL # Using where; Using index for group-by explain select distinct a1,a2,b,c from t2 where (a2 >= 'b') and (b = 'a') and (c = 'i121') group by a1,a2,b; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t2 range NULL idx_t2_1 163 NULL 21 Using where; Using index for group-by +1 SIMPLE t2 index NULL idx_t2_1 163 NULL # Using where; Using index explain select distinct a1,a2,b from t2 where (a1 > 'a') and (a2 > 'a') and (b = 'c') group by a1,a2,b; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t2 range idx_t2_0,idx_t2_1,idx_t2_2 idx_t2_1 146 NULL 16 Using where; Using index for group-by +1 SIMPLE t2 range idx_t2_0,idx_t2_1,idx_t2_2 idx_t2_1 146 NULL # Using where; Using index for group-by explain select distinct b from t2 where (a2 >= 'b') and (b = 'a') group by a1,a2,b; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t2 range NULL idx_t2_1 146 NULL 21 Using where; Using index for group-by; Using temporary; Using filesort +1 SIMPLE t2 range NULL idx_t2_1 146 NULL # Using where; Using index for group-by; Using temporary; Using filesort select distinct a1,a2,b from t1; a1 a2 b a a a @@ -1787,6 +1788,7 @@ c b a d b a select distinct a1,a2,b,c from t2 where (a2 >= 'b') and (b = 'a') and (c = 'i121') group by a1,a2,b; a1 a2 b c +a b a i121 select distinct a1,a2,b from t2 where (a1 > 'a') and (a2 > 'a') and (b = 'c') group by a1,a2,b; a1 a2 b select distinct b from t2 where (a2 >= 'b') and (b = 'a') group by a1,a2,b; diff --git a/mysql-test/r/mysqldump.result b/mysql-test/r/mysqldump.result index aa453c4eb31..35d0df0c888 100644 --- a/mysql-test/r/mysqldump.result +++ b/mysql-test/r/mysqldump.result @@ -693,3 +693,694 @@ UNLOCK TABLES; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; DROP TABLE t1; +create table t1 ( +F_c4ca4238a0b923820dcc509a6f75849b int, +F_c81e728d9d4c2f636f067f89cc14862c int, +F_eccbc87e4b5ce2fe28308fd9f2a7baf3 int, +F_a87ff679a2f3e71d9181a67b7542122c int, +F_e4da3b7fbbce2345d7772b0674a318d5 int, +F_1679091c5a880faf6fb5e6087eb1b2dc int, +F_8f14e45fceea167a5a36dedd4bea2543 int, +F_c9f0f895fb98ab9159f51fd0297e236d int, +F_45c48cce2e2d7fbdea1afc51c7c6ad26 int, +F_d3d9446802a44259755d38e6d163e820 int, +F_6512bd43d9caa6e02c990b0a82652dca int, +F_c20ad4d76fe97759aa27a0c99bff6710 int, +F_c51ce410c124a10e0db5e4b97fc2af39 int, +F_aab3238922bcc25a6f606eb525ffdc56 int, +F_9bf31c7ff062936a96d3c8bd1f8f2ff3 int, +F_c74d97b01eae257e44aa9d5bade97baf int, +F_70efdf2ec9b086079795c442636b55fb int, +F_6f4922f45568161a8cdf4ad2299f6d23 int, +F_1f0e3dad99908345f7439f8ffabdffc4 int, +F_98f13708210194c475687be6106a3b84 int, +F_3c59dc048e8850243be8079a5c74d079 int, +F_b6d767d2f8ed5d21a44b0e5886680cb9 int, +F_37693cfc748049e45d87b8c7d8b9aacd int, +F_1ff1de774005f8da13f42943881c655f int, +F_8e296a067a37563370ded05f5a3bf3ec int, +F_4e732ced3463d06de0ca9a15b6153677 int, +F_02e74f10e0327ad868d138f2b4fdd6f0 int, +F_33e75ff09dd601bbe69f351039152189 int, +F_6ea9ab1baa0efb9e19094440c317e21b int, +F_34173cb38f07f89ddbebc2ac9128303f int, +F_c16a5320fa475530d9583c34fd356ef5 int, +F_6364d3f0f495b6ab9dcf8d3b5c6e0b01 int, +F_182be0c5cdcd5072bb1864cdee4d3d6e int, +F_e369853df766fa44e1ed0ff613f563bd int, +F_1c383cd30b7c298ab50293adfecb7b18 int, +F_19ca14e7ea6328a42e0eb13d585e4c22 int, +F_a5bfc9e07964f8dddeb95fc584cd965d int, +F_a5771bce93e200c36f7cd9dfd0e5deaa int, +F_d67d8ab4f4c10bf22aa353e27879133c int, +F_d645920e395fedad7bbbed0eca3fe2e0 int, +F_3416a75f4cea9109507cacd8e2f2aefc int, +F_a1d0c6e83f027327d8461063f4ac58a6 int, +F_17e62166fc8586dfa4d1bc0e1742c08b int, +F_f7177163c833dff4b38fc8d2872f1ec6 int, +F_6c8349cc7260ae62e3b1396831a8398f int, +F_d9d4f495e875a2e075a1a4a6e1b9770f int, +F_67c6a1e7ce56d3d6fa748ab6d9af3fd7 int, +F_642e92efb79421734881b53e1e1b18b6 int, +F_f457c545a9ded88f18ecee47145a72c0 int, +F_c0c7c76d30bd3dcaefc96f40275bdc0a int, +F_2838023a778dfaecdc212708f721b788 int, +F_9a1158154dfa42caddbd0694a4e9bdc8 int, +F_d82c8d1619ad8176d665453cfb2e55f0 int, +F_a684eceee76fc522773286a895bc8436 int, +F_b53b3a3d6ab90ce0268229151c9bde11 int, +F_9f61408e3afb633e50cdf1b20de6f466 int, +F_72b32a1f754ba1c09b3695e0cb6cde7f int, +F_66f041e16a60928b05a7e228a89c3799 int, +F_093f65e080a295f8076b1c5722a46aa2 int, +F_072b030ba126b2f4b2374f342be9ed44 int, +F_7f39f8317fbdb1988ef4c628eba02591 int, +F_44f683a84163b3523afe57c2e008bc8c int, +F_03afdbd66e7929b125f8597834fa83a4 int, +F_ea5d2f1c4608232e07d3aa3d998e5135 int, +F_fc490ca45c00b1249bbe3554a4fdf6fb int, +F_3295c76acbf4caaed33c36b1b5fc2cb1 int, +F_735b90b4568125ed6c3f678819b6e058 int, +F_a3f390d88e4c41f2747bfa2f1b5f87db int, +F_14bfa6bb14875e45bba028a21ed38046 int, +F_7cbbc409ec990f19c78c75bd1e06f215 int, +F_e2c420d928d4bf8ce0ff2ec19b371514 int, +F_32bb90e8976aab5298d5da10fe66f21d int, +F_d2ddea18f00665ce8623e36bd4e3c7c5 int, +F_ad61ab143223efbc24c7d2583be69251 int, +F_d09bf41544a3365a46c9077ebb5e35c3 int, +F_fbd7939d674997cdb4692d34de8633c4 int, +F_28dd2c7955ce926456240b2ff0100bde int, +F_35f4a8d465e6e1edc05f3d8ab658c551 int, +F_d1fe173d08e959397adf34b1d77e88d7 int, +F_f033ab37c30201f73f142449d037028d int, +F_43ec517d68b6edd3015b3edc9a11367b int, +F_9778d5d219c5080b9a6a17bef029331c int, +F_fe9fc289c3ff0af142b6d3bead98a923 int, +F_68d30a9594728bc39aa24be94b319d21 int, +F_3ef815416f775098fe977004015c6193 int, +F_93db85ed909c13838ff95ccfa94cebd9 int, +F_c7e1249ffc03eb9ded908c236bd1996d int, +F_2a38a4a9316c49e5a833517c45d31070 int, +F_7647966b7343c29048673252e490f736 int, +F_8613985ec49eb8f757ae6439e879bb2a int, +F_54229abfcfa5649e7003b83dd4755294 int, +F_92cc227532d17e56e07902b254dfad10 int, +F_98dce83da57b0395e163467c9dae521b int, +F_f4b9ec30ad9f68f89b29639786cb62ef int, +F_812b4ba287f5ee0bc9d43bbf5bbe87fb int, +F_26657d5ff9020d2abefe558796b99584 int, +F_e2ef524fbf3d9fe611d5a8e90fefdc9c int, +F_ed3d2c21991e3bef5e069713af9fa6ca int, +F_ac627ab1ccbdb62ec96e702f07f6425b int, +F_f899139df5e1059396431415e770c6dd int, +F_38b3eff8baf56627478ec76a704e9b52 int, +F_ec8956637a99787bd197eacd77acce5e int, +F_6974ce5ac660610b44d9b9fed0ff9548 int, +F_c9e1074f5b3f9fc8ea15d152add07294 int, +F_65b9eea6e1cc6bb9f0cd2a47751a186f int, +F_f0935e4cd5920aa6c7c996a5ee53a70f int, +F_a97da629b098b75c294dffdc3e463904 int, +F_a3c65c2974270fd093ee8a9bf8ae7d0b int, +F_2723d092b63885e0d7c260cc007e8b9d int, +F_5f93f983524def3dca464469d2cf9f3e int, +F_698d51a19d8a121ce581499d7b701668 int, +F_7f6ffaa6bb0b408017b62254211691b5 int, +F_73278a4a86960eeb576a8fd4c9ec6997 int, +F_5fd0b37cd7dbbb00f97ba6ce92bf5add int, +F_2b44928ae11fb9384c4cf38708677c48 int, +F_c45147dee729311ef5b5c3003946c48f int, +F_eb160de1de89d9058fcb0b968dbbbd68 int, +F_5ef059938ba799aaa845e1c2e8a762bd int, +F_07e1cd7dca89a1678042477183b7ac3f int, +F_da4fb5c6e93e74d3df8527599fa62642 int, +F_4c56ff4ce4aaf9573aa5dff913df997a int, +F_a0a080f42e6f13b3a2df133f073095dd int, +F_202cb962ac59075b964b07152d234b70 int, +F_c8ffe9a587b126f152ed3d89a146b445 int, +F_3def184ad8f4755ff269862ea77393dd int, +F_069059b7ef840f0c74a814ec9237b6ec int, +F_ec5decca5ed3d6b8079e2e7e7bacc9f2 int, +F_76dc611d6ebaafc66cc0879c71b5db5c int, +F_d1f491a404d6854880943e5c3cd9ca25 int, +F_9b8619251a19057cff70779273e95aa6 int, +F_1afa34a7f984eeabdbb0a7d494132ee5 int, +F_65ded5353c5ee48d0b7d48c591b8f430 int, +F_9fc3d7152ba9336a670e36d0ed79bc43 int, +F_02522a2b2726fb0a03bb19f2d8d9524d int, +F_7f1de29e6da19d22b51c68001e7e0e54 int, +F_42a0e188f5033bc65bf8d78622277c4e int, +F_3988c7f88ebcb58c6ce932b957b6f332 int, +F_013d407166ec4fa56eb1e1f8cbe183b9 int, +F_e00da03b685a0dd18fb6a08af0923de0 int, +F_1385974ed5904a438616ff7bdb3f7439 int, +F_0f28b5d49b3020afeecd95b4009adf4c int, +F_a8baa56554f96369ab93e4f3bb068c22 int, +F_903ce9225fca3e988c2af215d4e544d3 int, +F_0a09c8844ba8f0936c20bd791130d6b6 int, +F_2b24d495052a8ce66358eb576b8912c8 int, +F_a5e00132373a7031000fd987a3c9f87b int, +F_8d5e957f297893487bd98fa830fa6413 int, +F_47d1e990583c9c67424d369f3414728e int, +F_f2217062e9a397a1dca429e7d70bc6ca int, +F_7ef605fc8dba5425d6965fbd4c8fbe1f int, +F_a8f15eda80c50adb0e71943adc8015cf int, +F_37a749d808e46495a8da1e5352d03cae int, +F_b3e3e393c77e35a4a3f3cbd1e429b5dc int, +F_1d7f7abc18fcb43975065399b0d1e48e int, +F_2a79ea27c279e471f4d180b08d62b00a int, +F_1c9ac0159c94d8d0cbedc973445af2da int, +F_6c4b761a28b734fe93831e3fb400ce87 int, +F_06409663226af2f3114485aa4e0a23b4 int, +F_140f6969d5213fd0ece03148e62e461e int, +F_b73ce398c39f506af761d2277d853a92 int, +F_bd4c9ab730f5513206b999ec0d90d1fb int, +F_82aa4b0af34c2313a562076992e50aa3 int, +F_0777d5c17d4066b82ab86dff8a46af6f int, +F_fa7cdfad1a5aaf8370ebeda47a1ff1c3 int, +F_9766527f2b5d3e95d4a733fcfb77bd7e int, +F_7e7757b1e12abcb736ab9a754ffb617a int, +F_5878a7ab84fb43402106c575658472fa int, +F_006f52e9102a8d3be2fe5614f42ba989 int, +F_3636638817772e42b59d74cff571fbb3 int, +F_149e9677a5989fd342ae44213df68868 int, +F_a4a042cf4fd6bfb47701cbc8a1653ada int, +F_1ff8a7b5dc7a7d1f0ed65aaa29c04b1e int, +F_f7e6c85504ce6e82442c770f7c8606f0 int, +F_bf8229696f7a3bb4700cfddef19fa23f int, +F_82161242827b703e6acf9c726942a1e4 int, +F_38af86134b65d0f10fe33d30dd76442e int, +F_96da2f590cd7246bbde0051047b0d6f7 int, +F_8f85517967795eeef66c225f7883bdcb int, +F_8f53295a73878494e9bc8dd6c3c7104f int, +F_045117b0e0a11a242b9765e79cbf113f int, +F_fc221309746013ac554571fbd180e1c8 int, +F_4c5bde74a8f110656874902f07378009 int, +F_cedebb6e872f539bef8c3f919874e9d7 int, +F_6cdd60ea0045eb7a6ec44c54d29ed402 int, +F_eecca5b6365d9607ee5a9d336962c534 int, +F_9872ed9fc22fc182d371c3e9ed316094 int, +F_31fefc0e570cb3860f2a6d4b38c6490d int, +F_9dcb88e0137649590b755372b040afad int, +F_a2557a7b2e94197ff767970b67041697 int, +F_cfecdb276f634854f3ef915e2e980c31 int, +F_0aa1883c6411f7873cb83dacb17b0afc int, +F_58a2fc6ed39fd083f55d4182bf88826d int, +F_bd686fd640be98efaae0091fa301e613 int, +F_a597e50502f5ff68e3e25b9114205d4a int, +F_0336dcbab05b9d5ad24f4333c7658a0e int, +F_084b6fbb10729ed4da8c3d3f5a3ae7c9 int, +F_85d8ce590ad8981ca2c8286f79f59954 int, +F_0e65972dce68dad4d52d063967f0a705 int, +F_84d9ee44e457ddef7f2c4f25dc8fa865 int, +F_3644a684f98ea8fe223c713b77189a77 int, +F_757b505cfd34c64c85ca5b5690ee5293 int, +F_854d6fae5ee42911677c739ee1734486 int, +F_e2c0be24560d78c5e599c2a9c9d0bbd2 int, +F_274ad4786c3abca69fa097b85867d9a4 int, +F_eae27d77ca20db309e056e3d2dcd7d69 int, +F_7eabe3a1649ffa2b3ff8c02ebfd5659f int, +F_69adc1e107f7f7d035d7baf04342e1ca int, +F_091d584fced301b442654dd8c23b3fc9 int, +F_b1d10e7bafa4421218a51b1e1f1b0ba2 int, +F_6f3ef77ac0e3619e98159e9b6febf557 int, +F_eb163727917cbba1eea208541a643e74 int, +F_1534b76d325a8f591b52d302e7181331 int, +F_979d472a84804b9f647bc185a877a8b5 int, +F_ca46c1b9512a7a8315fa3c5a946e8265 int, +F_3b8a614226a953a8cd9526fca6fe9ba5 int, +F_45fbc6d3e05ebd93369ce542e8f2322d int, +F_63dc7ed1010d3c3b8269faf0ba7491d4 int, +F_e96ed478dab8595a7dbda4cbcbee168f int, +F_c0e190d8267e36708f955d7ab048990d int, +F_ec8ce6abb3e952a85b8551ba726a1227 int, +F_060ad92489947d410d897474079c1477 int, +F_bcbe3365e6ac95ea2c0343a2395834dd int, +F_115f89503138416a242f40fb7d7f338e int, +F_13fe9d84310e77f13a6d184dbf1232f3 int, +F_d1c38a09acc34845c6be3a127a5aacaf int, +F_9cfdf10e8fc047a44b08ed031e1f0ed1 int, +F_705f2172834666788607efbfca35afb3 int, +F_74db120f0a8e5646ef5a30154e9f6deb int, +F_57aeee35c98205091e18d1140e9f38cf int, +F_6da9003b743b65f4c0ccd295cc484e57 int, +F_9b04d152845ec0a378394003c96da594 int, +F_be83ab3ecd0db773eb2dc1b0a17836a1 int, +F_e165421110ba03099a1c0393373c5b43 int, +F_289dff07669d7a23de0ef88d2f7129e7 int, +F_577ef1154f3240ad5b9b413aa7346a1e int, +F_01161aaa0b6d1345dd8fe4e481144d84 int, +F_539fd53b59e3bb12d203f45a912eeaf2 int, +F_ac1dd209cbcc5e5d1c6e28598e8cbbe8 int, +F_555d6702c950ecb729a966504af0a635 int, +F_335f5352088d7d9bf74191e006d8e24c int, +F_f340f1b1f65b6df5b5e3f94d95b11daf int, +F_e4a6222cdb5b34375400904f03d8e6a5 int, +F_cb70ab375662576bd1ac5aaf16b3fca4 int, +F_9188905e74c28e489b44e954ec0b9bca int, +F_0266e33d3f546cb5436a10798e657d97 int, +F_38db3aed920cf82ab059bfccbd02be6a int, +F_3cec07e9ba5f5bb252d13f5f431e4bbb int, +F_621bf66ddb7c962aa0d22ac97d69b793 int, +F_077e29b11be80ab57e1a2ecabb7da330 int, +F_6c9882bbac1c7093bd25041881277658 int, +F_19f3cd308f1455b3fa09a282e0d496f4 int, +F_03c6b06952c750899bb03d998e631860 int, +F_c24cd76e1ce41366a4bbe8a49b02a028 int, +F_c52f1bd66cc19d05628bd8bf27af3ad6 int, +F_fe131d7f5a6b38b23cc967316c13dae2 int, +F_f718499c1c8cef6730f9fd03c8125cab int, +F_d96409bf894217686ba124d7356686c9 int, +F_502e4a16930e414107ee22b6198c578f int, +F_cfa0860e83a4c3a763a7e62d825349f7 int, +F_a4f23670e1833f3fdb077ca70bbd5d66 int, +F_b1a59b315fc9a3002ce38bbe070ec3f5 int, +F_36660e59856b4de58a219bcf4e27eba3 int, +F_8c19f571e251e61cb8dd3612f26d5ecf int, +F_d6baf65e0b240ce177cf70da146c8dc8 int, +F_e56954b4f6347e897f954495eab16a88 int, +F_f7664060cc52bc6f3d620bcedc94a4b6 int, +F_eda80a3d5b344bc40f3bc04f65b7a357 int, +F_8f121ce07d74717e0b1f21d122e04521 int, +F_06138bc5af6023646ede0e1f7c1eac75 int, +F_39059724f73a9969845dfe4146c5660e int, +F_7f100b7b36092fb9b06dfb4fac360931 int, +F_7a614fd06c325499f1680b9896beedeb int, +F_4734ba6f3de83d861c3176a6273cac6d int, +F_d947bf06a885db0d477d707121934ff8 int, +F_63923f49e5241343aa7acb6a06a751e7 int, +F_db8e1af0cb3aca1ae2d0018624204529 int, +F_20f07591c6fcb220ffe637cda29bb3f6 int, +F_07cdfd23373b17c6b337251c22b7ea57 int, +F_d395771085aab05244a4fb8fd91bf4ee int, +F_92c8c96e4c37100777c7190b76d28233 int, +F_e3796ae838835da0b6f6ea37bcf8bcb7 int, +F_6a9aeddfc689c1d0e3b9ccc3ab651bc5 int, +F_0f49c89d1e7298bb9930789c8ed59d48 int, +F_46ba9f2a6976570b0353203ec4474217 int, +F_0e01938fc48a2cfb5f2217fbfb00722d int, +F_16a5cdae362b8d27a1d8f8c7b78b4330 int, +F_918317b57931b6b7a7d29490fe5ec9f9 int, +F_48aedb8880cab8c45637abc7493ecddd int, +F_839ab46820b524afda05122893c2fe8e int, +F_f90f2aca5c640289d0a29417bcb63a37 int, +F_9c838d2e45b2ad1094d42f4ef36764f6 int, +F_1700002963a49da13542e0726b7bb758 int, +F_53c3bce66e43be4f209556518c2fcb54 int, +F_6883966fd8f918a4aa29be29d2c386fb int, +F_49182f81e6a13cf5eaa496d51fea6406 int, +F_d296c101daa88a51f6ca8cfc1ac79b50 int, +F_9fd81843ad7f202f26c1a174c7357585 int, +F_26e359e83860db1d11b6acca57d8ea88 int, +F_ef0d3930a7b6c95bd2b32ed45989c61f int, +F_94f6d7e04a4d452035300f18b984988c int, +F_34ed066df378efacc9b924ec161e7639 int, +F_577bcc914f9e55d5e4e4f82f9f00e7d4 int, +F_11b9842e0a271ff252c1903e7132cd68 int, +F_37bc2f75bf1bcfe8450a1a41c200364c int, +F_496e05e1aea0a9c4655800e8a7b9ea28 int, +F_b2eb7349035754953b57a32e2841bda5 int, +F_8e98d81f8217304975ccb23337bb5761 int, +F_a8c88a0055f636e4a163a5e3d16adab7 int, +F_eddea82ad2755b24c4e168c5fc2ebd40 int, +F_06eb61b839a0cefee4967c67ccb099dc int, +F_9dfcd5e558dfa04aaf37f137a1d9d3e5 int, +F_950a4152c2b4aa3ad78bdd6b366cc179 int, +F_158f3069a435b314a80bdcb024f8e422 int, +F_758874998f5bd0c393da094e1967a72b int, +F_ad13a2a07ca4b7642959dc0c4c740ab6 int, +F_3fe94a002317b5f9259f82690aeea4cd int, +F_5b8add2a5d98b1a652ea7fd72d942dac int, +F_432aca3a1e345e339f35a30c8f65edce int, +F_8d3bba7425e7c98c50f52ca1b52d3735 int, +F_320722549d1751cf3f247855f937b982 int, +F_caf1a3dfb505ffed0d024130f58c5cfa int, +F_5737c6ec2e0716f3d8a7a5c4e0de0d9a int, +F_bc6dc48b743dc5d013b1abaebd2faed2 int, +F_f2fc990265c712c49d51a18a32b39f0c int, +F_89f0fd5c927d466d6ec9a21b9ac34ffa int, +F_a666587afda6e89aec274a3657558a27 int, +F_b83aac23b9528732c23cc7352950e880 int, +F_cd00692c3bfe59267d5ecfac5310286c int, +F_6faa8040da20ef399b63a72d0e4ab575 int, +F_fe73f687e5bc5280214e0486b273a5f9 int); +insert into t1 (F_8d3bba7425e7c98c50f52ca1b52d3735) values (1); + +/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; +/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; +/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; +/*!40101 SET NAMES utf8 */; +/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */; +/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */; +/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; +/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; +DROP TABLE IF EXISTS `t1`; +CREATE TABLE `t1` ( + `F_c4ca4238a0b923820dcc509a6f75849b` int(11) default NULL, + `F_c81e728d9d4c2f636f067f89cc14862c` int(11) default NULL, + `F_eccbc87e4b5ce2fe28308fd9f2a7baf3` int(11) default NULL, + `F_a87ff679a2f3e71d9181a67b7542122c` int(11) default NULL, + `F_e4da3b7fbbce2345d7772b0674a318d5` int(11) default NULL, + `F_1679091c5a880faf6fb5e6087eb1b2dc` int(11) default NULL, + `F_8f14e45fceea167a5a36dedd4bea2543` int(11) default NULL, + `F_c9f0f895fb98ab9159f51fd0297e236d` int(11) default NULL, + `F_45c48cce2e2d7fbdea1afc51c7c6ad26` int(11) default NULL, + `F_d3d9446802a44259755d38e6d163e820` int(11) default NULL, + `F_6512bd43d9caa6e02c990b0a82652dca` int(11) default NULL, + `F_c20ad4d76fe97759aa27a0c99bff6710` int(11) default NULL, + `F_c51ce410c124a10e0db5e4b97fc2af39` int(11) default NULL, + `F_aab3238922bcc25a6f606eb525ffdc56` int(11) default NULL, + `F_9bf31c7ff062936a96d3c8bd1f8f2ff3` int(11) default NULL, + `F_c74d97b01eae257e44aa9d5bade97baf` int(11) default NULL, + `F_70efdf2ec9b086079795c442636b55fb` int(11) default NULL, + `F_6f4922f45568161a8cdf4ad2299f6d23` int(11) default NULL, + `F_1f0e3dad99908345f7439f8ffabdffc4` int(11) default NULL, + `F_98f13708210194c475687be6106a3b84` int(11) default NULL, + `F_3c59dc048e8850243be8079a5c74d079` int(11) default NULL, + `F_b6d767d2f8ed5d21a44b0e5886680cb9` int(11) default NULL, + `F_37693cfc748049e45d87b8c7d8b9aacd` int(11) default NULL, + `F_1ff1de774005f8da13f42943881c655f` int(11) default NULL, + `F_8e296a067a37563370ded05f5a3bf3ec` int(11) default NULL, + `F_4e732ced3463d06de0ca9a15b6153677` int(11) default NULL, + `F_02e74f10e0327ad868d138f2b4fdd6f0` int(11) default NULL, + `F_33e75ff09dd601bbe69f351039152189` int(11) default NULL, + `F_6ea9ab1baa0efb9e19094440c317e21b` int(11) default NULL, + `F_34173cb38f07f89ddbebc2ac9128303f` int(11) default NULL, + `F_c16a5320fa475530d9583c34fd356ef5` int(11) default NULL, + `F_6364d3f0f495b6ab9dcf8d3b5c6e0b01` int(11) default NULL, + `F_182be0c5cdcd5072bb1864cdee4d3d6e` int(11) default NULL, + `F_e369853df766fa44e1ed0ff613f563bd` int(11) default NULL, + `F_1c383cd30b7c298ab50293adfecb7b18` int(11) default NULL, + `F_19ca14e7ea6328a42e0eb13d585e4c22` int(11) default NULL, + `F_a5bfc9e07964f8dddeb95fc584cd965d` int(11) default NULL, + `F_a5771bce93e200c36f7cd9dfd0e5deaa` int(11) default NULL, + `F_d67d8ab4f4c10bf22aa353e27879133c` int(11) default NULL, + `F_d645920e395fedad7bbbed0eca3fe2e0` int(11) default NULL, + `F_3416a75f4cea9109507cacd8e2f2aefc` int(11) default NULL, + `F_a1d0c6e83f027327d8461063f4ac58a6` int(11) default NULL, + `F_17e62166fc8586dfa4d1bc0e1742c08b` int(11) default NULL, + `F_f7177163c833dff4b38fc8d2872f1ec6` int(11) default NULL, + `F_6c8349cc7260ae62e3b1396831a8398f` int(11) default NULL, + `F_d9d4f495e875a2e075a1a4a6e1b9770f` int(11) default NULL, + `F_67c6a1e7ce56d3d6fa748ab6d9af3fd7` int(11) default NULL, + `F_642e92efb79421734881b53e1e1b18b6` int(11) default NULL, + `F_f457c545a9ded88f18ecee47145a72c0` int(11) default NULL, + `F_c0c7c76d30bd3dcaefc96f40275bdc0a` int(11) default NULL, + `F_2838023a778dfaecdc212708f721b788` int(11) default NULL, + `F_9a1158154dfa42caddbd0694a4e9bdc8` int(11) default NULL, + `F_d82c8d1619ad8176d665453cfb2e55f0` int(11) default NULL, + `F_a684eceee76fc522773286a895bc8436` int(11) default NULL, + `F_b53b3a3d6ab90ce0268229151c9bde11` int(11) default NULL, + `F_9f61408e3afb633e50cdf1b20de6f466` int(11) default NULL, + `F_72b32a1f754ba1c09b3695e0cb6cde7f` int(11) default NULL, + `F_66f041e16a60928b05a7e228a89c3799` int(11) default NULL, + `F_093f65e080a295f8076b1c5722a46aa2` int(11) default NULL, + `F_072b030ba126b2f4b2374f342be9ed44` int(11) default NULL, + `F_7f39f8317fbdb1988ef4c628eba02591` int(11) default NULL, + `F_44f683a84163b3523afe57c2e008bc8c` int(11) default NULL, + `F_03afdbd66e7929b125f8597834fa83a4` int(11) default NULL, + `F_ea5d2f1c4608232e07d3aa3d998e5135` int(11) default NULL, + `F_fc490ca45c00b1249bbe3554a4fdf6fb` int(11) default NULL, + `F_3295c76acbf4caaed33c36b1b5fc2cb1` int(11) default NULL, + `F_735b90b4568125ed6c3f678819b6e058` int(11) default NULL, + `F_a3f390d88e4c41f2747bfa2f1b5f87db` int(11) default NULL, + `F_14bfa6bb14875e45bba028a21ed38046` int(11) default NULL, + `F_7cbbc409ec990f19c78c75bd1e06f215` int(11) default NULL, + `F_e2c420d928d4bf8ce0ff2ec19b371514` int(11) default NULL, + `F_32bb90e8976aab5298d5da10fe66f21d` int(11) default NULL, + `F_d2ddea18f00665ce8623e36bd4e3c7c5` int(11) default NULL, + `F_ad61ab143223efbc24c7d2583be69251` int(11) default NULL, + `F_d09bf41544a3365a46c9077ebb5e35c3` int(11) default NULL, + `F_fbd7939d674997cdb4692d34de8633c4` int(11) default NULL, + `F_28dd2c7955ce926456240b2ff0100bde` int(11) default NULL, + `F_35f4a8d465e6e1edc05f3d8ab658c551` int(11) default NULL, + `F_d1fe173d08e959397adf34b1d77e88d7` int(11) default NULL, + `F_f033ab37c30201f73f142449d037028d` int(11) default NULL, + `F_43ec517d68b6edd3015b3edc9a11367b` int(11) default NULL, + `F_9778d5d219c5080b9a6a17bef029331c` int(11) default NULL, + `F_fe9fc289c3ff0af142b6d3bead98a923` int(11) default NULL, + `F_68d30a9594728bc39aa24be94b319d21` int(11) default NULL, + `F_3ef815416f775098fe977004015c6193` int(11) default NULL, + `F_93db85ed909c13838ff95ccfa94cebd9` int(11) default NULL, + `F_c7e1249ffc03eb9ded908c236bd1996d` int(11) default NULL, + `F_2a38a4a9316c49e5a833517c45d31070` int(11) default NULL, + `F_7647966b7343c29048673252e490f736` int(11) default NULL, + `F_8613985ec49eb8f757ae6439e879bb2a` int(11) default NULL, + `F_54229abfcfa5649e7003b83dd4755294` int(11) default NULL, + `F_92cc227532d17e56e07902b254dfad10` int(11) default NULL, + `F_98dce83da57b0395e163467c9dae521b` int(11) default NULL, + `F_f4b9ec30ad9f68f89b29639786cb62ef` int(11) default NULL, + `F_812b4ba287f5ee0bc9d43bbf5bbe87fb` int(11) default NULL, + `F_26657d5ff9020d2abefe558796b99584` int(11) default NULL, + `F_e2ef524fbf3d9fe611d5a8e90fefdc9c` int(11) default NULL, + `F_ed3d2c21991e3bef5e069713af9fa6ca` int(11) default NULL, + `F_ac627ab1ccbdb62ec96e702f07f6425b` int(11) default NULL, + `F_f899139df5e1059396431415e770c6dd` int(11) default NULL, + `F_38b3eff8baf56627478ec76a704e9b52` int(11) default NULL, + `F_ec8956637a99787bd197eacd77acce5e` int(11) default NULL, + `F_6974ce5ac660610b44d9b9fed0ff9548` int(11) default NULL, + `F_c9e1074f5b3f9fc8ea15d152add07294` int(11) default NULL, + `F_65b9eea6e1cc6bb9f0cd2a47751a186f` int(11) default NULL, + `F_f0935e4cd5920aa6c7c996a5ee53a70f` int(11) default NULL, + `F_a97da629b098b75c294dffdc3e463904` int(11) default NULL, + `F_a3c65c2974270fd093ee8a9bf8ae7d0b` int(11) default NULL, + `F_2723d092b63885e0d7c260cc007e8b9d` int(11) default NULL, + `F_5f93f983524def3dca464469d2cf9f3e` int(11) default NULL, + `F_698d51a19d8a121ce581499d7b701668` int(11) default NULL, + `F_7f6ffaa6bb0b408017b62254211691b5` int(11) default NULL, + `F_73278a4a86960eeb576a8fd4c9ec6997` int(11) default NULL, + `F_5fd0b37cd7dbbb00f97ba6ce92bf5add` int(11) default NULL, + `F_2b44928ae11fb9384c4cf38708677c48` int(11) default NULL, + `F_c45147dee729311ef5b5c3003946c48f` int(11) default NULL, + `F_eb160de1de89d9058fcb0b968dbbbd68` int(11) default NULL, + `F_5ef059938ba799aaa845e1c2e8a762bd` int(11) default NULL, + `F_07e1cd7dca89a1678042477183b7ac3f` int(11) default NULL, + `F_da4fb5c6e93e74d3df8527599fa62642` int(11) default NULL, + `F_4c56ff4ce4aaf9573aa5dff913df997a` int(11) default NULL, + `F_a0a080f42e6f13b3a2df133f073095dd` int(11) default NULL, + `F_202cb962ac59075b964b07152d234b70` int(11) default NULL, + `F_c8ffe9a587b126f152ed3d89a146b445` int(11) default NULL, + `F_3def184ad8f4755ff269862ea77393dd` int(11) default NULL, + `F_069059b7ef840f0c74a814ec9237b6ec` int(11) default NULL, + `F_ec5decca5ed3d6b8079e2e7e7bacc9f2` int(11) default NULL, + `F_76dc611d6ebaafc66cc0879c71b5db5c` int(11) default NULL, + `F_d1f491a404d6854880943e5c3cd9ca25` int(11) default NULL, + `F_9b8619251a19057cff70779273e95aa6` int(11) default NULL, + `F_1afa34a7f984eeabdbb0a7d494132ee5` int(11) default NULL, + `F_65ded5353c5ee48d0b7d48c591b8f430` int(11) default NULL, + `F_9fc3d7152ba9336a670e36d0ed79bc43` int(11) default NULL, + `F_02522a2b2726fb0a03bb19f2d8d9524d` int(11) default NULL, + `F_7f1de29e6da19d22b51c68001e7e0e54` int(11) default NULL, + `F_42a0e188f5033bc65bf8d78622277c4e` int(11) default NULL, + `F_3988c7f88ebcb58c6ce932b957b6f332` int(11) default NULL, + `F_013d407166ec4fa56eb1e1f8cbe183b9` int(11) default NULL, + `F_e00da03b685a0dd18fb6a08af0923de0` int(11) default NULL, + `F_1385974ed5904a438616ff7bdb3f7439` int(11) default NULL, + `F_0f28b5d49b3020afeecd95b4009adf4c` int(11) default NULL, + `F_a8baa56554f96369ab93e4f3bb068c22` int(11) default NULL, + `F_903ce9225fca3e988c2af215d4e544d3` int(11) default NULL, + `F_0a09c8844ba8f0936c20bd791130d6b6` int(11) default NULL, + `F_2b24d495052a8ce66358eb576b8912c8` int(11) default NULL, + `F_a5e00132373a7031000fd987a3c9f87b` int(11) default NULL, + `F_8d5e957f297893487bd98fa830fa6413` int(11) default NULL, + `F_47d1e990583c9c67424d369f3414728e` int(11) default NULL, + `F_f2217062e9a397a1dca429e7d70bc6ca` int(11) default NULL, + `F_7ef605fc8dba5425d6965fbd4c8fbe1f` int(11) default NULL, + `F_a8f15eda80c50adb0e71943adc8015cf` int(11) default NULL, + `F_37a749d808e46495a8da1e5352d03cae` int(11) default NULL, + `F_b3e3e393c77e35a4a3f3cbd1e429b5dc` int(11) default NULL, + `F_1d7f7abc18fcb43975065399b0d1e48e` int(11) default NULL, + `F_2a79ea27c279e471f4d180b08d62b00a` int(11) default NULL, + `F_1c9ac0159c94d8d0cbedc973445af2da` int(11) default NULL, + `F_6c4b761a28b734fe93831e3fb400ce87` int(11) default NULL, + `F_06409663226af2f3114485aa4e0a23b4` int(11) default NULL, + `F_140f6969d5213fd0ece03148e62e461e` int(11) default NULL, + `F_b73ce398c39f506af761d2277d853a92` int(11) default NULL, + `F_bd4c9ab730f5513206b999ec0d90d1fb` int(11) default NULL, + `F_82aa4b0af34c2313a562076992e50aa3` int(11) default NULL, + `F_0777d5c17d4066b82ab86dff8a46af6f` int(11) default NULL, + `F_fa7cdfad1a5aaf8370ebeda47a1ff1c3` int(11) default NULL, + `F_9766527f2b5d3e95d4a733fcfb77bd7e` int(11) default NULL, + `F_7e7757b1e12abcb736ab9a754ffb617a` int(11) default NULL, + `F_5878a7ab84fb43402106c575658472fa` int(11) default NULL, + `F_006f52e9102a8d3be2fe5614f42ba989` int(11) default NULL, + `F_3636638817772e42b59d74cff571fbb3` int(11) default NULL, + `F_149e9677a5989fd342ae44213df68868` int(11) default NULL, + `F_a4a042cf4fd6bfb47701cbc8a1653ada` int(11) default NULL, + `F_1ff8a7b5dc7a7d1f0ed65aaa29c04b1e` int(11) default NULL, + `F_f7e6c85504ce6e82442c770f7c8606f0` int(11) default NULL, + `F_bf8229696f7a3bb4700cfddef19fa23f` int(11) default NULL, + `F_82161242827b703e6acf9c726942a1e4` int(11) default NULL, + `F_38af86134b65d0f10fe33d30dd76442e` int(11) default NULL, + `F_96da2f590cd7246bbde0051047b0d6f7` int(11) default NULL, + `F_8f85517967795eeef66c225f7883bdcb` int(11) default NULL, + `F_8f53295a73878494e9bc8dd6c3c7104f` int(11) default NULL, + `F_045117b0e0a11a242b9765e79cbf113f` int(11) default NULL, + `F_fc221309746013ac554571fbd180e1c8` int(11) default NULL, + `F_4c5bde74a8f110656874902f07378009` int(11) default NULL, + `F_cedebb6e872f539bef8c3f919874e9d7` int(11) default NULL, + `F_6cdd60ea0045eb7a6ec44c54d29ed402` int(11) default NULL, + `F_eecca5b6365d9607ee5a9d336962c534` int(11) default NULL, + `F_9872ed9fc22fc182d371c3e9ed316094` int(11) default NULL, + `F_31fefc0e570cb3860f2a6d4b38c6490d` int(11) default NULL, + `F_9dcb88e0137649590b755372b040afad` int(11) default NULL, + `F_a2557a7b2e94197ff767970b67041697` int(11) default NULL, + `F_cfecdb276f634854f3ef915e2e980c31` int(11) default NULL, + `F_0aa1883c6411f7873cb83dacb17b0afc` int(11) default NULL, + `F_58a2fc6ed39fd083f55d4182bf88826d` int(11) default NULL, + `F_bd686fd640be98efaae0091fa301e613` int(11) default NULL, + `F_a597e50502f5ff68e3e25b9114205d4a` int(11) default NULL, + `F_0336dcbab05b9d5ad24f4333c7658a0e` int(11) default NULL, + `F_084b6fbb10729ed4da8c3d3f5a3ae7c9` int(11) default NULL, + `F_85d8ce590ad8981ca2c8286f79f59954` int(11) default NULL, + `F_0e65972dce68dad4d52d063967f0a705` int(11) default NULL, + `F_84d9ee44e457ddef7f2c4f25dc8fa865` int(11) default NULL, + `F_3644a684f98ea8fe223c713b77189a77` int(11) default NULL, + `F_757b505cfd34c64c85ca5b5690ee5293` int(11) default NULL, + `F_854d6fae5ee42911677c739ee1734486` int(11) default NULL, + `F_e2c0be24560d78c5e599c2a9c9d0bbd2` int(11) default NULL, + `F_274ad4786c3abca69fa097b85867d9a4` int(11) default NULL, + `F_eae27d77ca20db309e056e3d2dcd7d69` int(11) default NULL, + `F_7eabe3a1649ffa2b3ff8c02ebfd5659f` int(11) default NULL, + `F_69adc1e107f7f7d035d7baf04342e1ca` int(11) default NULL, + `F_091d584fced301b442654dd8c23b3fc9` int(11) default NULL, + `F_b1d10e7bafa4421218a51b1e1f1b0ba2` int(11) default NULL, + `F_6f3ef77ac0e3619e98159e9b6febf557` int(11) default NULL, + `F_eb163727917cbba1eea208541a643e74` int(11) default NULL, + `F_1534b76d325a8f591b52d302e7181331` int(11) default NULL, + `F_979d472a84804b9f647bc185a877a8b5` int(11) default NULL, + `F_ca46c1b9512a7a8315fa3c5a946e8265` int(11) default NULL, + `F_3b8a614226a953a8cd9526fca6fe9ba5` int(11) default NULL, + `F_45fbc6d3e05ebd93369ce542e8f2322d` int(11) default NULL, + `F_63dc7ed1010d3c3b8269faf0ba7491d4` int(11) default NULL, + `F_e96ed478dab8595a7dbda4cbcbee168f` int(11) default NULL, + `F_c0e190d8267e36708f955d7ab048990d` int(11) default NULL, + `F_ec8ce6abb3e952a85b8551ba726a1227` int(11) default NULL, + `F_060ad92489947d410d897474079c1477` int(11) default NULL, + `F_bcbe3365e6ac95ea2c0343a2395834dd` int(11) default NULL, + `F_115f89503138416a242f40fb7d7f338e` int(11) default NULL, + `F_13fe9d84310e77f13a6d184dbf1232f3` int(11) default NULL, + `F_d1c38a09acc34845c6be3a127a5aacaf` int(11) default NULL, + `F_9cfdf10e8fc047a44b08ed031e1f0ed1` int(11) default NULL, + `F_705f2172834666788607efbfca35afb3` int(11) default NULL, + `F_74db120f0a8e5646ef5a30154e9f6deb` int(11) default NULL, + `F_57aeee35c98205091e18d1140e9f38cf` int(11) default NULL, + `F_6da9003b743b65f4c0ccd295cc484e57` int(11) default NULL, + `F_9b04d152845ec0a378394003c96da594` int(11) default NULL, + `F_be83ab3ecd0db773eb2dc1b0a17836a1` int(11) default NULL, + `F_e165421110ba03099a1c0393373c5b43` int(11) default NULL, + `F_289dff07669d7a23de0ef88d2f7129e7` int(11) default NULL, + `F_577ef1154f3240ad5b9b413aa7346a1e` int(11) default NULL, + `F_01161aaa0b6d1345dd8fe4e481144d84` int(11) default NULL, + `F_539fd53b59e3bb12d203f45a912eeaf2` int(11) default NULL, + `F_ac1dd209cbcc5e5d1c6e28598e8cbbe8` int(11) default NULL, + `F_555d6702c950ecb729a966504af0a635` int(11) default NULL, + `F_335f5352088d7d9bf74191e006d8e24c` int(11) default NULL, + `F_f340f1b1f65b6df5b5e3f94d95b11daf` int(11) default NULL, + `F_e4a6222cdb5b34375400904f03d8e6a5` int(11) default NULL, + `F_cb70ab375662576bd1ac5aaf16b3fca4` int(11) default NULL, + `F_9188905e74c28e489b44e954ec0b9bca` int(11) default NULL, + `F_0266e33d3f546cb5436a10798e657d97` int(11) default NULL, + `F_38db3aed920cf82ab059bfccbd02be6a` int(11) default NULL, + `F_3cec07e9ba5f5bb252d13f5f431e4bbb` int(11) default NULL, + `F_621bf66ddb7c962aa0d22ac97d69b793` int(11) default NULL, + `F_077e29b11be80ab57e1a2ecabb7da330` int(11) default NULL, + `F_6c9882bbac1c7093bd25041881277658` int(11) default NULL, + `F_19f3cd308f1455b3fa09a282e0d496f4` int(11) default NULL, + `F_03c6b06952c750899bb03d998e631860` int(11) default NULL, + `F_c24cd76e1ce41366a4bbe8a49b02a028` int(11) default NULL, + `F_c52f1bd66cc19d05628bd8bf27af3ad6` int(11) default NULL, + `F_fe131d7f5a6b38b23cc967316c13dae2` int(11) default NULL, + `F_f718499c1c8cef6730f9fd03c8125cab` int(11) default NULL, + `F_d96409bf894217686ba124d7356686c9` int(11) default NULL, + `F_502e4a16930e414107ee22b6198c578f` int(11) default NULL, + `F_cfa0860e83a4c3a763a7e62d825349f7` int(11) default NULL, + `F_a4f23670e1833f3fdb077ca70bbd5d66` int(11) default NULL, + `F_b1a59b315fc9a3002ce38bbe070ec3f5` int(11) default NULL, + `F_36660e59856b4de58a219bcf4e27eba3` int(11) default NULL, + `F_8c19f571e251e61cb8dd3612f26d5ecf` int(11) default NULL, + `F_d6baf65e0b240ce177cf70da146c8dc8` int(11) default NULL, + `F_e56954b4f6347e897f954495eab16a88` int(11) default NULL, + `F_f7664060cc52bc6f3d620bcedc94a4b6` int(11) default NULL, + `F_eda80a3d5b344bc40f3bc04f65b7a357` int(11) default NULL, + `F_8f121ce07d74717e0b1f21d122e04521` int(11) default NULL, + `F_06138bc5af6023646ede0e1f7c1eac75` int(11) default NULL, + `F_39059724f73a9969845dfe4146c5660e` int(11) default NULL, + `F_7f100b7b36092fb9b06dfb4fac360931` int(11) default NULL, + `F_7a614fd06c325499f1680b9896beedeb` int(11) default NULL, + `F_4734ba6f3de83d861c3176a6273cac6d` int(11) default NULL, + `F_d947bf06a885db0d477d707121934ff8` int(11) default NULL, + `F_63923f49e5241343aa7acb6a06a751e7` int(11) default NULL, + `F_db8e1af0cb3aca1ae2d0018624204529` int(11) default NULL, + `F_20f07591c6fcb220ffe637cda29bb3f6` int(11) default NULL, + `F_07cdfd23373b17c6b337251c22b7ea57` int(11) default NULL, + `F_d395771085aab05244a4fb8fd91bf4ee` int(11) default NULL, + `F_92c8c96e4c37100777c7190b76d28233` int(11) default NULL, + `F_e3796ae838835da0b6f6ea37bcf8bcb7` int(11) default NULL, + `F_6a9aeddfc689c1d0e3b9ccc3ab651bc5` int(11) default NULL, + `F_0f49c89d1e7298bb9930789c8ed59d48` int(11) default NULL, + `F_46ba9f2a6976570b0353203ec4474217` int(11) default NULL, + `F_0e01938fc48a2cfb5f2217fbfb00722d` int(11) default NULL, + `F_16a5cdae362b8d27a1d8f8c7b78b4330` int(11) default NULL, + `F_918317b57931b6b7a7d29490fe5ec9f9` int(11) default NULL, + `F_48aedb8880cab8c45637abc7493ecddd` int(11) default NULL, + `F_839ab46820b524afda05122893c2fe8e` int(11) default NULL, + `F_f90f2aca5c640289d0a29417bcb63a37` int(11) default NULL, + `F_9c838d2e45b2ad1094d42f4ef36764f6` int(11) default NULL, + `F_1700002963a49da13542e0726b7bb758` int(11) default NULL, + `F_53c3bce66e43be4f209556518c2fcb54` int(11) default NULL, + `F_6883966fd8f918a4aa29be29d2c386fb` int(11) default NULL, + `F_49182f81e6a13cf5eaa496d51fea6406` int(11) default NULL, + `F_d296c101daa88a51f6ca8cfc1ac79b50` int(11) default NULL, + `F_9fd81843ad7f202f26c1a174c7357585` int(11) default NULL, + `F_26e359e83860db1d11b6acca57d8ea88` int(11) default NULL, + `F_ef0d3930a7b6c95bd2b32ed45989c61f` int(11) default NULL, + `F_94f6d7e04a4d452035300f18b984988c` int(11) default NULL, + `F_34ed066df378efacc9b924ec161e7639` int(11) default NULL, + `F_577bcc914f9e55d5e4e4f82f9f00e7d4` int(11) default NULL, + `F_11b9842e0a271ff252c1903e7132cd68` int(11) default NULL, + `F_37bc2f75bf1bcfe8450a1a41c200364c` int(11) default NULL, + `F_496e05e1aea0a9c4655800e8a7b9ea28` int(11) default NULL, + `F_b2eb7349035754953b57a32e2841bda5` int(11) default NULL, + `F_8e98d81f8217304975ccb23337bb5761` int(11) default NULL, + `F_a8c88a0055f636e4a163a5e3d16adab7` int(11) default NULL, + `F_eddea82ad2755b24c4e168c5fc2ebd40` int(11) default NULL, + `F_06eb61b839a0cefee4967c67ccb099dc` int(11) default NULL, + `F_9dfcd5e558dfa04aaf37f137a1d9d3e5` int(11) default NULL, + `F_950a4152c2b4aa3ad78bdd6b366cc179` int(11) default NULL, + `F_158f3069a435b314a80bdcb024f8e422` int(11) default NULL, + `F_758874998f5bd0c393da094e1967a72b` int(11) default NULL, + `F_ad13a2a07ca4b7642959dc0c4c740ab6` int(11) default NULL, + `F_3fe94a002317b5f9259f82690aeea4cd` int(11) default NULL, + `F_5b8add2a5d98b1a652ea7fd72d942dac` int(11) default NULL, + `F_432aca3a1e345e339f35a30c8f65edce` int(11) default NULL, + `F_8d3bba7425e7c98c50f52ca1b52d3735` int(11) default NULL, + `F_320722549d1751cf3f247855f937b982` int(11) default NULL, + `F_caf1a3dfb505ffed0d024130f58c5cfa` int(11) default NULL, + `F_5737c6ec2e0716f3d8a7a5c4e0de0d9a` int(11) default NULL, + `F_bc6dc48b743dc5d013b1abaebd2faed2` int(11) default NULL, + `F_f2fc990265c712c49d51a18a32b39f0c` int(11) default NULL, + `F_89f0fd5c927d466d6ec9a21b9ac34ffa` int(11) default NULL, + `F_a666587afda6e89aec274a3657558a27` int(11) default NULL, + `F_b83aac23b9528732c23cc7352950e880` int(11) default NULL, + `F_cd00692c3bfe59267d5ecfac5310286c` int(11) default NULL, + `F_6faa8040da20ef399b63a72d0e4ab575` int(11) default NULL, + `F_fe73f687e5bc5280214e0486b273a5f9` int(11) default NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1; + + +/*!40000 ALTER TABLE `t1` DISABLE KEYS */; +LOCK TABLES `t1` WRITE; +INSERT INTO `t1` (`F_c4ca4238a0b923820dcc509a6f75849b`, `F_c81e728d9d4c2f636f067f89cc14862c`, `F_eccbc87e4b5ce2fe28308fd9f2a7baf3`, `F_a87ff679a2f3e71d9181a67b7542122c`, `F_e4da3b7fbbce2345d7772b0674a318d5`, `F_1679091c5a880faf6fb5e6087eb1b2dc`, `F_8f14e45fceea167a5a36dedd4bea2543`, `F_c9f0f895fb98ab9159f51fd0297e236d`, `F_45c48cce2e2d7fbdea1afc51c7c6ad26`, `F_d3d9446802a44259755d38e6d163e820`, `F_6512bd43d9caa6e02c990b0a82652dca`, `F_c20ad4d76fe97759aa27a0c99bff6710`, `F_c51ce410c124a10e0db5e4b97fc2af39`, `F_aab3238922bcc25a6f606eb525ffdc56`, `F_9bf31c7ff062936a96d3c8bd1f8f2ff3`, `F_c74d97b01eae257e44aa9d5bade97baf`, `F_70efdf2ec9b086079795c442636b55fb`, `F_6f4922f45568161a8cdf4ad2299f6d23`, `F_1f0e3dad99908345f7439f8ffabdffc4`, `F_98f13708210194c475687be6106a3b84`, `F_3c59dc048e8850243be8079a5c74d079`, `F_b6d767d2f8ed5d21a44b0e5886680cb9`, `F_37693cfc748049e45d87b8c7d8b9aacd`, `F_1ff1de774005f8da13f42943881c655f`, `F_8e296a067a37563370ded05f5a3bf3ec`, `F_4e732ced3463d06de0ca9a15b6153677`, `F_02e74f10e0327ad868d138f2b4fdd6f0`, `F_33e75ff09dd601bbe69f351039152189`, `F_6ea9ab1baa0efb9e19094440c317e21b`, `F_34173cb38f07f89ddbebc2ac9128303f`, `F_c16a5320fa475530d9583c34fd356ef5`, `F_6364d3f0f495b6ab9dcf8d3b5c6e0b01`, `F_182be0c5cdcd5072bb1864cdee4d3d6e`, `F_e369853df766fa44e1ed0ff613f563bd`, `F_1c383cd30b7c298ab50293adfecb7b18`, `F_19ca14e7ea6328a42e0eb13d585e4c22`, `F_a5bfc9e07964f8dddeb95fc584cd965d`, `F_a5771bce93e200c36f7cd9dfd0e5deaa`, `F_d67d8ab4f4c10bf22aa353e27879133c`, `F_d645920e395fedad7bbbed0eca3fe2e0`, `F_3416a75f4cea9109507cacd8e2f2aefc`, `F_a1d0c6e83f027327d8461063f4ac58a6`, `F_17e62166fc8586dfa4d1bc0e1742c08b`, `F_f7177163c833dff4b38fc8d2872f1ec6`, `F_6c8349cc7260ae62e3b1396831a8398f`, `F_d9d4f495e875a2e075a1a4a6e1b9770f`, `F_67c6a1e7ce56d3d6fa748ab6d9af3fd7`, `F_642e92efb79421734881b53e1e1b18b6`, `F_f457c545a9ded88f18ecee47145a72c0`, `F_c0c7c76d30bd3dcaefc96f40275bdc0a`, `F_2838023a778dfaecdc212708f721b788`, `F_9a1158154dfa42caddbd0694a4e9bdc8`, `F_d82c8d1619ad8176d665453cfb2e55f0`, `F_a684eceee76fc522773286a895bc8436`, `F_b53b3a3d6ab90ce0268229151c9bde11`, `F_9f61408e3afb633e50cdf1b20de6f466`, `F_72b32a1f754ba1c09b3695e0cb6cde7f`, `F_66f041e16a60928b05a7e228a89c3799`, `F_093f65e080a295f8076b1c5722a46aa2`, `F_072b030ba126b2f4b2374f342be9ed44`, `F_7f39f8317fbdb1988ef4c628eba02591`, `F_44f683a84163b3523afe57c2e008bc8c`, `F_03afdbd66e7929b125f8597834fa83a4`, `F_ea5d2f1c4608232e07d3aa3d998e5135`, `F_fc490ca45c00b1249bbe3554a4fdf6fb`, `F_3295c76acbf4caaed33c36b1b5fc2cb1`, `F_735b90b4568125ed6c3f678819b6e058`, `F_a3f390d88e4c41f2747bfa2f1b5f87db`, `F_14bfa6bb14875e45bba028a21ed38046`, `F_7cbbc409ec990f19c78c75bd1e06f215`, `F_e2c420d928d4bf8ce0ff2ec19b371514`, `F_32bb90e8976aab5298d5da10fe66f21d`, `F_d2ddea18f00665ce8623e36bd4e3c7c5`, `F_ad61ab143223efbc24c7d2583be69251`, `F_d09bf41544a3365a46c9077ebb5e35c3`, `F_fbd7939d674997cdb4692d34de8633c4`, `F_28dd2c7955ce926456240b2ff0100bde`, `F_35f4a8d465e6e1edc05f3d8ab658c551`, `F_d1fe173d08e959397adf34b1d77e88d7`, `F_f033ab37c30201f73f142449d037028d`, `F_43ec517d68b6edd3015b3edc9a11367b`, `F_9778d5d219c5080b9a6a17bef029331c`, `F_fe9fc289c3ff0af142b6d3bead98a923`, `F_68d30a9594728bc39aa24be94b319d21`, `F_3ef815416f775098fe977004015c6193`, `F_93db85ed909c13838ff95ccfa94cebd9`, `F_c7e1249ffc03eb9ded908c236bd1996d`, `F_2a38a4a9316c49e5a833517c45d31070`, `F_7647966b7343c29048673252e490f736`, `F_8613985ec49eb8f757ae6439e879bb2a`, `F_54229abfcfa5649e7003b83dd4755294`, `F_92cc227532d17e56e07902b254dfad10`, `F_98dce83da57b0395e163467c9dae521b`, `F_f4b9ec30ad9f68f89b29639786cb62ef`, `F_812b4ba287f5ee0bc9d43bbf5bbe87fb`, `F_26657d5ff9020d2abefe558796b99584`, `F_e2ef524fbf3d9fe611d5a8e90fefdc9c`, `F_ed3d2c21991e3bef5e069713af9fa6ca`, `F_ac627ab1ccbdb62ec96e702f07f6425b`, `F_f899139df5e1059396431415e770c6dd`, `F_38b3eff8baf56627478ec76a704e9b52`, `F_ec8956637a99787bd197eacd77acce5e`, `F_6974ce5ac660610b44d9b9fed0ff9548`, `F_c9e1074f5b3f9fc8ea15d152add07294`, `F_65b9eea6e1cc6bb9f0cd2a47751a186f`, `F_f0935e4cd5920aa6c7c996a5ee53a70f`, `F_a97da629b098b75c294dffdc3e463904`, `F_a3c65c2974270fd093ee8a9bf8ae7d0b`, `F_2723d092b63885e0d7c260cc007e8b9d`, `F_5f93f983524def3dca464469d2cf9f3e`, `F_698d51a19d8a121ce581499d7b701668`, `F_7f6ffaa6bb0b408017b62254211691b5`, `F_73278a4a86960eeb576a8fd4c9ec6997`, `F_5fd0b37cd7dbbb00f97ba6ce92bf5add`, `F_2b44928ae11fb9384c4cf38708677c48`, `F_c45147dee729311ef5b5c3003946c48f`, `F_eb160de1de89d9058fcb0b968dbbbd68`, `F_5ef059938ba799aaa845e1c2e8a762bd`, `F_07e1cd7dca89a1678042477183b7ac3f`, `F_da4fb5c6e93e74d3df8527599fa62642`, `F_4c56ff4ce4aaf9573aa5dff913df997a`, `F_a0a080f42e6f13b3a2df133f073095dd`, `F_202cb962ac59075b964b07152d234b70`, `F_c8ffe9a587b126f152ed3d89a146b445`, `F_3def184ad8f4755ff269862ea77393dd`, `F_069059b7ef840f0c74a814ec9237b6ec`, `F_ec5decca5ed3d6b8079e2e7e7bacc9f2`, `F_76dc611d6ebaafc66cc0879c71b5db5c`, `F_d1f491a404d6854880943e5c3cd9ca25`, `F_9b8619251a19057cff70779273e95aa6`, `F_1afa34a7f984eeabdbb0a7d494132ee5`, `F_65ded5353c5ee48d0b7d48c591b8f430`, `F_9fc3d7152ba9336a670e36d0ed79bc43`, `F_02522a2b2726fb0a03bb19f2d8d9524d`, `F_7f1de29e6da19d22b51c68001e7e0e54`, `F_42a0e188f5033bc65bf8d78622277c4e`, `F_3988c7f88ebcb58c6ce932b957b6f332`, `F_013d407166ec4fa56eb1e1f8cbe183b9`, `F_e00da03b685a0dd18fb6a08af0923de0`, `F_1385974ed5904a438616ff7bdb3f7439`, `F_0f28b5d49b3020afeecd95b4009adf4c`, `F_a8baa56554f96369ab93e4f3bb068c22`, `F_903ce9225fca3e988c2af215d4e544d3`, `F_0a09c8844ba8f0936c20bd791130d6b6`, `F_2b24d495052a8ce66358eb576b8912c8`, `F_a5e00132373a7031000fd987a3c9f87b`, `F_8d5e957f297893487bd98fa830fa6413`, `F_47d1e990583c9c67424d369f3414728e`, `F_f2217062e9a397a1dca429e7d70bc6ca`, `F_7ef605fc8dba5425d6965fbd4c8fbe1f`, `F_a8f15eda80c50adb0e71943adc8015cf`, `F_37a749d808e46495a8da1e5352d03cae`, `F_b3e3e393c77e35a4a3f3cbd1e429b5dc`, `F_1d7f7abc18fcb43975065399b0d1e48e`, `F_2a79ea27c279e471f4d180b08d62b00a`, `F_1c9ac0159c94d8d0cbedc973445af2da`, `F_6c4b761a28b734fe93831e3fb400ce87`, `F_06409663226af2f3114485aa4e0a23b4`, `F_140f6969d5213fd0ece03148e62e461e`, `F_b73ce398c39f506af761d2277d853a92`, `F_bd4c9ab730f5513206b999ec0d90d1fb`, `F_82aa4b0af34c2313a562076992e50aa3`, `F_0777d5c17d4066b82ab86dff8a46af6f`, `F_fa7cdfad1a5aaf8370ebeda47a1ff1c3`, `F_9766527f2b5d3e95d4a733fcfb77bd7e`, `F_7e7757b1e12abcb736ab9a754ffb617a`, `F_5878a7ab84fb43402106c575658472fa`, `F_006f52e9102a8d3be2fe5614f42ba989`, `F_3636638817772e42b59d74cff571fbb3`, `F_149e9677a5989fd342ae44213df68868`, `F_a4a042cf4fd6bfb47701cbc8a1653ada`, `F_1ff8a7b5dc7a7d1f0ed65aaa29c04b1e`, `F_f7e6c85504ce6e82442c770f7c8606f0`, `F_bf8229696f7a3bb4700cfddef19fa23f`, `F_82161242827b703e6acf9c726942a1e4`, `F_38af86134b65d0f10fe33d30dd76442e`, `F_96da2f590cd7246bbde0051047b0d6f7`, `F_8f85517967795eeef66c225f7883bdcb`, `F_8f53295a73878494e9bc8dd6c3c7104f`, `F_045117b0e0a11a242b9765e79cbf113f`, `F_fc221309746013ac554571fbd180e1c8`, `F_4c5bde74a8f110656874902f07378009`, `F_cedebb6e872f539bef8c3f919874e9d7`, `F_6cdd60ea0045eb7a6ec44c54d29ed402`, `F_eecca5b6365d9607ee5a9d336962c534`, `F_9872ed9fc22fc182d371c3e9ed316094`, `F_31fefc0e570cb3860f2a6d4b38c6490d`, `F_9dcb88e0137649590b755372b040afad`, `F_a2557a7b2e94197ff767970b67041697`, `F_cfecdb276f634854f3ef915e2e980c31`, `F_0aa1883c6411f7873cb83dacb17b0afc`, `F_58a2fc6ed39fd083f55d4182bf88826d`, `F_bd686fd640be98efaae0091fa301e613`, `F_a597e50502f5ff68e3e25b9114205d4a`, `F_0336dcbab05b9d5ad24f4333c7658a0e`, `F_084b6fbb10729ed4da8c3d3f5a3ae7c9`, `F_85d8ce590ad8981ca2c8286f79f59954`, `F_0e65972dce68dad4d52d063967f0a705`, `F_84d9ee44e457ddef7f2c4f25dc8fa865`, `F_3644a684f98ea8fe223c713b77189a77`, `F_757b505cfd34c64c85ca5b5690ee5293`, `F_854d6fae5ee42911677c739ee1734486`, `F_e2c0be24560d78c5e599c2a9c9d0bbd2`, `F_274ad4786c3abca69fa097b85867d9a4`, `F_eae27d77ca20db309e056e3d2dcd7d69`, `F_7eabe3a1649ffa2b3ff8c02ebfd5659f`, `F_69adc1e107f7f7d035d7baf04342e1ca`, `F_091d584fced301b442654dd8c23b3fc9`, `F_b1d10e7bafa4421218a51b1e1f1b0ba2`, `F_6f3ef77ac0e3619e98159e9b6febf557`, `F_eb163727917cbba1eea208541a643e74`, `F_1534b76d325a8f591b52d302e7181331`, `F_979d472a84804b9f647bc185a877a8b5`, `F_ca46c1b9512a7a8315fa3c5a946e8265`, `F_3b8a614226a953a8cd9526fca6fe9ba5`, `F_45fbc6d3e05ebd93369ce542e8f2322d`, `F_63dc7ed1010d3c3b8269faf0ba7491d4`, `F_e96ed478dab8595a7dbda4cbcbee168f`, `F_c0e190d8267e36708f955d7ab048990d`, `F_ec8ce6abb3e952a85b8551ba726a1227`, `F_060ad92489947d410d897474079c1477`, `F_bcbe3365e6ac95ea2c0343a2395834dd`, `F_115f89503138416a242f40fb7d7f338e`, `F_13fe9d84310e77f13a6d184dbf1232f3`, `F_d1c38a09acc34845c6be3a127a5aacaf`, `F_9cfdf10e8fc047a44b08ed031e1f0ed1`, `F_705f2172834666788607efbfca35afb3`, `F_74db120f0a8e5646ef5a30154e9f6deb`, `F_57aeee35c98205091e18d1140e9f38cf`, `F_6da9003b743b65f4c0ccd295cc484e57`, `F_9b04d152845ec0a378394003c96da594`, `F_be83ab3ecd0db773eb2dc1b0a17836a1`, `F_e165421110ba03099a1c0393373c5b43`, `F_289dff07669d7a23de0ef88d2f7129e7`, `F_577ef1154f3240ad5b9b413aa7346a1e`, `F_01161aaa0b6d1345dd8fe4e481144d84`, `F_539fd53b59e3bb12d203f45a912eeaf2`, `F_ac1dd209cbcc5e5d1c6e28598e8cbbe8`, `F_555d6702c950ecb729a966504af0a635`, `F_335f5352088d7d9bf74191e006d8e24c`, `F_f340f1b1f65b6df5b5e3f94d95b11daf`, `F_e4a6222cdb5b34375400904f03d8e6a5`, `F_cb70ab375662576bd1ac5aaf16b3fca4`, `F_9188905e74c28e489b44e954ec0b9bca`, `F_0266e33d3f546cb5436a10798e657d97`, `F_38db3aed920cf82ab059bfccbd02be6a`, `F_3cec07e9ba5f5bb252d13f5f431e4bbb`, `F_621bf66ddb7c962aa0d22ac97d69b793`, `F_077e29b11be80ab57e1a2ecabb7da330`, `F_6c9882bbac1c7093bd25041881277658`, `F_19f3cd308f1455b3fa09a282e0d496f4`, `F_03c6b06952c750899bb03d998e631860`, `F_c24cd76e1ce41366a4bbe8a49b02a028`, `F_c52f1bd66cc19d05628bd8bf27af3ad6`, `F_fe131d7f5a6b38b23cc967316c13dae2`, `F_f718499c1c8cef6730f9fd03c8125cab`, `F_d96409bf894217686ba124d7356686c9`, `F_502e4a16930e414107ee22b6198c578f`, `F_cfa0860e83a4c3a763a7e62d825349f7`, `F_a4f23670e1833f3fdb077ca70bbd5d66`, `F_b1a59b315fc9a3002ce38bbe070ec3f5`, `F_36660e59856b4de58a219bcf4e27eba3`, `F_8c19f571e251e61cb8dd3612f26d5ecf`, `F_d6baf65e0b240ce177cf70da146c8dc8`, `F_e56954b4f6347e897f954495eab16a88`, `F_f7664060cc52bc6f3d620bcedc94a4b6`, `F_eda80a3d5b344bc40f3bc04f65b7a357`, `F_8f121ce07d74717e0b1f21d122e04521`, `F_06138bc5af6023646ede0e1f7c1eac75`, `F_39059724f73a9969845dfe4146c5660e`, `F_7f100b7b36092fb9b06dfb4fac360931`, `F_7a614fd06c325499f1680b9896beedeb`, `F_4734ba6f3de83d861c3176a6273cac6d`, `F_d947bf06a885db0d477d707121934ff8`, `F_63923f49e5241343aa7acb6a06a751e7`, `F_db8e1af0cb3aca1ae2d0018624204529`, `F_20f07591c6fcb220ffe637cda29bb3f6`, `F_07cdfd23373b17c6b337251c22b7ea57`, `F_d395771085aab05244a4fb8fd91bf4ee`, `F_92c8c96e4c37100777c7190b76d28233`, `F_e3796ae838835da0b6f6ea37bcf8bcb7`, `F_6a9aeddfc689c1d0e3b9ccc3ab651bc5`, `F_0f49c89d1e7298bb9930789c8ed59d48`, `F_46ba9f2a6976570b0353203ec4474217`, `F_0e01938fc48a2cfb5f2217fbfb00722d`, `F_16a5cdae362b8d27a1d8f8c7b78b4330`, `F_918317b57931b6b7a7d29490fe5ec9f9`, `F_48aedb8880cab8c45637abc7493ecddd`, `F_839ab46820b524afda05122893c2fe8e`, `F_f90f2aca5c640289d0a29417bcb63a37`, `F_9c838d2e45b2ad1094d42f4ef36764f6`, `F_1700002963a49da13542e0726b7bb758`, `F_53c3bce66e43be4f209556518c2fcb54`, `F_6883966fd8f918a4aa29be29d2c386fb`, `F_49182f81e6a13cf5eaa496d51fea6406`, `F_d296c101daa88a51f6ca8cfc1ac79b50`, `F_9fd81843ad7f202f26c1a174c7357585`, `F_26e359e83860db1d11b6acca57d8ea88`, `F_ef0d3930a7b6c95bd2b32ed45989c61f`, `F_94f6d7e04a4d452035300f18b984988c`, `F_34ed066df378efacc9b924ec161e7639`, `F_577bcc914f9e55d5e4e4f82f9f00e7d4`, `F_11b9842e0a271ff252c1903e7132cd68`, `F_37bc2f75bf1bcfe8450a1a41c200364c`, `F_496e05e1aea0a9c4655800e8a7b9ea28`, `F_b2eb7349035754953b57a32e2841bda5`, `F_8e98d81f8217304975ccb23337bb5761`, `F_a8c88a0055f636e4a163a5e3d16adab7`, `F_eddea82ad2755b24c4e168c5fc2ebd40`, `F_06eb61b839a0cefee4967c67ccb099dc`, `F_9dfcd5e558dfa04aaf37f137a1d9d3e5`, `F_950a4152c2b4aa3ad78bdd6b366cc179`, `F_158f3069a435b314a80bdcb024f8e422`, `F_758874998f5bd0c393da094e1967a72b`, `F_ad13a2a07ca4b7642959dc0c4c740ab6`, `F_3fe94a002317b5f9259f82690aeea4cd`, `F_5b8add2a5d98b1a652ea7fd72d942dac`, `F_432aca3a1e345e339f35a30c8f65edce`, `F_8d3bba7425e7c98c50f52ca1b52d3735`, `F_320722549d1751cf3f247855f937b982`, `F_caf1a3dfb505ffed0d024130f58c5cfa`, `F_5737c6ec2e0716f3d8a7a5c4e0de0d9a`, `F_bc6dc48b743dc5d013b1abaebd2faed2`, `F_f2fc990265c712c49d51a18a32b39f0c`, `F_89f0fd5c927d466d6ec9a21b9ac34ffa`, `F_a666587afda6e89aec274a3657558a27`, `F_b83aac23b9528732c23cc7352950e880`, `F_cd00692c3bfe59267d5ecfac5310286c`, `F_6faa8040da20ef399b63a72d0e4ab575`, `F_fe73f687e5bc5280214e0486b273a5f9`) VALUES (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL); +UNLOCK TABLES; +/*!40000 ALTER TABLE `t1` ENABLE KEYS */; + +/*!40101 SET SQL_MODE=@OLD_SQL_MODE */; +/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */; +/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */; +/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; +/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */; +/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; +/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; + +drop table t1; diff --git a/mysql-test/r/subselect.result b/mysql-test/r/subselect.result index 115f95978fc..028eb730191 100644 --- a/mysql-test/r/subselect.result +++ b/mysql-test/r/subselect.result @@ -2781,8 +2781,6 @@ c1 c2 2 NULL 3 NULL DROP TABLE t1,t2,t3; -drop table t1 -#; CREATE TABLE `t1` ( `itemid` bigint(20) unsigned NOT NULL auto_increment, `sessionid` bigint(20) unsigned default NULL, diff --git a/mysql-test/t/group_min_max.test b/mysql-test/t/group_min_max.test index 9feb4f33682..f705342b81c 100644 --- a/mysql-test/t/group_min_max.test +++ b/mysql-test/t/group_min_max.test @@ -174,7 +174,7 @@ explain select a1, max(a2) from t1 group by a1; explain select a1, min(a2), max(a2) from t1 group by a1; explain select a1, a2, b, min(c), max(c) from t1 group by a1,a2,b; explain select a1,a2,b,max(c),min(c) from t1 group by a1,a2,b; ---replace_column 7 # +--replace_column 9 # explain select a1,a2,b,max(c),min(c) from t2 group by a1,a2,b; -- Select fields in different order explain select min(a2), a1, max(a2), min(a2), a1 from t1 group by a1; @@ -213,17 +213,29 @@ explain select a1,a2,b,min(c),max(c) from t1 where (a1 = 'b' or a1 = 'd' or a1 = explain select a1,min(c),max(c) from t1 where a1 >= 'b' group by a1,a2,b; explain select a1, max(c) from t1 where a1 in ('a','b','d') group by a1,a2,b; +--replace_column 9 # explain select a1,a2,b, max(c) from t2 where a1 < 'd' group by a1,a2,b; +--replace_column 9 # explain select a1,a2,b,min(c),max(c) from t2 where a1 < 'd' group by a1,a2,b; +--replace_column 9 # explain select a1,a2,b,min(c),max(c) from t2 where a1 >= 'b' group by a1,a2,b; +--replace_column 9 # explain select a1,a2,b, max(c) from t2 where a1 >= 'c' or a1 < 'b' group by a1,a2,b; +--replace_column 9 # explain select a1, max(c) from t2 where a1 >= 'c' or a1 < 'b' group by a1,a2,b; +--replace_column 9 # explain select a1,a2,b,min(c),max(c) from t2 where a1 >= 'c' or a2 < 'b' group by a1,a2,b; +--replace_column 9 # explain select a1,a2,b, max(c) from t2 where a1 = 'z' or a1 = 'b' or a1 = 'd' group by a1,a2,b; +--replace_column 9 # explain select a1,a2,b,min(c),max(c) from t2 where a1 = 'z' or a1 = 'b' or a1 = 'd' group by a1,a2,b; +--replace_column 9 # explain select a1,a2,b, max(c) from t2 where (a1 = 'b' or a1 = 'd' or a1 = 'a' or a1 = 'c') and (a2 > 'a') group by a1,a2,b; +--replace_column 9 # explain select a1,a2,b,min(c),max(c) from t2 where (a1 = 'b' or a1 = 'd' or a1 = 'a' or a1 = 'c') and (a2 > 'a') group by a1,a2,b; +--replace_column 9 # explain select a1,min(c),max(c) from t2 where a1 >= 'b' group by a1,a2,b; +--replace_column 9 # explain select a1, max(c) from t2 where a1 in ('a','b','d') group by a1,a2,b; -- queries @@ -306,6 +318,7 @@ select a1,a2,b,min(c),max(c) from t2 where b is NULL group by a1,a2; -- C) Range predicates for the MIN/MAX attribute -- plans +--replace_column 9 # explain select a1,a2,b, max(c) from t1 where (c > 'b1') group by a1,a2,b; explain select a1,a2,b,min(c),max(c) from t1 where (c > 'b1') group by a1,a2,b; explain select a1,a2,b, max(c) from t1 where (c > 'f123') group by a1,a2,b; @@ -323,20 +336,35 @@ explain select a1,a2,b,min(c),max(c) from t1 where (c < 'c5') or (c = 'g412') or explain select a1,a2,b,min(c),max(c) from t1 where ((c > 'b111') and (c <= 'g112')) or ((c > 'd000') and (c <= 'i110')) group by a1,a2,b; explain select a1,a2,b,min(c),max(c) from t1 where (c between 'b111' and 'g112') or (c between 'd000' and 'i110') group by a1,a2,b; +--replace_column 9 # explain select a1,a2,b, max(c) from t2 where (c > 'b1') group by a1,a2,b; +--replace_column 9 # explain select a1,a2,b,min(c),max(c) from t2 where (c > 'b1') group by a1,a2,b; +--replace_column 9 # explain select a1,a2,b, max(c) from t2 where (c > 'f123') group by a1,a2,b; +--replace_column 9 # explain select a1,a2,b,min(c),max(c) from t2 where (c > 'f123') group by a1,a2,b; +--replace_column 9 # explain select a1,a2,b, max(c) from t2 where (c < 'a0') group by a1,a2,b; +--replace_column 9 # explain select a1,a2,b,min(c),max(c) from t2 where (c < 'a0') group by a1,a2,b; +--replace_column 9 # explain select a1,a2,b, max(c) from t2 where (c < 'k321') group by a1,a2,b; +--replace_column 9 # explain select a1,a2,b,min(c),max(c) from t2 where (c < 'k321') group by a1,a2,b; +--replace_column 9 # explain select a1,a2,b, max(c) from t2 where (c < 'a0') or (c > 'b1') group by a1,a2,b; +--replace_column 9 # explain select a1,a2,b,min(c),max(c) from t2 where (c < 'a0') or (c > 'b1') group by a1,a2,b; +--replace_column 9 # explain select a1,a2,b, max(c) from t2 where (c > 'b1') or (c <= 'g1') group by a1,a2,b; +--replace_column 9 # explain select a1,a2,b,min(c),max(c) from t2 where (c > 'b1') or (c <= 'g1') group by a1,a2,b; +--replace_column 9 # explain select a1,a2,b,min(c),max(c) from t2 where (c > 'b111') and (c <= 'g112') group by a1,a2,b; +--replace_column 9 # explain select a1,a2,b,min(c),max(c) from t2 where (c < 'c5') or (c = 'g412') or (c = 'k421') group by a1,a2,b; +--replace_column 9 # explain select a1,a2,b,min(c),max(c) from t2 where ((c > 'b111') and (c <= 'g112')) or ((c > 'd000') and (c <= 'i110')) group by a1,a2,b; -- queries @@ -394,11 +422,17 @@ explain select a1,a2,b,min(c) from t1 where ((a1 > 'a') or (a1 < '9')) and ((a2 explain select a1,a2,b,min(c) from t1 where (a1 > 'a') and (a2 > 'a') and (b = 'c') group by a1,a2,b; explain select a1,a2,b,min(c) from t1 where (ord(a1) > 97) and (ord(a2) + ord(a1) > 194) and (b = 'c') group by a1,a2,b; +--replace_column 9 # explain select a1,a2,b,min(c),max(c) from t2 where (a1 >= 'c' or a2 < 'b') and (b > 'a') group by a1,a2,b; +--replace_column 9 # explain select a1,a2,b,min(c),max(c) from t2 where (a1 >= 'c' or a2 < 'b') and (c > 'b111') group by a1,a2,b; +--replace_column 9 # explain select a1,a2,b,min(c),max(c) from t2 where (a2 >= 'b') and (b = 'a') and (c > 'b111') group by a1,a2,b; +--replace_column 9 # explain select a1,a2,b,min(c) from t2 where ((a1 > 'a') or (a1 < '9')) and ((a2 >= 'b') and (a2 < 'z')) and (b = 'a') and ((c < 'h112') or (c = 'j121') or (c > 'k121' and c < 'm122') or (c > 'o122')) group by a1,a2,b; +--replace_column 9 # explain select a1,a2,b,min(c) from t2 where ((a1 > 'a') or (a1 < '9')) and ((a2 >= 'b') and (a2 < 'z')) and (b = 'a') and ((c = 'j121') or (c > 'k121' and c < 'm122') or (c > 'o122') or (c < 'h112') or (c = 'c111')) group by a1,a2,b; +--replace_column 9 # explain select a1,a2,b,min(c) from t2 where (a1 > 'a') and (a2 > 'a') and (b = 'c') group by a1,a2,b; -- queries @@ -428,9 +462,13 @@ explain select a1,a2,b from t1 where (a2 >= 'b') and (b = 'a') group by a1,a2,b; explain select a1,a2,b,c from t1 where (a2 >= 'b') and (b = 'a') and (c = 'i121') group by a1,a2,b; explain select a1,a2,b from t1 where (a1 > 'a') and (a2 > 'a') and (b = 'c') group by a1,a2,b; +--replace_column 9 # explain select a1,a2,b from t2 where (a1 >= 'c' or a2 < 'b') and (b > 'a') group by a1,a2,b; +--replace_column 9 # explain select a1,a2,b from t2 where (a2 >= 'b') and (b = 'a') group by a1,a2,b; +--replace_column 9 # explain select a1,a2,b,c from t2 where (a2 >= 'b') and (b = 'a') and (c = 'i121') group by a1,a2,b; +--replace_column 9 # explain select a1,a2,b from t2 where (a1 > 'a') and (a2 > 'a') and (b = 'c') group by a1,a2,b; -- queries @@ -456,9 +494,12 @@ explain select distinct a1,a2,b,c from t1 where (a2 >= 'b') and (b = 'a') and (c explain select distinct a1,a2,b from t1 where (a1 > 'a') and (a2 > 'a') and (b = 'c'); explain select distinct b from t1 where (a2 >= 'b') and (b = 'a'); +--replace_column 9 # explain select distinct a1,a2,b from t2; +--replace_column 9 # explain select distinct a1,a2,b from t2 where (a2 >= 'b') and (b = 'a'); explain select distinct a1,a2,b,c from t2 where (a2 >= 'b') and (b = 'a') and (c = 'i121'); +--replace_column 9 # explain select distinct a1,a2,b from t2 where (a1 > 'a') and (a2 > 'a') and (b = 'c'); explain select distinct b from t2 where (a2 >= 'b') and (b = 'a'); @@ -496,10 +537,15 @@ explain select distinct a1,a2,b,c from t1 where (a2 >= 'b') and (b = 'a') and (c explain select distinct a1,a2,b from t1 where (a1 > 'a') and (a2 > 'a') and (b = 'c') group by a1,a2,b; explain select distinct b from t1 where (a2 >= 'b') and (b = 'a') group by a1,a2,b; +--replace_column 9 # explain select distinct a1,a2,b from t2; +--replace_column 9 # explain select distinct a1,a2,b from t2 where (a2 >= 'b') and (b = 'a') group by a1,a2,b; +--replace_column 9 # explain select distinct a1,a2,b,c from t2 where (a2 >= 'b') and (b = 'a') and (c = 'i121') group by a1,a2,b; +--replace_column 9 # explain select distinct a1,a2,b from t2 where (a1 > 'a') and (a2 > 'a') and (b = 'c') group by a1,a2,b; +--replace_column 9 # explain select distinct b from t2 where (a2 >= 'b') and (b = 'a') group by a1,a2,b; -- queries diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index 2eeb23f97c4..0bd9099ede1 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -948,7 +948,7 @@ int write_record(THD *thd, TABLE *table,COPY_INFO *info) err: if (key) - my_safe_afree(key,table->max_unique_length,MAX_KEY_LENGTH); + my_safe_afree(key,table->s->max_unique_length,MAX_KEY_LENGTH); info->last_errno= error; table->file->print_error(error,MYF(0)); DBUG_RETURN(1); From ae52de495a2248a37086352479eb57b43a5e90a6 Mon Sep 17 00:00:00 2001 From: "jimw@mysql.com" <> Date: Wed, 18 May 2005 17:10:48 -0700 Subject: [PATCH 23/26] Revert fix for Bug #6048: it introduced new problems. --- sql/item.cc | 19 ++++------------ sql/item.h | 54 ++-------------------------------------------- sql/sp_head.cc | 37 +++++++++++++------------------ sql/sp_rcontext.cc | 14 +++--------- 4 files changed, 24 insertions(+), 100 deletions(-) diff --git a/sql/item.cc b/sql/item.cc index aacf2f8cbdd..f105d97bec2 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -307,14 +307,8 @@ Item::Item(): /* Put item in free list so that we can free all items at end */ THD *thd= current_thd; - - if (reused) - next= reuse_next; - else - { - next= thd->free_list; - thd->free_list= this; - } + next= thd->free_list; + thd->free_list= this; /* Item constructor can be called during execution other then SQL_COM command => we should check thd->lex->current_select on zero (thd->lex @@ -349,13 +343,8 @@ Item::Item(THD *thd, Item *item): fixed(item->fixed), collation(item->collation) { - if (reused) - next= reuse_next; - else - { - next= thd->free_list; // Put in free list - thd->free_list= this; - } + next= thd->free_list; // Put in free list + thd->free_list= this; } diff --git a/sql/item.h b/sql/item.h index cd3e86aecd3..2bcc9482f4e 100644 --- a/sql/item.h +++ b/sql/item.h @@ -229,59 +229,9 @@ class Item { Item(const Item &); /* Prevent use of these */ void operator=(Item &); public: - /* For SP reuse mechanism */ - bool reused; - size_t reuse_slot_size; - Item *reuse_next; - - static void *operator new(size_t size) - { - Item *me= (Item *)sql_alloc((uint) size); - - if (me) - { - me->reuse_slot_size= size; - me->reused= FALSE; - } - return (void*)me; - } + static void *operator new(size_t size) {return (void*) sql_alloc((uint) size); } static void *operator new(size_t size, MEM_ROOT *mem_root) - { - Item *me= (Item *)alloc_root(mem_root, (uint) size); - - if (me) - { - me->reuse_slot_size= size; - me->reused= FALSE; - } - return (void*)me; - } - static void *operator new(size_t size, MEM_ROOT *mem_root, Item *reuse) - { - Item *me; - - if (!reuse || size > reuse->reuse_slot_size) - { - me= (Item *)alloc_root(mem_root, (uint) size); - if (me) - { - me->reuse_slot_size= size; - me->reused= FALSE; - } - } - else - { /* Reuse old item */ - size_t slot_size= reuse->reuse_slot_size; - - reuse->delete_self(); - me= reuse; - me->reuse_slot_size= slot_size; - /* For the constructor */ - me->reuse_next= reuse->next; - me->reused= TRUE; - } - return (void *)me; - } + { return (void*) alloc_root(mem_root, (uint) size); } static void operator delete(void *ptr,size_t size) { TRASH(ptr, size); } static void operator delete(void *ptr, MEM_ROOT *mem_root) {} diff --git a/sql/sp_head.cc b/sql/sp_head.cc index 0424f6caa9f..ca2ec6d0acf 100644 --- a/sql/sp_head.cc +++ b/sql/sp_head.cc @@ -131,9 +131,7 @@ sp_prepare_func_item(THD* thd, Item **it_addr) ** if nothing else. */ Item * -sp_eval_func_item(THD *thd, Item **it_addr, enum enum_field_types type, - MEM_ROOT *mem_root, - Item *reuse) +sp_eval_func_item(THD *thd, Item **it_addr, enum enum_field_types type) { DBUG_ENTER("sp_eval_func_item"); Item *it= sp_prepare_func_item(thd, it_addr); @@ -146,7 +144,7 @@ sp_eval_func_item(THD *thd, Item **it_addr, enum enum_field_types type, /* QQ How do we do this? Is there some better way? */ if (type == MYSQL_TYPE_NULL) - it= new(mem_root, reuse) Item_null(); + it= new Item_null(); else { switch (sp_map_result_type(type)) { @@ -157,12 +155,12 @@ sp_eval_func_item(THD *thd, Item **it_addr, enum enum_field_types type, if (it->null_value) { DBUG_PRINT("info", ("INT_RESULT: null")); - it= new(mem_root, reuse) Item_null(); + it= new Item_null(); } else { DBUG_PRINT("info", ("INT_RESULT: %d", i)); - it= new(mem_root, reuse) Item_int(i); + it= new Item_int(i); } break; } @@ -173,7 +171,7 @@ sp_eval_func_item(THD *thd, Item **it_addr, enum enum_field_types type, if (it->null_value) { DBUG_PRINT("info", ("REAL_RESULT: null")); - it= new(mem_root, reuse) Item_null(); + it= new Item_null(); } else { @@ -182,7 +180,7 @@ sp_eval_func_item(THD *thd, Item **it_addr, enum enum_field_types type, uint8 decimals= it->decimals; uint32 max_length= it->max_length; DBUG_PRINT("info", ("REAL_RESULT: %g", d)); - it= new(mem_root, reuse) Item_float(d); + it= new Item_float(d); it->decimals= decimals; it->max_length= max_length; } @@ -192,9 +190,9 @@ sp_eval_func_item(THD *thd, Item **it_addr, enum enum_field_types type, { my_decimal value, *val= it->val_decimal(&value); if (it->null_value) - it= new(mem_root, reuse) Item_null(); + it= new Item_null(); else - it= new(mem_root, reuse) Item_decimal(val); + it= new Item_decimal(val); #ifndef DBUG_OFF char dbug_buff[DECIMAL_MAX_STR_LENGTH+1]; DBUG_PRINT("info", ("DECIMAL_RESULT: %s", dbug_decimal_as_string(dbug_buff, val))); @@ -210,16 +208,14 @@ sp_eval_func_item(THD *thd, Item **it_addr, enum enum_field_types type, if (it->null_value) { DBUG_PRINT("info", ("default result: null")); - it= new(mem_root, reuse) Item_null(); + it= new Item_null(); } else { DBUG_PRINT("info",("default result: %*s", s->length(), s->c_ptr_quick())); - it= new(mem_root, reuse) Item_string(thd->strmake(s->ptr(), - s->length()), - s->length(), - it->collation.collation); + it= new Item_string(thd->strmake(s->ptr(), s->length()), + s->length(), it->collation.collation); } break; } @@ -712,7 +708,7 @@ sp_head::execute_function(THD *thd, Item **argp, uint argcount, Item **resp) for (i= 0 ; i < params && i < argcount ; i++) { sp_pvar_t *pvar = m_pcont->find_pvar(i); - Item *it= sp_eval_func_item(thd, argp++, pvar->type, thd->mem_root, NULL); + Item *it= sp_eval_func_item(thd, argp++, pvar->type); if (it) nctx->push_item(it); @@ -827,8 +823,7 @@ sp_head::execute_procedure(THD *thd, List *args) } else { - Item *it2= sp_eval_func_item(thd, li.ref(), pvar->type, - thd->mem_root, NULL); + Item *it2= sp_eval_func_item(thd, li.ref(), pvar->type); if (it2) nctx->push_item(it2); // IN or INOUT @@ -1474,9 +1469,7 @@ sp_instr_set::exec_core(THD *thd, uint *nextp) Item *it; int res; - it= sp_eval_func_item(thd, &m_value, m_type, - thd->mem_root, - thd->spcont->get_item(m_offset)); + it= sp_eval_func_item(thd, &m_value, m_type); if (! it) res= -1; else @@ -1722,7 +1715,7 @@ sp_instr_freturn::exec_core(THD *thd, uint *nextp) Item *it; int res; - it= sp_eval_func_item(thd, &m_value, m_type, thd->mem_root, NULL); + it= sp_eval_func_item(thd, &m_value, m_type); if (! it) res= -1; else diff --git a/sql/sp_rcontext.cc b/sql/sp_rcontext.cc index fdffa7fb88d..672491a97f2 100644 --- a/sql/sp_rcontext.cc +++ b/sql/sp_rcontext.cc @@ -43,11 +43,8 @@ sp_rcontext::sp_rcontext(uint fsize, uint hmax, uint cmax) int sp_rcontext::set_item_eval(uint idx, Item **item_addr, enum_field_types type) { - extern Item *sp_eval_func_item(THD *thd, Item **it, enum_field_types type, - MEM_ROOT *mem_root, - Item *reuse); - THD *thd= current_thd; - Item *it= sp_eval_func_item(thd, item_addr, type, thd->mem_root, NULL); + extern Item *sp_eval_func_item(THD *thd, Item **it, enum_field_types type); + Item *it= sp_eval_func_item(current_thd, item_addr, type); if (! it) return -1; @@ -114,12 +111,7 @@ void sp_rcontext::save_variables(uint fp) { while (fp < m_count) - { - Item *it= m_frame[fp]; - - m_frame[fp++]= NULL; // Prevent reuse - m_saved.push_front(it); - } + m_saved.push_front(m_frame[fp++]); } void From 6cca51f06a08838f30b93c987ad87c7031a633b6 Mon Sep 17 00:00:00 2001 From: "monty@mysql.com" <> Date: Thu, 19 May 2005 04:48:22 +0300 Subject: [PATCH 24/26] Fixed references to uninitialized memory --- sql/sp.cc | 9 ++++----- sql/sql_lex.cc | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/sql/sp.cc b/sql/sp.cc index 81513cb3198..9a816f277ed 100644 --- a/sql/sp.cc +++ b/sql/sp.cc @@ -72,6 +72,9 @@ db_find_routine_aux(THD *thd, int type, sp_name *name, DBUG_PRINT("enter", ("type: %d name: %*s", type, name->m_name.length, name->m_name.str)); + *opened= FALSE; + *tablep= 0; + /* Speed up things if mysql.proc doesn't exists. mysql_proc_table_exists is set when we create or read stored procedure or on flush privileges. @@ -88,9 +91,7 @@ db_find_routine_aux(THD *thd, int type, sp_name *name, strcmp(table->s->table_name, "proc") == 0) break; } - if (table) - *opened= FALSE; - else + if (!table) { TABLE_LIST tables; @@ -99,7 +100,6 @@ db_find_routine_aux(THD *thd, int type, sp_name *name, tables.table_name= tables.alias= (char*)"proc"; if (! (table= open_ltable(thd, &tables, ltype))) { - *tablep= NULL; /* Under explicit LOCK TABLES or in prelocked mode we should not say that mysql.proc table does not exist if we are unable to @@ -131,7 +131,6 @@ db_find_routine_aux(THD *thd, int type, sp_name *name, key, table->key_info->key_length, HA_READ_KEY_EXACT)) { - *tablep= NULL; DBUG_RETURN(SP_KEY_NOT_FOUND); } *tablep= table; diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index 98e7475ea90..7c7939eaf60 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -1101,7 +1101,7 @@ void st_select_lex::init_query() embedding= leaf_tables= 0; item_list.empty(); join= 0; - where= prep_where= 0; + having= where= prep_where= 0; olap= UNSPECIFIED_OLAP_TYPE; having_fix_field= 0; resolve_mode= NOMATTER_MODE; From 1edd387dab056c73cba222fa793ed516e9eb7ef1 Mon Sep 17 00:00:00 2001 From: "monty@mysql.com" <> Date: Thu, 19 May 2005 05:54:31 +0300 Subject: [PATCH 25/26] portablity fix --- mysql-test/r/group_min_max.result | 2 +- mysql-test/t/group_min_max.test | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mysql-test/r/group_min_max.result b/mysql-test/r/group_min_max.result index 09555bf3725..dea6bca2cdd 100644 --- a/mysql-test/r/group_min_max.result +++ b/mysql-test/r/group_min_max.result @@ -148,7 +148,7 @@ id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE t1 range NULL idx_t1_1 147 NULL 17 Using index for group-by explain select a1,a2,b,max(c),min(c) from t2 group by a1,a2,b; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t2 range NULL idx_t2_1 146 NULL # Using index for group-by +1 SIMPLE t2 range NULL idx_t2_1 # NULL # Using index for group-by explain select min(a2), a1, max(a2), min(a2), a1 from t1 group by a1; id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE t1 range NULL idx_t1_1 65 NULL 5 Using index for group-by diff --git a/mysql-test/t/group_min_max.test b/mysql-test/t/group_min_max.test index f705342b81c..76f959b983b 100644 --- a/mysql-test/t/group_min_max.test +++ b/mysql-test/t/group_min_max.test @@ -174,7 +174,7 @@ explain select a1, max(a2) from t1 group by a1; explain select a1, min(a2), max(a2) from t1 group by a1; explain select a1, a2, b, min(c), max(c) from t1 group by a1,a2,b; explain select a1,a2,b,max(c),min(c) from t1 group by a1,a2,b; ---replace_column 9 # +--replace_column 7 # 9 # explain select a1,a2,b,max(c),min(c) from t2 group by a1,a2,b; -- Select fields in different order explain select min(a2), a1, max(a2), min(a2), a1 from t1 group by a1; From 8091707afe469a8452046c1823ca19c9b57ac7aa Mon Sep 17 00:00:00 2001 From: "matt@mysql.com" <> Date: Thu, 19 May 2005 07:22:23 +0200 Subject: [PATCH 26/26] configure.in: Increment to next version. --- configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.in b/configure.in index bc00a15fed1..332b851402d 100644 --- a/configure.in +++ b/configure.in @@ -6,7 +6,7 @@ AC_PREREQ(2.50)dnl Minimum Autoconf version required. AC_INIT(sql/mysqld.cc) AC_CANONICAL_SYSTEM # Don't forget to also update the NDB lines below. -AM_INIT_AUTOMAKE(mysql, 5.0.6-beta) +AM_INIT_AUTOMAKE(mysql, 5.0.7-beta) AM_CONFIG_HEADER(config.h) PROTOCOL_VERSION=10