- developers - lists.mariadb.org

[Maria-developers] bzr commit into MariaDB 5.1, with Maria 1.5:maria branch (monty:2807)
by Michael Widenius 17 Jan '10

17 Jan '10

#At lp:maria based on revid:knielsen@knielsen-hq.org-20100117084143-u10fexdnq5m0wga8 2807 Michael Widenius 2010-01-17 Fixed race condition when innobase_shutdown_for_mysql() was called before parser was initialized (as it's initialized on first usage) modified: storage/xtradb/pars/lexyy.c storage/xtradb/pars/pars0lex.l === modified file 'storage/xtradb/pars/lexyy.c' --- a/storage/xtradb/pars/lexyy.c 2010-01-06 12:00:14 +0000 +++ b/storage/xtradb/pars/lexyy.c 2010-01-17 11:41:32 +0000 @@ -2786,8 +2786,10 @@ void pars_lexer_close(void) /*==================*/ { - yylex_destroy(); - free(stringbuf); + if (yy_buffer_stack) + yylex_destroy(); + if (stringbuf) + free(stringbuf); stringbuf = NULL; stringbuf_len_alloc = stringbuf_len = 0; } === modified file 'storage/xtradb/pars/pars0lex.l' --- a/storage/xtradb/pars/pars0lex.l 2010-01-06 12:00:14 +0000 +++ b/storage/xtradb/pars/pars0lex.l 2010-01-17 11:41:32 +0000 @@ -669,8 +669,10 @@ void pars_lexer_close(void) /*==================*/ { - yylex_destroy(); - free(stringbuf); + if (yy_buffer_stack) + yylex_destroy(); + if (stringbuf) + free(stringbuf); stringbuf = NULL; stringbuf_len_alloc = stringbuf_len = 0; }

1 0

[Maria-developers] bzr commit into MariaDB 5.1, with Maria 1.5:maria branch (knielsen:2806)
by knielsen＠knielsen-hq.org 17 Jan '10

17 Jan '10

#At lp:maria 2806 knielsen(a)knielsen-hq.org 2010-01-17 Fix freed-twice error in XtraDB (from InnoDB plugin 1.0.6). modified: storage/xtradb/srv/srv0start.c === modified file 'storage/xtradb/srv/srv0start.c' --- a/storage/xtradb/srv/srv0start.c 2010-01-15 15:58:25 +0000 +++ b/storage/xtradb/srv/srv0start.c 2010-01-17 08:41:43 +0000 @@ -2057,8 +2057,8 @@ innobase_shutdown_for_mysql(void) pars_lexer_close(); log_mem_free(); buf_pool_free(); - ut_free_all_mem(); mem_close(); + ut_free_all_mem(); if (os_thread_count != 0 || os_event_count != 0

1 0

[Maria-developers] bzr commit into MariaDB 5.1, with Maria 1.5:maria branch (knielsen:2805)
by knielsen＠knielsen-hq.org 16 Jan '10

16 Jan '10

