mariadb

Tree: 97bb72f139

Author	SHA1	Message	Date
unknown	97bb72f139	add mysqlslap back to windows builds for 5.1 client/CMakeLists.txt: add mysqlslap back in for 5.1	19 years ago
unknown	072a190820	powermacg5 problem fix we need a copy of I_S name because the name can be changed in case of lowercase_table_name!=0	19 years ago
unknown	1440a30dfe	Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build into trift2.:/MySQL/M51/cmake-5.1	19 years ago
unknown	c28ca5e2e2	Re-apply fixes originally made by Kent, they got lost because of a merge conflict with the CMakeLists.txt dependency fix (numer 29982 in our bugs DB). These changes are for bug#30118. client/CMakeLists.txt: Manual merge from 5.0 (bug#30118) libmysql/CMakeLists.txt: Manual merge from 5.0 (bug#30118) mysys/CMakeLists.txt: Manual merge from 5.0 (bug#30118) sql/CMakeLists.txt: Added missing '${MYSQLD_EXE_SUFFIX}' to "mysqld" targets new in 5.1 zlib/CMakeLists.txt: Manual merge from 5.0 (bug#30118)	19 years ago
unknown	46362c4b2e	README.txt-1: Rename: mysql-test/suite/funcs_1/README.txt -> mysql-test/suite/funcs_1/README.txt-1 README.txt: Rename: BitKeeper/deleted/.del-README.txt -> mysql-test/suite/funcs_1/README.txt README.txt-old-delete: Rename: mysql-test/suite/funcs_1/README.txt -> mysql-test/suite/funcs_1/README.txt-old-delete README.txt: Rename: mysql-test/suite/funcs_1/README.txt-1 -> mysql-test/suite/funcs_1/README.txt .del-README.txt-old-delete: Delete: mysql-test/suite/funcs_1/README.txt-old-delete BitKeeper/deleted/.del-README.txt-old-delete: Delete: mysql-test/suite/funcs_1/README.txt-old-delete mysql-test/suite/funcs_1/README.txt: Rename: mysql-test/suite/funcs_1/README.txt-1 -> mysql-test/suite/funcs_1/README.txt	19 years ago
unknown	126a403278	Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build into trift2.:/MySQL/M51/push-5.1	19 years ago
unknown	82d28fada7	WL#3732 Information schema optimization client/mysqldump.c: table type compare is changed to case insensitive mysql-test/r/information_schema.result: test result mysql-test/r/information_schema_db.result: result fix mysql-test/suite/ndb/r/ndb_alter_table.result: result fix mysql-test/suite/ndb/r/ndb_temporary.result: result fix mysql-test/t/information_schema.test: test case sql/ha_ndbcluster.cc: char* variables are changed to LEX_STRING sql/ha_ndbcluster.h: char* variables are changed to LEX_STRING sql/ha_ndbcluster_binlog.cc: char* variables are changed to LEX_STRING sql/handler.cc: char* variables are changed to LEX_STRING sql/handler.h: char* variables are changed to LEX_STRING sql/sql_base.cc: Modified functions which are used during open table process according to table opening method and requested_object. sql/sql_select.cc: Add support for I_S tables into select_describe() function sql/sql_show.cc: 1. Added initialization of 'open_method' to 'st_field_info' structs. 2. Added initialization of 'i_s_requested_object' to 'ST_SCHEMA_TABLE' structs. 3. New function which calculates database name and table name values from 'where' condition if it's possible void get_lookup_field_values(THD thd, COND cond, TABLE_LIST table, LOOKUP_FIELD_VALUES lookup_field_vals); 4. New function which set table open method setup_table_open_method(TABLE_LIST tables, ST_SCHEMA_TABLE schema_table, enum enum_schema_tables schema_table_idx) 5. New function int make_db_list(THD thd, List<LEX_STRING> files, LOOKUP_FIELD_VALUES lookup_field_vals, bool with_i_schema) 6. New function int make_table_name_list(THD thd, List<LEX_STRING> files, LEX lex, LOOKUP_FIELD_VALUES lookup_field_vals, bool with_i_schema, LEX_STRING db_name) 7. Modified 'get_all_tables' function according to new schema(see wl#3732). sql/sql_show.h: char variables are changed to LEX_STRING sql/table.cc: Modified functions which are used during open table process according to table opening method and requested_object. sql/table.h: 1. added new constants(open_method) #define SKIP_OPEN_TABLE 0 #define OPEN_FRM_ONLY 1 #define OPEN_FULL_TABLE 2 2. Added new field 'open_method' into struct st_field_info; uint open_method; 3. Added new field into ST_SCHEMA_TABLE struct uint i_s_requested_object; /* the object we need to open(TABLE \| VIEW) */. 4. Added new field to TABLE_LIST struct. uint i_s_requested_object; This field is set from ST_SCHEMA_TABLE.i_s_requested_object for processed table before opening. 5. Added new fields to TABLE_LIST struct, used for 'explain select' for I_S table bool has_db_lookup_value; bool has_table_lookup_value; uint table_open_method; sql/unireg.h: added new constants	19 years ago
unknown	408d729f5c	Merge trift2.:/MySQL/M50/push-5.0 into trift2.:/MySQL/M51/push-5.1	19 years ago
unknown	5000893f39	Merge trift2.:/MySQL/M41/push-4.1 into trift2.:/MySQL/M50/push-5.0	19 years ago
unknown	0fe21fdc41	Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1-build into trift2.:/MySQL/M41/push-4.1	19 years ago
unknown	8df5a067c3	Limit stack size of the server to 1 MB. Manual transfer of the fix for bug#20815 from 5.0 to 5.1 CMakeLists.txt: Limit stack size of the server to 1 MB. Manual transfer of the fix for bug#20815 from 5.0 to 5.1	19 years ago
unknown	e8ed87ebfb	Merge trift2.:/MySQL/M50/push-5.0 into trift2.:/MySQL/M51/push-5.1 sql/CMakeLists.txt: Auto merged	19 years ago
unknown	02daa6f378	Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0-build into trift2.:/MySQL/M50/push-5.0 sql/CMakeLists.txt: Auto merged	19 years ago
unknown	16d1f6f1a4	Merge trift2.:/MySQL/M50/push-5.0 into trift2.:/MySQL/M51/push-5.1 mysql-test/r/show_check.result: Auto merged mysql-test/t/show_check.test: Auto merged	19 years ago
unknown	50cb2b97b5	Merge trift2.:/MySQL/M50/mysql-5.0 into trift2.:/MySQL/M50/push-5.0	19 years ago
unknown	ee37c3a3a5	Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build into trift2.:/MySQL/M51/push-5.1 BitKeeper/deleted/.del-CMakeLists.txt~2eb9019b: Auto merged BitKeeper/deleted/.del-CMakeLists.txt~86a68ea1: Auto merged BitKeeper/deleted/.del-CMakeLists.txt~99a50df6: Auto merged BitKeeper/deleted/.del-CMakeLists.txt~ef945345: Auto merged BitKeeper/deleted/.del-CMakeLists.txt~fdec1f01: Auto merged dbug/CMakeLists.txt: Auto merged tests/CMakeLists.txt: Auto merged zlib/CMakeLists.txt: Auto merged client/CMakeLists.txt: Will be re-applied using "patch". libmysql/CMakeLists.txt: Will be re-applied using "patch". mysys/CMakeLists.txt: Will be re-applied using "patch". sql/CMakeLists.txt: Will be re-applied using "patch".	19 years ago
unknown	88032f4cce	Merge mysql.com:/home/kent/bk/cmake-tls/mysql-5.0-build into mysql.com:/home/kent/bk/cmake-tls/mysql-5.1-build BitKeeper/deleted/.del-CMakeLists.txt~5: Auto merged storage/myisam/myisamchk.c: Auto merged	19 years ago
unknown	4d2630ed46	make_win_bin_dist: Simplified copying of 'mysql-test' directory scripts/make_win_bin_dist: Simplified copying of 'mysql-test' directory	19 years ago
unknown	88a8e461ab	Merge trift2.:/MySQL/M51/bug29982-5.1 into trift2.:/MySQL/M51/push-5.1 BitKeeper/deleted/.del-CMakeLists.txt~5b8836e4: Auto merged BitKeeper/deleted/.del-CMakeLists.txt~fc201a06: Auto merged CMakeLists.txt: Auto merged tests/CMakeLists.txt: Auto merged	19 years ago
unknown	2e5f50d603	Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint into trift2.:/MySQL/M51/push-5.1 sql/sql_parse.cc: Auto merged	19 years ago
unknown	f639db3097	Merge production.mysql.com:/usersnfs/jperkin/bk/trees/build/mysql-4.1 into production.mysql.com:/usersnfs/jperkin/bk/trees/build/mysql-5.0 myisam/myisamchk.c: Auto merged	19 years ago
unknown	0de7ddf0e5	Merge jperkin@bk-internal.mysql.com:/home/bk/mysql-4.1-build into production.mysql.com:/usersnfs/jperkin/bk/trees/build/mysql-4.1	19 years ago
unknown	fb828592b4	myisamchk.c: Fix typo in usage. myisam/myisamchk.c: Fix typo in usage.	19 years ago
unknown	6e20710c6c	Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0-build into mysql.com:/home/kent/bk/cmake-tls/mysql-5.0-build	19 years ago
unknown	39371b1bcb	Makefile.am: Add CMakeLists.txt to source distribution CMakeLists.txt: Added missing '${MYSQLD_EXE_SUFFIX}' to "mysqld" targets new in 5.1 Manual merge from 5.0 (bug#30118) CMakeLists.txt, mysqlbinlog.cc, lib_sql.cc: No need to test on USING_CMAKE, it is the only Windows build client/mysqlbinlog.cc: No need to test on USING_CMAKE, it is the only Windows build libmysqld/CMakeLists.txt: No need to test on USING_CMAKE, it is the only Windows build libmysqld/lib_sql.cc: No need to test on USING_CMAKE, it is the only Windows build libmysqld/Makefile.am: Add CMakeLists.txt to source distribution libmysqld/examples/Makefile.am: Add CMakeLists.txt to source distribution sql/CMakeLists.txt: Added missing '${MYSQLD_EXE_SUFFIX}' to "mysqld" targets new in 5.1 client/CMakeLists.txt: Manual merge from 5.0 (bug#30118) libmysql/CMakeLists.txt: Manual merge from 5.0 (bug#30118) mysys/CMakeLists.txt: Manual merge from 5.0 (bug#30118) zlib/CMakeLists.txt: Manual merge from 5.0 (bug#30118)	19 years ago
unknown	9687988e83	Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint into mysql.com:/home/ram/work/b30088/b30088.5.0 mysql-test/r/show_check.result: Auto merged mysql-test/t/show_check.test: Auto merged	19 years ago
unknown	6f88aa45db	After-merge fix: result adjusted.	19 years ago
unknown	2a20aa7f8a	Merge mysql.com:/home/ram/work/b30088/b30088.5.0 into mysql.com:/home/ram/work/b30088/b30088.5.1 sql/mysqld.cc: Auto merged mysql-test/t/show_check.test: SCCS merged	19 years ago
unknown	88d913eb3e	Merge mysql.com:/home/kent/bk/cmake-tls/mysql-5.0-build into mysql.com:/home/kent/bk/cmake-tls/mysql-5.1-build BitKeeper/deleted/.del-CMakeLists.txt~13: Auto merged BitKeeper/deleted/.del-CMakeLists.txt~14: Auto merged BitKeeper/deleted/.del-CMakeLists.txt~3: Auto merged BitKeeper/deleted/.del-CMakeLists.txt~8: Auto merged BitKeeper/deleted/.del-CMakeLists.txt~9: Auto merged scripts/make_win_bin_dist: SCCS merged	19 years ago
unknown	def8d6b363	CMakeLists.txt (several), make_win_bin_dist: Aligned client library build and use with the Unix version when it comes to what source to include directly in the builds, and what libraries to link with (bug#30118). Also reviewed, corrected and made more clear when static or dynamic Thread Local Storage is to be used. Some code duplication was removed, and some redundant library usage were removed, reducing the risk of incorrect TLS usage. client/CMakeLists.txt: - Removed code duplication by moving build of "mysqlclient" to the "libmysql" directory - Link clients with the new "mysqlclient_notls", to protect for the case the clients use more than the client API, and access thread data directly. - Synced explicit target addition of sources with Unix. dbug/CMakeLists.txt: No need to set CXX flags, no C++ code libmysql/CMakeLists.txt: - Aligned more with Unix version when it comes to included source files - Build both DLL and static library in this directory - Produce separe static TLS version of the static client library, for use when building clients in this build that might access TLS storage directly. mysys/CMakeLists.txt: We only have to build the static TLS version, as no clients are linking directly with the "mysys" library. scripts/make_win_bin_dist: Ajusted paths to new "mysqlclient.lib" location in source tree sql/CMakeLists.txt: Removed duplicate "ha_blackhole.cc" in file listing Removed explicit link to "dbug.lib" not needed Link with the static TLS "mysqlclient_notls" tests/CMakeLists.txt: Removed explicit link to "dbug", "mysys", "yassl", "taocrypt" and "zlib" not needed. Added explicit source addition "../mysys/my_memmem.c". No need for setting CXX flags, no C++ code. Use the static TLS "mysqlclient_notls" for linkage. zlib/CMakeLists.txt: No need for a dynamic TLS version of this library, no access to thread storage is done from it. Also no need to define MYSQL_CLIENT, not used, or __WIN32__ that is handled by the library header without this define.	19 years ago
unknown	8b9e7c14db	Merge mysql.com:/home/ram/work/b30200/b30200.5.0 into mysql.com:/home/ram/work/b30200/b30200.5.1 sql/item_func.cc: Auto merged sql/sql_parse.cc: Auto merged sql/item_create.cc: manual merge.	19 years ago
unknown	898333f843	Fix for bug #30200 : mysqlbinlog.test: connection_id() not restored under ps-protocol Problem: thd->thread_specific_used flag is not set executing a statement containig connection_id() function using PS protocol, that leads to improper binlog event creation. Fix: set the flag in the Item_func_connection_id::fix_fields(). sql/item_create.cc: Fix for bug #30200: mysqlbinlog.test: connection_id() not restored under ps-protocol - set the thd->thread_specific_used flag in the Item_func_connection_id::fix_fields() to have it properly set using PS protocol as well. sql/item_func.cc: Fix for bug #30200: mysqlbinlog.test: connection_id() not restored under ps-protocol - set the thd->thread_specific_used flag in the Item_func_connection_id::fix_fields() to have it properly set using PS protocol as well. sql/sql_parse.cc: Fix for bug #30200: mysqlbinlog.test: connection_id() not restored under ps-protocol - reset the thd->thread_specific_used flag in the mysql_reset_thd_for_next_command().	19 years ago
unknown	4e17077bbf	Merge trift2.:/MySQL/M50/push-5.0 into trift2.:/MySQL/M51/push-5.1	19 years ago
unknown	720008c649	Merge trift2.:/MySQL/M51/mysql-5.1 into trift2.:/MySQL/M51/push-5.1 sql/sql_parse.cc: Auto merged	19 years ago
unknown	4fa1ad315f	Merge trift2.:/MySQL/M50/mysql-5.0 into trift2.:/MySQL/M50/push-5.0	19 years ago
unknown	c7419debba	Post-merge fix. Update some test results, and add an InnoDB-only compatibility hook, thd_mark_transaction_to_rollback(). mysql-test/r/ps.result: Post-merge fix. Changes for WL 3984 (Revise locking of mysql.general_log and mysql.slow_log) cause some test result differences. mysql-test/r/show_check.result: Post-merge fix. Changes for WL 3984 (Revise locking of mysql.general_log and mysql.slow_log) cause some test result differences. sql/sql_class.cc: Post-merge fix, add InnoDB compatibility hook (defined for InnoDB only), thd_mark_transaction_to_rollback(). storage/innobase/handler/ha_innodb.cc: Post-merge fix, add InnoDB compatibility hook (defined for InnoDB only), thd_mark_transaction_to_rollback(). storage/innobase/handler/ha_innodb.h: Post-merge fix, add InnoDB compatibility hook (defined for InnoDB only), thd_mark_transaction_to_rollback().	19 years ago
unknown	48eb7f8c85	Merge 50 -> 51 (-opt changesets) sql/handler.cc: Auto merged sql/handler.h: Auto merged sql/sp_head.cc: Auto merged sql/sp_rcontext.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_select.h: Auto merged sql/sql_table.cc: Auto merged sql/sql_union.cc: Auto merged sql/sql_yacc.yy: Auto merged sql/table.cc: Auto merged mysql-test/include/read_many_rows.inc: Manual merge mysql-test/r/read_many_rows_innodb.result: Manual merge sql/sql_class.cc: Manual merge sql/sql_class.h: Manual merge storage/innobase/handler/ha_innodb.cc: Manual merge	19 years ago
unknown	d07385965a	Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/41 into ramayana.hindu.god:/home/tsmith/m/bk/maint/50	19 years ago
unknown	15835a5693	Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-opt into ramayana.hindu.god:/home/tsmith/m/bk/maint/51 mysql-test/r/show_check.result: Auto merged mysql-test/t/disabled.def: Auto merged mysql-test/t/show_check.test: Auto merged sql/handler.cc: Auto merged sql/handler.h: Auto merged sql/log.cc: Auto merged sql/set_var.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_delete.cc: Auto merged sql/sql_insert.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_show.cc: Auto merged sql/sql_table.cc: Auto merged sql/sql_yacc.yy: Auto merged sql/table.cc: Auto merged	19 years ago
unknown	90d6229652	Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-opt into ramayana.hindu.god:/home/tsmith/m/bk/maint/50 sql/handler.h: Auto merged sql/sql_base.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_table.cc: Auto merged sql/sql_yacc.yy: Auto merged sql/table.cc: Auto merged	19 years ago
unknown	cbbc8bb3c1	Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-4.1-opt into ramayana.hindu.god:/home/tsmith/m/bk/maint/41	19 years ago
unknown	7756406fa9	Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50 into ramayana.hindu.god:/home/tsmith/m/bk/maint/51 configure.in: Auto merged	19 years ago
unknown	7b1f54257f	Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/41 into ramayana.hindu.god:/home/tsmith/m/bk/maint/50	19 years ago
unknown	c2fa38b930	Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-build into ramayana.hindu.god:/home/tsmith/m/bk/maint/51 BitKeeper/deleted/.del-CMakeLists.txt~1: Auto merged CMakeLists.txt: Auto merged configure.in: Auto merged sql/sql_parse.cc: Auto merged	19 years ago
unknown	159da8b824	Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-build into ramayana.hindu.god:/home/tsmith/m/bk/maint/50 configure.in: Auto merged	19 years ago
unknown	e399ae5ab7	Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-4.1-build into ramayana.hindu.god:/home/tsmith/m/bk/maint/41	19 years ago
unknown	5161bc9e53	Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50 into ramayana.hindu.god:/home/tsmith/m/bk/maint/51 mysql-test/r/federated.result: Auto merged mysql-test/t/federated.test: Auto merged sql/item_func.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_table.cc: Auto merged storage/federated/ha_federated.h: Auto merged mysql-test/include/mix1.inc: SCCS merged mysql-test/r/innodb_mysql.result: use local	19 years ago
unknown	9436e186ed	Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/41 into ramayana.hindu.god:/home/tsmith/m/bk/maint/50	19 years ago
unknown	4ea92b81a7	Merge ramayana.hindu.god:/home/tsmith/m/bk/51 into ramayana.hindu.god:/home/tsmith/m/bk/maint/51 mysql-test/include/mix1.inc: Auto merged mysql-test/r/innodb_mysql.result: Auto merged sql/mysql_priv.h: Auto merged sql/sql_base.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_parse.cc: Auto merged sql/sql_table.cc: Auto merged	19 years ago
unknown	41ac5d83b2	Merge ramayana.hindu.god:/home/tsmith/m/bk/50 into ramayana.hindu.god:/home/tsmith/m/bk/maint/50 mysql-test/r/federated.result: Auto merged mysql-test/t/federated.test: Auto merged sql/ha_federated.h: Auto merged sql/item_func.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_table.cc: Auto merged mysql-test/r/innodb_mysql.result: Manual merge mysql-test/t/innodb_mysql.test: Manual merge	19 years ago

1 2 3 4 5 ...

48977 Commits (97bb72f139b95cf2ecd2c8ed0ac9a3b449ef8977) All Branches Search

48977 Commits (97bb72f139b95cf2ecd2c8ed0ac9a3b449ef8977)

All Branches