summaryrefslogtreecommitdiff
path: root/storage/federated
Commit message (Collapse)AuthorAgeFilesLines
* mergeVladislav Vaintroub2009-12-191-1/+1
|\
| * WL#2360 Performance schemaMarc Alff2009-12-091-1/+1
| | | | | | | | Part III: mysys instrumentation
* | mergeVladislav Vaintroub2009-12-102-14/+43
|\ \ | |/
| * WL#2360 Performance schemaMarc Alff2009-12-042-14/+43
| | | | | | Part II, engines instrumentation
* | - Introduce MYSQL_ADD_PLUGIN that replaces MYSQL_STORAGE_ENGINEVladislav Vaintroub2009-12-011-1/+1
| | | | | | | | - Fix semisync library prefix (remove lib on Unixes) - restrict exported symbols from zlib and yassl (fvisibility=hidden)
* | mergeVladislav Vaintroub2009-11-251-3/+3
|\ \ | |/
| * Backport of:Konstantin Osipov2009-11-241-3/+3
| | | | | | | | | | | | | | | | | | | | | | ---------------------------------------------------------------------- ChangeSet@1.2571, 2008-04-08 12:30:06+02:00, vvaintroub@wva. +122 -0 Bug#32082 : definition of VOID in my_global.h conflicts with Windows SDK headers VOID macro is now removed. Its usage is replaced with void cast. In some cases, where cast does not make much sense (pthread_*, printf, hash_delete, my_seek), cast is ommited.
* | WL#5161 : Cross-platform build with CMakeVladislav Vaintroub2009-11-091-1/+7
|/
* Backport of:Konstantin Osipov2009-10-161-1/+1
| | | | | | | | | | | ------------------------------------------------------------ revno: 2476.981.1 committer: msvensson@pilot.mysql.com timestamp: Mon 2007-11-26 19:03:23 +0100 message: Bug#31952 Remove undocumented mysql_rpl_* functions. - Functions removed + variables in st_mysql and st_mysql_options renamed to "unused". - Code updated to work without those functions and variables
* Backport of:Konstantin Osipov2009-10-141-8/+8
| | | | | | | | | | | | | | ---------------------------------------------------------- revno: 2617.22.5 committer: Konstantin Osipov <kostja@sun.com> branch nick: mysql-6.0-runtime timestamp: Tue 2009-01-27 05:08:48 +0300 message: Remove non-prefixed use of HASH. Always use my_hash_init(), my_hash_inited(), my_hash_search(), my_hash_element(), my_hash_delete(), my_hash_free() rather than non-prefixed counterparts (hash_init(), etc). Remove the backward-compatible defines.
* Creation of mysql-trunk = {summit + "Innodb plugin replacing the builtin"}:Guilhem Bichot2009-08-042-34/+22
|\ | | | | | | | | | | | | bzr branch mysql-5.1-performance-version mysql-trunk # Summit cd mysql-trunk bzr merge mysql-5.1-innodb_plugin # which is 5.1 + Innodb plugin bzr rm innobase # remove the builtin Next step: build, test fixes.
| * Merge 5.1-bugteam -> 5.1-innodb_plugin.Sergey Vojtovich2009-07-141-22/+20
| |\
| | * Merge from 5.0-bugteamStaale Smedseng2009-06-171-22/+20
| | |
| * | Backport WL#3653 to 5.1 to enable bundled innodb plugin.Vladislav Vaintroub2009-06-101-12/+2
| |/ | | | | | | | | Remove custom DLL loader code from innodb plugin code, use symbols exported from mysqld.
| * Bug #39802 On Windows, 32-bit time_t should be enforcedAnurag Shekhar2009-05-131-2/+2
| | | | | | | | | | | | | | This patch fixes compilation warning, "conversion from 'time_t' to 'ulong', possible loss of data". The fix is to typecast time_t to ulong before assigning it to ulong. Backported this from 6.0-bugteam tree.
* | Merge MySQL 5.1.35 into MySQL 5.4Mikael Ronstrom2009-06-112-12/+12
|\ \ | |/
| * Bug#29125 Windows Server X64: so many compiler warningsIgnacio Galarza2009-02-132-12/+12
| | | | | | | | | | | | - Remove bothersome warning messages. This change focuses on the warnings that are covered by the ignore file: support-files/compiler_warnings.supp. - Strings are guaranteed to be max uint in length
* | Fixing some issues in the build when using DTrace probesMC Brown2009-03-181-1/+1
| | | | | | | | | | | | | | Probe definition file is now a separate file that is copied during build to the correct location, this enforces dependency requirements correctly and allows builds to work when using the current or separate build directories
* | Yet another attempt of getting DTrace builds done properlyMikael Ronstrom2009-02-211-3/+3
| |
* | A workaround to handle the problem with thatMikael Ronstrom2009-02-201-3/+8
| | | | | | | | | | | | | | abs_top_srcdir doesn't work on some automake platforms. Done by copying the .d files to the build directories.
* | Changed to use top_srcdir instead of abs_top_srcdir since manyMikael Ronstrom2009-02-201-1/+1
| | | | | | | | automake tools on Solaris seems to have a bug related to the use of abs_top_srcdir
* | More readability for DTrace commandsMikael Ronstrom2009-02-201-1/+1
| |
* | Merged Performance Version 0.2.1 with latest 5.1 tree (last push 11 feb ↵Mikael Ronstrom2009-02-171-1/+1
|\ \ | |/ | | | | 14.01.13 2009)
| * Fix warnings and bug spotted by gcc-4.3.Davi Arnaut2008-12-161-1/+1
| | | | | | | | Related to operator precedence and associativity. Make the expressions as explicit as possible.
* | Reverted DTrace fixMikael Ronstrom2009-02-061-1/+1
| |
* | Added support for rep; nop replacing PAUSE due to Solaris bugMikael Ronstrom2009-02-031-1/+1
| | | | | | | | | | | | | | Replaced abs_top_srcdir with top_srcdir, not sure it's an improvement but at least it's known that abs_top_srcdir in cases have a problem and this is a more common variable to use for the same purpose.
* | DTrace fixes plus fixing a too long file nameMikael Ronstrom2008-12-221-1/+1
| |
* | A number of fixes to DTrace patchMikael Ronstrom2008-12-201-2/+1
| | | | | | Removed instance manager from builds
* | Backport of DTrace patches from 6.0Mikael Ronstrom2008-12-203-5/+51
|/
* Merge from 5.0-bugteam.Chad MILLER2008-08-151-0/+3
|
* Merge trift2.:/MySQL/M51/mysql-5.1joerg@trift2.2008-03-271-2/+3
|\ | | | | | | into trift2.:/MySQL/M51/push-5.1
| * Merge bk-internal.mysql.com:/home/bk/mysql-5.1-buildjperkin/jonathan@chorlton.adsl.perkin.org.uk2008-03-061-2/+3
| |\ | | | | | | | | | into chorlton.adsl.perkin.org.uk:/Users/jonathan/mysql/bk/build/5.1
| | * Use pkglibdir to simplify pkgplugindir, and fix the path in ajperkin/jonathan@chorlton.adsl.perkin.org.uk2008-01-021-1/+1
| | | | | | | | | | | | couple of Makefiles. Continuation of the fix for bug#31736.
| | * Add new pkgplugindir handling to seperate plugins from libraries,jperkin/jonathan@chorlton.adsl.perkin.org.uk2007-12-191-2/+3
| | | | | | | | | | | | | | | | | | and allow override for binary distributions. Extend mysql_config to print compiled-in plugin location for third-party plugins to use. Resolves bug#31736.
* | | Post-merge fixistruewing@stella.local2008-03-261-1/+2
| | |
* | | Merge stella.local:/home2/mydev/mysql-5.1-ateamistruewing@stella.local2008-03-261-1/+0
|\ \ \ | | | | | | | | | | | | into stella.local:/home2/mydev/mysql-5.1-axmrg
| * | | Merge mysql.com:/home/svoj/devel/mysql/push/mysql-5.0-enginessvoj@june.mysql.com2008-03-211-1/+8
| | | | | | | | | | | | | | | | into mysql.com:/home/svoj/devel/mysql/push/mysql-5.1-engines
* | | | Merge stella.local:/home2/mydev/mysql-5.0-axmrgistruewing@stella.local2008-03-261-5/+12
|/ / / | | | | | | | | | into stella.local:/home2/mydev/mysql-5.1-axmrg
* | | Merge ↵antony@pcg5ppc.xiphis.org2008-03-071-3/+20
|\ \ \ | |/ / |/| | | | | | | | | | | pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/mysql-5.1-engines into pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/merge.20080307/mysql-5.1
| * | After merge fix.svoj@mysql.com/april.(none)2008-02-141-3/+3
| | |
| * | Merge mysql.com:/home/svoj/devel/mysql/BUG33946/mysql-5.0-enginessvoj@april.(none)2008-02-141-3/+20
| |/ | | | | | | into mysql.com:/home/svoj/devel/mysql/BUG33946/mysql-5.1-engines
* | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-buildiggy@alf.(none)2008-02-211-0/+1
|\ \ | |/ |/| | | into alf.(none):/src/mysql-5.1-build_31929
| * Bug#31929 Windows build fails with >=4 Parallel build threads.iggy@alf.(none)2008-01-291-0/+1
| | | | | | | | | | - Add GenError Dependency to storage engines that include mysqld_error.h
* | Merge mysql.com:/home/hf/work/mrg/my50-mrgholyfoot/hf@hfmain.(none)2007-12-012-0/+19
|/ | | | into mysql.com:/home/hf/work/mrg/my51-mrg
* Merge mysql.com:/home/hf/work/29801/my50-29801holyfoot/hf@hfmain.(none)2007-10-221-1/+6
| | | | into mysql.com:/home/hf/work/29801/my51-29801
* fixed type conversion warnings revealed by bug 30639gkodinov/kgeorge@macbook.local2007-09-211-3/+3
|
* Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtimekostja@bodhi.(none)2007-08-311-6/+6
|\ | | | | | | into bodhi.(none):/opt/local/work/mysql-5.1-12713-new
| * Never access thd->ha_data directly, use getters/setters from the pluginkostja@bodhi.(none)2007-08-311-6/+6
| | | | | | | | | | | | API instead. This is a pre-requisite of the fix for Bug 12713, which changes the data type of thd->ha_data from void * to struct Ha_data.
* | CMakeLists.txt (many), win/README, mysql_manifest.cmake, configure.js:kent@mysql.com/kent-amd64.(none)2007-08-061-4/+6
|/ | | | | | | | | | | | | | | | | | | Additional changes for bug#29903 - Changed to do embedded build part as normal build, when WITH_EMBEDDED_SERVER is set. - Allow both normal and debug build with embedded. - Build static embedded library by pointing out all source and compile it all, i.e. not building libraries from libraries, not portable. - Let embedded use generated files from the "sql" directory, added dependencies to make sure built before embedded. - Mark library "dbug" in TARGET_LINK_LIBRARIES() with "debug", so only linked in when debug target is used. - Removed change of target name with "mysqld${MYSQLD_EXE_SUFFIX}", as others can't depend on it, not defined at configure time. Instead set the output file name. - Created work around for bug in CMake 2.4.6 and output names, to set the "mysqld<suffix>.pdb" name to the same base name. - Set the correct manifest "name" (patch by iggy)
* Merge ramayana.hindu.god:/home/tsmith/m/bk/51tsmith@ramayana.hindu.god2007-07-311-0/+1
|\ | | | | | | into ramayana.hindu.god:/home/tsmith/m/bk/maint/jul31/51
View Lorry Controller Status