#At lp:maria 2805 knielsen(a)knielsen-hq.org 2010-01-16 Result file updates following merge of MySQL 5.1.42 and XtraDB 9. modified: mysql-test/suite/funcs_1/r/is_columns_is.result mysql-test/suite/funcs_1/r/is_tables_is.result mysql-test/suite/pbxt/r/func_group.result mysql-test/suite/pbxt/r/mysqlshow.result per-file messages: mysql-test/suite/funcs_1/r/is_columns_is.result XTRADB_ADMIN_COMMAND table added. Column name change: "accessed" -> "access" (XtraDB 9 change). mysql-test/suite/funcs_1/r/is_tables_is.result XTRADB_ADMIN_COMMAND table added. mysql-test/suite/pbxt/r/func_group.result Update results to be correct following fix of Bug#43668. mysql-test/suite/pbxt/r/mysqlshow.result XTRADB_ADMIN_COMMAND table added. === modified file 'mysql-test/suite/funcs_1/r/is_columns_is.result' --- a/mysql-test/suite/funcs_1/r/is_columns_is.result 2009-10-10 09:59:06 +0000 +++ b/mysql-test/suite/funcs_1/r/is_columns_is.result 2010-01-16 05:12:57 +0000 @@ -127,7 +127,7 @@ NULL information_schema INNODB_BUFFER_PO NULL information_schema INNODB_BUFFER_POOL_PAGES_BLOB page_no 2 0 NO bigint NULL NULL 19 0 NULL NULL bigint(21) unsigned select NULL information_schema INNODB_BUFFER_POOL_PAGES_BLOB part_len 4 0 NO bigint NULL NULL 19 0 NULL NULL bigint(21) unsigned select NULL information_schema INNODB_BUFFER_POOL_PAGES_BLOB space_id 1 0 NO bigint NULL NULL 19 0 NULL NULL bigint(21) unsigned select -NULL information_schema INNODB_BUFFER_POOL_PAGES_INDEX accessed 9 0 NO bigint NULL NULL 19 0 NULL NULL bigint(21) unsigned select +NULL information_schema INNODB_BUFFER_POOL_PAGES_INDEX access_time 9 0 NO bigint NULL NULL 19 0 NULL NULL bigint(21) unsigned select NULL information_schema INNODB_BUFFER_POOL_PAGES_INDEX data_size 7 0 NO bigint NULL NULL 19 0 NULL NULL bigint(21) unsigned select NULL information_schema INNODB_BUFFER_POOL_PAGES_INDEX dirty 11 0 NO bigint NULL NULL 19 0 NULL NULL bigint(21) unsigned select NULL information_schema INNODB_BUFFER_POOL_PAGES_INDEX fix_count 14 0 NO bigint NULL NULL 19 0 NULL NULL bigint(21) unsigned select @@ -394,6 +394,7 @@ NULL information_schema VIEWS TABLE_CATA NULL information_schema VIEWS TABLE_NAME 3 NO varchar 64 192 NULL NULL utf8 utf8_general_ci varchar(64) select NULL information_schema VIEWS TABLE_SCHEMA 2 NO varchar 64 192 NULL NULL utf8 utf8_general_ci varchar(64) select NULL information_schema VIEWS VIEW_DEFINITION 4 NULL NO longtext 4294967295 4294967295 NULL NULL utf8 utf8_general_ci longtext select +NULL information_schema XTRADB_ADMIN_COMMAND result_message 1 NO varchar 1024 3072 NULL NULL utf8 utf8_general_ci varchar(1024) select NULL information_schema XTRADB_ENHANCEMENTS comment 3 NO varchar 100 300 NULL NULL utf8 utf8_general_ci varchar(100) select NULL information_schema XTRADB_ENHANCEMENTS description 2 NO varchar 255 765 NULL NULL utf8 utf8_general_ci varchar(255) select NULL information_schema XTRADB_ENHANCEMENTS link 4 NO varchar 255 765 NULL NULL utf8 utf8_general_ci varchar(255) select @@ -589,7 +590,7 @@ NULL information_schema INNODB_BUFFER_PO NULL information_schema INNODB_BUFFER_POOL_PAGES_INDEX n_recs bigint NULL NULL NULL NULL bigint(21) unsigned NULL information_schema INNODB_BUFFER_POOL_PAGES_INDEX data_size bigint NULL NULL NULL NULL bigint(21) unsigned NULL information_schema INNODB_BUFFER_POOL_PAGES_INDEX hashed bigint NULL NULL NULL NULL bigint(21) unsigned -NULL information_schema INNODB_BUFFER_POOL_PAGES_INDEX accessed bigint NULL NULL NULL NULL bigint(21) unsigned +NULL information_schema INNODB_BUFFER_POOL_PAGES_INDEX access_time bigint NULL NULL NULL NULL bigint(21) unsigned NULL information_schema INNODB_BUFFER_POOL_PAGES_INDEX modified bigint NULL NULL NULL NULL bigint(21) unsigned NULL information_schema INNODB_BUFFER_POOL_PAGES_INDEX dirty bigint NULL NULL NULL NULL bigint(21) unsigned NULL information_schema INNODB_BUFFER_POOL_PAGES_INDEX old bigint NULL NULL NULL NULL bigint(21) unsigned @@ -848,6 +849,7 @@ NULL information_schema TRIGGERS CREATED 3.0000 information_schema VIEWS SECURITY_TYPE varchar 7 21 utf8 utf8_general_ci varchar(7) 3.0000 information_schema VIEWS CHARACTER_SET_CLIENT varchar 32 96 utf8 utf8_general_ci varchar(32) 3.0000 information_schema VIEWS COLLATION_CONNECTION varchar 32 96 utf8 utf8_general_ci varchar(32) +3.0000 information_schema XTRADB_ADMIN_COMMAND result_message varchar 1024 3072 utf8 utf8_general_ci varchar(1024) 3.0000 information_schema XTRADB_ENHANCEMENTS name varchar 255 765 utf8 utf8_general_ci varchar(255) 3.0000 information_schema XTRADB_ENHANCEMENTS description varchar 255 765 utf8 utf8_general_ci varchar(255) 3.0000 information_schema XTRADB_ENHANCEMENTS comment varchar 100 300 utf8 utf8_general_ci varchar(100) === modified file 'mysql-test/suite/funcs_1/r/is_tables_is.result' --- a/mysql-test/suite/funcs_1/r/is_tables_is.result 2009-10-10 09:59:06 +0000 +++ b/mysql-test/suite/funcs_1/r/is_tables_is.result 2010-01-16 05:12:57 +0000 @@ -958,6 +958,29 @@ user_comment Separator ----------------------------------------------------- TABLE_CATALOG NULL TABLE_SCHEMA information_schema +TABLE_NAME XTRADB_ADMIN_COMMAND +TABLE_TYPE SYSTEM VIEW +ENGINE MEMORY +VERSION 10 +ROW_FORMAT Fixed +TABLE_ROWS #TBLR# +AVG_ROW_LENGTH #ARL# +DATA_LENGTH #DL# +MAX_DATA_LENGTH #MDL# +INDEX_LENGTH #IL# +DATA_FREE #DF# +AUTO_INCREMENT NULL +CREATE_TIME #CRT# +UPDATE_TIME #UT# +CHECK_TIME #CT# +TABLE_COLLATION utf8_general_ci +CHECKSUM NULL +CREATE_OPTIONS #CO# +TABLE_COMMENT #TC# +user_comment +Separator ----------------------------------------------------- +TABLE_CATALOG NULL +TABLE_SCHEMA information_schema TABLE_NAME XTRADB_ENHANCEMENTS TABLE_TYPE SYSTEM VIEW ENGINE MEMORY @@ -1941,6 +1964,29 @@ user_comment Separator ----------------------------------------------------- TABLE_CATALOG NULL TABLE_SCHEMA information_schema +TABLE_NAME XTRADB_ADMIN_COMMAND +TABLE_TYPE SYSTEM VIEW +ENGINE MEMORY +VERSION 10 +ROW_FORMAT Fixed +TABLE_ROWS #TBLR# +AVG_ROW_LENGTH #ARL# +DATA_LENGTH #DL# +MAX_DATA_LENGTH #MDL# +INDEX_LENGTH #IL# +DATA_FREE #DF# +AUTO_INCREMENT NULL +CREATE_TIME #CRT# +UPDATE_TIME #UT# +CHECK_TIME #CT# +TABLE_COLLATION utf8_general_ci +CHECKSUM NULL +CREATE_OPTIONS #CO# +TABLE_COMMENT #TC# +user_comment +Separator ----------------------------------------------------- +TABLE_CATALOG NULL +TABLE_SCHEMA information_schema TABLE_NAME XTRADB_ENHANCEMENTS TABLE_TYPE SYSTEM VIEW ENGINE MEMORY === modified file 'mysql-test/suite/pbxt/r/func_group.result' --- a/mysql-test/suite/pbxt/r/func_group.result 2009-11-24 10:19:08 +0000 +++ b/mysql-test/suite/pbxt/r/func_group.result 2010-01-16 05:12:57 +0000 @@ -885,7 +885,7 @@ cast(sum(distinct df) as signed) 3 select cast(min(df) as signed) from t1; cast(min(df) as signed) -0 +1 select 1e8 * sum(distinct df) from t1; 1e8 * sum(distinct df) 330000000 === modified file 'mysql-test/suite/pbxt/r/mysqlshow.result' --- a/mysql-test/suite/pbxt/r/mysqlshow.result 2009-08-17 15:57:58 +0000 +++ b/mysql-test/suite/pbxt/r/mysqlshow.result 2010-01-16 05:12:57 +0000 @@ -113,7 +113,7 @@ Database: information_schema | INNODB_RSEG | | XTRADB_ENHANCEMENTS | | INNODB_BUFFER_POOL_PAGES_INDEX | -| INNODB_INDEX_STATS | +| XTRADB_ADMIN_COMMAND | | INNODB_TRX | | INNODB_CMP_RESET | | INNODB_LOCK_WAITS | @@ -122,6 +122,7 @@ Database: information_schema | INNODB_CMPMEM | | INNODB_TABLE_STATS | | INNODB_BUFFER_POOL_PAGES_BLOB | +| INNODB_INDEX_STATS | +---------------------------------------+ Database: INFORMATION_SCHEMA +---------------------------------------+ @@ -161,7 +162,7 @@ Database: INFORMATION_SCHEMA | INNODB_RSEG | | XTRADB_ENHANCEMENTS | | INNODB_BUFFER_POOL_PAGES_INDEX | -| INNODB_INDEX_STATS | +| XTRADB_ADMIN_COMMAND | | INNODB_TRX | | INNODB_CMP_RESET | | INNODB_LOCK_WAITS | @@ -170,6 +171,7 @@ Database: INFORMATION_SCHEMA | INNODB_CMPMEM | | INNODB_TABLE_STATS | | INNODB_BUFFER_POOL_PAGES_BLOB | +| INNODB_INDEX_STATS | +---------------------------------------+ Wildcard: inf_rmation_schema +--------------------+

