Commit 21c2e6e1 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1 

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb


sql/ha_ndbcluster.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
parents f11f6836 5abe2fdb

.bzrignore

+14 −0
Original line number Diff line number Diff line
@@ -1255,6 +1255,7 @@ mysql-test/mysql-test-run-shell 
mysql-test/mysql-test-run.log

mysql-test/mysql_test_run_new

mysql-test/ndb/ndbcluster

mysql-test/partitions.log

mysql-test/r/*.err

mysql-test/r/*.log

mysql-test/r/*.out
@@ -1334,8 +1335,21 @@ mysql-test/r/symlink.log 
mysql-test/r/system_mysql_db.log

mysql-test/r/tmp.result

mysql-test/r/udf.log

mysql-test/rpl.log

mysql-test/share/mysql

mysql-test/std_data/*.pem

mysql-test/suite/funcs_1/r/innodb_trig_03e.warnings

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

mysql-test/t/index_merge.load

mysql-test/t/tmp.test

mysql-test/var

mysql-test/suite/funcs_1/README.txt

0 → 100644
+112 −0
Original line number Diff line number Diff line 
Matthias 17.06.2005

-------------------

1. I changed the database test1 (dropped + created in SP test)

   to test4.

   Please adjust the SP test cases.

2. There is a difference between my definition of

       innodb_tb4 + memory_tb4

   to the latest table definition used by disha.

   Please adjust the table definition if needed.

3. The data load files are product of the Disha data generation script

   (downloaded ~20 May ?) + modified by Omer

   These load data fit fairly to the table definitions.



4. How to execute the "small" test with 10 rows per table.

   Do NOT set the environment variable NO_REFRESH to a

   value <> ''.

   Start the test for example by

   ./mysql-test-run.pl --vardir=/dev/shm/var \

              --force --suite=funcs_1 --do-test=myisam

   The "result" files fit mostly to this variant.



   Any database not in ('mysql','test') and any tables

   needed within a testcase ( t/<storage engine>_<test filed>.test )

   will be (re)created at the beginning of the test.



5. How to execute the "big" test with many rows per table.

   Replace the directories

     suite/funcs_1/data   and

     suite/funcs_1/r

   with the appropriate ones for the "big" test.

   Set the environment variable NO_REFRESH to a value <> ''.

   Start the test for example by

   ./mysql-test-run.pl --vardir=/dev/shm/var \

              --force --suite=funcs_1 --do-test=myisam



   All databases and tables will be (re)created by the script

   <storage engine>__load.test  .



6. I am not sure of the files

   ./funcs_1/include/create_<whatever>.inc

   are in the moment needed. I included them, because I

   guess my VIEW testcase example needs them.



I guess the pushed files are far away from being perfect.

It is a 8 hours hack.

Please try them, create missing files and come up with improvements.



Good luck !



Matthias 17.06.2005

===================================================================

Omer 19.06.2005

---------------

1. Changed the structure of the memory_tb3 table to include two

   additional column f121, f122. These columns exist for the table in

   the other storage engines as TEXT. Since memory does not support

   TEXT, Disha did not include them. How ever I am using them in the

   Trigger tests so added them to the memory definition as CHAR(50);.

   Also modifyed the DataGen_modiy.pl file to account for these two

   column when generating the data.

   - checked in a new DataGen_modify.pl (create a 'lib' directory

     under 'funcs_1').

   - checked in a new memory_tb3.txt

2. Added three <storage>_triggers.test files based on Matthias's

   structure above.

3. Added three <storage>__triggers.result files

4. Added the Trigger_master.test file in the trigger dierctory

   Note: This is not complete and is still under work

5. Created a 'lib' directory and added the DataGen*.pl scripts to it

   (exists under the disha suite) but should be here as well).

Omer 19.06.2005

===================================================================

Matthias 12.09.2005

-------------------

   Replace the geometry data types by VARBINARY

   The removal of the geometry data types was necessary, because the

   execution of the funcs_1 testsuite should not depend on the

   availability of the geometry feature.

   Note: There are servers compiled without the geometry feature.



   The columns are not removed, but their data type was changed

   VARBINARY. This allows us to omit any changes within the loader

   input files or data generation scripts.

   The replacement of geometry by VARCHAR allows us to use our



Matthias 12.09.2005

===================================================================

Matthias 14.09.2005

-------------------

   The results of the <storage_engine>_views testcases suffer when

   executed in "--ps-protocol" mode from the open

   Bug#11589: mysqltest, --ps-protocol, strange output,

              float/double/real with zerofill  .

   Implementation of a workaround:

     At the beginning of views_master.inc is a variable $have_bug_11589 .

     If this varable is set to 1, the ps-protocol will be switched

     of for the critical statements.

Matthias 14.09.2005

===================================================================

Carsten 16.09.2005

------------------

1. The results of the datadict_<engine> testcases have been changed in nearly 

   all occurrencies of --error <n> because now for the INFORMATION_SCHEMA only 

   the --error 1044 (ERROR 42000: Access denied for user '..' to database 

   'information_schema') seems to be used.

2. To get identical results when using "--ps-protocol" some SELECTs FROM 

   information_schema has been wrapped to suppress using ps-protocol because 

   there are differences.

3. The test using SELECT .. OUTFILE has been disabled due to bug #13202.

4. Fixed datadict_<engine>.result files after the change that added 2 columns to 

   the VIEWS table (DEFINER varchar(77), SECURITY_TYPE varchar(7)).

===================================================================

mysql-test/suite/funcs_1/bitdata/bitdata_master.test

0 → 100644
+6 −0
Original line number Diff line number Diff line 
#### suite/funcs_1/bitdata/bitdata_master.test



let $message= NOT YET IMPLEMENTED: bitdata tests;

--source include/show_msg80.inc



exit;

mysql-test/suite/funcs_1/cursors/cursors_master.test

0 → 100644
+3 −0
Original line number Diff line number Diff line 
#### suite/funcs_1/cursors/cursors_master.test

let $message= NOT YET IMPLEMENTED: cursor tests;

--source include/show_msg80.inc

mysql-test/suite/funcs_1/data/innodb_tb1.txt

0 → 100644
+10 −0
Original line number Diff line number Diff line 
			a`0	a`0	0`	0`	a`0	a`0	0`	0`	!	6	163	103	238	3058	30243	22056	9444	-5	1	1	1	-5	1	1	1	-5	1	1	1	-5	1	1	1	-5	-5	1	1	1	1	1	1	-5	0.0	1	0.0	1	0.0	1	0.0	-5	1	1	1	-5	-5

			aa0	aa0	1aa	1aa	aa0	aa0	1aa	1aa	@	9	207	1	246	13214	57220	1505	58996	-4	2	2	2	-4	2	2	2	-4	2	2	2	-4	2	2	2	-4	-4	2	2	2	2	2	2	-4	1.1	2	1.1	2	1.1	2	1.1	-4	2	2	2	-4	-4

			ab0	ab0	2baa	2baa	ab0	ab0	2baa	2baa	#	3	50	103	193	10965	3038	31585	20149	-3	3	3	3	-3	3	3	3	-3	3	3	3	-3	3	3	3	-3	-3	3	3	3	3	3	3	-3	2.2	3	2.2	3	2.2	3	2.2	-3	3	3	3	-3	-3

			ac0	ac0	3caaa	3caaa	ac0	ac0	3caaa	3caaa	$	62	188	47	176	5103	58378	13178	38317	-2	4	4	4	-2	4	4	4	-2	4	4	4	-2	4	4	4	-2	-2	4	4	4	4	4	4	-2	3.3	4	3.3	4	3.3	4	3.3	-2	4	4	4	-2	-2

			ad0	ad0	4daaaa	4daaaa	ad0	ad0	4daaaa	4daaaa	%	59	15	21	80	17942	48443	12646	53903	-1	5	5	5	-1	5	5	5	-1	5	5	5	-1	5	5	5	-1	-1	5	5	5	5	5	5	-1	4.4	5	4.4	5	4.4	5	4.4	-1	5	5	5	-1	-1

			ae0	ae0	5eaaaaa	5eaaaaa	ae0	ae0	5eaaaaa	5eaaaaa	^	86	223	103	88	3880	31147	5801	28348	0	6	6	6	0	6	6	6	0	6	6	6	0	6	6	6	0	0	6	6	6	6	6	6	0	5.5	6	5.5	6	5.5	6	5.5	0	6	6	6	0	0

			af0	af0	6faaaaaa	6faaaaaa	af0	af0	6faaaaaa	6faaaaaa	&	124	125	77	208	2591	29533	18803	21557	1	7	7	7	1	7	7	7	1	7	7	7	1	7	7	7	1	1	7	7	7	7	7	7	1	6.6	7	6.6	7	6.6	7	6.6	1	7	7	7	1	1

			ag0	ag0	7gaaaaaaa	7gaaaaaaa	ag0	ag0	7gaaaaaaa	7gaaaaaaa	*	123	103	80	92	10179	60769	25778	58195	2	8	8	8	2	8	8	8	2	8	8	8	2	8	8	8	2	2	8	8	8	8	8	8	2	7.7	8	7.7	8	7.7	8	7.7	2	8	8	8	2	2

			a^0	a^0	8^aaaaaaaa	8^aaaaaaaa	a^0	a^0	8^aaaaaaaa	8^aaaaaaaa	(	111	166	81	66	5159	2177	6774	38396	3	9	9	9	3	9	9	9	3	9	9	9	3	9	9	9	3	3	9	9	9	9	9	9	3	8.8	9	8.8	9	8.8	9	8.8	3	9	9	9	3	3

			a_0	a_0	9_aaaaaaaaa	9_aaaaaaaaa	a_0	a_0	9_aaaaaaaaa	9_aaaaaaaaa	)	37	174	97	34	9183	16470	13064	6297	4	10	10	10	4	10	10	10	4	10	10	10	4	10	10	10	4	4	10	10	10	10	10	10	4	9.9	10	9.9	10	9.9	10	9.9	4	10	10	10	4	4