mariadb

Commit Graph

Author	SHA1	Message	Date
unknown	62273f8e66	remove assert sql/event_data_objects.cc: add a comments that using gmt_sec_to_TIME() won't be safe after 2038. per andrey's request sql/event_queue.cc: remove assert, which aborts server in the case when it shouldn't	19 years ago
unknown	0c55e29acb	No bug number. Fixed typos in the comments. sql/sql_yacc.yy: Fixed typos	19 years ago
unknown	a309ff223a	Merge outpost.site:/home/cps/mysql/trees/5.0-runtime-19044 into outpost.site:/home/cps/mysql/trees/5.1-runtime-19044 server-tools/instance-manager/listener.cc: Auto merged	19 years ago
unknown	1adc136812	Fix Bug #19044 IM aborts on exit On windows IM aborted on assert once one stoppped it. The reason is that we didn't close the sockets on windows and therefore, the listener thread wasn't able to finish. This happened because we used close() call for it. While on windows one should use closesocket(). On other platfroms we have appropriate defines for closesocket(), so this is the function which should be used. server-tools/instance-manager/listener.cc: close -> closesocket	19 years ago
unknown	425183958b	Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime into outpost.site:/home/cps/mysql/trees/5.1-runtime-19044 storage/csv/ha_tina.cc: Auto merged	19 years ago
unknown	ebd5aec15e	Fix Bug #21328 mysqld issues warnings on ALTER CSV table to MyISAM mysql-test/r/csv.result: update result file mysql-test/r/log_tables.result: log_tables test contains alter of a CSV table with NULLs which results in warnings. In fact this is how the bug noticed. So, now when it is fixed we should update result file. mysql-test/t/csv.test: add a test for the bug storage/csv/ha_tina.cc: We should write 0 to the data file in the case we meet NULL. CSV does not support NULL values internally and we shouldn't distinguish them from 0 when writing a row (the alternative is to implement full NULL support). Otherwise other routines (such as Field::check_int() become confused). In 5.0 NULLs are stored as zeroes. In 5.1 it somehow turned into empty string. Which is wrong.	19 years ago
unknown	8ffed8be88	Merge bk-internal.mysql.com:/home/bk/mysql-5.1 into bodhi.local:/opt/local/work/mysql-5.1-runtime server-tools/instance-manager/guardian.cc: Auto merged sql/handler.cc: Auto merged sql/set_var.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_prepare.cc: Auto merged	19 years ago
unknown	ec00e02c9a	Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime into bodhi.local:/opt/local/work/mysql-5.1-runtime	19 years ago
unknown	7c6fe6e7f0	Merge bodhi.local:/opt/local/work/mysql-5.0-4968 into bodhi.local:/opt/local/work/mysql-5.1-runtime sql/sql_class.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_prepare.cc: Auto merged tests/mysql_client_test.c: Manual merge.	19 years ago
unknown	fe84b016e1	A fix and a test case for Bug#24179 "select b into $var" fails with --cursor_protocol": fix a misleading error message in case of SELECT .. INTO. sql/sql_class.cc: Implement select_result::check_simple_select hierarchy to support correct error messages in case of SELECT .. INTO and C API cursors. sql/sql_class.h: Set the error message inside the function that checks for the error condition (simple_select, renamed to check_simple_select). sql/sql_prepare.cc: Use a new method that now sets the error. tests/mysql_client_test.c: Add a test case for Bug#24179 "select b into $var" fails with --cursor_protocol" (check for the right error message and error code).	19 years ago
unknown	cf245c8f3a	Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1 into kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build client/mysqltest.c: Auto merged mysql-test/mysql-test-run.pl: Auto merged sql/field.cc: Auto merged sql/item.cc: Auto merged sql/item_sum.cc: Auto merged sql/opt_range.cc: Auto merged sql/sql_base.cc: Auto merged sql/table.cc: Auto merged	19 years ago
unknown	5176be8db8	Merge bk-internal:/home/bk/mysql-5.1 into dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-5.1-opt sql/table.cc: Auto merged	19 years ago
unknown	b6004e6295	Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1-marvel into kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build Makefile.am: Auto merged sql-common/my_time.c: Auto merged	19 years ago
unknown	922ea687fb	Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1 into kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build mysql-test/lib/mtr_process.pl: Auto merged	19 years ago
unknown	8c056ce5e3	Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime into weblab.(none):/home/marcsql/TREE/mysql-5.1-11733_topdown sql/handler.cc: Auto merged sql/set_var.cc: Auto merged	19 years ago
unknown	d469888a95	WL#3602 Post review changes the --read-only option is not enforced for the slave thread in replication, or for the SUPER user. sql/handler.cc: Post review changes Allowing writes for the slave thread or for SUPER, in read-only mode sql/lock.cc: Post review changes Allowing writes for the slave thread or for SUPER, in read-only mode mysql-test/r/rpl_read_only.result: New test mysql-test/t/rpl_read_only-slave.opt: New test mysql-test/t/rpl_read_only.test: New test	19 years ago
unknown	1c8facbc9f	Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work into kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build mysql-test/mysql-test-run.pl: Auto merged	19 years ago
unknown	0bc42ce633	late after-merge fix mysql-test/mysql-test-run.pl: late after-merge fix: re-add MTR_BUILD_THREAD=auto	19 years ago
unknown	a49e1f4edf	Merge monty@192.168.0.9:/home/my/mysql-5.1 into mysql.com:/home/my/mysql-5.1	19 years ago
unknown	9b1336fec9	Merge bk-internal.mysql.com:/home/bk/mysql-5.1 into mysql.com:/home/my/mysql-5.1 configure.in: Auto merged include/my_pthread.h: Auto merged libmysql/libmysql.c: Auto merged server-tools/instance-manager/guardian.cc: Auto merged sql/field.cc: Auto merged sql/field.h: Auto merged sql/item_func.cc: Auto merged sql/item_strfunc.cc: Auto merged sql/item_sum.cc: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/set_var.cc: Auto merged sql/sql_cache.cc: Auto merged sql/sql_lex.h: Auto merged sql/sql_plugin.cc: Auto merged sql/sql_trigger.cc: Auto merged sql/sql_yacc.yy: Auto merged sql/table.cc: Auto merged storage/archive/ha_archive.cc: Auto merged storage/csv/ha_tina.cc: Auto merged storage/federated/ha_federated.cc: Auto merged sql/item_create.cc: manual merge	19 years ago
unknown	e0aeba21a5	After merge fixes Marked some functions as noreturn sql/mysql_priv.h: Marked some functions as noreturn storage/federated/ha_federated.cc: After merge fix storage/myisam/ft_boolean_search.c: Removed duplicate code storage/myisam/myisamchk.c: Added LINT_INIT() storage/myisam/myisampack.c: After merge fix storage/myisam/sort.c: Indentation fixup	19 years ago
unknown	600336ef45	Merge mysql.com:/home/my/mysql-5.0 into mysql.com:/home/my/mysql-5.1 client/mysql.cc: Auto merged cmd-line-utils/readline/bind.c: Auto merged cmd-line-utils/readline/histfile.c: Auto merged extra/yassl/taocrypt/include/algebra.hpp: Auto merged include/my_global.h: Auto merged include/my_tree.h: Auto merged mysys/my_thr_init.c: Auto merged server-tools/instance-manager/guardian.cc: Auto merged server-tools/instance-manager/portability.h: Auto merged sql/field.cc: Auto merged sql/gen_lex_hash.cc: Auto merged sql/item.cc: Auto merged sql/item_func.cc: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/set_var.cc: Auto merged sql/slave.cc: Auto merged sql/sp_cache.cc: Auto merged sql/sp_head.cc: Auto merged sql/sql_acl.cc: Auto merged sql-common/client.c: Auto merged sql-common/my_time.c: Auto merged sql/sql_delete.cc: Auto merged sql/sql_handler.cc: Auto merged sql/sql_lex.h: Auto merged sql/sql_prepare.cc: Auto merged sql/sql_view.cc: Auto merged sql/sql_yacc.yy: Auto merged storage/heap/hp_clear.c: Auto merged storage/heap/hp_write.c: Auto merged storage/innobase/handler/ha_innodb.cc: Auto merged storage/innobase/os/os0file.c: Auto merged strings/ctype-simple.c: Auto merged client/mysqldump.c: Manual merge client/mysqltest.c: Manual merge extra/replace.c: Manual merge libmysql/libmysql.c: Manual merge mysys/base64.c: Manual merge sql/ha_ndbcluster.cc: Manual merge sql/handler.cc: Manual merge sql/item_strfunc.cc: Manual merge sql/item_timefunc.cc: Manual merge sql/log.cc: Manual merge sql/opt_range.cc: Manual merge sql/password.c: Manual merge sql/sp.cc: Manual merge sql/sql_base.cc: Manual merge sql/sql_cache.cc: Manual merge sql/sql_db.cc: Manual merge sql/sql_rename.cc: Manual merge sql/sql_select.cc: Manual merge sql/sql_show.cc: Manual merge sql/sql_trigger.cc: Manual merge sql/sql_update.cc: Manual merge sql/tztime.cc: Manual merge storage/archive/ha_archive.cc: Manual merge storage/federated/ha_federated.cc: Manual merge storage/myisam/mi_create.c: Manual merge storage/myisam/myisampack.c: Manual merge storage/myisammrg/myrg_rkey.c: Manual merge storage/ndb/src/mgmapi/mgmapi.cpp: Manual merge storage/ndb/src/ndbapi/Ndb.cpp: Manual merge storage/ndb/src/ndbapi/NdbScanOperation.cpp: Manual merge storage/ndb/src/ndbapi/NdbTransaction.cpp: Manual merge storage/ndb/src/ndbapi/Ndblist.cpp: Manual merge	19 years ago
unknown	c8100cba20	Merge bk-internal.mysql.com:/home/bk/mysql-5.1 into bodhi.local:/opt/local/work/mysql-5.1-runtime	19 years ago
unknown	9e5ec3539e	Don't abort if we call my_thread_end() multiple times Fixed new introduced bug in my_time.c BitKeeper/deleted/.del-valgrind.supp.orig: Delete: mysql-test/valgrind.supp.orig mysys/my_thr_init.c: More comments Don't abort if we call my_thread_end() multiple times sql-common/my_time.c: Fixed wrong patch in last commit sql/sql_cache.cc: Fixed old bad merge (not critical) sql/tztime.cc: Portability fix	19 years ago
unknown	25226de9ea	Fixed compiler warnings Don't assert if my_thread_end() is called twice (common case) client/mysql.cc: Removed not used variables client/mysqldump.c: Fixed compiler warnings client/mysqltest.c: Fixed compiler warnings cmd-line-utils/readline/bind.c: Fixed compiler warnings cmd-line-utils/readline/histfile.c: Fixed compiler warnings extra/replace.c: Fixed compiler warning on windows extra/yassl/taocrypt/include/algebra.hpp: Fixed compiler warnings heap/hp_write.c: Fixed compiler warnings innobase/os/os0file.c: Fixed compiler warnings libmysql/libmysql.c: Call my_end()/my_thread_end last. my_end() calls free_charsets(), which allowed me to move the call myisam/myisampack.c: Fixed compiler warnings myisammrg/myrg_rkey.c: Fixed compiler warnings mysys/my_thr_init.c: More comments Don't assert if my_thread_end() is called twice (common case) ndb/src/mgmapi/mgmapi.cpp: Fixed compiler warnings ndb/src/ndbapi/Ndb.cpp: Fixed compiler warnings ndb/src/ndbapi/NdbScanOperation.cpp: Fixed compiler warnings ndb/src/ndbapi/NdbTransaction.cpp: Fixed compiler warnings ndb/src/ndbapi/Ndblist.cpp: Fixed compiler warnings server-tools/instance-manager/guardian.cc: Removed not used variable server-tools/instance-manager/portability.h: Removed duplicated symbol sql/gen_lex_hash.cc: Fixed compiler warning sql/ha_archive.cc: Fixed compiler warnings sql/ha_ndbcluster.cc: Fixed compiler warnings sql/mysqld.cc: Fixed compiler warnings sql/sql_cache.cc: Fixed compiler warnings Fixed DBUG_PRINT strings to be consistent with 5.1 sql/tztime.cc: Fixed compiler warnings sql/uniques.cc: Fixed compiler warnings	19 years ago
unknown	f8d8b3db91	Bug #24487 Valgrind: uninited byte in table->record[1] in binlog code for rbr + inno db The reason of this valgrind's compaint is not a bug but rather a feature of bitwise ops: for any value of the byte x x \| 1 -> 1, and x & 0 -> 0. x, being a null_byte part of record[1] can be left unassigned even after ha_innobase::index_read_idx because the above and still be correct. Addding a check memory upon the invocation of the function can detect this fact long before record[1], old record, is eventually passed to my_write. Fixed with initialization of record[1]'s null_bytes part in open_table_from_share. sql/table.cc: initialization of null-bytes for valgrind.	19 years ago
unknown	cdc86ac126	Merge dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-5.0-opt into dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-5.1-opt mysql-test/r/func_gconcat.result: Auto merged mysql-test/r/func_group.result: Auto merged mysql-test/t/func_gconcat.test: Auto merged mysql-test/t/func_group.test: Auto merged	19 years ago
unknown	a4342155a5	Merge bk-internal:/home/bk/mysql-5.0-opt into macbook.gmz:/Users/kgeorge/mysql/work/B11927-5.0-opt	19 years ago
unknown	140c3ee961	func_group.test, func_group.result, func_gconcat.result, func_gconcat.test: merge fix : removed undeterministic warnings mysql-test/r/func_gconcat.result: merge fix : removed undeterministic warnings mysql-test/r/func_group.result: merge fix : removed undeterministic warnings mysql-test/t/func_gconcat.test: merge fix : removed undeterministic warnings mysql-test/t/func_group.test: merge fix : removed undeterministic warnings	19 years ago
unknown	7191e77539	Fixed portability issue in my_thr_init.c (was added in my last push) Fixed compiler warnings (detected by VC++): - Removed not used variables - Added casts - Fixed wrong assignments to bool - Fixed wrong calls with bool arguments - Added missing argument to store(longlong), which caused wrong store method to be called. client/mysqldump.c: Removed compiler warning heap/hp_clear.c: Removed compiler warning include/my_global.h: Removed compiler warning include/my_tree.h: Changed memory limits from int to ulong (Allowed me to get rid of some compiler warnings) myisam/mi_create.c: Removed compiler warning myisam/myisampack.c: Removed compiler warning mysys/base64.c: Removed compiler warning mysys/my_thr_init.c: Fixed portability issue (detected on windows) Added DBUG_ASSERT to detect if we call my_thread_end() too many times Don't wait if THR_thread_count == -1 (error condition) mysys/tree.c: Removed compiler warning sql/field.cc: Removed compiler warning Fixed wrong parameter to check_date() Added missing argument to store(longlong) sql/ha_archive.cc: Removed compiler warning sql/ha_federated.cc: Removed compiler warning sql/ha_innodb.cc: Removed not used variable sql/handler.cc: Removed not used variable Fixed wrong if (we didn't detect if rollback or commit failed). Not critical as value is not yet used sql/item.cc: Removed compiler warning sql/item_func.cc: Removed compiler warning sql/item_strfunc.cc: Removed compiler warning sql/item_timefunc.cc: Removed compiler warning sql/log.cc: Removed compiler warning sql/mysql_priv.h: Removed compiler warning sql/opt_range.cc: Removed compiler warning sql/password.c: Removed compiler warning sql/set_var.cc: Removed compiler warning sql/slave.cc: Removed compiler warning sql/sp.cc: Removed compiler warning sql/sp_cache.cc: Removed compiler warning sql/sp_head.cc: Removed compiler warning Adjusted argument to reserve() to not use up too much memory that we are probably not going to need sql/sql_acl.cc: Added missing argument to store(longlong) sql/sql_base.cc: Removed compiler warning sql/sql_db.cc: Removed compiler warning sql/sql_delete.cc: Removed compiler warning sql/sql_handler.cc: Removed not used variable sql/sql_lex.h: Removed not used variable sql/sql_prepare.cc: Removed not used variable sql/sql_rename.cc: Removed not used variable sql/sql_select.cc: Fixed that select_options are not 'cut' Removed some not used variables Removed compiler warnings by adding cast sql/sql_show.cc: Removed not used variables Added missing argument to store(longlong) Removed compiler warnings sql/sql_trigger.cc: Removed not used variables Added cast to remove compiler warnings sql/sql_update.cc: Fixed wrong set of bool variable sql/sql_view.cc: Removed not used variables Added cast to get rid of compiler warnings sql-common/client.c: Fixed compiler warning sql-common/my_time.c: Fixed wrong argument to check_date() Added casts to get rid of compiler warnings sql/sql_yacc.yy: Removed not used variable sql/uniques.cc: Changes memory size from uint to ulong Added casts to get rid of compiler warnings strings/ctype-simple.c: Fixed cast to get rid of compiler warnings	19 years ago
unknown	899ee4595b	Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work into kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build mysql-test/lib/mtr_process.pl: Auto merged	19 years ago
unknown	32f0650142	Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work into kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work mysql-test/lib/mtr_process.pl: Auto merged	19 years ago
unknown	5af42c1b25	minor fix to mtr_process.pl mysql-test/lib/mtr_process.pl: print extra message _once_ every 60 seconds	19 years ago
unknown	4c0f67f8c4	Merge dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-5.0-opt into dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-5.1-opt mysql-test/r/func_gconcat.result: Auto merged mysql-test/r/ps.result: Auto merged mysql-test/t/func_gconcat.test: Auto merged mysql-test/t/ps.test: Auto merged sql/item_sum.cc: Auto merged	19 years ago
unknown	6ea42e6779	Merge dl145s.mysql.com:/data0/bk/team_tree_merge/mysql-5.1 into dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-5.1-opt mysql-test/r/func_in.result: Auto merged mysql-test/r/ps.result: Auto merged mysql-test/t/ps.test: Auto merged sql/field.cc: Auto merged sql/item_func.h: Auto merged sql/item_sum.cc: Auto merged	19 years ago
unknown	45fc00eeee	Merge dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-4.1-opt into dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-5.0-opt	19 years ago
unknown	6e791795a2	Merge dl145s.mysql.com:/data0/bk/team_tree_merge/mysql-5.0 into dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-5.0-opt mysql-test/r/ps.result: Auto merged mysql-test/t/ps.test: Auto merged sql/item_sum.cc: Auto merged	19 years ago
unknown	7c9c5409a3	Merge dl145s.mysql.com:/data0/bk/team_tree_merge/mysql-4.1 into dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-4.1-opt	19 years ago
unknown	ef42631b53	func_gconcat.result, func_gconcat.test: disabled warnings because their order is undeterministic mysql-test/t/func_gconcat.test: disabled warnings because their order is undeterministic mysql-test/r/func_gconcat.result: disabled warnings because their order is undeterministic	19 years ago
unknown	2467dc1423	Merge trift2.:/MySQL/M51/push-5.1 into trift2.:/MySQL/M51/bug24182-5.1	19 years ago
unknown	ba4c767e73	support-files/mysql.spec.sh : Call "make install" using "benchdir_root=%{_datadir}" (bug#24182). support-files/mysql.spec.sh: Call "make install" using "benchdir_root=%{_datadir}", because that is affecting the regression test suite as well. Fixes bug#24182.	19 years ago
unknown	3099fd27b0	Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build into trift2.:/MySQL/M51/push-5.1	19 years ago
unknown	23776f53ff	Fix for the following bugs: - BUG#22306: STOP INSTANCE can not be applied for instances in Crashed, Failed and Abandoned; - BUG#23476: DROP INSTANCE does not work - BUG#23215: STOP INSTANCE takes too much time BUG#22306: The problem was that STOP INSTANCE checked that mysqld is up and running. If it was not so, STOP INSTANCE reported an error. Now, STOP INSTANCE reports an error if the instance has been started (mysqld can be down). BUG#23476: The problem was that DROP INSTANCE tried to stop inactive instance. The fix is trivial. BUG#23215: The problem was that locks were not acquired properly, so the instance-monitoring thread could not acquire the mutex, holded by the query-processing thread. The fix is to simplify locking scheme by moving instance-related information to Instance-class out of Guardian-class. This allows to get rid of storing a separate list of Instance-information in Guardian and keeping it synchronized with the original list in Instance_map. server-tools/instance-manager/commands.cc: 1. Introduce Instance_cmd class -- base class for the commands that deal with the one instance; 2. Remove Instance_map argument from command constructors; 3. Ensure, that Instance Map and Instance are locked in the proper order; 4. Polishing. server-tools/instance-manager/commands.h: 1. Introduce Instance_cmd class -- base class for the commands that deal with the one instance; 2. Remove Instance_map argument from command constructors; 3. Polishing. server-tools/instance-manager/guardian.cc: 1. Move "extended" instance information to the Instance-class. That allows to get rid of storing instance-related container and data in Guardian class, that significantly simplifies locking schema. 2. Polishing. server-tools/instance-manager/guardian.h: 1. Move "extended" instance information to the Instance-class. That allows to get rid of storing instance-related container and data in Guardian class, that significantly simplifies locking schema. 2. Polishing. server-tools/instance-manager/instance.cc: 1. Move "extended" instance information to the Instance-class. 2. Introduce new state STOPPED to mark that guarded instance is stopped and should not be restarted by Guardian. 3. Polishing. server-tools/instance-manager/instance.h: 1. Move "extended" instance information to the Instance-class. 2. Introduce new state STOPPED to mark that guarded instance is stopped and should not be restarted by Guardian. 3. Polishing. server-tools/instance-manager/instance_map.cc: 1. Move flush_instances() from Instance_map to Manager. 2. Polishing. server-tools/instance-manager/instance_map.h: 1. Move flush_instances() from Instance_map to Manager. 2. Polishing. server-tools/instance-manager/instance_options.h: Polishing. server-tools/instance-manager/manager.cc: 1. Move flush_instances() from Instance_map to Manager. 2. Polishing. server-tools/instance-manager/manager.h: 1. Move flush_instances() from Instance_map to Manager. 2. Polishing. server-tools/instance-manager/user_map.cc: Polishing.	19 years ago
unknown	1e2d3cdb6c	Merge bk-internal.mysql.com:/home/bk/mysql-5.1-marvel into mysql.com:/home/my/mysql-5.1	19 years ago
unknown	1e87cfee19	Fixed compiler warnings (Mostly VC++): - Removed not used variables - Changed some ulong parameters/variables to ulonglong (possible serious bug) - Added casts to get rid of safe assignment from longlong to long (and similar) - Added casts to function parameters - Fixed signed/unsigned compares - Added some constructores to structures - Removed some not portable constructs Better fix for bug Bug #21428 "skipped 9 bytes from file: socket (3)" on "mysqladmin shutdown" (Added new parameter to net_clear() to define when we want the communication buffer to be emptied) client/mysql.cc: Removed not used variable client/mysqldump.c: Fixed compiler warning client/mysqlslap.c: Fixed compiler warning client/mysqltest.c: Fixed compiler warning extra/replace.c: Fixed compiler warning include/my_global.h: Fixed compiler warning include/mysql_com.h: Changed prototype for net_clear() libmysql/libmysql.c: Changed prototype for net_clear() mysys/base64.c: Fixed compiler warning (function definition and prototype didn't match) mysys/my_thr_init.c: AFter merge fixes mysys/my_vle.c: Fixed compiler warning sql/event_data_objects.cc: Fixed compiler warning sql/event_scheduler.cc: Removed not used variable sql/field.cc: Removed not used variables Fixed compiler warning sql/gen_lex_hash.cc: Fixed compiler warning sql/ha_partition.h: Fixed compiler warning sql/handler.cc: Fixed compiler warning sql/item.cc: Fixed compiler warning sql/item_create.cc: Fixed compiler warning sql/item_func.cc: Fixed compiler warning sql/item_strfunc.cc: Fixed compiler warning sql/item_timefunc.cc: Fixed compiler warning sql/item_xmlfunc.cc: Fixed compiler warning sql/log.cc: Fixed compiler warning sql/log_event.cc: Fixed compiler warning sql/log_event.h: Fixed compiler warning sql/mysql_priv.h: Fixed too short 'select_type' sql/net_serv.cc: Added argument to net_clear() if we should empty the communication buffer. sql/opt_range.cc: Fixed compiler warning sql/partition_info.cc: Fixed compiler warning sql/rpl_injector.h: Fixed compiler warning sql/set_var.cc: Fixed compiler warning sql/slave.cc: Fixed compiler warning sql/sp_head.cc: Fixed compiler warning sql/sql_base.cc: Fixed compiler warning sql/sql_db.cc: Fixed compiler warning sql/sql_delete.cc: Fixed compiler warning sql/sql_insert.cc: Fixed compiler warning sql/sql_lex.h: Fixed compiler warning sql/sql_parse.cc: Fixed compiler warning sql/sql_partition.cc: Fixed compiler warning sql/sql_plugin.cc: Fixed compiler warning sql/sql_prepare.cc: Fixed compiler warning sql/sql_rename.cc: Fixed compiler warning sql/sql_select.cc: Fixed compiler warning sql/sql_show.cc: Fixed compiler warning sql/sql_table.cc: Fixed compiler warning sql/sql_trigger.cc: Fixed compiler warning sql-common/client.c: Better fix for bug Bug #21428 "skipped 9 bytes from file: socket (3)" on "mysqladmin shutdown" sql-common/my_time.c: Fixed compiler warning sql/sql_union.cc: Fixed compiler warning sql/sql_update.cc: Fixed compiler warning sql/sql_view.cc: Fixed compiler warning sql/sql_yacc.yy: Fixed compiler warning sql/table.cc: Fixed compiler warning storage/archive/azio.c: Fixed compiler warning storage/csv/ha_tina.cc: Removed not used code storage/myisam/mi_unique.c: Fixed compiler warning storage/ndb/include/util/OutputStream.hpp: Fixed compiler warning storage/ndb/include/util/SocketAuthenticator.hpp: Fixed compiler warning storage/ndb/src/kernel/vm/Pool.hpp: Fixed compiler warning strings/ctype-simple.c: Fixed compiler warning strings/my_strchr.c: Fixed compiler warning	19 years ago
unknown	46fd7deccb	Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 into bk-internal.mysql.com:/data0/bk/mysql-5.1-arch sql/mysqld.cc: Auto merged sql/set_var.cc: Auto merged	19 years ago
unknown	6949b04246	A post-merge fix: fix the failing trigger-grant.test. sql/sql_trigger.cc: Another post-merge fix: make TRIGGER privilege work again, after IF EXISTS refactoring.	19 years ago
unknown	21fdaf5e83	A post-merge fix. mysql-test/r/func_str.result: Update results (a post-merge fix).	19 years ago
unknown	0717e6c3c6	A post-merge fix.	19 years ago
unknown	126375b16a	Merge bk-internal.mysql.com:/home/bk/mysql-5.0 into bodhi.local:/opt/local/work/mysql-5.1-runtime-merge libmysql/libmysql.c: Auto merged libmysqld/lib_sql.cc: Auto merged mysql-test/lib/mtr_io.pl: Auto merged mysql-test/r/im_daemon_life_cycle.result: Auto merged mysql-test/r/im_life_cycle.result: Auto merged mysql-test/r/rpl_trigger.result: Auto merged mysql-test/r/trigger.result: Auto merged mysql-test/t/im_daemon_life_cycle.imtest: Auto merged mysql-test/t/im_life_cycle.imtest: Auto merged mysql-test/t/im_utils.imtest: Auto merged mysql-test/t/rpl_trigger.test: Auto merged mysql-test/t/trigger.test: Auto merged sql/item_cmpfunc.cc: Auto merged sql/item_func.cc: Auto merged sql/item_strfunc.cc: Auto merged sql/item_sum.cc: Auto merged sql/mysqld.cc: Auto merged sql/sql_cache.cc: Auto merged tests/mysql_client_test.c: Auto merged mysql-test/lib/mtr_process.pl: Use local. mysql-test/r/func_str.result: SCCS merged mysql-test/t/func_str.test: Manual merge. sql/sql_trigger.cc: Manual merge. sql/sql_yacc.yy: Manual merge.	19 years ago

1 2 3 4 5 ...

40582 Commits (62273f8e661c760fbb672ccb0eba80fba34f2c11) All Branches Search

40582 Commits (62273f8e661c760fbb672ccb0eba80fba34f2c11)

All Branches