mariadb

Tree: c690c11feb

Author	SHA1	Message	Date
unknown	756baf0023	Merge bk-internal:/home/bk/mysql-5.0-maint into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint	19 years ago
unknown	22ce97e354	Merge bk-internal:/home/bk/mysql-5.1-new-maint into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint	19 years ago
unknown	db141b6b45	Merge polly.local:/tmp/20924/bug20294/my41-bug20294 into polly.local:/tmp/20924/bug20294/my50-bug20294 sql/item_cmpfunc.cc: Auto merged sql/item_cmpfunc.h: Auto merged sql/item_func.h: Auto merged sql/log_event.cc: Auto merged sql/sql_class.h: Auto merged mysql-test/r/case.result: Manual merge mysql-test/r/func_if.result: Manual merge mysql-test/r/func_test.result: Manual merge mysql-test/r/user_var.result: Manual merge mysql-test/t/case.test: Manual merge mysql-test/t/func_if.test: Manual merge mysql-test/t/func_test.test: Manual merge mysql-test/t/user_var.test: Manual merge sql/item_func.cc: Manual merge	19 years ago
unknown	acd9f1bd69	Bug#14862 undefined reference to `isinf' on SOLARIS - strings/strtod.c - Change the configure test looking for 'isinf' so the value returned from isinf is used. That avoids the call to isinf being optimized away. configure.in: Use the value returned from isinf so it's not optimized away by the compiler(i.e gcc 4.1)	19 years ago
unknown	1fff863add	Merge neptunus.(none):/home/msvensson/mysql/tmp_merge into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint client/mysqldump.c: Auto merged	19 years ago
unknown	2fb566524f	Merge neptunus.(none):/home/msvensson/mysql/tmp_merge into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint	19 years ago
unknown	bba3a1be5d	Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1 into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint sql/share/errmsg.txt: Auto merged storage/innobase/Makefile.am: Auto merged storage/innobase/handler/ha_innodb.cc: SCCS merged	19 years ago
unknown	621889582d	remove warning	19 years ago
unknown	381f39670a	Merge naruto.:C:/cpp/bug20789/my50-bug20789 into naruto.:C:/cpp/mysql-5.1-maint storage/myisam/mi_locking.c: Auto merged	19 years ago
unknown	5aa6e8615e	Post-review fixes for bug #20924 mysql-test/r/case.result: Post-review fix for bug #20924 mysql-test/r/func_if.result: Post-review fix for bug #20924 mysql-test/r/func_test.result: Post-review fix for bug #20924 mysql-test/r/user_var.result: Post-review fix for bug #20924 mysql-test/t/case.test: Post-review fix for bug #20924 mysql-test/t/func_if.test: Post-review fix for bug #20924 mysql-test/t/func_test.test: Post-review fix for bug #20924 mysql-test/t/user_var.test: Post-review fix for bug #20924 sql/item_func.cc: Post-review fix for bug #20924 sql/item_func.h: Post-review fix for bug #20924 sql/log_event.cc: Post-review fix for bug #20924	19 years ago
unknown	3ca9164590	Bug#20789 Merge Subtable Rename Causes Crash - When an ALTER TABLE RENAME is performed on windows, the files are closed and their cached file descriptors are marked invalid. Performing INSERT, UPDATE or SELECT on the associated merge table causes a server crash on windows. This patch adds a test for bad file descriptors when a table attempts a lock. If a bad descriptor is found an error is thrown. An additional FLUSH TABLES will be necessary to further operate on the associated merge table. myisam/mi_locking.c: This patch prevents the windows built to crash if the file is closed. mysql-test/r/windows.result: Added test case for the windows built. mysql-test/t/windows.test: Added test case for the windows built.	19 years ago
unknown	c47ce44b70	correct prototype	19 years ago
unknown	04a5f335d3	WL#3337 (Event scheduler new architecture) Remove SHOW SCHEDULER STATUS command and migrate the information output to `mysqladmin debug` (COM_DEBUG) SHOW SCHEDULER STATUS was introduced in 5.1.11, provided some debug information about event scheduler internals and was enabled only in debug builds. sql/event_queue.cc: Remove SHOW SCHEDULER STATUS. Reporting still will be there but through COM_DEBUG (mysqladmin debug) sql/event_queue.h: dump_internal_status cannot return an error, therefore it should be void. sql/event_scheduler.cc: Remove SHOW SCHEDULER STATUS. Reporting still will be there but through COM_DEBUG (mysqladmin debug) sql/event_scheduler.h: dump_internal_status cannot return an error, therefore it should be void. sql/events.cc: Change from outputting the internal data from the wire to the standard output. SHOW SCHEDULER STATUS was removed. sql/events.h: dump_internal_status() cannot return an error, therefore it should be void sql/lex.h: remove SCHEDULER as recognized word. This is part of removing SHOW SCHEDULER STATUS sql/sp_head.cc: SQLCOM_SHOW_SCHEDULER_STATUS has been removed sql/sql_lex.h: SQLCOM_SHOW_SCHEDULER_STATUS has been removed sql/sql_parse.cc: SQLCOM_SHOW_SCHEDULER_STATUS has been removed sql/sql_test.cc: Dump Events' internal information on COM_DEBUG sql/sql_yacc.yy: SQLCOM_SHOW_SCHEDULER_STATUS has been removed	19 years ago
unknown	80421c1b5f	Bug#22139 undefined reference to `my_memmem' when compiling tests/mysql_client_test - Build mysql_client_test from mysql_client_test.c and mysys/my_memmem.c tests/Makefile.am: Build mysql_client_test from mysql_client_test.c and mysys/my_memmem.c	19 years ago
unknown	2214e282a3	Merge neptunus.(none):/home/msvensson/mysql/tmp_merge into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint mysql-test/mysql-test-run.pl: Null merge backported changes mysql-test/lib/mtr_cases.pl: Null merge backported changes mysql-test/lib/mtr_match.pl: Auto merged mysql-test/lib/mtr_misc.pl: Null merge backported changes mysql-test/r/ctype_ucs.result: SCCS merged mysql-test/t/ctype_ucs.test: Null merge, fixed in 5.0 already BUILD/SETUP.sh: Merge mysql-test/r/myisam.result: Merge mysql-test/t/myisam.test: Merge support-files/mysql.spec.sh: Merge tests/mysql_client_test.c: Merge	19 years ago
unknown	c4812a0a11	Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint	19 years ago
unknown	c5adcd20f1	Merge bk-internal:/home/bk/mysql-5.1-new-maint into shellback.(none):/home/msvensson/mysql/mysql-5.1-new-maint	19 years ago
unknown	9e89ea6fa8	log.cc: Fixing failed merge sql/log.cc: Fixing failed merge	19 years ago
unknown	3f77f0dd6e	Change stolen from the -win tree. More specifically, the scripts/Makefile isn't created and it doesn't translate mysql_fix_privilege_tables ".sh" . So, mysql-test/mysql-test-run.pl doesn't find the binary and substitutes /bin/false instead. That obviously doesn't "fix" anything and the test fails because of it. mysql-test/t/system_mysql_db_fix.test: Change stolen from the -win tree.	19 years ago
unknown	937b16feec	Merge shellback.(none):/home/msvensson/mysql/mysql-5.1 into shellback.(none):/home/msvensson/mysql/mysql-5.1-new-maint sql/share/errmsg.txt: Auto merged storage/innobase/Makefile.am: Auto merged storage/innobase/handler/ha_innodb.cc: Auto merged	19 years ago
unknown	567561edcc	Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 into bk-internal.mysql.com:/data0/bk/mysql-5.1-kt	19 years ago
unknown	833e186937	Merge bk-internal:/home/bk/mysql-5.1 into shellback.(none):/home/msvensson/mysql/mysql-5.1 storage/innobase/handler/ha_innodb.cc: Manual merge	19 years ago
unknown	8cfdb8eb15	Use the mtr_file_exists function to detect if ndbapi_example is available	19 years ago
unknown	a822d65149	bugfix	19 years ago
unknown	2eb8437db2	Merge bk-internal.mysql.com:/home/bk/mysql-5.1-arch into janus.mylan:/usr/home/serg/Abk/mysql-5.1-arch	19 years ago
unknown	e44a923254	Fix initialized memory. Count the number of failures in shm-closing functions and return it. vio/viosocket.c: Initialize the return code and set it according to errors in the closing functions.	19 years ago
unknown	b430d54aa7	"crash_commit_before" need innodb mysql-test/t/crash_commit_before.test: Server need to be compiled with innodb support for this test case to suceed	19 years ago
unknown	d0a978e9c8	Merge shellback.(none):/home/msvensson/mysql/mysql-5.1 into shellback.(none):/home/msvensson/mysql/mysql-5.1-new-maint sql/ha_innodb.cc: Auto merged sql/handler.cc: Auto merged sql/log.cc: Auto merged sql/mysqld.cc: Auto merged sql/sql_show.cc: Auto merged storage/csv/ha_tina.cc: Auto merged mysql-test/mysql-test-run.pl: Merge	19 years ago
unknown	925802234f	Fix problem running mysql-test-run.pl when running in a clone not compiled with ndb support mysql-test/mysql-test-run.pl: Don't set LD_LIBRARY_PATH to the ndb dirs if ndb support is not available	19 years ago
unknown	089547f48d	Bug#21855 Compilation error in ha_innodb.cc - Add ifdefs in ha_innodb.cc so it's only compiled if we have selected to build mysqld with innodb. This is inline with how it's done in other handlers. sql/ha_innodb.cc: Add ifdef for WITH_INNOBASE_STORAGE_ENGINE around all code in ha_innodb.cc so it's only included if we have defined --with-innodb to configure	19 years ago
unknown	d64bf3a35e	Merge shellback.(none):/home/msvensson/mysql/mysql-5.0 into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint	19 years ago
unknown	3fa0f96bcf	Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 into mysql.com:/home/gluh/MySQL/Merge/5.0	19 years ago
unknown	4ef211eee0	after merge fix sql/mysql_priv.h: after merge fix added charset parameter to check_string_length() function sql/slave.h: after merge fix USERNAME_LENGTH const is changed to USERNAME_BYTE_LENGTH sql/sql_parse.cc: after merge fix added charset parameter to check_string_length() function sql/sql_yacc.yy: after merge fix added charset parameter to check_string_length() function	19 years ago
unknown	f64483cb90	Bug #20924 : CAST(expr as UNSIGNED) returns SIGNED value when used in various functions - Honor unsigned_flag in the corresponding functions - Use compare_int_signed_unsigned()/compare_int_unsigned_signed() instead of explicit comparison in GREATEST() and LEAST() mysql-test/r/case.result: Added test case for bug #20924 mysql-test/r/func_if.result: Added test case for bug #20924 mysql-test/r/func_test.result: Added test case for bug #20924 mysql-test/r/user_var.result: Added test case for bug #20924 mysql-test/t/case.test: Added test case for bug #20924 mysql-test/t/func_if.test: Added test case for bug #20924 mysql-test/t/func_test.test: Added test case for bug #20924 mysql-test/t/user_var.test: Added test case for bug #20924 sql/item_cmpfunc.cc: Bug #20924: CAST(expr as UNSIGNED) returns SIGNED value when used in various functions - Moved some code out of Arg_comparator to external functions to be reused in Item_func_min_max - Fixed IFNULL(), IF(), CASE() and COALESCE() sql/item_cmpfunc.h: Bug #20924: CAST(expr as UNSIGNED) returns SIGNED value when used in various functions - Moved some code out of Arg_comparator to external functions to be reused in Item_func_min_max sql/item_func.cc: Bug #20924: CAST(expr as UNSIGNED) returns SIGNED value when used in various functions Fixed LEAST(), GREATEST() and "SET @a=..." parts sql/item_func.h: Bug #20924: CAST(expr as UNSIGNED) returns SIGNED value when used in various functions Fixed "SET @a=..." part sql/sql_class.h: Bug #20924: CAST(expr as UNSIGNED) returns SIGNED value when used in various functions Fixed "SET @a=..." part	19 years ago
unknown	cf13cfc64a	Speed up "bk citool" for msvensson:	19 years ago
unknown	960af9f6fe	Merge bk-internal:/home/bk/mysql-5.1-new-maint into shellback.(none):/home/msvensson/mysql/mysql-5.1-new-maint configure.in: Auto merged include/mysql_com.h: Auto merged mysql-test/lib/mtr_process.pl: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/r/grant.result: Auto merged mysql-test/r/partition.result: Auto merged mysql-test/r/partition_mgm.result: Auto merged mysql-test/t/disabled.def: Auto merged mysql-test/t/grant.test: Auto merged sql/item_strfunc.cc: Auto merged sql/item_strfunc.h: Auto merged sql/mysqld.cc: Auto merged sql/sql_acl.cc: Auto merged sql/sql_show.cc: Auto merged	19 years ago
unknown	984983f852	Warning fixes for Windows, and an include fix for Windows for Innodb. storage/archive/azio.c: Fixed warnings for windows storage/federated/ha_federated.cc: Warning fixes for Windows storage/innobase/CMakeLists.txt: Fixed includes for Windows	19 years ago
unknown	53267edaf6	fix build	19 years ago
unknown	117ae7cb79	Add support for Falcon, so that partitioning can be tested. sql/handler.h: Adding Falcon	19 years ago
unknown	0c7b78bbed	Fix for a compile problem in Windows. sql/CMakeLists.txt: Compile problem for Windoows storage/innobase/handler/ha_innodb.cc: Removed some dead code (Marko approved)	19 years ago
unknown	7795b59afc	Adding in a few more engines to the now defunct (but still used) handler enum's since its the only way to enable for partitioning. sql/handler.h: Extended to add in more DB types for partioning.	19 years ago
unknown	e1a709261e	configure.in : NDB version and general version must be (kept) in sync - do that. configure.in: NDB version and general version must be (kept) in sync - do that.	19 years ago
unknown	d17ac1331e	Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-arch into zim.(none):/home/brian/mysql/merge-5.1	19 years ago
unknown	2d35bd61df	Merge trift2.:/M50/clone-5.0 into trift2.:/M50/push-5.0 configure.in: Auto merged	19 years ago
unknown	b179cf8f5a	Fix a change to "configure.in" that broke building commercial sources. To be pushed to both the cloned 5.0.25 and the general 5.0 tree. configure.in: When creating "commercial" sources, this file gets modified by "mysql-copyright". For this, it is essential that the string 'cmd-line-utils/readline/Makefile' be alone on its line ...	19 years ago
unknown	b098f25d87	Moves Innodb handler to the Innodb storage directory. storage/innobase/handler/ha_innodb.h: Rename: sql/ha_innodb.h -> storage/innobase/handler/ha_innodb.h libmysqld/Makefile.am: Removed Innodb specific mention sql/Makefile.am: Updated to remove innodb storage/innobase/CMakeLists.txt: Added include directory storage/innobase/Makefile.am: Updated to add in handler storage/innobase/handler/ha_innodb.cc: Adjusted include files, also disabled replication code which was not being used. storage/innobase/plug.in: Added additional Makefile storage/innobase/handler/Makefile.am: New BitKeeper file ``storage/innobase/handler/Makefile.am''	19 years ago
unknown	dc6243e588	after merge fix include/mysql_com.h: USERNAME_LENGTH is changed to USERNAME_BYTE_LENGTH mysql-test/r/ctype_utf8.result: result fix mysql-test/t/ctype_utf8.test: test fix sql/sp.cc: NAME_LEN constant is changed to NAME_BYTE_LEN for database name buffer USERNAME_LENGTH constant is changed to USERNAME_BYTE_LENGTH for user name buffer sql/sp_head.cc: NAME_LEN constant is changed to NAME_BYTE_LEN for database name buffer USERNAME_LENGTH constant is changed to USERNAME_BYTE_LENGTH for user name buffer sql/sql_acl.cc: NAME_LEN constant is changed to NAME_BYTE_LEN for database name buffer USERNAME_LENGTH constant is changed to USERNAME_BYTE_LENGTH for user name buffer sql/sql_class.h: NAME_LEN constant is changed to NAME_BYTE_LEN for database name buffer sql/sql_parse.cc: NAME_LEN constant is changed to NAME_BYTE_LEN for database name buffer Function check_string_length() is fixed, now it check string lenght in symbols sql/sql_repl.h: NAME_LEN constant is changed to NAME_BYTE_LEN for database name buffer USERNAME_LENGTH constant is changed to USERNAME_BYTE_LENGTH for user name buffer	19 years ago
unknown	5babf50018	cleanup of pligin removal code fixed multiple and missing deinitializations, moved all deinit/del code in one place	19 years ago
unknown	2ae54e3b9d	minor plugin api fixes: remove #define __attribute__(A) from plugin.h increase API version because placeholders were added more robust definition of min_plugin_interface_version include/mysql/plugin.h: move #define __attribute__(A) out of plugin.h (not part of the API) increase API version because placeholders were added plugin/fulltext/plugin_example.c: compilation failure on non-GCC compilers sql/sql_plugin.cc: more robust definition of min_plugin_interface_version it should work even when we forget to update it	19 years ago
unknown	146049d2e4	Merge mysql.com:/home/gluh/MySQL/Merge/4.1-merge into mysql.com:/home/gluh/MySQL/Merge/5.0 include/mysql_com.h: Auto merged mysql-test/t/ctype_utf8.test: Auto merged sql/item_func.h: Auto merged sql/item_strfunc.cc: Auto merged sql/item_strfunc.h: Auto merged sql/slave.cc: Auto merged sql/sql_parse.cc: Auto merged sql-common/client.c: Auto merged sql/sql_select.cc: Auto merged sql/table.cc: Auto merged mysql-test/r/ctype_utf8.result: manual merge sql/sql_acl.cc: manual merge	19 years ago

1 2 3 4 5 ...

37902 Commits (c690c11feb18e43b87cffb6d95d8e34a110d94d7) All Branches Search

37902 Commits (c690c11feb18e43b87cffb6d95d8e34a110d94d7)

All Branches