1 0

[Maria-developers] bzr commit into MariaDB 5.1, with Maria 1.5:maria branch (knielsen:2804) Bug#47720 Bug#49032
by knielsen＠knielsen-hq.org 15 Jan '10

15 Jan '10

#At lp:maria 2804 knielsen(a)knielsen-hq.org 2010-01-15 Apply to XtraDB MySQL/build-in innodb patches for Bug#49032 and Bug#47720. modified: mysql-test/t/innodb-autoinc.test storage/xtradb/handler/ha_innodb.cc storage/xtradb/row/row0sel.c === modified file 'mysql-test/t/innodb-autoinc.test' --- a/mysql-test/t/innodb-autoinc.test 2010-01-15 17:02:57 +0000 +++ b/mysql-test/t/innodb-autoinc.test 2010-01-15 21:12:30 +0000 @@ -2,6 +2,8 @@ # embedded server ignores 'delayed', so skip this -- source include/not_embedded.inc +let $file_format_check=`select @@innodb_file_format_check`; + --disable_warnings drop table if exists t1; --enable_warnings @@ -655,3 +657,7 @@ REPLACE INTO t1 VALUES (-1); SELECT * FROM t1; SHOW CREATE TABLE t1; DROP TABLE t1; + +--disable_query_log +EVAL SET GLOBAL innodb_file_format_check=$file_format_check; +--enable_query_log === modified file 'storage/xtradb/handler/ha_innodb.cc' --- a/storage/xtradb/handler/ha_innodb.cc 2010-01-15 18:44:11 +0000 +++ b/storage/xtradb/handler/ha_innodb.cc 2010-01-15 21:12:30 +0000 @@ -4742,24 +4742,29 @@ no_commit: update the table upper limit. Note: last_value will be 0 if get_auto_increment() was not called.*/ - if (auto_inc <= col_max_value - && auto_inc >= prebuilt->autoinc_last_value) { + if (auto_inc >= prebuilt->autoinc_last_value) { set_max_autoinc: - ut_a(prebuilt->autoinc_increment > 0); - - ulonglong need; - ulonglong offset; - - offset = prebuilt->autoinc_offset; - need = prebuilt->autoinc_increment; - - auto_inc = innobase_next_autoinc( - auto_inc, need, offset, col_max_value); - - err = innobase_set_max_autoinc(auto_inc); - - if (err != DB_SUCCESS) { - error = err; + /* This should filter out the negative + values set explicitly by the user. */ + if (auto_inc <= col_max_value) { + ut_a(prebuilt->autoinc_increment > 0); + + ulonglong need; + ulonglong offset; + + offset = prebuilt->autoinc_offset; + need = prebuilt->autoinc_increment; + + auto_inc = innobase_next_autoinc( + auto_inc, + need, offset, col_max_value); + + err = innobase_set_max_autoinc( + auto_inc); + + if (err != DB_SUCCESS) { + error = err; + } } } break; === modified file 'storage/xtradb/row/row0sel.c' --- a/storage/xtradb/row/row0sel.c 2009-09-07 10:22:53 +0000 +++ b/storage/xtradb/row/row0sel.c 2010-01-15 21:12:30 +0000 @@ -4616,6 +4616,7 @@ row_search_autoinc_read_column( dict_index_t* index, /*!< in: index to read from */ const rec_t* rec, /*!< in: current rec */ ulint col_no, /*!< in: column number */ + ulint mtype, /*!< in: column main type */ ibool unsigned_type) /*!< in: signed or unsigned flag */ { ulint len; @@ -4632,10 +4633,27 @@ row_search_autoinc_read_column( data = rec_get_nth_field(rec, offsets, col_no, &len); ut_a(len != UNIV_SQL_NULL); - ut_a(len <= sizeof value); /* we assume AUTOINC value cannot be negative */ - value = mach_read_int_type(data, len, unsigned_type); + switch (mtype) { + case DATA_INT: + ut_a(len <= sizeof value); + value = mach_read_int_type(data, len, unsigned_type); + break; + + case DATA_FLOAT: + ut_a(len == sizeof(float)); + value = mach_float_read(data); + break; + + case DATA_DOUBLE: + ut_a(len == sizeof(double)); + value = mach_double_read(data); + break; + + default: + ut_error; + } if (UNIV_LIKELY_NULL(heap)) { mem_heap_free(heap); @@ -4721,7 +4739,8 @@ row_search_max_autoinc( dfield->col->prtype & DATA_UNSIGNED); *value = row_search_autoinc_read_column( - index, rec, i, unsigned_type); + index, rec, i, + dfield->col->mtype, unsigned_type); } }

