mariadb

Tree: c690c11feb

Author	SHA1	Message	Date
unknown	c690c11feb	In current 5.1 build we don't build embedded server for windows (this will be fixed when 5.1-win will be pushed into main tree). Commenting the libmysqld and libmysqld/example subdirectories will allow us to upgrade from cmake 2.2 to 2.4. CMakeLists.txt: comment libmysqld and libmysqld/example directories	19 years ago
unknown	daaf51fbe9	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 storage/innobase/handler/ha_innodb.cc: Auto merged	19 years ago
unknown	96b2748a99	Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint include/my_net.h: Auto merged	19 years ago
unknown	0dfa6c953a	Merge bk-internal.mysql.com:/home/bk/mysql-5.1 into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint BitKeeper/etc/ignore: auto-union mysql-test/mysql-test-run.pl: Auto merged sql/mysqld.cc: Auto merged sql/share/errmsg.txt: Auto merged sql/sql_class.h: Auto merged sql/sql_parse.cc: Auto merged	19 years ago
unknown	eceb03503d	Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1 into zim.(none):/home/brian/mysql/merge-5.1 sql/ha_ndbcluster.cc: Auto merged sql/item_sum.cc: Auto merged sql/log.cc: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/set_var.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_show.cc: Auto merged sql/table.cc: Auto merged storage/archive/ha_archive.cc: Auto merged	19 years ago
unknown	d79485a9be	This changes the order of the universe, black is now the new white. In practice this means that handlerton is now created by the server and is passed to the engine. Plugin startups can now also control how plugins are inited (and can optionally pass values). Bit more flexibility to those who want to write plugin interfaces to the database. include/mysql/plugin.h: Optional to pass parameter now to init and deinit functions sql/ha_ndbcluster.cc: Cleanup, handlerton is now a pointer. sql/ha_ndbcluster_binlog.cc: Cleanup (handlerton is now a pointer) sql/ha_ndbcluster_binlog.h: Cleanup (handlerton is now a pointer) sql/ha_partition.cc: Cleaned up handlerton change sql/handler.cc: Cheanup of handlerton change sql/item_sum.cc: Cleanedup of handlerton change sql/log.cc: Cleanup of handlerton change sql/mysql_priv.h: Reverted patch for variables (what would have happen previously if a have_ would have been called that was dynamically loaded? boom!) sql/mysqld.cc: Cleanup of handlerton changes and reverted have variable patch sql/partition_info.cc: Cleanup of handlerton (we need to clean this up a bit more). sql/set_var.cc: Cleanup related to handlerton changes sql/sql_cache.cc: Handlerton changes cleanup sql/sql_insert.cc: Handlerton changes cleanup. sql/sql_partition.cc: Handlerton cleanup changes sql/sql_plugin.cc: Handlerton changes. init() can now be controlled by a plugin specific startup. There was also an issue with how we deinited the status variables. It should have been occuring before we shut down the engines. sql/sql_select.cc: Handlerton cleanup changes sql/sql_show.cc: Handlerton cleanup changes sql/sql_table.cc: Handlerton cleanup changes sql/table.cc: Cleanup storage/archive/ha_archive.cc: Cleanup storage/archive/ha_archive.h: Cleanup storage/blackhole/ha_blackhole.cc: Cleanup storage/csv/ha_tina.cc: Cleanup storage/example/ha_example.cc: Cleanup storage/federated/ha_federated.cc: Cleanup storage/heap/ha_heap.cc: Cleanup storage/innobase/handler/ha_innodb.cc: Cleanup storage/myisam/ha_myisam.cc: Cleanup storage/myisammrg/ha_myisammrg.cc: Cleanup	19 years ago
unknown	24cdd48020	Merge shellback.(none):/home/msvensson/mysql/work/my50-work into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint	19 years ago
unknown	1e5685bde0	Add definition of SHUT_RDWR for compiling on windows	19 years ago
unknown	39f28ab6c5	Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint BitKeeper/etc/ignore: auto-union BitKeeper/etc/config: Auto merged client/mysql.cc: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/r/mysql.result: Auto merged mysql-test/r/user_var.result: Auto merged mysql-test/t/mysql.test: Auto merged mysql-test/t/user_var.test: Auto merged sql/item_cmpfunc.cc: Auto merged sql/item_cmpfunc.h: Auto merged sql/item_func.cc: Auto merged sql/item_func.h: Auto merged sql/item_strfunc.cc: Auto merged sql/log_event.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_parse.cc: Auto merged tests/Makefile.am: Auto merged vio/viosocket.c: Auto merged	19 years ago
unknown	9e1a6b0eef	Merge bk-internal:/home/bk/mysql-5.0-maint into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint	19 years ago
unknown	91a1db9dda	Merge shellback.(none):/home/msvensson/mysql/work/my51-work into shellback.(none):/home/msvensson/mysql/mysql-5.1-maint	19 years ago
unknown	66b6357ea8	Merge shellback.(none):/home/msvensson/mysql/work/my50-work into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint	19 years ago
unknown	607e99d08e	Merge shellback.(none):/home/msvensson/mysql/work/my50-work into shellback.(none):/home/msvensson/mysql/work/my51-work configure.in: Auto merged storage/ndb/include/ndb_global.h.in: SCCS merged	19 years ago
unknown	6373941ad4	Merge shellback.(none):/home/msvensson/mysql/bug20602/my50-bug20602 into shellback.(none):/home/msvensson/mysql/work/my50-work configure.in: Auto merged	19 years ago
unknown	05b14821ed	Merge msvensson.mysql.internal:mysql/my50-m-bug16574 into shellback.(none):/home/msvensson/mysql/work/my50-work	19 years ago
unknown	507edfc279	Merge shellback.(none):/home/msvensson/mysql/work/my50-work into shellback.(none):/home/msvensson/mysql/work/my51-work configure.in: Auto merged	19 years ago
unknown	0fa2995def	Merge shellback.(none):/home/msvensson/mysql/work/my50-work into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint	19 years ago
unknown	e15148ad79	Merge msvensson.mysql.internal:mysql/my50-m-bug16576 into shellback.(none):/home/msvensson/mysql/work/my50-work configure.in: Auto merged	19 years ago
unknown	8e76d8e868	Merge shellback.(none):/home/msvensson/mysql/work/my51-work into shellback.(none):/home/msvensson/mysql/mysql-5.1-maint	19 years ago
unknown	2d755a344e	Merge shellback.(none):/home/msvensson/mysql/work/my50-work into shellback.(none):/home/msvensson/mysql/work/my51-work include/my_global.h: Auto merged	19 years ago
unknown	860ae72264	Merge shellback.(none):/home/msvensson/mysql/work/my50-work into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint	19 years ago
unknown	040c9378c1	Merge msvensson.mysql.internal:mysql/my50-m-bug21222 into shellback.(none):/home/msvensson/mysql/work/my50-work	19 years ago
unknown	018d0b9f64	Merge shellback.(none):/home/msvensson/mysql/bug22139/my51-bug22139 into shellback.(none):/home/msvensson/mysql/mysql-5.1-maint sql/share/errmsg.txt: Auto merged storage/innobase/Makefile.am: Auto merged tests/Makefile.am: Auto merged storage/innobase/handler/ha_innodb.cc: SCCS merged	19 years ago
unknown	cb92ed6444	Merge shellback.(none):/home/msvensson/mysql/bug22139/my50-bug22139 into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint tests/Makefile.am: Auto merged	19 years ago
unknown	9ae1145d53	Merge shellback.(none):/home/msvensson/mysql/bug22139/my50-bug22139 into shellback.(none):/home/msvensson/mysql/bug22139/my51-bug22139 tests/Makefile.am: Auto merged	19 years ago
unknown	1878b9f6f3	Merge hholzgraefe@bk-internal.mysql.com:/home/bk/mysql-5.0-maint into mysql.com:/home/hartmut/projects/mysql/dev/teamtrees/mysql-5.0-maint	19 years ago
unknown	7974ef2c5e	Add SSL specific linker flags to --libmysqld-libs (Bug #21239 )	19 years ago
unknown	fe966fca74	Merge shellback.(none):/home/msvensson/mysql/work/my51-work into shellback.(none):/home/msvensson/mysql/mysql-5.1-maint	19 years ago
unknown	581e2fd1c4	Merge shellback.(none):/home/msvensson/mysql/work/my50-work into shellback.(none):/home/msvensson/mysql/work/my51-work	19 years ago
unknown	1c0c90bdb3	Merge bk-internal:/home/bk/mysql-5.0-maint into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint	19 years ago
unknown	a55a105bc2	Merge shellback.(none):/home/msvensson/mysql/work/my50-work into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint	19 years ago
unknown	6653bfb373	Bug#22326 Build problems on hurd-i386: conflicting declaration of socklen_t extra/yassl/testsuite/test.hpp: Remove define for __MACH__ http://bugs.debian.org/387369	19 years ago
unknown	3e3d97ea14	Merge bk-internal.mysql.com:/home/bk/mysql-5.0 into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint	19 years ago
unknown	9d65cd5b11	Merge shellback.(none):/home/msvensson/mysql/work/my51-work into shellback.(none):/home/msvensson/mysql/mysql-5.1-maint	19 years ago
unknown	f3c2cc137c	Merge msvensson.mysql.internal:mysql/mysql-5.1-maint into shellback.(none):/home/msvensson/mysql/mysql-5.1-maint	19 years ago
unknown	0dae68973c	Merge msvensson.mysql.internal:mysql/mysql-5.0-maint into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint	19 years ago
unknown	0deefdd3a7	Merge shellback.(none):/home/msvensson/mysql/work/my50-work into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint vio/viosocket.c: Auto merged	19 years ago
unknown	cdc2c4e930	Merge shellback.(none):/home/msvensson/mysql/work/my50-work into shellback.(none):/home/msvensson/mysql/work/my51-work sql/mysqld.cc: Auto merged vio/viosocket.c: Auto merged	19 years ago
unknown	3860571e95	Use the enum/define SHUT_RDWR instead of heardcoded "2" to shutdown	19 years ago
unknown	7d131bcde2	Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1 into mysql.com:/usr/home/ram/work/mysql-5.1-maint BitKeeper/etc/ignore: auto-union mysql-test/mysql-test-run.pl: Auto merged sql/Makefile.am: Auto merged sql/mysqld.cc: Auto merged sql/sp_head.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_lex.cc: Auto merged sql/sql_lex.h: Auto merged sql/sql_parse.cc: Auto merged sql/sql_yacc.yy: Auto merged sql/table.cc: Auto merged	19 years ago
unknown	39d888ccd1	Merge bk-internal:/home/bk/mysql-5.0-maint into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint	19 years ago
unknown	bba4e89a51	Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime into mockturtle.local:/home/dlenev/src/mysql-5.1-rt-merge	19 years ago
unknown	549c922bdb	Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1 into siva.hindu.god:/usr/home/tim/m/bk/51 sql/sql_parse.cc: Auto merged	19 years ago
unknown	38d2f59512	Merge ted.mysql.internal:/home/ted/src/mysql/mysql-5.0-maint into ted.mysql.internal:/home/ted/src/mysql/mysql-5.0-5.1-gca	19 years ago
unknown	8c3b5d22dd	Merge ted.mysql.internal:/home/ted/src/mysql/mysql-5.0-5.1-gca into ted.mysql.internal:/home/ted/src/mysql/mysql-5.1-new-maint client/mysql_upgrade.c: Auto merged	19 years ago
unknown	ef218ff99d	Bug#21011 The [client] group header was overwritten by "password" option in upgrade_defaults file which confused mysqlcheck thus used to prevent the whole thing from running correctly when the "--password=" option is specified on mysql_upgrade command line with no corresponding "--user=" option client/mysql_upgrade.c: The "password" option should be issued after group header to upgrade_defaults file whenever it is used	19 years ago
unknown	2e5837355b	Fix an assert on AIX 5.2, 64bit. COND_queue_state wasn't initialized prior to usage as well as deinitialized on shutdown. sql/event_queue.cc: Deinitialize and initialize COND_queue_state	19 years ago
unknown	38a9dea4ae	Post-merge fix: remove dup() call in ha_archive.cc which resulted in a memory leak. storage/archive/ha_archive.cc: Remove dup() call from azdopen(&archive, create_file, ...), as it resulted in a memory leak.	19 years ago
unknown	3f190bed63	Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug21424/my50-bug21424 into rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint	19 years ago
unknown	f1e6d23944	Merge bk-internal.mysql.com:/home/bk/mysql-5.1 into mockturtle.local:/home/dlenev/src/mysql-5.1-rt-merge BitKeeper/etc/ignore: auto-union client/mysqltest.c: Auto merged libmysqld/Makefile.am: Auto merged mysql-test/mysql-test-run.pl: Auto merged sql/CMakeLists.txt: Auto merged sql/Makefile.am: Auto merged sql/mysqld.cc: Auto merged sql/set_var.cc: 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/share/errmsg.txt: Auto merged sql/sql_parse.cc: Auto merged sql/sql_show.cc: Auto merged sql/sql_yacc.yy: Auto merged	19 years ago

1 2 3 4 5 ...

37902 Commits (c690c11feb18e43b87cffb6d95d8e34a110d94d7) All Branches Search

37902 Commits (c690c11feb18e43b87cffb6d95d8e34a110d94d7)

All Branches