mariadb

Tree: af26b2b87e

Author	SHA1	Message	Date
unknown	1640452364	Bug#23345: Wrongly allowed INTO in a non-last select of a UNION. INTO clause can be specified only for the last select of a UNION and it receives the result of the whole query. But it was wrongly allowed in non-last selects of a UNION which leads to a confusing query result. Now INTO allowed only in the last select of a UNION. mysql-test/t/union.test: Added a test case for the bug#23345: Wrongly allowed INTO in a non-last select of a UNION. mysql-test/r/union.result: Added a test case for the bug#23345: Wrongly allowed INTO in a non-last select of a UNION. sql/sql_yacc.yy: Bug#23345: Wrongly allowed INTO in a non-last select of a UNION. Now INTO allowed only in the last select of a UNION.	19 years ago
unknown	e772a22d40	Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint into recycle.(none):/src/bug27144/my50-bug27144	19 years ago
unknown	fb616ccc53	Modifying mysql-test-run.pl to allow steeing of --secure-file-priv to 'mysql-test' when running suites other tha the main one mysql-test/mysql-test-run.pl: Modifying to allow steeing of --secure-file-priv to 'mysql-test' when running suites other tha the main one	19 years ago
unknown	9e6d54e4a5	Merge recycle.(none):/src/bug27144/my50-bug27144 into recycle.(none):/src/bug27144/my51-bug27144 mysql-test/t/sp-destruct.test: SCCS merged	19 years ago
unknown	65c34cc855	Bug#27144 sp-destruct.test is disabled on Windows - Update test to run properly on Windows. mysql-test/t/sp-destruct.test: Bug#27144 sp-destruct.test is disabled on Windows - Enabled test on Windows. - Replaced non-portable system commands (mkdir, rmdir, mv, cp, echo) with the mysqltest builtin commands. - Replace Windows directory seperator in error ER_NOT_FROM_FILE with posix directory seperator for single test/result pair.	19 years ago
unknown	4390f78889	Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint into recycle.(none):/src/bug23736/my50-bug23736	19 years ago
unknown	2608804665	Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint into recycle.(none):/src/bug23736/my51-bug23736	19 years ago
unknown	858ff63811	Fix warnings on Windows. sql/event_data_objects.cc: Fix Windows 64 bit build warnings. No better fix exists at the moment.	19 years ago
unknown	33a51fd843	Fix a broken merge. scripts/mysql_system_tables.sql: Add time_zone to the list of mysql.event columns. scripts/mysql_system_tables_fix.sql: Update after a bad merge: now mysql_system_tables_fix contains only alter definitions, no CREATE definitions (single definition source approach that was implemented by Magnus).	19 years ago
unknown	68d074d073	Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb into poseidon.mysql.com:/home/tomas/mysql-5.0-ndb	19 years ago
unknown	0ca0887b24	Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb into poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb sql/ha_ndbcluster.cc: Auto merged storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp: Auto merged storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp: Auto merged storage/ndb/tools/restore/Restore.cpp: Auto merged storage/ndb/tools/restore/consumer_restore.cpp: Auto merged	19 years ago
unknown	fe6bc37346	Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-build into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build	19 years ago
unknown	7ecb18b510	Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1-build into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build	19 years ago
unknown	89bfca83c9	Merge mysql_cab_desk.:C:/source/c++/mysql-5.0_BUG_25543 into mysql_cab_desk.:C:/source/c++/mysql-5.1_BUG_25543 mysql-test/r/rpl_misc_functions.result: Auto merged mysql-test/t/rpl_misc_functions.test: Auto merged sql/sql_class.cc: Manual merge of conflicts during push of BUG#25543.	19 years ago
unknown	3eb75c15ea	Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work-26701 into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build BUILD/check-cpu: Auto merged	19 years ago
unknown	578e45917d	Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-26701 into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work-26701 BUILD/check-cpu: Auto merged	19 years ago
unknown	fc2040cfc2	Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-26701 into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build BUILD/check-cpu: Auto merged	19 years ago
unknown	983e1f5acb	fix shell script BUILD/check-cpu: make comparison a little more compatible with less exotic shells	19 years ago
unknown	f668148944	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/Dbdih.hpp: Auto merged ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: Auto merged ndb/src/kernel/blocks/dbtc/Dbtc.hpp: Auto merged ndb/src/kernel/blocks/dbtc/DbtcMain.cpp: Auto merged	19 years ago
unknown	a1368c8e16	Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb	19 years ago
unknown	2d3b2458fe	Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp: Auto merged storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp: Auto merged storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp: Auto merged	19 years ago
unknown	b278b21030	Merge perch.ndb.mysql.com:/home/jonas/src/50-work into perch.ndb.mysql.com:/home/jonas/src/51-telco-gca storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp: Auto merged storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp: Auto merged storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp: Auto merged	19 years ago
unknown	f5acedb6a7	ndb - bug#27283 Additional fix for 2-node case ndb/src/kernel/blocks/dbdih/Dbdih.hpp: Add error insert ref for errcode = 7181 ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: Make GSN_GCP_NODEFINISH always be sent to DIH node requesting it ndb/src/kernel/blocks/dbtc/Dbtc.hpp: Make GSN_GCP_NODEFINISH always be sent to DIH node requesting it ndb/src/kernel/blocks/dbtc/DbtcMain.cpp: Make GSN_GCP_NODEFINISH always be sent to DIH node requesting it	19 years ago
unknown	7dcf587c9f	Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work-26701 into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build BUILD/check-cpu: Auto merged	19 years ago
unknown	7ee021e100	Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-26701 into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build BUILD/check-cpu: Auto merged	19 years ago
unknown	3c1f99e3da	Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-26701 into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work-26701 BUILD/check-cpu: Auto merged	19 years ago
unknown	d344d81c95	Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint BitKeeper/etc/ignore: auto-union BitKeeper/deleted/.del-init_db.sql~e2b8d0c8390e8023: Auto merged BitKeeper/deleted/.del-test_db.sql: Auto merged scripts/make_binary_distribution.sh: Auto merged sql/mysql_priv.h: Auto merged sql/sql_acl.h: Auto merged mysql-test/install_test_db.sh: Manual merge mysql-test/mysql-test-run.pl: Manual merge netware/Makefile.am: Manual merge	19 years ago
unknown	2176fef446	Merge bk-internal:/home/bk/mysql-5.0-maint into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint BitKeeper/etc/ignore: auto-union BitKeeper/deleted/.del-init_db.sql~e2b8d0c8390e8023: Auto merged BitKeeper/deleted/.del-test_db.sql: Auto merged mysql-test/install_test_db.sh: Auto merged mysql-test/mysql-test-run.pl: Auto merged scripts/make_binary_distribution.sh: Auto merged sql/mysql_priv.h: Auto merged sql/sql_acl.h: Auto merged netware/Makefile.am: Manual merge	19 years ago
unknown	ed0badb128	Merge bk-internal:/home/bk/mysql-5.1-new-maint into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint BitKeeper/etc/ignore: auto-union BitKeeper/deleted/.del-init_db.sql~e2b8d0c8390e8023: Auto merged BitKeeper/deleted/.del-test_db.sql: Auto merged include/my_pthread.h: Auto merged mysql-test/mysql-test-run.pl: Auto merged scripts/make_binary_distribution.sh: Auto merged sql/log.cc: Auto merged sql/mysql_priv.h: Auto merged sql/sql_acl.h: Auto merged mysql-test/install_test_db.sh: Manual merge mysql-test/r/flush2.result: Manual merge netware/Makefile.am: Manual merge	19 years ago
unknown	94a40d6c39	Merge dsl-hkibras1-ff1dc300-249.dhcp.inet.fi:/home/elkin/MySQL/MAIN/mysql-5.1-build into dsl-hkibras1-ff1dc300-249.dhcp.inet.fi:/home/elkin/MySQL/MAIN/mysql-5.1-new-maint	19 years ago
unknown	6fb9ef87e3	Merge dsl-hkibras1-ff1dc300-249.dhcp.inet.fi:/home/elkin/MySQL/TEAM/FIXES/5.1/bug26079_binlog_max_innodb into dsl-hkibras1-ff1dc300-249.dhcp.inet.fi:/home/elkin/MySQL/MAIN/mysql-5.1-new-maint sql/log.cc: Auto merged	19 years ago
unknown	5d7f62824f	Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-telco-gca into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca	19 years ago
unknown	f58baa6a28	Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb	19 years ago
unknown	f397b42288	mysqlbinlog-cp932.test: merging mysql-test/t/mysqlbinlog-cp932.test: merging	19 years ago
unknown	01fe2589be	Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb	19 years ago
unknown	a7d1bd9f17	Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb sql/ha_ndbcluster.cc: Auto merged	19 years ago
unknown	447f5de15b	Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb sql/ha_ndbcluster.cc: Auto merged	19 years ago
unknown	a7970e2408	Bug #26825 MySQL Server Crashes in high load - initialize to NULL, to avoid call of free on uninitialized variable	19 years ago
unknown	f275b8e9f5	ndb - bug#24028 in 5.0 proper fix exists only in version >= 5.1 mysql-test/r/ndb_blob.result: bug#24028 in 5.0 only mysql-test/t/ndb_blob.test: bug#24028 in 5.0 only ndb/src/ndbapi/NdbBlob.cpp: bug#24028 in 5.0 only ndb/test/ndbapi/testBlobs.cpp: bug#24028 in 5.0 only	19 years ago
unknown	e2e6aa89d3	Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca sql/ha_ndbcluster.cc: manual merge	19 years ago
unknown	fb2858bc75	Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb	19 years ago
unknown	1662b18757	Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb storage/ndb/src/mgmsrv/MgmtSrvr.cpp: Auto merged	19 years ago
unknown	ca19097cbc	Merge perch.ndb.mysql.com:/home/jonas/src/50-work into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb ndb/src/mgmsrv/MgmtSrvr.cpp: Auto merged	19 years ago
unknown	de44ff1ba2	Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb sql/ha_ndbcluster.cc: Auto merged	19 years ago
unknown	fa30eca697	Merge perch.ndb.mysql.com:/home/jonas/src/50-work into perch.ndb.mysql.com:/home/jonas/src/51-telco-gca storage/ndb/src/mgmsrv/MgmtSrvr.cpp: Auto merged	19 years ago
unknown	34a9dd6a5e	ndb - bug#27286 (5.0 version) make sure master is sendable ndb/src/mgmsrv/MgmtSrvr.cpp: make sure master is sendable	19 years ago
unknown	55400a0080	ndb - bug#27286 make sure master node is sendable, when getting ref::NotMaster storage/ndb/src/mgmsrv/MgmtSrvr.cpp: make sure master node is sendable, when getting ref::NotMaster	19 years ago
unknown	49f2196da0	Bug #26825 MySQL Server Crashes in high load - initialize to NULL, to avoid call of free on uninitialized variable	19 years ago
unknown	55de5d6f28	Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb storage/ndb/src/common/debugger/EventLogger.cpp: Auto merged storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp: Auto merged	19 years ago
unknown	c73db035de	correct event buffer status reporting	19 years ago

... 3 4 5 6 7 ...

44606 Commits (af26b2b87efe108fbaa19c83506411a43a005b33) All Branches Search

44606 Commits (af26b2b87efe108fbaa19c83506411a43a005b33)

All Branches