Merge bk-internal.mysql.com:/home/bk/mysql-4.1/

into serg.mylan:/usr/home/serg/Abk/mysql-4.1

mysql-test/include/ps_query.inc

@@ -246,6 +246,11 @@ select a,b from t1 order by 2 ;
 prepare stmt1 from ' select a,b from t1
 order by ? ';
 execute stmt1 using @arg00;
+set @arg00=1 ;
+execute stmt1 using @arg00;
+set @arg00=0 ;
+--error 1054
+execute stmt1 using @arg00;
 
 ##### parameter used in limit clause
 set @arg00=1;

mysql-test/r/ps_2myisam.result

@@ -334,6 +334,16 @@ a	b
 1	one
 3	three
 2	two
+set @arg00=1 ;
+execute stmt1 using @arg00;
+a	b
+1	one
+2	two
+3	three
+4	four
+set @arg00=0 ;
+execute stmt1 using @arg00;
+ERROR 42S22: Unknown column '?' in 'order clause'
 set @arg00=1;
 prepare stmt1 from ' select a,b from t1
 limit 1 ';

mysql-test/r/ps_3innodb.result

@@ -334,6 +334,16 @@ a	b
 1	one
 3	three
 2	two
+set @arg00=1 ;
+execute stmt1 using @arg00;
+a	b
+1	one
+2	two
+3	three
+4	four
+set @arg00=0 ;
+execute stmt1 using @arg00;
+ERROR 42S22: Unknown column '?' in 'order clause'
 set @arg00=1;
 prepare stmt1 from ' select a,b from t1
 limit 1 ';

mysql-test/r/ps_4heap.result

@@ -335,6 +335,16 @@ a	b
 1	one
 3	three
 2	two
+set @arg00=1 ;
+execute stmt1 using @arg00;
+a	b
+1	one
+2	two
+3	three
+4	four
+set @arg00=0 ;
+execute stmt1 using @arg00;
+ERROR 42S22: Unknown column '?' in 'order clause'
 set @arg00=1;
 prepare stmt1 from ' select a,b from t1
 limit 1 ';

mysql-test/r/ps_5merge.result

@@ -377,6 +377,16 @@ a	b
 1	one
 3	three
 2	two
+set @arg00=1 ;
+execute stmt1 using @arg00;
+a	b
+1	one
+2	two
+3	three
+4	four
+set @arg00=0 ;
+execute stmt1 using @arg00;
+ERROR 42S22: Unknown column '?' in 'order clause'
 set @arg00=1;
 prepare stmt1 from ' select a,b from t1
 limit 1 ';
@@ -1560,6 +1570,16 @@ a	b
 1	one
 3	three
 2	two
+set @arg00=1 ;
+execute stmt1 using @arg00;
+a	b
+1	one
+2	two
+3	three
+4	four
+set @arg00=0 ;
+execute stmt1 using @arg00;
+ERROR 42S22: Unknown column '?' in 'order clause'
 set @arg00=1;
 prepare stmt1 from ' select a,b from t1
 limit 1 ';

mysql-test/r/ps_6bdb.result

@@ -334,6 +334,16 @@ a	b
 1	one
 3	three
 2	two
+set @arg00=1 ;
+execute stmt1 using @arg00;
+a	b
+1	one
+2	two
+3	three
+4	four
+set @arg00=0 ;
+execute stmt1 using @arg00;
+ERROR 42S22: Unknown column '?' in 'order clause'
 set @arg00=1;
 prepare stmt1 from ' select a,b from t1
 limit 1 ';