1 0

[Maria-developers] bzr commit into MariaDB 5.1, with Maria 1.5:maria branch (knielsen:2803)
by knielsen＠knielsen-hq.org 15 Jan '10

15 Jan '10

#At lp:maria 2803 knielsen(a)knielsen-hq.org 2010-01-15 Fix crashes by taking kernel mutex when calling srv_table_reserve_slot() during thread startup. modified: storage/xtradb/srv/srv0srv.c === modified file 'storage/xtradb/srv/srv0srv.c' --- a/storage/xtradb/srv/srv0srv.c 2010-01-15 15:58:25 +0000 +++ b/storage/xtradb/srv/srv0srv.c 2010-01-15 19:48:33 +0000 @@ -2559,10 +2559,9 @@ srv_master_thread( srv_main_thread_process_no = os_proc_get_number(); srv_main_thread_id = os_thread_pf(os_thread_get_curr_id()); - srv_table_reserve_slot(SRV_MASTER); - mutex_enter(&kernel_mutex); + srv_table_reserve_slot(SRV_MASTER); srv_n_threads_active[SRV_MASTER]++; mutex_exit(&kernel_mutex); @@ -3167,8 +3166,8 @@ srv_purge_thread( os_thread_pf(os_thread_get_curr_id())); #endif - srv_table_reserve_slot(SRV_PURGE); mutex_enter(&kernel_mutex); + srv_table_reserve_slot(SRV_PURGE); srv_n_threads_active[SRV_PURGE]++; mutex_exit(&kernel_mutex); @@ -3255,8 +3254,8 @@ srv_purge_worker_thread( fprintf(stderr, "Purge worker thread starts, id %lu\n", os_thread_pf(os_thread_get_curr_id())); #endif - srv_table_reserve_slot(SRV_PURGE_WORKER); mutex_enter(&kernel_mutex); + srv_table_reserve_slot(SRV_PURGE_WORKER); srv_n_threads_active[SRV_PURGE_WORKER]++; mutex_exit(&kernel_mutex);

