summaryrefslogtreecommitdiff
path: root/storage/ndb
Commit message (Collapse)AuthorAgeFilesLines
* Another incarnation of the patch for Bug#30708Alexander Nozdrin2010-05-1934-108/+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.
* Manual merge of mysql-trunk into mysql-trunk-merge.Alexey Kopytov2010-03-241-4/+0
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Manual merge from mysql-trunk-merge.Alexander Nozdrin2010-03-011-1/+1
| |\ | | | | | | | | | Conflicts: - sql/share/Makefile.am
| * \ Manual merge from mysql-trunk-merge.Alexander Nozdrin2010-01-285-18/+18
| |\ \ | | | | | | | | | | | | Conflicts: - storage/archive/ha_archive.cc
| * \ \ Manual merge of mysql-next-mr-runtime upstream.Davi Arnaut2009-11-191-4/+0
| |\ \ \
| | * \ \ Bug #33544 UDF_INIT member decimals initialized wrong with Magne Mahre2009-11-111-4/+0
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | STRING_RESULT argument There is a "magic" number for precision : NOT_FIXED_DEC. This means that the precision is not a fixed number. But this constant was re-defined in several files and was not available to the UDF developers. Moved the NOT_FIXED_DEC definition to the correct header and removed the redundant definitions. Backported to 5.6.0 (mysql-next-mr-runtime)
| | | * | | Bug #33544: UDF_INIT member decimals initialized wrong with gkodinov/kgeorge@magare.gmz2008-03-051-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | STRING_RESULT argument There is a "magic" number for precision : NOT_FIXED_DEC. This means that the precision is not a fixed number. But this constant was re-defined in several files and was not available to the UDF developers. Moved the NOT_FIXED_DEC definition to the correct header and removed the redundant definitions.
* | | | | | Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.Alexey Kopytov2010-03-121-1/+1
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Text conflict in client/mysqlbinlog.cc Text conflict in mysql-test/r/explain.result Text conflict in mysql-test/r/subselect.result Text conflict in mysql-test/r/subselect3.result Text conflict in mysql-test/r/type_datetime.result Text conflict in sql/share/Makefile.am
| * | | | | Bug #35250: readline check breaks when doing vpath buildGeorgi Kodinov2010-03-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MySQL uses two source layouts when building : the bzr layout and the source package layout. The previous fix for bug 35250 contained 1 change that is valid for both modes and a number of changes that are valid only for the bzr source layout. The important thing was to fix the source package layout. And for this the change in configure.in was sufficient. It's not trivial (and not requested by this bug) to support VPATH builds from the bzr trees. This is why the other changes are reverted and the change to fix the VPATH build for source distributions is left intact.
* | | | | | Manual merge from mysql-5.1-bugteam to mysql-trunk-merge.Alexey Kopytov2010-02-261-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Text conflict in scripts/Makefile.am Text conflict in sql/share/Makefile.am
| * | | | | Bug #35250: readline check breaks when doing vpath buildGeorgi Kodinov2010-02-121-1/+1
| | |_|_|/ | |/| | | | | | | | | | | | | Fixed several (obvious) places that don't work with vpath build.
* | | | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2010-01-245-18/+18
|\ \ \ \ \ | |/ / / / | | / / / | |/ / / |/| | |
| * | | Apply patch on behalf of the NDB team:Davi Arnaut2010-01-205-18/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 3321 Magnus Blåudd 2010-01-05 BUG#44840 - ndbapi compiler warning - type qualifier ignored for function return type - Remove the "const" - NOTE! This is an ABI incompatible change for some C++ compilers, NdbApi applications using any of the four changed functions may need a recompile if it's using dynamic linking.
* | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-11-061-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | Auto-merge from mysql-5.1.Alexander Nozdrin2009-11-051-1/+1
| |\ \ \ | | |/ /
| | * | Automerge.Davi Arnaut2009-11-021-1/+1
| | | |
| | * | automergeGeorgi Kodinov2009-09-181-1/+2
| | |\ \
* | | \ \ manual merge: mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-mergeLuis Soares2009-10-221-0/+8
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts ========= Text conflict in .bzr-mysql/default.conf Text conflict in libmysqld/CMakeLists.txt Text conflict in libmysqld/Makefile.am Text conflict in mysql-test/collections/default.experimental Text conflict in mysql-test/extra/rpl_tests/rpl_row_sp006.test Text conflict in mysql-test/suite/binlog/r/binlog_tmp_table.result Text conflict in mysql-test/suite/rpl/r/rpl_loaddata.result Text conflict in mysql-test/suite/rpl/r/rpl_loaddata_fatal.result Text conflict in mysql-test/suite/rpl/r/rpl_row_create_table.result Text conflict in mysql-test/suite/rpl/r/rpl_row_sp006_InnoDB.result Text conflict in mysql-test/suite/rpl/r/rpl_stm_log.result Text conflict in mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_simplex.result Text conflict in mysql-test/suite/rpl_ndb/r/rpl_ndb_sp006.result Text conflict in mysql-test/t/mysqlbinlog.test Text conflict in sql/CMakeLists.txt Text conflict in sql/Makefile.am Text conflict in sql/log_event_old.cc Text conflict in sql/rpl_rli.cc Text conflict in sql/slave.cc Text conflict in sql/sql_binlog.cc Text conflict in sql/sql_lex.h 21 conflicts encountered. NOTE ==== mysql-5.1-rpl-merge has been made a mirror of mysql-next-mr: - "mysql-5.1-rpl-merge$ bzr pull ../mysql-next-mr" This is the first cset (merge/...) committed after pulling from mysql-next-mr.
| * | | | Backport BUG#25192 Using relay-log and relay-log-index without values ↵He Zhenxing2009-10-021-0/+8
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | produces unexpected results. Options loaded from config files were added before command line arguments, and they were parsed together, which could interprete the following: option-a option-b as --option-a=--option-b if 'option-a' requires a value, and caused confusing. Because all options that requires a value are always given in the form '--option=value', so it's an error if there is no '=value' part for such an option read from config file. This patch added a separator to separate the arguments from config files and that from command line, so that they can be handled differently. And report an error for options loaded from config files that requires a value and is not given in the form '--option=value'.
* | | | Merge from mysql-5.1.Alexander Nozdrin2009-09-191-1/+2
|\ \ \ \ | |/ / /
| * | | Merge from mysql-5.1.38-releaseJonathan Perkin2009-09-031-1/+2
| |\ \ \
| | * | | Apply patch from bug#46834 to install the test suite in RPMs.Jonathan Perkin2009-08-211-1/+2
| | | | |
* | | | | Merge from mysql-5.1-bugteam.Alexander Nozdrin2009-09-165-345/+376
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | A patch for Bug#45118 (mysqld.exe crashed in debug modeAlexander Nozdrin2009-09-101-9/+9
| |/ / / | | | | | | | | | | | | | | | | on Windows in dbug.c) -- part 2: a patch for the DBUG subsystem to detect misuse of DBUG_ENTER / DBUG_RETURN macros. 5.1 version.
| * | | Increase thread stack size on HP-UX when built with debug.Davi Arnaut2009-09-021-1/+6
| | | |
| * | | Bug#45611: Minor code cleanupDavi Arnaut2009-09-012-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | Remove a self assignment. Rework a few constructs to avoid a potential overflow. Based upon patch contributed by Michal Hrusecky
| * | | Fix for a few assorted compiler warnings.Davi Arnaut2009-08-281-329/+356
| |/ /
* | | merge of 5.1-main into mysql-trunk.Guilhem Bichot2009-08-121-1/+1
|\ \ \ | |/ / | | | | | | Changes to ha_innodb.cc are not propagated to plugin, they will come back via Oracle/Innobase if needed.
| * | Auto-mergeIgnacio Galarza2009-07-311-1/+1
| | |
* | | Creation of mysql-trunk = {summit + "Innodb plugin replacing the builtin"}:Guilhem Bichot2009-08-041-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | 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.
| * | Add missing newline to usage message of ndb_print_backup_file (Bug #34989)Jim Winstead2009-04-281-1/+1
| | |
* | | Merge MySQL 5.1.35 into MySQL 5.4Mikael Ronstrom2009-06-112-4/+4
|\ \ \ | |/ /
| * | Merge from 5.0-bugteamStaale Smedseng2009-04-162-4/+4
| | |
* | | Bug #44536: MySQL 5.4 version mismatch in the sourcesMySQL Build Team2009-05-221-1/+1
| | | | | | | | | | | | Update version number; also modify NDB's version.c for compatibility.
* | | Merged Performance Version 0.2.1 with latest 5.1 tree (last push 11 feb ↵Mikael Ronstrom2009-02-174-7/+5
|\ \ \ | |/ / | | | | | | 14.01.13 2009)
| * | merge: 5.1 -> 5.1-rplLuis Soares2009-01-083-6/+4
| |\ \ | | | | | | | | | | | | | | | | conflicts: Text conflict in mysql-test/lib/mtr_report.pm Text conflict in mysql-test/mysql-test-run.pl
| | * | mysql-test/r/partition.resultBuild Team2008-11-252-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/t/partition.test sql/ha_partition.cc Bug#40954: Crash in MyISAM index code with concurrency test using partitioned tables Problem was usage of read_range_first with an empty key. Solution was to not to give a key if it was empty. (real author Mattias Jonsson) storage/archive/archive_reader.c client/mysqlslap.c Aligned the copyright texts output from "--version" of tools, to let internal tools be able to change them if needed. storage/ndb/test/tools/connect.cpp storage/ndb/test/run-test/atrt.hpp Corrected a few GPL headers not restricted to GPL version 2 Makefile.am Added missing --report-features to the 'test-bt-fast' target support-files/mysql.spec.sh Reversed the removal of the "%define license GPL" in as internal tools depended on it
| | * | Changes of copyright output from "--version" and similar.kent.boortz@sun.com2008-11-141-2/+2
| | | | | | | | | | | | | | | | Changes of copyright in RPM spec file.
| * | | Revert faulty commitmsvensson@pilot.mysql.com2008-04-271-1/+1
| | | |
| * | | Add supression for expected warning(s) in slaves error logmsvensson@pilot.mysql.com2008-04-271-1/+1
| |/ /
* | | Use sun_prefetch_read_many() and friends, instead of sparc_prefetch_read_many(),MySQL Build Team2009-01-281-2/+2
|/ / | | | | | | | | etc. The sparc_* are defined only for sparc, but the sun_* are generic for x86 and sparc (and are defined empty for any other platform).
* | Merge trift2.:/MySQL/M51/ndb-decl-5.1joerg@trift2.2008-03-271-2/+3
|\ \ | | | | | | | | | into trift2.:/MySQL/M51/push-5.1
| * | ndb_version.h.in : Fix a syntax error (variable declaration came too late).joerg@trift2.2008-02-051-2/+3
| | |
* | | Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1tsmith@rhel5-ia64-a.mysql.com2008-03-271-1/+1
|\ \ \ | | | | | | | | | | | | into rhel5-ia64-a.mysql.com:/data0/tsmith/build/51
| * \ \ Merge trift2.:/MySQL/M51/mysql-5.1joerg@trift2.2008-03-142-3/+4
| |\ \ \ | | | | | | | | | | | | | | | into trift2.:/MySQL/M51/push-5.1
| * | | | Merge mysql.com:/home/kent/bk/build/mysql-5.0-buildkent@kent-amd64.(none)2008-02-261-1/+1
| | | | | | | | | | | | | | | | | | | | into mysql.com:/home/kent/bk/build/mysql-5.1-build
* | | | | Merge quad.opbmk:/mnt/raid/alik/MySQL/devel/5.1anozdrin/alik@quad.opbmk2008-03-181-1/+0
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | into quad.opbmk:/mnt/raid/alik/MySQL/devel/5.1-rt-merged
| * | | | Fix for Bug #34786 Compiling ndb on Mac OS X 10.5.2 (Intel) failsandrey@whirlpool.hristov.com2008-03-051-1/+0
| |/ / /
* | | | Merge kaamos.(none):/data/src/mysql-5.1kaa@kaamos.(none)2008-03-122-3/+4
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| into kaamos.(none):/data/src/opt/mysql-5.1-opt
| * | Merge bk-internal:/home/bk/mysql-5.1-optgkodinov/kgeorge@macbook.gmz2008-01-302-3/+4
| |\ \ | | |/ | |/| | | | into macbook.gmz:/Users/kgeorge/mysql/work/B31326-merge-5.1-opt
View Lorry Controller Status