mariadb

Tree: 8233b914ec

Author	SHA1	Message	Date
unknown	3685d889e7	mysql_explain_log.sh: Patch from Paul DuBois for better help messages scripts/mysql_explain_log.sh: Patch from Paul DuBois for better help messages	19 years ago
unknown	fcb13e451c	Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb ndb/include/kernel/signaldata/DumpStateOrd.hpp: Auto merged ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: Auto merged ndb/src/kernel/blocks/qmgr/Qmgr.hpp: Auto merged ndb/src/kernel/blocks/qmgr/QmgrMain.cpp: Auto merged ndb/test/ndbapi/testNodeRestart.cpp: Auto merged	19 years ago
unknown	44a0eb0c94	Merge perch.ndb.mysql.com:/home/jonas/src/50-work into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: Auto merged ndb/src/kernel/blocks/qmgr/QmgrMain.cpp: Auto merged ndb/test/run-test/daily-basic-tests.txt: Auto merged	19 years ago
unknown	45b1bdb1b2	ndb - bug#25554 fix bug when master failure during nr (recommit against 5.0) ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: recommit against 5.0 ndb/src/kernel/blocks/qmgr/QmgrMain.cpp: recommit against 5.0 ndb/test/ndbapi/testNodeRestart.cpp: recommit against 5.0 ndb/test/run-test/daily-basic-tests.txt: recommit against 5.0	19 years ago
unknown	4a819ce19e	Merge bodhi.local:/opt/local/work/mysql-4.1-runtime into bodhi.local:/opt/local/work/mysql-5.0-runtime sql/item_func.cc: Auto merged	19 years ago
unknown	6ab5bdf311	Merge bk-internal.mysql.com:/home/bk/mysql-5.0 into bodhi.local:/opt/local/work/mysql-5.0-runtime heap/hp_block.c: Auto merged mysql-test/r/view.result: Auto merged server-tools/instance-manager/listener.cc: Auto merged sql/item_func.cc: Auto merged sql/sp_head.cc: Auto merged sql/sp_head.h: Auto merged sql/sql_class.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_lex.cc: Auto merged sql/sql_lex.h: Auto merged sql/sql_prepare.cc: Auto merged sql/sql_string.cc: Auto merged sql/sql_yacc.yy: Auto merged tests/mysql_client_test.c: Auto merged heap/hp_write.c: SCCS merged	19 years ago
unknown	fcbe66a366	Merge bk-internal.mysql.com:/home/bk/mysql-4.1 into bodhi.local:/opt/local/work/mysql-4.1-runtime sql/item_func.cc: Auto merged	19 years ago
unknown	489eb9e6b2	Merge mysqldev@production.mysql.com:my/mysql-4.0-15815 into trift2.:/MySQL/M40/mysql-4.0	19 years ago
unknown	380848157e	Merge mysqldev@quadxeon:/benchmarks/ext3/TOSAVE/tsmith/bk/g40 into mysql.com:/data0/mysqldev/my/mysql-4.0-15815	19 years ago
unknown	7f9da471cd	Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt into rakia.gmz:/home/kgeorge/mysql/autopush/B25106-5.0-opt sql/sql_base.cc: Auto merged	19 years ago
unknown	6c41a043a4	BUG#25106: A USING clause in combination with a VIEW results in column aliases ignored When a column reference to a column in JOIN USING is resolved and a new Item is created for this column the user defined name was lost. This fix preserves the alias by setting the name of the new Item to the original alias. mysql-test/r/join.result: BUG#25106: A USING clause in combination with a VIEW results in column aliases ignored - test case mysql-test/t/join.test: BUG#25106: A USING clause in combination with a VIEW results in column aliases ignored - test case sql/sql_base.cc: BUG#25106: A USING clause in combination with a VIEW results in column aliases ignored - take the alias of the Item to be replaced and set it into the newly allocated Item.	19 years ago
unknown	b1861675a4	Merge trift2.:/MySQL/M40/clone-4.0 into trift2.:/MySQL/M40/mysql-4.0	19 years ago
unknown	113b784b36	Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint mysys/mf_iocache.c: Auto merged mysys/my_seek.c: Auto merged	19 years ago
unknown	c97f7e7cb9	Merge bk-internal.mysql.com:/home/bk/mysql-5.0 into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint include/my_global.h: Auto merged mysql-test/Makefile.am: Auto merged mysql-test/lib/mtr_cases.pl: Auto merged mysql-test/lib/mtr_process.pl: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/t/myisam.test: Auto merged mysql-test/t/mysqladmin.test: Auto merged mysql-test/t/rpl_rotate_logs.test: Auto merged scripts/make_binary_distribution.sh: Auto merged scripts/mysqlbug.sh: Auto merged sql/field.cc: Auto merged sql/field.h: Auto merged sql/item_sum.h: Auto merged sql/mysqld.cc: Auto merged sql/opt_range.cc: Auto merged sql/sql_class.h: Auto merged Makefile.am: manual merge mysql-test/t/trigger.test: manual merge strings/ctype-extra.c: manual merge	19 years ago
unknown	4c50203d4b	Merge kpdesk.mysql.com:/home/thek/dev/mysql-4.1-maint into kpdesk.mysql.com:/home/thek/dev/mysql-5.0-maint mysys/mf_iocache.c: Auto merged mysys/my_seek.c: null merge.	19 years ago
unknown	df3219a026	Merge kpettersson@bk-internal:/home/bk/mysql-5.0-maint into kpdesk.mysql.com:/home/thek/dev/mysql-5.0-maint mysys/mf_iocache.c: Auto merged	19 years ago
unknown	56e9169013	Merge kpdesk.mysql.com:/home/thek/dev/mysql-4.0-maint into kpdesk.mysql.com:/home/thek/dev/mysql-4.1-maint mysys/mf_iocache.c: Auto merged mysys/my_seek.c: Auto merged	19 years ago
unknown	819c169783	Merge kpdesk.mysql.com:/home/thek/dev/test23010/my40-bug23010 into kpdesk.mysql.com:/home/thek/dev/mysql-4.0-maint	19 years ago
unknown	081b9c0e6b	Merge kpettersson@bk-internal:/home/bk/mysql-4.1-maint into kpdesk.mysql.com:/home/thek/dev/mysql-4.1-maint mysys/mf_iocache.c: Auto merged	19 years ago
unknown	32b14754aa	Merge kpdesk.mysql.com:/home/thek/dev/mysql-4.1-maint into kpdesk.mysql.com:/home/thek/dev/mysql-5.0-maint mysys/mf_iocache.c: Auto merged mysys/my_read.c: Auto merged mysys/my_seek.c: null merge	19 years ago
unknown	9397ff2a7d	Merge kpdesk.mysql.com:/home/thek/dev/mysql-4.0-maint into kpdesk.mysql.com:/home/thek/dev/mysql-4.1-maint mysys/mf_iocache.c: Auto merged mysys/my_read.c: Auto merged mysys/my_seek.c: Auto merged	19 years ago
unknown	26eb72649e	Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-build into kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build	19 years ago
unknown	b88f53e74e	Merge naruto.:C:/cpp/bug24751/my41-bug24751 into naruto.:C:/cpp/mysql-4.1-maint	19 years ago
unknown	90bec9ce3d	Merge naruto.:C:/cpp/bug24751/my50-bug24751 into naruto.:C:/cpp/mysql-5.0-maint mysys/mf_iocache.c: Auto merged	19 years ago
unknown	b139c2875e	Merge mysql.com:/home/kent/bk/tmp2/mysql-4.1-build into mysql.com:/home/kent/bk/tmp2/mysql-5.0-build innobase/buf/buf0buf.c: Auto merged innobase/dict/dict0dict.c: Auto merged innobase/fil/fil0fil.c: Auto merged innobase/ha/ha0ha.c: Auto merged innobase/include/hash0hash.h: Auto merged innobase/lock/lock0lock.c: Auto merged innobase/log/log0recv.c: Auto merged	19 years ago
unknown	a1566a0952	Many files: Reverted change for bug#13859, applied smaller patch from Marko innobase/buf/buf0buf.c: Reverted change for bug#13859, applied smaller patch from Marko innobase/dict/dict0dict.c: Reverted change for bug#13859, applied smaller patch from Marko innobase/fil/fil0fil.c: Reverted change for bug#13859, applied smaller patch from Marko innobase/ha/ha0ha.c: Reverted change for bug#13859, applied smaller patch from Marko innobase/ha/hash0hash.c: Reverted change for bug#13859, applied smaller patch from Marko innobase/include/hash0hash.h: Reverted change for bug#13859, applied smaller patch from Marko innobase/lock/lock0lock.c: Reverted change for bug#13859, applied smaller patch from Marko innobase/log/log0recv.c: Reverted change for bug#13859, applied smaller patch from Marko innobase/thr/thr0loc.c: Reverted change for bug#13859, applied smaller patch from Marko	19 years ago
unknown	bfca790262	Merge trift2.:/MySQL/M50/mysql-5.0 into trift2.:/MySQL/M50/push-5.0	19 years ago
unknown	0c715c6fb8	Merge trift2.:/MySQL/M41/push-4.1 into trift2.:/MySQL/M50/push-5.0 VC++Files/libmysqld/libmysqld.dsp: Auto merged VC++Files/mysql.dsw: Auto merged VC++Files/mysqldemb/mysqldemb.dsp: Auto merged VC++Files/sql/mysqld.dsp: Auto merged VC++Files/sql/mysqldmax.dsp: Auto merged mysys/my_read.c: Auto merged scripts/make_binary_distribution.sh: Auto merged support-files/MySQL-shared-compat.spec.sh: Auto merged	19 years ago
unknown	ce3a76a4a8	Merge bk@192.168.21.1:mysql-5.0-opt into mysql.com:/d2/hf/mr10/my50-mr10 sql/mysqld.cc: Auto merged	19 years ago
unknown	029d6cf92d	Merge naruto.:C:/cpp/bug24751/my41-bug24751 into naruto.:C:/cpp/bug24751/my50-bug24751 mysys/mf_iocache.c: Auto merged	19 years ago
unknown	2cbccbfb0c	Bug#24751 - Possible infinit loop in init_io_cache() when insufficient memory - When cache memory can't be allocated size is recaclulated using 3/4 of the requested memory. This number is rounded up to the nearest min_cache step. However with the previous implementation the new cache size might become bigger than requested because of this rounding and thus we get an infinit loop. - This patch fixes this problem by ensuring that the new cache size always will be smaller on the second and subsequent iterations until we reach min_cache. mysys/mf_iocache.c: - Added mask to cachesize to ensure that algorithm always produce a smaller cache size than current, until we reach 'min_cache' size.	19 years ago
unknown	50361d9a44	Merge mjorgensen@bk-internal.mysql.com:/home/bk/mysql-5.0-sage into tiger.mmj.dk:/Users/mmj/bktrees/mysql-5.0 configure.in: Auto merged mysql-test/install_test_db.sh: Auto merged mysql-test/mysql-test-run.pl: Auto merged scripts/mysql_install_db.sh: Auto merged sql/CMakeLists.txt: Auto merged sql/mysqld.cc: Auto merged win/configure.js: Auto merged	19 years ago
unknown	7b524960a5	Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/mysql-4.0-bug15815 into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/g40	19 years ago
unknown	34d5b84bc5	Merge trift2.:/MySQL/M40/clone-4.0 into trift2.:/MySQL/M41/push-4.1 VC++Files/mysql.dsw: Null-merge: Removal of BerkeleyDB is limited to 4.0 VC++Files/libmysqld/libmysqld.dsp: Null-merge: Removal of BerkeleyDB is limited to 4.0 VC++Files/mysqldemb/mysqldemb.dsp: Null-merge: Removal of BerkeleyDB is limited to 4.0 VC++Files/mysqlserver/mysqlserver.dsp: Null-merge: Removal of BerkeleyDB is limited to 4.0 VC++Files/sql/mysqld.dsp: Null-merge: Removal of BerkeleyDB is limited to 4.0 VC++Files/sql/mysqldmax.dsp: Null-merge: Removal of BerkeleyDB is limited to 4.0	19 years ago
unknown	6ee56e4142	Merge trift2.:/MySQL/M40/upward-4.0 into trift2.:/MySQL/M41/push-4.1 mysys/my_read.c: Auto merged scripts/make_binary_distribution.sh: Null merge, because "--platform" is already a real argument in 4.1 support-files/MySQL-shared-compat.spec.sh: Null merge, because the 4.1 version already uses two digits for "version40" and "version41".	19 years ago
unknown	10698df6da	Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1-opt into olga.mysql.com:/home/igor/mysql-4.1-opt	19 years ago
unknown	34a723988e	Merge cbell@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl into suse.vabb.com:/home/Chuck/development/mysql-5.0-rpl	19 years ago
unknown	1f58d47fb4	BUG#22645 - LC_TIME_NAMES: Statement not replicated This patch is an additional code change to the get_str_len_and_pointer method in log_events.cc. This change is necessary to correct a problem encountered on 64-bit SUSE where the auto_increment_* variables were being overwritten. The change corrects a cast mismatch which caused the problem. sql/log_event.cc: BUG#22645 - LC_TIME_NAMES: Statement not replicated This patch is an additional code change to the get_str_len_and_pointer, copy_str_and_move methods and the Query_leg_event constructor to correct a type mismatch encountered during testing on SUSE 64-bit. The patch changes the data type of the buffer variables was changed to a new typedef defined in the Log_event class. The new type is: typedef unsigned char Byte; The variables changed include: pos, start, end, and data_buf sql/log_event.h: BUG#22645 - LC_TIME_NAMES: Statement not replicated This patch adds a new type definition to the Log_event class. The new type is typedef unsigned char Byte. It is used in place of the uchar and usigned char definitions in the Query_log_event constructor to eliminate type conversion problems encountere on SUSE 64-bit.	19 years ago
unknown	a4817aced5	configure.in: Corrected default for --disable-grant-options configure.in: Corrected default for --disable-grant-options	19 years ago
unknown	6943153ead	Merge olga.mysql.com:/home/igor/mysql-4.1-opt into olga.mysql.com:/home/igor/mysql-5.0-opt sql/item.cc: Auto merged mysql-test/r/order_by.result: Manual merge mysql-test/t/order_by.test: Manual merge	19 years ago
unknown	c11c3b08b8	Merge bk@192.168.21.1:mysql-5.0 into mysql.com:/d2/hf/mr10/my50-mr10	19 years ago
unknown	4ffd49d311	configure.in: Removed line accidently inserted when correcting bug#18526 configure.in: Removed line accidently inserted when correcting bug#18526	19 years ago
unknown	380ad35c20	Merge mysql.com:/d2/hf/common/my50-common into mysql.com:/d2/hf/mr10/my50-mr10	19 years ago
unknown	53c9b0d07c	after merge fix	19 years ago
unknown	f5005095d2	Merge mysql.com:/home/gluh/MySQL/Merge/4.1-opt into mysql.com:/home/gluh/MySQL/Merge/5.0-opt sql/mysqld.cc: Auto merged sql/sql_base.cc: Auto merged sql/mysql_priv.h: manual merge	19 years ago
unknown	ac71a8fa5e	Fix for bug#20867 InnoDB Bug - create temporary table+crash => mysqld needs to clean up 2nd version During tmp tables cleanup we get the handler for temporary table and delete table using handler method. sql/mysql_priv.h: added function prototype sql/mysqld.cc: added call of mysql_rm_tmp_tables() function sql/sql_base.cc: mysql_rm_tmp_tables() -removed from table_cache_init -During tmp tables cleanup we get the handler for temporary table and delete table using handler method. it allows to remove orphan records from data dictionary(InnoDB)	19 years ago
unknown	6fc17dab1e	Fixed bug #25427 . In the method Item_field::fix_fields we try to resolve the name of the field against the names of the aliases that occur in the select list. This is done by a call of the function find_item_in_list. When this function finds several occurrences of the field name it sends an error message to the error queue and returns 0. Yet the code did not take into account that find_item_in_list could return 0 and tried to dereference the returned value. mysql-test/r/order_by.result: Added a test case for bug #25427. mysql-test/t/order_by.test: Added a test case for bug #25427. sql/item.cc: Fixed bug #25427. In the method Item_field::fix_fields we try to resolve the name of the field against the names of the aliases that occur in the select list. This is done by a call of the function find_item_in_list. When this function finds several occurrences of the field name it sends an error message to the error queue and returns 0. Yet the code did not take into account that find_item_in_list could return 0 and tried to dereference the returned value.	19 years ago
unknown	c2e9a4af2d	WL #3670 : Compile-time option to remove GRANT-related startup options - configure --disable-grant-options defines DISABLE_GRANT_OPTIONS - configure.js/cmake also updated - if DISABLE_GRANT_OPTIONS is defined, mysqld no longer recognizes: --bootstrap --init-file --skip-grant-tables Scripts which rely on those three options are modified to check the environment for MYSQLD_BOOTSTRAP; it should be set to the full path of a mysqld which does handle those options. For example: $ export MYSQLD_BOOTSTRAP $ MYSQLD_BOOTSTRAP=/path/to/full/MySQL/bin/mysqld $ mysql_install_db $ make test configure.in: WL#3670 Add --disable-grant-options mysql-test/install_test_db.sh: Add MYSQLD_BOOTSTRAP env variable, to enable test suite to work even if mysqld does not accept --bootstrap or --skip-grant-tables. mysql-test/mysql-test-run.pl: Add MYSQLD_BOOTSTRAP env variable, to enable test suite to work even if mysqld does not accept --bootstrap or --skip-grant-tables. mysql-test/mysql_test_run_new.c: Mention need for MYSQLD_BOOTSTRAP in a comment, in case this needs to be used with a mysqld which does not accept the --bootstrap option. scripts/mysql_install_db.sh: Add MYSQLD_BOOTSTRAP env variable, to enable mysqld_install_db to work even if mysqld does not accept --bootstrap or --skip-grant-tables. sql/CMakeLists.txt: Add DISABLE_GRANT_OPTIONS define sql/mysqld.cc: Add DISABLE_GRANT_OPTIONS define, which removes the --bootstrap, --init-file, and --skip-grant-tables options win/README: Document the DISABLE_GRANT_OPTIONS define win/configure.js: Handle DISABLE_GRANT_OPTIONS	19 years ago
unknown	b04652e289	Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0-opt into olga.mysql.com:/home/igor/mysql-5.0-opt	19 years ago
unknown	4374848c82	support-files/MySQL-shared-compat.spec.sh : Dummy, irrelevant change - just trigger a new build. support-files/MySQL-shared-compat.spec.sh: Dummy, irrelevant change - just trigger a new build.	19 years ago

... 2 3 4 5 6 ...

34548 Commits (8233b914ecc3cdc9cbec27aba4406c0ecd67cb58) All Branches Search

34548 Commits (8233b914ecc3cdc9cbec27aba4406c0ecd67cb58)

All Branches