1 0

[Maria-developers] bzr commit into MariaDB 5.1, with Maria 1.5:maria branch (knielsen:2802)
by knielsen＠knielsen-hq.org 15 Jan '10

15 Jan '10

#At lp:maria 2802 knielsen(a)knielsen-hq.org 2010-01-15 After-merge fix for XtraDB 9: missing DBUG_RETURN. modified: storage/xtradb/handler/ha_innodb.cc === modified file 'storage/xtradb/handler/ha_innodb.cc' --- a/storage/xtradb/handler/ha_innodb.cc 2010-01-15 17:02:57 +0000 +++ b/storage/xtradb/handler/ha_innodb.cc 2010-01-15 18:44:11 +0000 @@ -9729,7 +9729,7 @@ ha_innobase::check_if_incompatible_data( if (table->field[i]->flags & FIELD_IN_ADD_INDEX && innobase_strcasecmp(table->field[i]->field_name, dict_table_get_col_name(prebuilt->table, i))) { - return(COMPATIBLE_DATA_NO); + DBUG_RETURN(COMPATIBLE_DATA_NO); } } }

1 0

[Maria-developers] bzr commit into MariaDB 5.1, with Maria 1.5:maria branch (monty:2801)
by Michael Widenius 15 Jan '10

15 Jan '10

