summaryrefslogtreecommitdiff
path: root/libmysql
Commit message (Collapse)AuthorAgeFilesLines
* mergeDaniel Fischer2010-06-181-5/+5
|\
| * post-merge fixDaniel Fischer2010-04-301-2/+2
| |
| * mergeDaniel Fischer2010-04-301-10/+25
| |\
| | * Try new RPM layout.Jonathan Perkin2010-04-261-6/+12
| | | | | | | | | | | | Fix libmysqlclient_r symlinks.
| | * Remove duplicates.Jonathan Perkin2010-04-261-2/+4
| | |
| | * Try to fix libmysqlclient symlinks on per-OS basis.Jonathan Perkin2010-04-261-3/+10
| | |
| * | MergeDaniel Fischer2010-04-211-2/+29
| |\ \ | | |/
| | * Need to add .a extension now.Jonathan Perkin2010-03-311-1/+1
| | |
| | * Put back libmysqlclient_r.a, not sure it was supposed to be removed.Jonathan Perkin2010-03-311-0/+1
| | | | | | | | | | | | Remove libmysqld-debug.a, it doesn't exist in current packages?
| | * Apply wlad fixes from mysql-next-mr-bugfixingJonathan Perkin2010-03-311-4/+25
| | |
| * | Add components to INSTALL, some eraly Wix supportVladislav Vaintroub2010-02-101-4/+4
| | |
* | | Post-merge fix: rename filename in shared make file.Davi Arnaut2010-05-311-1/+1
| | |
* | | Another incarnation of the patch for Bug#30708Alexander Nozdrin2010-05-192-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | (make relies GNU extentions). The patch was partially backport from 6.0. Original comment: bug#30708: make relies GNU extensions. Now that we no longer use BitKeeper we can safely remove the SCCS handling with no loss of functionality.
* | | Changes to build using CMake according to existing release packages:Jonathan Perkin2010-05-121-9/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Update/fix file layouts for each package type, add new types for native package formats including deb, rpm and svr4. - Build all plugins, including debug versions - Update compiler flags to match current release - Add missing @VAR@ expansions - Install correct mysqclient library symlinks - Fix icc/ia64 builds - Fix install of libmysqld-debug - Don't include mysql_embedded - Remove unpackaged manual pages to avoid missing files warnings - Don't install mtr's test suite
* | | WL#5030: Split and remove mysql_priv.hMats Kindahl2010-03-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch: - Moves all definitions from the mysql_priv.h file into header files for the component where the variable is defined - Creates header files if the component lacks one - Eliminates all include directives from mysql_priv.h - Eliminates all circular include cycles - Rename time.cc to sql_time.cc - Rename mysql_priv.h to sql_priv.h
* | | Manual merge of mysql-trunk into mysql-trunk-merge.Alexey Kopytov2010-03-246-181/+225
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Text conflict in client/mysqlbinlog.cc Text conflict in mysql-test/Makefile.am Text conflict in mysql-test/collections/default.daily Text conflict in mysql-test/r/mysqlbinlog_row_innodb.result Text conflict in mysql-test/suite/rpl/r/rpl_typeconv_innodb.result Text conflict in mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test Text conflict in mysql-test/suite/rpl/t/rpl_row_create_table.test Text conflict in mysql-test/suite/rpl/t/rpl_slave_skip.test Text conflict in mysql-test/suite/rpl/t/rpl_typeconv_innodb.test Text conflict in mysys/charset.c Text conflict in sql/field.cc Text conflict in sql/field.h Text conflict in sql/item.h Text conflict in sql/item_func.cc Text conflict in sql/log.cc Text conflict in sql/log_event.cc Text conflict in sql/log_event_old.cc Text conflict in sql/mysqld.cc Text conflict in sql/rpl_utility.cc Text conflict in sql/rpl_utility.h Text conflict in sql/set_var.cc Text conflict in sql/share/Makefile.am Text conflict in sql/sql_delete.cc Text conflict in sql/sql_plugin.cc Text conflict in sql/sql_select.cc Text conflict in sql/sql_table.cc Text conflict in storage/example/ha_example.h Text conflict in storage/federated/ha_federated.cc Text conflict in storage/myisammrg/ha_myisammrg.cc Text conflict in storage/myisammrg/myrg_open.c
| * | | Bug #52149 - packaging differences in CMake buildVladislav Vaintroub2010-03-171-4/+25
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Corrected some packaging bugs: - install mysqlservices library - install libmysqlclient_r.so.{16,16.0.0} as links to libmysqlclient.so - install libmysqld-debug.a - install my_safe_process, my_safe_kill and symlinks to mysql-test-run.pl (mtr, mysql-test-run) into correct place ${INSTALL_MYSQLTESTDIR}
| * | Install static client and embedded debug librariesVladislav Vaintroub2010-02-201-0/+5
| |/
| * mergeVladislav Vaintroub2010-02-061-4/+7
| |\
| | * Manual merge from mysql-next-mr.Alexander Nozdrin2010-01-184-39/+26
| | |\ | | | | | | | | | | | | Conflicts: - sql/sql_plugin.cc
| | * \ Auto-merge from mysql-trunk-merge.Alexander Nozdrin2009-12-241-4/+7
| | |\ \
| * | | | Handle different installation layouts.Vladislav Vaintroub2010-01-241-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | using cmake option INSTALL_LAYOUT=STANDALONE would produce the layout as in tar.gz or zip packages. INSTALL_LAYOUT=UNIX will produce unixish install layout (with mysqld being in sbin subdirectory , libs in lib/mysql etc). This layout is used for RPM packages. Subtle differences in both packages unfortunately lead to the need to recompile MySQL to use with other package type - as otherwise for example default plugins or data directories would be wrong set. There are numerous other variables that allow fine-tuning packaging layout. (INSTALL_BINDIR, INSTALL_LIBDIR , INSTALL_PLUGINDIR etc). This options are different from autotools as they do not expect full paths to directories, but only subdirectory of CMAKE_INSTALL_PREFIX. There are 2 special options that expect full directory paths - MYSQL_DATADIR that defines default MYSQL data directory (autotools equivalent is --localstatedir) - SYSCONFDIR can be added to search my.cnf search path (autotools equivalent is --sysconfdir)
| * | | | mergeVladislav Vaintroub2010-01-141-1/+2
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Enable WL#4435.Alexander Nozdrin2010-01-121-1/+2
| | | | |
| * | | | mergeVladislav Vaintroub2009-12-252-36/+22
| |\ \ \ \ | | |/ / /
| | * | | Auto-merge from mysql-next-mr.Alexander Nozdrin2009-12-251-2/+1
| | |\ \ \ | | | |/ /
| | * | | Fixed a Windows build failureAlexey Kopytov2009-12-221-1/+1
| | | | |
| | * | | Backport of WL #2934: Make/find library for doing float/double Alexey Kopytov2009-12-223-38/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to string conversions and vice versa" Initial import of the dtoa.c code and custom wrappers around it to allow its usage from the server code. Conversion of FLOAT/DOUBLE values to DECIMAL ones or strings and vice versa has been significantly reworked. As the new algoritms are more precise than the older ones, results of such conversions may not always match those obtained from older server versions. This in turn may break compatibility for some applications. This patch also fixes the following bugs: - bug #12860 "Difference in zero padding of exponent between Unix and Windows" - bug #21497 "DOUBLE truncated to unusable value" - bug #26788 "mysqld (debug) aborts when inserting specific numbers into char fields" - bug #24541 "Data truncated..." on decimal type columns without any good reason"
| * | | | mergeVladislav Vaintroub2009-12-222-2/+2
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Manual merge from mysql-next-mr.Alexander Nozdrin2009-12-221-1/+0
| | |\ \ \ | | | |/ / | | | | | | | | | | Conflicts: - storage/ibmdb2i/ha_ibmdb2i.cc
| | * | | Automerge the changes of version 5.5.0-m2.Joerg Bruehe2009-12-161-2/+1
| | |\ \ \
| * | \ \ \ mergeVladislav Vaintroub2009-12-191-1/+0
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-12-161-1/+0
| | |\ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: - include/my_no_pthread.h - mysql-test/r/sp-ucs2.result - sql/log.cc - sql/sql_acl.cc - sql/sql_yacc.yy
| * | | | | Replace ADD_EXECUTABLE with MYSQL_ADD_EXECUTABLE for binaries that are ↵Vladislav Vaintroub2009-12-171-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | installed. MYSQL_ADD_EXECUTABLE will instructs CPack where to install the exe. On Windows, it also adds version resource and if -DSIGNCODE was given, will sign the exe in packaging step.
| * | | | | mergeVladislav Vaintroub2009-12-164-26/+0
| |\ \ \ \ \ | | |/ / / /
| | * | | | Auto-merge from mysql-trunk.Alexander Nozdrin2009-12-161-10/+0
| | |\ \ \ \
| | * \ \ \ \ Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-12-122-15/+0
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: - extra/comp_err.c - mysql-test/collections/default.experimental - mysql-test/r/archive.result - mysql-test/r/select.result - mysql-test/suite/binlog/r/binlog_unsafe.result - mysql-test/suite/binlog/t/binlog_unsafe.test - mysql-test/suite/rpl/t/disabled.def - mysql-test/t/archive.test - mysql-test/t/select.test - sql/item.cc - sql/item.h - sql/item_timefunc.cc - sql/sql_base.cc - sql/sql_delete.cc - sql/sql_load.cc - sql/sql_partition.cc - sql/sql_table.cc - storage/innobase/handler/ha_innodb.cc - vio/vio.c
| * | | | | | | Cleanup, use MYSQL_INSTALL_TARGETS macro instead of INSTALL(TARGETS) ↵Vladislav Vaintroub2009-12-121-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | combined with INSTALL_DEBUG_SYMBOLS
| * | | | | | | On Linux, support -Wl,--no-undefined (only client shared library)Vladislav Vaintroub2009-12-071-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and --Wl,--as-needed (all shared modules). The later will remove unused dependencies (also from gcc and C++ runtime)
| * | | | | | | set version and soversionn for client shared libraryVladislav Vaintroub2009-12-051-1/+5
| | | | | | | |
| * | | | | | | mergeVladislav Vaintroub2009-12-042-4/+7
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | WL#2360 Performance schemaMarc Alff2009-11-302-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Part 1: Instrumentation interface
| * | | | | | | mergeVladislav Vaintroub2009-11-251-0/+1
| |\ \ \ \ \ \ \
| | * | | | | | | - move ADD_SUBDIRECTORY(extra) outside of WITHOUT_SERVERVladislav Vaintroub2009-11-251-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | - add INSTALL to shared client library
| * | | | | | | | mergeVladislav Vaintroub2009-11-251-1/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| / / / / / / | | |/ / / / / /
| | * | | | | | Backport of:Konstantin Osipov2009-11-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ---------------------------------------------------------------------- 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.
| * | | | | | | add --disable-shared equivalentVladislav Vaintroub2009-11-251-12/+16
| | | | | | | | | | | | | | | | | | | | | | | | fix mtr (empty argument passed to mysqld)
| * | | | | | | implement convenience librariesVladislav Vaintroub2009-11-242-106/+121
| | | | | | | |
| * | | | | | | mergeVladislav Vaintroub2009-11-201-3/+0
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Manual merge of mysql-next-mr-runtime upstream.Davi Arnaut2009-11-191-3/+0
| | |\ \ \ \ \ \
View Lorry Controller Status