summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* WL#4380Narayanan V2008-07-221-5/+12
| | | | | | | | | | | | | | | | | | | | | | | 1) When gcc -E is run in the Mac OS it introduces a line of output that results in showing up as a difference between the .pp and .out files. Removed this OS specific preprocessor text inserted by the preprocessor in the MAC OS. Added a sed regular expression to remove MAC OS specific pre-processor text. 2) Added the -w option to diff to remove the differences in output being caused in solaris. Makefile.am: 1) When gcc -E is run in the Mac OS it introduces a line of output that results in showing up as a difference between the .pp and .out files. Removed this OS specific preprocessor text inserted by the preprocessor in the MAC OS. Added a sed regular expression to remove MAC OS specific pre-processor text. 2) Added the -w option to diff to remove the differences in output being caused in solaris.
* WL#4380Narayanan V2008-07-211-1/+1
| | | | | | | | | Modified the abi_check command to ignore space differences between the .pp and the .out files. Makefile.am: Modified the abi_check command to ignore space differences between the .pp and the .out files.
* WL#4380Narayanan V2008-07-182-5/+10
| | | | | | | | | | | | | | | 1) Modified abi_check rule to not write into the distribution directory. 2) Added the .pp files to EXTRA_DIST so that it will be included in the distribution Makefile.am: Modified the abi_check rule to not generate the .out files in the distribution directory. include/Makefile.am: Added the EXTRA_DIST entry for plugin.h.pp and mysql.h.pp so that they will be included while creating the distribution.
* WL#4380Narayanan V2008-07-151-0/+2
| | | | | | | | Add the abi_check rule to the main build. Makefile.am: Modify Makefile.am to add the abi_check rule into the main build.
* WL#4380Narayanan V2008-07-101-15/+25
| | | | | | | | | | | Modified the abi_check target to check for only mysql.h and plugin.h for now. Makefile.am: added two targets, abi_check - compiles without mysql_priv.h abi_check_all - compiles with mysql_priv.h
* WL#4380Thava Alagu2008-07-098-1201/+11853
|\ | | | | | | Merging changes from 5.1 main tree to 5.1-sea team tree.
| * Removed the references to mysql_h.ic in include/Makefile.amNarayanan V2008-06-181-14/+0
| | | | | | | | | | | | | | | | | | include/Makefile.am: Removed 1) EXTRA_DIST which was pointing to mysql_h.ic 2) abi_check target which is not being used anymore since we are not using icheck
| * WL#4380Narayanan V2008-06-176-1186/+11849
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | added a rule that use gcc to generate preprocessor output (gcc -E) that can be then compared to a already generated output using the diff utility. Ran make test on the repository to verify changes. Makefile.am: Added a rule for checking that the abi/api has not changed. The following steps are followed in the rule in makefile.am 1) Generate preprocessor output for the files that need to be tested for abi/api changes. use -nostdinc to prevent generation of preprocessor output for system headers. This results in messages in stderr saying that these headers were not found. Redirect the stderr output to /dev/null to prevent seeing these messages. 2) sed the output to remove blank lines and lines that begin with # (The header information is retained to enable easy analysis of abi diffs at a later stage). 3) diff the generated file and the canons (.pp files already in the repository). 4) delete the .out file that is generated. If the diff fails, the generated file is not removed. This will be useful for analysis of ABI differences (e.g. using a visual diff tool). A ABI change that causes a build to fail will always be accompanied by new canons (.out files). The .out files that are not removed will be replaced as the new .pp files. e.g. If include/mysql/plugin.h has an ABI change then this rule would leave a include/mysql/plugin.out file. A developer with a justified API change will then do a mv include/mysql/plugin.out include/mysql/plugin.pp to replace the old canons with the new ones. configure.in: 1) Removed the part of the file that was icheck related. 2) Added an entry for the configure variable DIFF include/mysql.h.pp: The pre-processor output canon file for include/mysql.h include/mysql/plugin.h.pp: The pre-processor output canon file for include/mysql/plugin.h include/mysql_h.ic: since the icheck target has been removed, this file need no longer be present in the repository sql/mysql_priv.h.pp: The pre-processor output canon file for sql/mysql_priv.h
| * Created the 5.1 Storage Engine API treeMattias Jonsson2008-06-121-1/+4
| | | | | | | | | | | | | | Changed the tree default configuration .bzr-mysql/default.conf: Changed tree_name, added tree_location, post_commit_url and project_name
* | Upmerge 5.0 -> 5.1Matthias Leich2008-07-013-5/+20
|\ \
| * | Fix forMatthias Leich2008-06-303-5/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug#36787 Test funcs_1.charset_collation_1 failing Details: 1. Skip charset_collation_1 if charset "ucs2_bin" is missing (property which distincts "vanilla" builds from the others) 2. Let builds with version_comment LIKE "%Advanced%" (found them for 5.1) execute charset_collation_3. 3. Update comments charset_collation.inc so that they reflect the current experiences.
* | | We may need 5.1.27 for selected pushes, so reserve the number.Joerg Bruehe2008-06-301-1/+1
| | |
* | | Upmerge 5.0 -> 5.1Matthias Leich2008-06-252-109/+181
|\ \ \ | |/ /
| * | Fix forMatthias Leich2008-06-252-108/+180
| | | | | | | | | | | | | | | | | | Bug#37492 timing bug in subselect.test + similar weaknesses found during testing + replace error numbers by error names
* | | auto merge 5.1-main --> 5.1-bugteamGleb Shchepa2008-06-2514-243/+342
|\ \ \
| * \ \ auto mergeTatiana A. Nurnberg2008-06-216-26/+78
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | configure.in: auto-merge mysql-test/suite/bugs/r/rpl_bug33029.result: auto-merge mysql-test/suite/bugs/t/rpl_bug33029.test: auto-merge sql/slave.cc: auto-merge sql/sql_class.cc: auto-merge sql/structs.h: auto-merge
| | * | | Correct the version number, after cloning 5.1.26 the next one is 27Joerg Bruehe2008-06-201-1/+1
| | | | |
| | * | | Raise version number after cloning 5.1.26Joerg Bruehe2008-06-201-1/+1
| | | | |
| | * | | merging prior to push Bug #36443Andrei Elkin2008-06-209-218/+265
| | |\ \ \
| | * | | | Bug#36443 Server crashes when executing insert when insert trigger on tableAndrei Elkin2008-06-195-25/+77
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The crash appeared to be a result of allocating an instance of Discrete_interval automatically that that was referred in out-of-declaration scope. Fixed with correcting backing up and restoring scheme of auto_inc_intervals_forced, introduced by bug#33029, by means of shallow copying; added simulation code that forces executing those fixes of the former bug that targeted at master-and-slave having incompatible bug#33029-prone versions. mysql-test/suite/bugs/r/rpl_bug33029.result: new results file mysql-test/suite/bugs/t/rpl_bug33029.test: test merely checks no crash happens on slave. sql/slave.cc: forcing to execute special logics implemented for bug#33029 if simulate_bug33029 the debug option is set. sql/sql_class.cc: swaps of backed and the actual auto_inc_intervals_forced basing on shallow coping. sql/structs.h: Removing the deep _copy() and methods associated with it; adding methods to Discrete_intervals_list: private `=', copy constructor to prevent using; private set_members(); public copy_shallow(), swap(), get_{head, tail, current}(); empty_no_free() through set_members().
| * | | | Bug#33812: mysql client incorrectly parsing DELIMITERTatiana A. Nurnberg2008-06-203-31/+8
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unnecessary and incorrect code that tried to pull delimiter commands out of the middle of statements. client/mysql.cc: Remove unnecessary and incorrect code that tried to pull delimiter commands out of the middle of statements. mysql-test/r/mysql.result: show we no longer parse DELIMITER when we shouldn't. mysql-test/t/mysql_delimiter.sql: show we no longer parse DELIMITER when we shouldn't.
| * | | re 36818: rpl_server_id1 fails expecting slave has stoppedTatiana A. Nurnberg2008-06-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On a slow environment like valgrind the test is vulnerable because it does not check if slave has stopped at time of the new session is requested `start slave;' -- disabling test till it is fixed. mysql-test/suite/rpl/t/disabled.def: disable rpl_server_id1 until test is fixed.
| * | | Bug#36434: ha_innodb.so is installed in the wrong directoryTatiana A. Nurnberg2008-06-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ha_innodb.so was incorrectly installed in the lib/mysql directory rather than in lib/mysql/plugin. Amending CS for 31736. storage/innobase/Makefile.am: Install innobase to plugin-dir, not lib-dir.
| * | | Bug#35480: BOM detection code crashes mysql CLI with zero-sized inputTatiana A. Nurnberg2008-06-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | MySQL client crashed if no input was passed to it. client/mysql.cc: Check if there's any data before reading it!
| * | | Fixed bug #37004.Tatiana A. Nurnberg2008-06-193-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The value of JOIN::tables must be set to 0 when there is no matching min/max row. mysql-test/r/subselect.result: Added a test case for bug #37004. mysql-test/t/subselect.test: Added a test case for bug #37004.
| * | | Merge changes from mysql 5.1.25 release clone (BK), applied manually into bzr.Timothy Smith2008-06-173-216/+241
| |\ \ \ | | |/ / | |/| |
| | * | fix typoTimothy Smith2008-06-172-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | This change was committed to the 5.1.25 release clone, but never made it to the mysql-5.1 BK tree. I'm committing it to mysql-5.1 bzr now.
| | * | Bug #37024: Wrong location of messagefilesTimothy Smith2008-06-171-214/+239
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | make_binary_distribution.sh got clobbered by the 5.0 version during a merge. This caused a few packaging problems, including message files put in the wrong place and some missing files. Fix is just to revert back to the 5.1 version from before the merge. Problem introduced in ChangeSet 1.2606.2.1 2008/05/13 15:56:07 kent@kent-amd64.(none) This change was made in the 5.1.25 release clone in BK, but never made it to the main mysql-5.1 BK tree. I am adding it to mysql-5.1 bzr.
* | | | auto merge 5.0-bugteam --> 5.1-bugteamGleb Shchepa2008-06-243-33/+24
|\ \ \ \ | | |_|/ | |/| |
| * | | back-port from 5.1.Gleb Shchepa2008-06-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug#35480: BOM detection code crashes mysql CLI with zero-sized input MySQL client crashed if no input was passed to it.
| * | | back-port from 5.1.Gleb Shchepa2008-06-243-31/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug#33812: mysql client incorrectly parsing DELIMITER Remove unnecessary and incorrect code that tried to pull delimiter commands out of the middle of statements.
| * | | Bug #36244: MySQL CLI doesn't recognize standalone -- Gleb Shchepa2008-06-242-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | as a commentary mysql client has been modified to interpret EOL after standalone -- commentary strings like whitespace character (according to http://dev.mysql.com/doc/refman/5.0/en/ansi-diff-comments.html) mysql-test/t/mysql_delimiter.sql: Added test case for bug #36244.
* | | | Automatic mergeMatthias Leich mleich@mysql.com2008-06-20184-5657/+9737
|\ \ \ \
| * \ \ \ 1. Upmerge of fix for the bugsMatthias Leich mleich@mysql.com2008-06-18184-5657/+9737
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 37167 funcs_1: Many tests fail if the embedded server is used. 37164 funcs_1: Some tests fail if an optional character set is missing. + some cleanup within the testsuite related to the fixes above + some adjustments to open bugs on Mac OS X 2. Skip tests which suffer from bug 37456 funcs_1: Several tests crash when used with embedded server 3. Minor cleanup in some tests
| | * | | Fix forMatthias Leich mleich@mysql.com2008-06-18104-5593/+8633
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug#37167 funcs_1: Many tests fail if the embedded server is used. Bug#37164 funcs_1: Some tests fail if an optional character set is missing. + some cleanup within the testsuite related to the fixes above + some adjustments to open bugs on Mac OS X
| | | * | | Fix forMatthias Leich mleich@mysql.com2008-06-16104-5593/+8633
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug#37167 funcs_1: Many tests fail if the embedded server is used. Bug#37164 funcs_1: Some tests fail if an optional character set is missing. + some cleanup within the testsuite related to the fixes above + some adjustments to open bugs on Mac OS X Details: - Remove the initial loading of data from tests if these data are not somewhere retrieved - Remove any use of columns with attribute unicode (-> UCS2 is no more needed) from tests where unicode properties are not checked or somehow required - Create a separate branch of the Character maximum length test (CML). If UCS2 is available than this test gets applied to every available type of string column with attribute unicode This prevents any loss of coverage by the points above. - Disable the execution of is_tables_ndb which gives wrong results because of a bug. Correct the exepected results of this test. - In case of tests failing when applied to the embedded server 1) Create a variant of this test for the embedded server or 2) Skip the test in case of embedded server depending on purpose and complexity of test. - Skip the tests which could suffer from Bug 28309 First insert violates unique constraint - was "memory" table empty ? Bug 37380 Test funcs_1.is_columns_myisam_embedded fails on OS X (both bugs Mac OS X, embedded server, MySQL 5.0 only) - Minor improvements like remove typos
* | | | | | Silence unused variable warning by printing the variables value.Davi Arnaut2008-06-191-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysys/stacktrace.c: Print stack bottom and thread stack values as they might be useful.
* | | | | | auto mergeGleb Shchepa2008-06-195-60/+96
|\ \ \ \ \ \
| * | | | | | Bug#37003 Tests sporadically crashes with embedded serverDavi Arnaut2008-06-195-60/+96
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Another problem is that the backtrace facility wasn't being enabled for non-Linux targets even if the target OS has the backtrace functions. Also, the stacktrace functions inside mysqltest were being used without proper checks for their presence in the build. client/mysqltest.c: Only use stacktrace functions if they are available. configure.in: Check if the compiler defines __bss_start include/my_stacktrace.h: Enable stacktrace if system has backtrace functions. mysys/stacktrace.c: Use backtrace functions if the system supports it. sql/mysqld.cc: Only use stacktrace functions if they are available.
* | | | | | | auto merge with local tree (bug #37076)Gleb Shchepa2008-06-195-66/+162
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Fixed bug #37076: TIMESTAMP/DATETIME/DATE values are notGleb Shchepa2008-06-195-66/+162
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | replicated correctly between machines with mixed endiannes mysql-test/extra/rpl_tests/rpl_row_basic.test: Added regression test for bug#37076. mysql-test/suite/rpl/r/rpl_row_basic_2myisam.result: Added regression test for bug#37076. mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result: Added regression test for bug#37076. mysql-test/suite/rpl_ndb/r/rpl_row_basic_7ndb.result: Added regression test for bug#37076. sql/field.h: Fixed bug #37076: TIMESTAMP/DATETIME/DATE values are not replicated correctly between machines with mixed endiannes pack and unpack virtual methods have been overloaded for Field_timestamp (TIMESTAMP domain), Field_datetime (DATETIME domain) and Field_date (DATE domain) classes to replicate data between platforms with different endiannes in a correct way like in Field_long and Field_longlong classes. Common code have been moved to private handle_int32 and handle_int64 private methods.
* | | | | | Bug#37003 Tests sporadically crashes with embedded serverDavi Arnaut2008-06-1817-115/+227
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem was that when a embedded linked version of mysqltest crashed there was no way to obtain a stack trace if no core file is available. Another problem is that the embedded version of libmysql was not behaving (crash) the same as the non-embedded with respect to sending commands to a explicitly closed connection. The solution is to generate a mysqltest's stack trace on crash and to enable "reconnect" if the connection handle was explicitly closed so the behavior matches the non-embedded one. client/CMakeLists.txt: Link mysys to mysqltest. client/Makefile.am: Link mysys to mysqltest. client/mysqltest.c: Add fatal signal handling with backtracing for Unix and Windows. configure.in: Add check for weak symbols support and remove a spurious word. include/Makefile.am: Add new header with prototype for stack tracing functions. include/my_stacktrace.h: Add new header with prototype for stack tracing functions. libmysqld/CMakeLists.txt: stack tracing is now part of mysys. libmysqld/Makefile.am: stack tracing is now part of mysys. libmysqld/lib_sql.cc: Re-connect if connection was explicitly closed. This is done to match the behavior of the non-embeded libmysql. mysql-test/t/sql_low_priority_updates_func.test: Test expects parallelism between queries that cannot be guaranteed under embedded. mysys/CMakeLists.txt: Add stacktrace to mysys. mysys/Makefile.am: Add stacktrace to mysys. mysys/stacktrace.c: Move stacktrace to mysys and add weak symbol for the C++ name de-mangling function so that it can later be overridden in C++ code. Also add my_ prefix to exported functions. sql/CMakeLists.txt: stacktrace was moved to mysys. sql/Makefile.am: stacktrace was moved to mysys. sql/mysqld.cc: Add my_ prefix to mysys functions.
* | | | | | Bug#33873: Fast ALTER TABLE doesn't work with multibyte character setsDavi Arnaut2008-06-175-80/+152
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem was that when comparing tables for a possible fast alter table, the comparison was being performed using the parsed information and not the final definition. The solution is to use the possible final table layout to compare if a fast alter is possible or not. mysql-test/include/mix1.inc: Disable test case for Bug 21704 as it hasn't been fixed. mysql-test/r/alter_table.result: Add test case result for Bug#33873 mysql-test/r/innodb_mysql.result: Update test case result mysql-test/t/alter_table.test: Add test case for Bug#33873 sql/sql_table.cc: Use updated (final) information to compare fields.
* | | | | auto mergeMattias Jonsson2008-06-173-7/+17
|\ \ \ \ \
| * \ \ \ \ auto mergeGeorgi Kodinov2008-06-170-0/+0
| |\ \ \ \ \
| * \ \ \ \ \ merge of 5.0-bugteam and 5.1 mainGeorgi Kodinov2008-06-170-0/+0
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | auto mergeGeorgi Kodinov2008-06-171-14/+36
| | |\ \ \ \ \
| | | * \ \ \ \ Merging bug fixes for 34995 and 35543 into the main tree,Joerg Bruehe2008-06-131-14/+36
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | and the build tag for 5.0.62.
| | * | \ \ \ \ \ mergeTatiana A. Nurnberg2008-06-176-5/+21
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | configure.in: Raise version number after cloning 5.0.64 mysql-test/r/federated_disabled.result: Bug#37069 (5.0): implement --skip-federated mysql-test/t/federated_disabled-master.opt: Bug#37069 (5.0): implement --skip-federated mysql-test/t/federated_disabled.test: Bug#37069 (5.0): implement --skip-federated mysys/errors.c: Fix for Bug#16902. sql/mysqld.cc: Bug#37069 (5.0): implement --skip-federated
| | | * | | | | | | Fix for Bug#16902.Hakan Kuecuekyilmaz2008-06-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysys/errors.c: Fixed typo, Bug#16902.