#At lp:maria based on revid:knielsen@knielsen-hq.org-20100115170257-h7nt8f7bvzxa9lfe 2801 Michael Widenius 2010-01-15 [merge] Automatic merge removed: mysql-test/suite/maria/t/maria2-master.opt === removed file 'mysql-test/suite/maria/t/maria2-master.opt' --- a/mysql-test/suite/maria/t/maria2-master.opt 2010-01-15 15:27:55 +0000 +++ b/mysql-test/suite/maria/t/maria2-master.opt 1970-01-01 00:00:00 +0000 @@ -1 +0,0 @@ ---secure-file-priv="../../std_data"

1 0

[Maria-developers] bzr commit into MariaDB 5.1, with Maria 1.5:maria branch (monty:2780)
by Michael Widenius 15 Jan '10

15 Jan '10

#At lp:maria based on revid:monty@askmonty.org-20100115154033-p7zphwgmegcrw6ts 2780 Michael Widenius 2010-01-15 Removed not needed test file (that caused embedded server to fail) removed: mysql-test/suite/maria/t/maria2-master.opt === removed file 'mysql-test/suite/maria/t/maria2-master.opt' --- a/mysql-test/suite/maria/t/maria2-master.opt 2010-01-15 15:27:55 +0000 +++ b/mysql-test/suite/maria/t/maria2-master.opt 1970-01-01 00:00:00 +0000 @@ -1 +0,0 @@ ---secure-file-priv="../../std_data"

1 0

[Maria-developers] [Branch ~maria-captains/maria/5.1] Rev 2799: Fixed that we use same flags when testing for assembler as by makefiles.
by noreply＠launchpad.net 15 Jan '10

15 Jan '10

------------------------------------------------------------ revno: 2799 committer: Michael Widenius <monty(a)askmonty.org> branch nick: maria-5.1 timestamp: Fri 2010-01-15 20:06:18 +0200 message: Fixed that we use same flags when testing for assembler as by makefiles. Fixed bug in locking by triggers found by test case when compiling without query cache modified: configure.in sql/sql_yacc.yy -- lp:maria https://code.launchpad.net/~maria-captains/maria/5.1 Your team Maria developers is subscribed to branch lp:maria. To unsubscribe from this branch go to https://code.launchpad.net/~maria-captains/maria/5.1/+edit-subscription.

1 0

[Maria-developers] bzr commit into MariaDB 5.1, with Maria 1.5:maria branch (monty:2799)
by Michael Widenius 15 Jan '10

15 Jan '10

