| List: | Internals | « Previous MessageNext Message » | |
| From: | jonas | Date: | September 9 2005 1:30pm |
| Subject: | bk commit into 5.1 tree (jonas:1.1878) | ||
| View as plain text | |||
Below is the list of changes that have just been committed into a local 5.1 repository of jonas. When jonas does a push these changes will be propagated to the main repository and, within 24 hours after the push, to the public repository. For information on how to access the public repository see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html ChangeSet 1.1878 05/09/09 13:30:38 jonas@eel.(none) +10 -0 Merge eel.(none):/home/jonas/src/mysql-5.0 into eel.(none):/home/jonas/src/mysql-5.1-push storage/ndb/test/src/UtilTransactions.cpp 1.20 05/09/09 13:30:33 jonas@eel.(none) +0 -0 Auto merged storage/ndb/test/src/NDBT_Test.cpp 1.25 05/09/09 13:30:33 jonas@eel.(none) +0 -0 Auto merged storage/ndb/test/ndbapi/bank/Bank.hpp 1.8 05/09/09 13:30:33 jonas@eel.(none) +0 -0 Auto merged storage/ndb/test/ndbapi/bank/Bank.cpp 1.11 05/09/09 13:30:33 jonas@eel.(none) +0 -0 Auto merged storage/ndb/test/ndbapi/Makefile.am 1.23 05/09/09 13:30:33 jonas@eel.(none) +0 -0 Auto merged storage/ndb/test/include/NDBT_Test.hpp 1.13 05/09/09 13:30:33 jonas@eel.(none) +0 -0 Auto merged storage/ndb/test/src/UtilTransactions.cpp 1.17.2.2 05/09/09 13:30:33 jonas@eel.(none) +0 -0 Merge rename: ndb/test/src/UtilTransactions.cpp -> storage/ndb/test/src/UtilTransactions.cpp storage/ndb/test/src/NDBT_Test.cpp 1.23.1.2 05/09/09 13:30:33 jonas@eel.(none) +0 -0 Merge rename: ndb/test/src/NDBT_Test.cpp -> storage/ndb/test/src/NDBT_Test.cpp storage/ndb/test/ndbapi/bank/Bank.hpp 1.6.1.2 05/09/09 13:30:33 jonas@eel.(none) +0 -0 Merge rename: ndb/test/ndbapi/bank/Bank.hpp -> storage/ndb/test/ndbapi/bank/Bank.hpp storage/ndb/test/ndbapi/bank/Bank.cpp 1.9.1.2 05/09/09 13:30:33 jonas@eel.(none) +0 -0 Merge rename: ndb/test/ndbapi/bank/Bank.cpp -> storage/ndb/test/ndbapi/bank/Bank.cpp storage/ndb/test/ndbapi/Makefile.am 1.19.4.2 05/09/09 13:30:33 jonas@eel.(none) +0 -0 Merge rename: ndb/test/ndbapi/Makefile.am -> storage/ndb/test/ndbapi/Makefile.am storage/ndb/test/include/NDBT_Test.hpp 1.11.1.2 05/09/09 13:30:33 jonas@eel.(none) +0 -0 Merge rename: ndb/test/include/NDBT_Test.hpp -> storage/ndb/test/include/NDBT_Test.hpp storage/ndb/src/common/portlib/NdbThread.c 1.28 05/09/09 13:30:33 jonas@eel.(none) +0 -0 Auto merged sql/sql_show.cc 1.262 05/09/09 13:30:33 jonas@eel.(none) +0 -0 Auto merged sql/set_var.h 1.71 05/09/09 13:30:33 jonas@eel.(none) +0 -0 Auto merged sql/set_var.cc 1.134 05/09/09 13:30:33 jonas@eel.(none) +0 -0 Auto merged storage/ndb/src/common/portlib/NdbThread.c 1.20.6.2 05/09/09 13:30:32 jonas@eel.(none) +0 -0 Merge rename: ndb/src/common/portlib/NdbThread.c -> storage/ndb/src/common/portlib/NdbThread.c # This is a BitKeeper patch. What follows are the unified diffs for the # set of deltas contained in the patch. The rest of the patch, the part # that BitKeeper cares about, is below these diffs. # User: jonas # Host: eel.(none) # Root: /home/jonas/src/mysql-5.1-push/RESYNC --- 1.261/sql/sql_show.cc 2005-09-06 09:11:51 +02:00 +++ 1.262/sql/sql_show.cc 2005-09-09 13:30:33 +02:00 @@ -2010,10 +2010,20 @@ /* get_all_tables() returns 1 on failure and 0 on success thus return only these and not the result code of ::process_table() + + We should use show_table_list->alias instead of + show_table_list->table_name because table_name + could be changed during opening of I_S tables. It's safe + to use alias because alias contains original table name + in this case(this part of code is used only for + 'show columns' & 'show statistics' commands). */ error= test(schema_table->process_table(thd, show_table_list, - table, res, show_table_list->db, - show_table_list->alias)); + table, res, + (show_table_list->view ? + show_table_list->view_db.str : + show_table_list->db), + show_table_list->alias)); close_thread_tables(thd); show_table_list->table= 0; goto err; @@ -2114,6 +2124,13 @@ lex->derived_tables= 0; res= open_normal_and_derived_tables(thd, show_table_list, MYSQL_LOCK_IGNORE_FLUSH); + /* + We should use show_table_list->alias instead of + show_table_list->table_name because table_name + could be changed during opening of I_S tables. It's safe + to use alias because alias contains original table name + in this case. + */ res= schema_table->process_table(thd, show_table_list, table, res, base_name, show_table_list->alias); --- 1.20.6.1/ndb/src/common/portlib/NdbThread.c 2005-09-07 14:51:52 +02:00 +++ 1.28/storage/ndb/src/common/portlib/NdbThread.c 2005-09-09 13:30:33 +02:00 @@ -36,6 +36,27 @@ void * object; }; + +#ifdef NDB_SHM_TRANSPORTER +void NdbThread_set_shm_sigmask(my_bool block) +{ + DBUG_ENTER("NdbThread_set_shm_sigmask"); + if (g_ndb_shm_signum) + { + sigset_t mask; + DBUG_PRINT("info",("Block signum %d",g_ndb_shm_signum)); + sigemptyset(&mask); + sigaddset(&mask, g_ndb_shm_signum); + if (block) + pthread_sigmask(SIG_BLOCK, &mask, 0); + else + pthread_sigmask(SIG_UNBLOCK, &mask, 0); + } + DBUG_VOID_RETURN; +} +#endif + + static void* ndb_thread_wrapper(void* _ss){ @@ -43,14 +64,7 @@ { DBUG_ENTER("ndb_thread_wrapper"); #ifdef NDB_SHM_TRANSPORTER - if (g_ndb_shm_signum) - { - sigset_t mask; - DBUG_PRINT("info",("Block signum %d",g_ndb_shm_signum)); - sigemptyset(&mask); - sigaddset(&mask, g_ndb_shm_signum); - pthread_sigmask(SIG_BLOCK, &mask, 0); - } + NdbThread_set_shm_sigmask(TRUE); #endif { /** --- 1.133/sql/set_var.cc 2005-09-07 09:39:26 +02:00 +++ 1.134/sql/set_var.cc 2005-09-09 13:30:33 +02:00 @@ -142,11 +142,8 @@ sys_var_thd_ulong sys_bulk_insert_buff_size("bulk_insert_buffer_size", &SV::bulk_insert_buff_size); sys_var_character_set_server sys_character_set_server("character_set_server"); -sys_var_str sys_charset_system("character_set_system", - sys_check_charset, - sys_update_charset, - sys_set_default_charset, - (char *)my_charset_utf8_general_ci.name); +sys_var_const_str sys_charset_system("character_set_system", + (char *)my_charset_utf8_general_ci.name); sys_var_character_set_database sys_character_set_database("character_set_database"); sys_var_character_set_client sys_character_set_client("character_set_client"); sys_var_character_set_connection sys_character_set_connection("character_set_connection"); @@ -571,6 +568,7 @@ &sys_character_set_client, &sys_character_set_connection, &sys_character_set_results, + &sys_charset_system, &sys_collation_connection, &sys_collation_database, &sys_collation_server, @@ -1120,27 +1118,6 @@ { strmake(ft_boolean_syntax, def_ft_boolean_syntax, sizeof(ft_boolean_syntax)-1); -} - -/* - The following 3 functions need to be changed in 4.1 when we allow - one to change character sets -*/ - -static int sys_check_charset(THD *thd, set_var *var) -{ - return 0; -} - - -static bool sys_update_charset(THD *thd, set_var *var) -{ - return 0; -} - - -static void sys_set_default_charset(THD *thd, enum_var_type type) -{ } --- 1.70/sql/set_var.h 2005-08-05 23:50:36 +02:00 +++ 1.71/sql/set_var.h 2005-09-09 13:30:33 +02:00 @@ -190,6 +190,7 @@ return 1; } bool check_default(enum_var_type type) { return 1; } + bool is_readonly() const { return 1; } }; @@ -901,7 +902,7 @@ bool not_all_support_one_shot(List<set_var_base> *var_list); void fix_delay_key_write(THD *thd, enum_var_type type); ulong fix_sql_mode(ulong sql_mode); -extern sys_var_str sys_charset_system; +extern sys_var_const_str sys_charset_system; extern sys_var_str sys_init_connect; extern sys_var_str sys_init_slave; extern sys_var_thd_time_zone sys_time_zone; --- 1.19.4.1/ndb/test/ndbapi/Makefile.am 2005-09-09 12:53:59 +02:00 +++ 1.23/storage/ndb/test/ndbapi/Makefile.am 2005-09-09 13:30:33 +02:00 @@ -81,10 +81,10 @@ test_event_multi_table_SOURCES = test_event_multi_table.cpp testSRBank_SOURCES = testSRBank.cpp -INCLUDES_LOC = -I$(top_srcdir)/ndb/include/kernel +INCLUDES_LOC = -I$(top_srcdir)/storage/ndb/include/kernel -include $(top_srcdir)/ndb/config/common.mk.am -include $(top_srcdir)/ndb/config/type_ndbapitest.mk.am +include $(top_srcdir)/storage/ndb/config/common.mk.am +include $(top_srcdir)/storage/ndb/config/type_ndbapitest.mk.am ##testDict_INCLUDES = $(INCLUDES) -I$(top_srcdir)/ndb/include/kernel ##testIndex_INCLUDES = $(INCLUDES) -I$(top_srcdir)/ndb/include/kernel @@ -102,61 +102,61 @@ testScan.dsp flexBench.dsp: Makefile \ - $(top_srcdir)/ndb/config/win-prg.am \ - $(top_srcdir)/ndb/config/win-name \ - $(top_srcdir)/ndb/config/win-includes \ - $(top_srcdir)/ndb/config/win-sources \ - $(top_srcdir)/ndb/config/win-libraries - cat $(top_srcdir)/ndb/config/win-prg.am > $@ - @$(top_srcdir)/ndb/config/win-name $@ flexBench - @$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES) - @$(top_srcdir)/ndb/config/win-sources $@ $(flexBench_SOURCES) - @$(top_srcdir)/ndb/config/win-libraries $@ LINK $(LDADD) + $(top_srcdir)/storage/ndb/config/win-prg.am \ + $(top_srcdir)/storage/ndb/config/win-name \ + $(top_srcdir)/storage/ndb/config/win-includes \ + $(top_srcdir)/storage/ndb/config/win-sources \ + $(top_srcdir)/storage/ndb/config/win-libraries + cat $(top_srcdir)/storage/ndb/config/win-prg.am > $@ + @$(top_srcdir)/storage/ndb/config/win-name $@ flexBench + @$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES) + @$(top_srcdir)/storage/ndb/config/win-sources $@ $(flexBench_SOURCES) + @$(top_srcdir)/storage/ndb/config/win-libraries $@ LINK $(LDADD) testBasic.dsp: Makefile \ - $(top_srcdir)/ndb/config/win-prg.am \ - $(top_srcdir)/ndb/config/win-name \ - $(top_srcdir)/ndb/config/win-includes \ - $(top_srcdir)/ndb/config/win-sources \ - $(top_srcdir)/ndb/config/win-libraries - cat $(top_srcdir)/ndb/config/win-prg.am > $@ - @$(top_srcdir)/ndb/config/win-name $@ testBasic - @$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES) - @$(top_srcdir)/ndb/config/win-sources $@ $(testBasic_SOURCES) - @$(top_srcdir)/ndb/config/win-libraries $@ LINK $(LDADD) + $(top_srcdir)/storage/ndb/config/win-prg.am \ + $(top_srcdir)/storage/ndb/config/win-name \ + $(top_srcdir)/storage/ndb/config/win-includes \ + $(top_srcdir)/storage/ndb/config/win-sources \ + $(top_srcdir)/storage/ndb/config/win-libraries + cat $(top_srcdir)/storage/ndb/config/win-prg.am > $@ + @$(top_srcdir)/storage/ndb/config/win-name $@ testBasic + @$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES) + @$(top_srcdir)/storage/ndb/config/win-sources $@ $(testBasic_SOURCES) + @$(top_srcdir)/storage/ndb/config/win-libraries $@ LINK $(LDADD) testOIBasic.dsp: Makefile \ - $(top_srcdir)/ndb/config/win-prg.am \ - $(top_srcdir)/ndb/config/win-name \ - $(top_srcdir)/ndb/config/win-includes \ - $(top_srcdir)/ndb/config/win-sources \ - $(top_srcdir)/ndb/config/win-libraries - cat $(top_srcdir)/ndb/config/win-prg.am > $@ - @$(top_srcdir)/ndb/config/win-name $@ testOIBasic - @$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES) - @$(top_srcdir)/ndb/config/win-sources $@ $(testOIBasic_SOURCES) - @$(top_srcdir)/ndb/config/win-libraries $@ LINK $(LDADD) + $(top_srcdir)/storage/ndb/config/win-prg.am \ + $(top_srcdir)/storage/ndb/config/win-name \ + $(top_srcdir)/storage/ndb/config/win-includes \ + $(top_srcdir)/storage/ndb/config/win-sources \ + $(top_srcdir)/storage/ndb/config/win-libraries + cat $(top_srcdir)/storage/ndb/config/win-prg.am > $@ + @$(top_srcdir)/storage/ndb/config/win-name $@ testOIBasic + @$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES) + @$(top_srcdir)/storage/ndb/config/win-sources $@ $(testOIBasic_SOURCES) + @$(top_srcdir)/storage/ndb/config/win-libraries $@ LINK $(LDADD) testBlobs.dsp: Makefile \ - $(top_srcdir)/ndb/config/win-prg.am \ - $(top_srcdir)/ndb/config/win-name \ - $(top_srcdir)/ndb/config/win-includes \ - $(top_srcdir)/ndb/config/win-sources \ - $(top_srcdir)/ndb/config/win-libraries - cat $(top_srcdir)/ndb/config/win-prg.am > $@ - @$(top_srcdir)/ndb/config/win-name $@ testBlobs - @$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES) - @$(top_srcdir)/ndb/config/win-sources $@ $(testBlobs_SOURCES) - @$(top_srcdir)/ndb/config/win-libraries $@ LINK $(LDADD) + $(top_srcdir)/storage/ndb/config/win-prg.am \ + $(top_srcdir)/storage/ndb/config/win-name \ + $(top_srcdir)/storage/ndb/config/win-includes \ + $(top_srcdir)/storage/ndb/config/win-sources \ + $(top_srcdir)/storage/ndb/config/win-libraries + cat $(top_srcdir)/storage/ndb/config/win-prg.am > $@ + @$(top_srcdir)/storage/ndb/config/win-name $@ testBlobs + @$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES) + @$(top_srcdir)/storage/ndb/config/win-sources $@ $(testBlobs_SOURCES) + @$(top_srcdir)/storage/ndb/config/win-libraries $@ LINK $(LDADD) testScan.dsp: Makefile \ - $(top_srcdir)/ndb/config/win-prg.am \ - $(top_srcdir)/ndb/config/win-name \ - $(top_srcdir)/ndb/config/win-includes \ - $(top_srcdir)/ndb/config/win-sources \ - $(top_srcdir)/ndb/config/win-libraries - cat $(top_srcdir)/ndb/config/win-prg.am > $@ - @$(top_srcdir)/ndb/config/win-name $@ testScan - @$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES) - @$(top_srcdir)/ndb/config/win-sources $@ $(testScan_SOURCES) - @$(top_srcdir)/ndb/config/win-libraries $@ LINK $(LDADD) + $(top_srcdir)/storage/ndb/config/win-prg.am \ + $(top_srcdir)/storage/ndb/config/win-name \ + $(top_srcdir)/storage/ndb/config/win-includes \ + $(top_srcdir)/storage/ndb/config/win-sources \ + $(top_srcdir)/storage/ndb/config/win-libraries + cat $(top_srcdir)/storage/ndb/config/win-prg.am > $@ + @$(top_srcdir)/storage/ndb/config/win-name $@ testScan + @$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES) + @$(top_srcdir)/storage/ndb/config/win-sources $@ $(testScan_SOURCES) + @$(top_srcdir)/storage/ndb/config/win-libraries $@ LINK $(LDADD)
| Thread | ||
|---|---|---|
| • bk commit into 5.1 tree (jonas:1.1878) | jonas | 9 Sep |
© 1995-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
Page generated in 0.473 sec. using MySQL 5.1.14-beta-log