mariadb

Tree: 82a72ee17e

Author	SHA1	Message	Date
unknown	82a72ee17e	Merge bk-internal:/home/bk/mysql-4.0 into chilla.local:/home/mydev/mysql-4.1-bug14400-monty BitKeeper/etc/ignore: auto-union include/my_global.h: Auto merged myisam/mi_rkey.c: Manual null merge as a better fix is already present. mysql-test/r/myisam.result: Manual null merge as a better fix is already present. mysql-test/t/myisam.test: Manual null merge as a better fix is already present. sql/sql_select.cc: Manual merge of purify improvements.	19 years ago
unknown	ab7d1d70a4	Merge bk-internal.mysql.com:/home/bk/mysql-4.1-engines into chilla.local:/home/mydev/mysql-4.1-bug14400 myisam/mi_rkey.c: Auto merged	19 years ago
unknown	addff97f31	Bug#14400 - Query joins wrong rows from table which is subject of "concurrent insert" After merge fix.	19 years ago
unknown	562763f160	Merge bk-internal.mysql.com:/home/bk/mysql-4.1-engines into chilla.local:/home/mydev/mysql-4.1-bug14400 mysql-test/r/myisam.result: Auto merged mysql-test/t/myisam.test: Auto merged myisam/mi_rkey.c: Bug#14400 - Query joins wrong rows from table which is subject of "concurrent insert" Manual merge	19 years ago
unknown	203d099962	Merge chilla.local:/home/mydev/mysql-4.0-bug14400 into chilla.local:/home/mydev/mysql-4.1-bug14400 myisam/mi_rkey.c: Bug#14400 - Query joins wrong rows from table which is subject of "concurrent insert" Manual merge from 4.0 mysql-test/r/myisam.result: Bug#14400 - Query joins wrong rows from table which is subject of "concurrent insert" Manual merge from 4.0 mysql-test/t/myisam.test: Bug#14400 - Query joins wrong rows from table which is subject of "concurrent insert" Manual merge from 4.0	19 years ago
unknown	71314617ae	Bug#14400 - Query joins wrong rows from table which is subject of "concurrent insert" Additional fix for full keys and test case. myisam/mi_rkey.c: Bug#14400 - Query joins wrong rows from table which is subject of "concurrent insert" Additional fix for full keys. mysql-test/r/myisam.result: Bug#14400 - Query joins wrong rows from table which is subject of "concurrent insert" Additional results. mysql-test/t/myisam.test: Bug#14400 - Query joins wrong rows from table which is subject of "concurrent insert" Additional test case.	19 years ago
unknown	a32f6b8941	Merge chilla.local:/home/mydev/mysql-4.0-bug14400 into chilla.local:/home/mydev/mysql-4.1-bug14400 myisam/mi_rkey.c: Bug#14400 - Query joins wrong rows from table which is subject of "concurrent insert" Manual merge from 4.0. mysql-test/r/myisam.result: Bug#14400 - Query joins wrong rows from table which is subject of "concurrent insert" Manual merge from 4.0. mysql-test/t/myisam.test: Bug#14400 - Query joins wrong rows from table which is subject of "concurrent insert" Manual merge from 4.0.	19 years ago
unknown	7d600f7131	Bug#14400 - Query joins wrong rows from table which is subject of "concurrent insert" Better fix by Monty: "The previous bug fix didn't work when using partial keys." mysql-test/r/myisam.result: Bug#14400 - Query joins wrong rows from table which is subject of "concurrent insert" Added test result mysql-test/t/myisam.test: Bug#14400 - Query joins wrong rows from table which is subject of "concurrent insert" Added test case	19 years ago
unknown	662890878b	Merge april.(none):/home/svoj/devel/bk/mysql-4.1-engines into april.(none):/home/svoj/devel/mysql/BUG19702/mysql-4.1	19 years ago
unknown	0f64834dc7	Merge hf@192.168.21.12:work/mysql-4.1.15440 into mysql.com:/home/hf/work/mysql-4.1.clean	19 years ago
unknown	aec4860f25	Merge hf@192.168.21.12:work/mysql-4.1.13717 into mysql.com:/home/hf/work/mysql-4.1.clean	19 years ago
unknown	c17fc16cc4	BUG#19702 - Using myisampack/myisamchk on a FULLTEXT indexed table results in table corrupt Fulltext key has always two keysegs, thus we need to update FT_SEGS (last) element from seg array in case of compressed table. Also we must update ft2_keyinfo. myisam/mi_packrec.c: Fulltext key has always two keysegs, thus we need to update FT_SEGS (last) element from seg array in case of compressed table. Also we must update ft2_keyinfo.	20 years ago
unknown	5576ed8b1e	Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 into mysql.com:/usr/home/ram/work/4.1.b20695	20 years ago
unknown	be3047a02a	Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 into mysql.com:/usr/home/bar/mysql-4.1.b9509	20 years ago
unknown	c55b9f5069	Merge mysql.com:/usr/home/bar/mysql-4.1 into mysql.com:/usr/home/bar/mysql-4.1.b9509 mysql-test/r/ctype_utf8.result: Auto merged mysql-test/t/ctype_utf8.test: Auto merged sql/sql_select.cc: Auto merged	20 years ago
unknown	80684559c8	Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 into mysql.com:/windows/Linux_space/MySQL/mysql-4.1	20 years ago
unknown	87b7363c5c	ndb_lock.test, ndb_lock.result: bug #18184 SELECT ... FOR UPDATE does not work..: New test case ha_ndbcluster.h, ha_ndbcluster.cc, NdbConnection.hpp: Fix for bug #21059 Server crashes on join query with large dataset with NDB tables: Releasing operation for each intermediate batch, before next call to trans->execute(NoCommit); mysql-test/r/ndb_lock.result: bug #18184 SELECT ... FOR UPDATE does not work..: New test case mysql-test/t/ndb_lock.test: bug #18184 SELECT ... FOR UPDATE does not work..: New test case ndb/include/ndbapi/NdbConnection.hpp: Fix for bug #21059 Server crashes on join query with large dataset with NDB tables: Releasing operation for each intermediate batch, before next call to trans->execute(NoCommit); sql/ha_ndbcluster.cc: Fix for bug #21059 Server crashes on join query with large dataset with NDB tables: Releasing operation for each intermediate batch, before next call to trans->execute(NoCommit); sql/ha_ndbcluster.h: Fix for bug #21059 Server crashes on join query with large dataset with NDB tables: Releasing operation for each intermediate batch, before next call to trans->execute(NoCommit);	20 years ago
unknown	fe3dee0621	Fix for bug #20695 : Charset introducer overrides charset definition for column. - if there are two character set definitions in the column declaration, we replace the first one with the second one as we store both in the LEX->charset slot. Add a separate slot to the LEX structure to store underscore charset. - convert default values to the column charset of STRING, VARSTRING fields if necessary as well. mysql-test/r/ctype_recoding.result: Fix for bug #20695: Charset introducer overrides charset definition for column. - test result. mysql-test/t/ctype_recoding.test: Fix for bug #20695: Charset introducer overrides charset definition for column. - test case. sql/sql_lex.cc: Fix for bug #20695: Charset introducer overrides charset definition for column. - LEX->underscore_charset introduced to store UNDERSCORE_CHARSET sql/sql_lex.h: Fix for bug #20695: Charset introducer overrides charset definition for column. - LEX->underscore_charset introduced to store UNDERSCORE_CHARSET sql/sql_table.cc: Fix for bug #20695: Charset introducer overrides charset definition for column. - convert default values to the column charset of VARSTRING, STRING, ENUM, SET fields if necessary. sql/sql_yacc.yy: Fix for bug #20695: Charset introducer overrides charset definition for column. - LEX->underscore_charset introduced to store UNDERSCORE_CHARSET	20 years ago
unknown	73c1453e35	Merge mysql.com:/usr/home/bar/mysql-4.1 into mysql.com:/usr/home/bar/mysql-4.1.b17939 client/mysql.cc: Auto merged	20 years ago
unknown	f2e1358bf6	Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1 into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-bug9678	20 years ago
unknown	32741794a3	BUG#9678: Client library hangs after network communication failure Socket timeouts in client library were used only on Windows. The solution is to use socket timeouts in client library on all systems were they are supported. No test case is provided because it is impossible to simulate network failure in current test suit. sql/net_serv.cc: Retry indefinitely only if got EINTR. vio/viosocket.c: Set socket timeouts on POSIX systems as well as on Windows.	20 years ago
unknown	ebf58763e2	Merge april.(none):/home/svoj/devel/bk/mysql-4.1 into april.(none):/home/svoj/devel/mysql/BUG18874/mysql-4.1	20 years ago
unknown	f6d7985a5b	BUG#18874 - Setting myisam_repair_threads > 1, index cardinality always 1 Fixed by moving update_key_parts() down to be after write_index(). myisam/sort.c: write_index() collects index statistic which is further used in update_key_parts(). Thus update_key_parts() must be called after write_index(). mysql-test/r/repair.result: Test case for bug#18874. mysql-test/t/repair.test: Test case for bug#18874.	20 years ago
unknown	a756f762e8	Make the heap_btree test repeatable. mysql-test/r/heap_btree.result: Make the heap_btree test repeatable. - 'order by' added where we don't use the 'a' index. mysql-test/t/heap_btree.test: Make the heap_btree test repeatable. - 'order by' added where we don't use the 'a' index.	20 years ago
unknown	bb3efba00c	Restore alphabetical order of the system variables. sql/set_var.cc: Restore alphabetical order of the system variables. - moved the have_merge_engine variable.	20 years ago
unknown	49591aa30b	Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 into mysql.com:/usr/home/bar/mysql-4.1.b15276	20 years ago
unknown	edc8900bb0	mysqld --collation-server=xxx --character-set-server=yyy didn't work as expected: collation_server was set not to xxx, but to the default collation of character set "yyy". With different argument order it worked as expected: mysqld --character-set-server=yyy --collation-server=yyy Fix: initializate default_collation_name to 0 when processing --character-set-server only if --collation-server has not been specified in command line. mysql-test/r/ctype_ucs2_def.result: Adding test cast mysql-test/t/ctype_ucs2_def-master.opt: Adding test case mysql-test/t/ctype_ucs2_def.test: Adding test case sql/mysqld.cc: Don't clear default_collation_name when processing --character-set-server if collation has already been specified using --collation-server	20 years ago
unknown	256ac388eb	Bug#7192 Specify --with-collation doesn't work for connections? --with-collation worked only on the server side. Client side ignored this argument, so collation_connection was not properly set (remained latin1_swedish_ci). sql-common/client.c: - Take into account MYSQL_DEFAULT_COLLATION_NAME if character set is not set using mysql_option(), to honor --with-collation argument to configure. - Use default collation for the character set when it's not set using mysql_option().	20 years ago
unknown	dcb6659001	Better bug fix for #14400 "Query joins wrong rows from table which is subject of "concurrent insert"" The previous bug fix didn't work when using partial keys. Don't use GNUC min/max operations are they are depricated. Fixed valgrind warning BitKeeper/etc/ignore: Added /.libs/ include/my_global.h: Don't use GNUC min/max operations are they are depricated myisam/mi_rkey.c: Better bug fix for #14400 "Query joins wrong rows from table which is subject of "concurrent insert"" The previous bug fix didn't work when using partial keys. myisam/mi_test_all.res: Updated results to match mi_test_all.sh myisam/mi_test_all.sh: Removed confusing warning mysql-test/r/myisam.result: Added test case for #14400 mysql-test/t/myisam.test: Added test case for #14400 sql/sql_select.cc: Fixed valgrind warning (in field_string::val_int())	20 years ago
unknown	bfdbb780c2	Fix for bug #20709 : Collation not used in group by on 4.1. myisam/mi_uniue.c:mi_check_unique() should skip trailing spaces comparing TEXT and VARTTEXT key segments. myisam/mi_unique.c: Fix for bug #20709: Collation not used in group by on 4.1. myisam/mi_uniue.c:mi_check_unique() should skip trailing spaces comparing TEXT and VARTTEXT key segments. Example: assume, we have a 'char(200) collate utf8_unicode_ci' field, there are two records with _utf8"0x65" and _utf8"0xC3A9" characters; these values are equal according to the utf8_unicode_ci collation, but two 600 byte length corresponding keys: "0x65<0x20 repeats 599 times>" and "0xC3A9<0x20 repeats 598 times>" are not equal if we count trailing spaces and it may cause inconsequent behavior. So, let's pass 1 as the skip_end_space parameter value to the mi_compare_text() function for proper TEXT and VARTTEXT key segments comparison. mysql-test/r/ctype_utf8.result: Fix for bug #20709: Collation not used in group by on 4.1. - test results. mysql-test/t/ctype_utf8.test: Fix for bug #20709: Collation not used in group by on 4.1. - test case.	20 years ago
unknown	70269a091e	Removed iggy's accidentally checked-in test files. BitKeeper/deleted/.del-bug20328.test: Delete: mysql-test/t/bug20328.test BitKeeper/deleted/.del-bug20328.result: Delete: mysql-test/r/bug20328.result	20 years ago
unknown	8f88400d33	Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1 into may.pils.ru:/home/svoj/devel/mysql/BUG20060/mysql-4.1	20 years ago
unknown	a2a5f2b536	BUG#20060 - mysqld option "--flush " doesn't work for update statement Problem described in this bug report affects MyISAM tables only. Running mysqld --flush instructs mysqld to sync all changes to disk after each SQL statement. It worked well for INSERT and DELETE statements, but it did sync for UPDATE only in case if there was index change (change of colum that has an index). If no updated column has an index, data wasn't synced to disk. This fix makes UPDATE statement to sync data to disk even if there is no index change (that is only data change) and mysqld is run with --flush option. myisam/mi_update.c: Every myisam function that updates myisam table must end with call to _mi_writeinfo(). If operation (second param of _mi_writeinfo()) is not 0 it sets share->changed to 1, that is flags that data has changed. If operation is 0, this function equals to no-op in this case. mi_update() must always pass !0 value as operation, since even if there is no index change there could be data change.	20 years ago
unknown	ef6019010d	Merge mysql.com:/usr/home/bar/mysql-4.1.b19741v0 into mysql.com:/usr/home/bar/mysql-4.1.b19741	20 years ago
unknown	dba52b539a	Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1 into may.pils.ru:/home/svoj/devel/mysql/BUG7391/mysql-4.1	20 years ago
unknown	842ec23341	Bug#21419 test case lowercase_fs_off fails on Windows - Backport patch from 5.0 sql/mysqld.cc: Add else case to set "lower_case_file_system" also when lower_case_table_names are 1	20 years ago
unknown	135ffa6360	Merge neptunus.(none):/home/msvensson/mysql/my41-bug21218 into neptunus.(none):/home/msvensson/mysql/mysql-4.1 mysql-test/t/mysqlbinlog.test: Auto merged	20 years ago
unknown	485510a2c8	Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1 into may.pils.ru:/home/svoj/devel/mysql/BUG7391/mysql-4.1	20 years ago
unknown	74465080c6	BUG#7391 - Cross-database multi-table UPDATE uses active database privileges This problem is 4.1 specific. It doesn't affect 4.0 and was fixed in 5.x before. Having any mysql user who is allowed to issue multi table update statement and any column/table grants, allows this user to update any table on a server (mysql grant tables are not exception). check_grant() accepts number of tables (in table list) to be checked in 5-th param. While checking grants for multi table update, number of tables must be 1. It must never be 0 (actually we have DBUG_ASSERT(number > 0) in 5.x in grant_check() function). mysql-test/r/grant.result: Addition to test case for bug#7391: - Added grant statement to trigger this problem in 4.1. - Fixed error messages. mysql-test/t/grant.test: Addition to test case for bug#7391: - Added grant statement to trigger this problem in 4.1. - Fixed error messages. sql/sql_update.cc: check_grant() accepts number of tables (in table list) to be checked in 5-th param. For this particular check number of tables must be 1. It must never be 0 (actually we have DBUG_ASSERT(number > 0) in 5.x in grant_check() function).	20 years ago
unknown	595b5fdbe8	Merge bk-internal.mysql.com:/home/bk/mysql-4.1 into zippy.cornsilk.net:/home/cmiller/work/mysql/m41-maint--07OBQ sql/set_var.cc: Auto merged	20 years ago
unknown	f4fb48bab0	Bug#9719: DELETE with WHERE on HEAP table just deletes first row of matched set. (Ramil's patch, recreated.) heap/hp_delete.c: Reset info->lastkey_len for further heap_rnext/heap_rprev calls. mysql-test/r/heap_btree.result: Test for bug #9719: DELETE with WHERE on HEAP table just deletes first row of matched set. mysql-test/t/heap_btree.test: Test for bug #9719: DELETE with WHERE on HEAP table just deletes first row of matched set.	20 years ago
unknown	98daac1865	Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-4.1-maint into rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-4.1-maint_bug20721	20 years ago
unknown	d31ae636dd	Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1 into moonbone.local:/work/tmp_merge-4.1-opt-mysql	20 years ago
unknown	328e8c7430	Merge moonbone.local:/work/tmp_merge-4.1 into moonbone.local:/work/tmp_merge-4.1-opt-mysql	20 years ago
unknown	84ece59cef	Merge moonbone.local:/work/tmp_merge-4.1 into moonbone.local:/work/tmp_merge-4.1-opt-mysql sql/item_strfunc.cc: Auto merged sql/mysql_priv.h: Auto merged sql/sql_parse.cc: Auto merged sql/sql_select.cc: Auto merged	20 years ago
unknown	504e375656	Merge bk@192.168.21.1:mysql-4.1 into mysql.com:/home/hf/work/mysql-4.1.20317	20 years ago
unknown	87fc6265ce	Merge bk-internal:/home/bk/mysql-4.1 into neptunus.(none):/home/msvensson/mysql/mysql-4.1	20 years ago
unknown	2b86ee9f0a	bug #13717 embedded library dumps warnings on STDERR directly Here i just disabled STDERR warnings in embedded server Later we should get more defined about logs in the embedded server sql/log.cc: Log messages muted in embedded server	20 years ago
unknown	340053df4e	Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1 into mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge	20 years ago
unknown	0f581cd3c5	Merge anubis.greendragongames.com:/home/greenman/workspace-mysql/mysql/mysql-4.1-maint into anubis.greendragongames.com:/home/greenman/workspace-mysql/mysql/pending/bug-4.1-19364 client/mysql.cc: Auto merged	20 years ago

1 2 3 4 5 ...

20869 Commits (82a72ee17e74db84b2c7a5ecfccf8a459c642acc) All Branches Search

20869 Commits (82a72ee17e74db84b2c7a5ecfccf8a459c642acc)

All Branches