#At lp:maria based on revid:monty@askmonty.org-20100114165100-00keho9r4bv83dq1 2799 Michael Widenius 2010-01-15 Fixed that we use same flags when testing for assembler as by makefiles. Fixed bug in locking by triggers found by test case when compiling without query cache modified: configure.in sql/sql_yacc.yy per-file messages: configure.in Fixed that we use same flags when testing for assembler as by makefiles. sql/sql_yacc.yy Fixed bug in locking by triggers found by test case when compiling without query cache The idea should be that triggers uses the same lock method (low_priority_locks...) as main tables. === modified file 'configure.in' --- a/configure.in 2010-01-09 10:45:27 +0000 +++ b/configure.in 2010-01-15 18:06:18 +0000 @@ -224,14 +224,6 @@ then GXX="no" fi -if test "$ac_cv_prog_gcc" = "yes" -then - AS="$CC -c" - AC_SUBST(AS) -else - AC_PATH_PROG(AS, as, as) -fi - # Still need ranlib for readline; local static use only so no libtool. AC_PROG_RANLIB # We use libtool @@ -688,7 +680,7 @@ AC_ARG_ENABLE(assembler, AC_MSG_CHECKING(if we should use assembler functions) # For now we only support assembler on i386 and sparc systems -AM_CONDITIONAL(ASSEMBLER_x86, test "$ENABLE_ASSEMBLER" = "yes" -a "$BASE_MACHINE_TYPE" = "i386" && $AS strings/strings-x86.s -o checkassembler >/dev/null 2>&1 && test -f checkassembler && (rm -f checkassembler; exit 0;)) +AM_CONDITIONAL(ASSEMBLER_x86, test "$ENABLE_ASSEMBLER" = "yes" -a "$BASE_MACHINE_TYPE" = "i386" && $CCAS $CCASFLAGS -c strings/strings-x86.s -o checkassembler >/dev/null 2>&1 && test -f checkassembler && (rm -f checkassembler; exit 0;)) AM_CONDITIONAL(ASSEMBLER_sparc32, test "$ENABLE_ASSEMBLER" = "yes" -a "$BASE_MACHINE_TYPE" = "sparc") AM_CONDITIONAL(ASSEMBLER_sparc64, test "$ENABLE_ASSEMBLER" = "yes" -a "$BASE_MACHINE_TYPE" = "sparcv9") AM_CONDITIONAL(ASSEMBLER, test "$ASSEMBLER_x86_TRUE" = "" -o "$ASSEMBLER_sparc32_TRUE" = "") === modified file 'sql/sql_yacc.yy' --- a/sql/sql_yacc.yy 2009-12-03 11:19:05 +0000 +++ b/sql/sql_yacc.yy 2010-01-15 18:06:18 +0000 @@ -9483,16 +9483,12 @@ replace: insert_lock_option: /* empty */ { -#ifdef HAVE_QUERY_CACHE /* - If it is SP we do not allow insert optimisation whan result of + If it is SP we do not allow insert optimisation when result of insert visible only after the table unlocking but everyone can read table. */ $$= (Lex->sphead ? TL_WRITE_DEFAULT : TL_WRITE_CONCURRENT_INSERT); -#else - $$= TL_WRITE_CONCURRENT_INSERT; -#endif } | LOW_PRIORITY { $$= TL_WRITE_LOW_PRIORITY; } | DELAYED_SYM { $$= TL_WRITE_DELAYED; } @@ -10515,15 +10511,11 @@ load_data_lock: /* empty */ { $$= TL_WRITE_DEFAULT; } | CONCURRENT { -#ifdef HAVE_QUERY_CACHE /* - Ignore this option in SP to avoid problem with query cache + Ignore this option in SP to avoid problem with query cache and + triggers with non default priority locks */ - if (Lex->sphead != 0) - $$= TL_WRITE_DEFAULT; - else -#endif - $$= TL_WRITE_CONCURRENT_INSERT; + $$= (Lex->sphead ? TL_WRITE_DEFAULT : TL_WRITE_CONCURRENT_INSERT); } | LOW_PRIORITY { $$= TL_WRITE_LOW_PRIORITY; } ; @@ -12237,12 +12229,7 @@ lock_option: | WRITE_SYM { $$= TL_WRITE_DEFAULT; } | WRITE_SYM CONCURRENT { -#ifdef HAVE_QUERY_CACHE - if (Lex->sphead != 0) - $$= TL_WRITE_DEFAULT; - else -#endif - $$= TL_WRITE_CONCURRENT_INSERT; + $$= (Lex->sphead ? TL_WRITE_DEFAULT : TL_WRITE_CONCURRENT_INSERT); } | LOW_PRIORITY WRITE_SYM { $$= TL_WRITE_LOW_PRIORITY; }

1 0