delta/mariadb-git.git - github.com: MariaDB/server.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	MDEV-34 delete storage/ndb and sql/ndb (and collateral changes)	Sergei Golubchik	2014-10-11	1	-14/+0
\| \| \| \| \| \| \| \| \| \|	remove: * NDB from everywhere * IM from mtr-v1 * packaging/rpm-oel and packaging/rpm-uln * few unused spec files * plug.in file * .bzrignore
*	Post merge fix for	unknown	2008-04-01	1	-8/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ChangeSet@1.2583, 2008-03-31 Merge five.local.lan:/work/merge/mysql-5.0-Bug into five.local.lan:/work/merge/mysql-5.1-Bug Addditional manual fixes will be needed. MERGE: 1.1810.3667.16 Which contains ChangeSet@1.1810.3667.16, 2008-03-31 Fix for Bug #35335 funcs_1: Some tests fail within load_file during pushbuild runs ... mysql-test/std_data/funcs_1/ndb_tb1.txt: Rename: mysql-test/suite/funcs_1/data/ndb_tb1.txt -> mysql-test/std_data/funcs_1/ndb_tb1.txt mysql-test/std_data/funcs_1/ndb_tb2.txt: Rename: mysql-test/suite/funcs_1/data/ndb_tb2.txt -> mysql-test/std_data/funcs_1/ndb_tb2.txt mysql-test/std_data/funcs_1/ndb_tb3.txt: Rename: mysql-test/suite/funcs_1/data/ndb_tb3.txt -> mysql-test/std_data/funcs_1/ndb_tb3.txt mysql-test/std_data/funcs_1/ndb_tb4.txt: Rename: mysql-test/suite/funcs_1/data/ndb_tb4.txt -> mysql-test/std_data/funcs_1/ndb_tb4.txt
*	Merge five.local.lan:/work/merge/mysql-5.0-funcs_1	unknown	2008-03-11	1	-59/+43
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into five.local.lan:/work/merge/mysql-5.1-funcs_1 mysql-test/suite/funcs_1/cursors/cursors_master.test: Auto merged BitKeeper/deleted/.del-innodb_triggers.result: Auto merged BitKeeper/deleted/.del-memory_triggers.result: Auto merged BitKeeper/deleted/.del-myisam_triggers.result: Auto merged mysql-test/suite/funcs_1/r/innodb_storedproc_02.result: SCCS merged mysql-test/suite/funcs_1/r/innodb_storedproc_03.result: Auto merged mysql-test/suite/funcs_1/r/innodb_storedproc_07.result: SCCS merged mysql-test/suite/funcs_1/r/innodb_storedproc_08.result: SCCS merged mysql-test/suite/funcs_1/r/innodb_storedproc_10.result: SCCS merged mysql-test/suite/funcs_1/r/memory_storedproc_02.result: SCCS merged mysql-test/suite/funcs_1/r/memory_storedproc_03.result: Auto merged mysql-test/suite/funcs_1/r/memory_storedproc_07.result: SCCS merged mysql-test/suite/funcs_1/r/memory_storedproc_08.result: SCCS merged mysql-test/suite/funcs_1/r/memory_storedproc_10.result: SCCS merged mysql-test/suite/funcs_1/r/myisam_storedproc_02.result: SCCS merged mysql-test/suite/funcs_1/r/myisam_storedproc_03.result: Auto merged mysql-test/suite/funcs_1/r/myisam_storedproc_07.result: SCCS merged mysql-test/suite/funcs_1/r/myisam_storedproc_08.result: SCCS merged mysql-test/suite/funcs_1/r/myisam_storedproc_10.result: SCCS merged mysql-test/suite/funcs_1/t/innodb_storedproc.test: Auto merged mysql-test/suite/funcs_1/t/memory_storedproc.test: Auto merged mysql-test/suite/funcs_1/t/myisam_storedproc.test: Auto merged mysql-test/suite/funcs_1/views/views_master.inc: Auto merged mysql-test/suite/funcs_1/datadict/datadict_load.inc: manual merge mysql-test/suite/funcs_1/r/is_columns_innodb.result: manual merge mysql-test/suite/funcs_1/r/myisam_views.result: manual merge
\| *	Post fix for	unknown	2008-03-11	1	-49/+33
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	WL#4203 Reorganize and fix the data dictionary tests of testsuite funcs_1 because the goal to fix Bug#34532 Some funcs_1 tests do not clean up at end of testing was partially missed. Some minor additional modifications are for WL#4304 Cleanup in funcs_1 tests BitKeeper/deleted/.del-innodb_triggers.result: Rename: mysql-test/suite/funcs_1/r/innodb_triggers.result -> BitKeeper/deleted/.del-innodb_triggers.result BitKeeper/deleted/.del-memory_triggers.result: Rename: mysql-test/suite/funcs_1/r/memory_triggers.result -> BitKeeper/deleted/.del-memory_triggers.result BitKeeper/deleted/.del-myisam_triggers.result: Rename: mysql-test/suite/funcs_1/r/myisam_triggers.result -> BitKeeper/deleted/.del-myisam_triggers.result mysql-test/suite/funcs_1/r/innodb_storedproc_02.result: Change mode to -rw-rw-r-- mysql-test/suite/funcs_1/r/innodb_storedproc_03.result: Change mode to -rw-rw-r-- mysql-test/suite/funcs_1/r/innodb_storedproc_07.result: Change mode to -rw-rw-r-- mysql-test/suite/funcs_1/r/innodb_storedproc_08.result: Change mode to -rw-rw-r-- mysql-test/suite/funcs_1/r/innodb_storedproc_10.result: Change mode to -rw-rw-r-- mysql-test/suite/funcs_1/r/memory_storedproc_02.result: Change mode to -rw-rw-r-- mysql-test/suite/funcs_1/r/memory_storedproc_03.result: Change mode to -rw-rw-r-- mysql-test/suite/funcs_1/r/memory_storedproc_07.result: Change mode to -rw-rw-r-- mysql-test/suite/funcs_1/r/memory_storedproc_08.result: Change mode to -rw-rw-r-- mysql-test/suite/funcs_1/r/memory_storedproc_10.result: Change mode to -rw-rw-r-- mysql-test/suite/funcs_1/r/myisam_storedproc_02.result: Change mode to -rw-rw-r-- mysql-test/suite/funcs_1/r/myisam_storedproc_03.result: Change mode to -rw-rw-r-- mysql-test/suite/funcs_1/r/myisam_storedproc_07.result: Change mode to -rw-rw-r-- mysql-test/suite/funcs_1/r/myisam_storedproc_08.result: Change mode to -rw-rw-r-- mysql-test/suite/funcs_1/r/myisam_storedproc_10.result: Change mode to -rw-rw-r-- mysql-test/suite/funcs_1/cursors/cursors_master.test: Backport of file in 5.1 mysql-test/suite/funcs_1/datadict/datadict_load.inc: Cleanup mysql-test/suite/funcs_1/r/innodb_views.result: Updated results mysql-test/suite/funcs_1/r/is_columns_innodb.result: Updated results mysql-test/suite/funcs_1/r/is_columns_memory.result: Updated results mysql-test/suite/funcs_1/r/is_columns_myisam.result: Updated results mysql-test/suite/funcs_1/r/is_columns_ndb.result: Updated results mysql-test/suite/funcs_1/r/is_tables_innodb.result: Updated results mysql-test/suite/funcs_1/r/is_tables_memory.result: Updated results mysql-test/suite/funcs_1/r/is_tables_myisam.result: Updated results mysql-test/suite/funcs_1/r/is_tables_ndb.result: Updated results mysql-test/suite/funcs_1/r/memory_views.result: Updated results mysql-test/suite/funcs_1/r/myisam_views.result: Updated results mysql-test/suite/funcs_1/t/innodb_storedproc.test: Backport of file in 5.1 mysql-test/suite/funcs_1/t/memory_storedproc.test: Backport of file in 5.1 mysql-test/suite/funcs_1/t/myisam_storedproc.test: Backport of file in 5.1 mysql-test/suite/funcs_1/t/myisam_trig_1011ext.test: Cleanup mysql-test/suite/funcs_1/views/views_master.inc: Backport of file in 5.1 which got many fixes for instabilities and other improvements
\| *	Updates to test/result files of funcs_1 to 5.0.40 level,	unknown	2007-05-01	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- validated current result files - forced order by and removed time stamps removed a_version files (since do not make sense now when suite is in the main tree) Note: datadict tests still fail as a result of regression bug 28181 in 5.0.42 (discovered while performing this update) - tests should run clean once bug is fixed BitKeeper/deleted/.del-a_version_check.test: Delete: mysql-test/suite/funcs_1/t/a_version_check.test BitKeeper/deleted/.del-a_version_check.result: Delete: mysql-test/suite/funcs_1/r/a_version_check.result BitKeeper/deleted/.del-innodb_views.warnings: Delete: mysql-test/suite/funcs_1/r/innodb_views.warnings BitKeeper/deleted/.del-memory_views.warnings: Delete: mysql-test/suite/funcs_1/r/memory_views.warnings BitKeeper/deleted/.del-myisam_views.warnings: Delete: mysql-test/suite/funcs_1/r/myisam_views.warnings mysql-test/suite/funcs_1/datadict/datadict_load.inc: Modified to correct failiure to return host name on some systems mysql-test/suite/funcs_1/datadict/datadict_master.inc: corrections to force order by on queries and replace time stamps with strings mysql-test/suite/funcs_1/datadict/datadict_show_schema.inc: corrections to force order by on queries mysql-test/suite/funcs_1/r/innodb__datadict.result: Updated result file with order bu selects, elimination of time stamps and selects with empty user (that we don't have anymore) mysql-test/suite/funcs_1/r/innodb_func_view.result: confirming existing results as correct ones - old result file had wrong cast values returned mysql-test/suite/funcs_1/r/innodb_trig_08.result: confirming existing results as correct ones - updated error message mysql-test/suite/funcs_1/r/innodb_views.result: confirming existing results as correct ones - returned results are correct, wrong 'expected' error messages removed mysql-test/suite/funcs_1/r/memory__datadict.result: Updated result file with order bu selects, elimination of time stamps and selects with empty user (that we don't have anymore) mysql-test/suite/funcs_1/r/memory_func_view.result: confirming existing results as correct ones - old result file had wrong cast values returned mysql-test/suite/funcs_1/r/memory_trig_08.result: confirming existing results as correct ones - updated error message mysql-test/suite/funcs_1/r/memory_views.result: confirming existing results as correct ones - returned results are correct, wrong 'expected' error messages removed mysql-test/suite/funcs_1/r/myisam__datadict.result: Updated result file with order bu selects, elimination of time stamps and selects with empty user (that we don't have anymore) mysql-test/suite/funcs_1/r/myisam_func_view.result: confirming existing results as correct ones - old result file had wrong cast values returned mysql-test/suite/funcs_1/r/myisam_trig_08.result: confirming existing results as correct ones - updated error message mysql-test/suite/funcs_1/r/myisam_views.result: confirming existing results as correct ones - returned results are correct, wrong 'expected' error messages removed mysql-test/suite/funcs_1/t/disabled.def: Updated disabled messages with clearer ones mysql-test/suite/funcs_1/views/views_master.inc: removed invalid -- lines generating warning files
\| *	copy from test-extra-5.0 to main tree	unknown	2007-02-06	1	-0/+121
\| \| \| \| \| \| \|	BitKeeper/etc/ignore: Added mysql-test/mysql-test-run-shell to the ignore list mysql-test/suite/funcs_2/include/check_charset.inc: finished files with newline
*	Post merge fix 2 for	unknown	2007-08-29	1	-1/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ChangeSet@1.2509, 2007-08-28 http://lists.mysql.com/commits/33239 Fixes for the funcs_1 datadict test bugs #30418 "datadict" tests (all engines) fail: Dependency on the host name for ordering #30420 "datadict" tests (all engines) fail: Release build has help tables loaded #30438 "{memory,myisam,ndb}__datadict" tests fail: Use "InnoDB" without checking #30440 "datadict" tests (all engines) fail: Character sets depend on configuration mysql-test/suite/funcs_1/README.txt: Improved README mysql-test/suite/funcs_1/datadict/datadict_load.inc: Additions for the NDB variant (currently not in use) mysql-test/suite/funcs_1/datadict/datadict_master.inc: Write a comment about Bug#30689 into the test protocols. mysql-test/suite/funcs_1/datadict/processlist_priv.inc: Fix for a not reported bug. The missing revoke usage and drop user harmed the next test. mysql-test/suite/funcs_1/r/a_processlist_priv_no_prot.result: Updated results mysql-test/suite/funcs_1/r/b_processlist_priv_ps.result: Updated results mysql-test/suite/funcs_1/r/innodb__datadict.result: Updated results mysql-test/suite/funcs_1/r/memory__datadict.result: Updated results mysql-test/suite/funcs_1/r/myisam__datadict.result: Updated results mysql-test/suite/funcs_1/r/ndb__datadict.result: Updated results as far as they could be corrected. Attention: This test failed even before the current bug fixes. The updated expected results are now better than before, but they do not prevent that the test fails. It looks like one script is "damaged" and treats this NDB test different than expected within the file with expected results.
*	Updated funcs_1 files to 5.1.18 level	unknown	2007-05-02	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- validating current result files - updating with new features in information_schema / error messages - forced order by and removed time stamps removed a_version files that are not needed (now that the suite is in the main tree Note: datadict tests still fail as a result of bug 28181 (a regression introduced in 5.0.42 - and 5.1.18(?) - tests should runn clean once it is fixed BitKeeper/deleted/.del-a_version_check.test~82ea7fb267df9e58: Delete: mysql-test/suite/funcs_1/t/a_version_check.test BitKeeper/deleted/.del-a_version_check.result~97a8ec1e3211c26: Delete: mysql-test/suite/funcs_1/r/a_version_check.result mysql-test/suite/funcs_1/datadict/datadict_load.inc: Modified to correct failiure to return host name on some systems mysql-test/suite/funcs_1/datadict/datadict_master.inc: corrections to fooce order by on queries, replace time stamps with strings and enable the testing of referential_constraints table mysql-test/suite/funcs_1/datadict/datadict_show_schema.inc: corrections to force order by on queries mysql-test/suite/funcs_1/r/innodb__datadict.result: Updated result file with order by selects, elimination of time stamps and selects of empty user (that we don't have anymore) and adding the testing of referential_constraints table mysql-test/suite/funcs_1/r/innodb_func_view.result: confirming existing results as correct - old result file had wrong cast values mysql-test/suite/funcs_1/r/innodb_trig_0102.result: Corrected error with long trigger name (that was previously quietly trimmed) mysql-test/suite/funcs_1/r/innodb_trig_08.result: confirmed existing results as corrects ones - updated error message mysql-test/suite/funcs_1/r/innodb_views.result: confirmed current results as correct - returned results included a wrong 'expected' error message mysql-test/suite/funcs_1/r/memory__datadict.result: Updated result file with order by selects, elimination of time stamps and selects of empty user (that we don't have anymore) and adding the testing of referential_constraints table mysql-test/suite/funcs_1/r/memory_func_view.result: confirming existing results as correct - old result file had wrong cast values mysql-test/suite/funcs_1/r/memory_trig_0102.result: Corrected error with long trigger name (that was previously quietly trimmed) mysql-test/suite/funcs_1/r/memory_trig_08.result: confirmed existing results as corrects ones - updated error message mysql-test/suite/funcs_1/r/memory_views.result: confirmed current results as correct - returned results included a wrong 'expected' error message mysql-test/suite/funcs_1/r/myisam__datadict.result: Updated result file with order by selects, elimination of time stamps and selects of empty user (that we don't have anymore) and adding the testing of referential_constraints table mysql-test/suite/funcs_1/r/myisam_func_view.result: confirming existing results as correct - old result file had wrong cast values mysql-test/suite/funcs_1/r/myisam_trig_0102.result: Corrected error with long trigger name (that was previously quietly trimmed) mysql-test/suite/funcs_1/r/myisam_trig_08.result: confirmed existing results as corrects ones - updated error message mysql-test/suite/funcs_1/r/myisam_views.result: confirmed current results as correct - returned results included a wrong 'expected' error message mysql-test/suite/funcs_1/r/ndb__datadict.result: Updated result file with order by selects, elimination of time stamps and selects of empty user (that we don't have anymore) and adding the testing of referential_constraints table mysql-test/suite/funcs_1/r/ndb_func_view.result: confirming existing results as correct - old result file had wrong cast values mysql-test/suite/funcs_1/r/ndb_trig_0102.result: Corrected error with long trigger name (that was previously quietly trimmed) mysql-test/suite/funcs_1/r/ndb_trig_08.result: confirmed existing results as corrects ones - updated error message mysql-test/suite/funcs_1/r/ndb_views.result: confirmed current results as correct - returned results included a wrong 'expected' error message mysql-test/suite/funcs_1/t/disabled.def: Updated disabled messages with clearer ones mysql-test/suite/funcs_1/triggers/triggers_0102.inc: Added code to test for error in case of a trigger name that is to long mysql-test/suite/funcs_1/views/views_master.inc: Correction to remove wrong '--eror' meaningless tag that generated warnings
*	copy from test-extra-5.1 to main tree	unknown	2007-02-06	1	-0/+121
	BitKeeper/etc/ignore: Added mysql-test/suite/funcs_1/r/innodb_views.warnings mysql-test/suite/funcs_1/r/memory_trig_03e.warnings mysql-test/suite/funcs_1/r/memory_views.warnings mysql-test/suite/funcs_1/r/myisam_trig_03e.warnings mysql-test/suite/funcs_1/r/myisam_views.warnings mysql-test/suite/funcs_1/r/ndb_trig_03e.warnings mysql-test/suite/funcs_1/r/ndb_views.warnings mysql-test/suite/partitions/r/diff mysql-test/suite/partitions/r/partition_bit_ndb.warnings mysql-test/suite/partitions/r/partition_special_innodb.warnings mysql-test/suite/partitions/r/partition_special_myisam.warnings storage/archive/archive_reader mysql-test/suite/funcs_1/r/innodb_trig_03e.warnings to the ignore list mysql-test/suite/funcs_2/include/check_charset.inc: inserted newline at the end of file. mysql-test/suite/objects/include/drop_all.inc: inserted newline at the end of file. mysql-test/suite/partitions/include/partition_key_32col.inc: inserted newline at the end of file. mysql-test/suite/rpl/data/rpl_mixed.dat: inserted newline at the end of file. mysql-test/suite/rpl/include/rpl_mixed_check_event.inc: inserted newline at the end of file. mysql-test/suite/rpl/include/rpl_mixed_check_select.inc: inserted newline at the end of file. mysql-test/suite/rpl/include/rpl_mixed_check_user.inc: inserted newline at the end of file. mysql-test/suite/rpl/include/rpl_mixed_check_view.inc: inserted newline at the end of file.