bzr push into mysql-6.0-bugteam branch (Sergey.Glukhov:2783 to 2784)

[Sergey Glukhov]

 2784 Sergey Glukhov	2008-12-09 [merge]
      5.1-bugteam->6.0-bugteam merge
modified:
  extra/yassl/include/openssl/ssl.h
  mysql-test/r/myisampack.result
  mysql-test/r/type_float.result
  mysql-test/t/myisampack.test
  mysql-test/t/type_float.test
  sql/mysql_priv.h
  sql/sql_table.cc

 2783 Alexander Barkov	2008-12-09
      Postfix for WL#4164 Two-byte collation IDs
      
      Problem:
      Collation ID=2047 didn't work because of a wrong condition in some loops.
      (Only collation ID=2046 worked).
      Fix:
      Changing the loops to work with ID=2047.
modified:
  mysql-test/r/ctype_ldml.result
  mysql-test/t/ctype_ldml.test
  mysys/charset.c

=== modified file 'extra/yassl/include/openssl/ssl.h'
--- a/extra/yassl/include/openssl/ssl.h	2008-11-18 16:45:44 +0000
+++ b/extra/yassl/include/openssl/ssl.h	2008-12-08 17:45:48 +0000
@@ -203,8 +203,8 @@ SSL_CTX* SSL_CTX_new(SSL_METHOD*);
 SSL* SSL_new(SSL_CTX*);
 int  SSL_set_fd (SSL*, YASSL_SOCKET_T);
 YASSL_SOCKET_T SSL_get_fd(const SSL*);
-int  SSL_connect(SSL*);                    // if you get an error from connect
-                                           // see note at top of REAMDE
+int  SSL_connect(SSL*);                    /* if you get an error from connect
+                                              see note at top of REAMDE */
 int  SSL_write(SSL*, const void*, int);
 int  SSL_read(SSL*, void*, int);
 int  SSL_accept(SSL*);

=== modified file 'mysql-test/r/myisampack.result'
--- a/mysql-test/r/myisampack.result	2007-11-07 08:55:28 +0000
+++ b/mysql-test/r/myisampack.result	2008-12-09 09:04:28 +0000
@@ -27,3 +27,25 @@ CHECK TABLE t1 EXTENDED;
 Table	Op	Msg_type	Msg_text
 test.t1	check	status	OK
 DROP TABLE t1;
+drop table if exists t1;
+create table t1(f1 int, f2 varchar(255));
+insert into t1 values(1, 'foo'), (2, 'bar');
+insert into t1 select * from t1;
+insert into t1 select * from t1;
+insert into t1 select * from t1;
+insert into t1 select * from t1;
+insert into t1 select * from t1;
+insert into t1 select * from t1;
+insert into t1 select * from t1;
+insert into t1 select * from t1;
+insert into t1 select * from t1;
+insert into t1 select * from t1;
+insert into t1 select * from t1;
+insert into t1 select * from t1;
+flush tables;
+optimize table t1;
+Table	Op	Msg_type	Msg_text
+test.t1	optimize	error	Table 'test.t1' is read only
+Warnings:
+Error	1036	Table 't1' is read only
+drop table t1;

=== modified file 'mysql-test/r/type_float.result'
--- a/mysql-test/r/type_float.result	2008-12-07 17:41:29 +0000
+++ b/mysql-test/r/type_float.result	2008-12-09 09:27:28 +0000
@@ -422,11 +422,11 @@ insert into t1(d) values (9.223372036854
 (9.22337203685479e18),
 (1.84e19);
 update t1 set u = d;
-select * from t1;
-d	u
-9.223372036854776e18	9223372036854775808
-9.22337203685478e18	9223372036854779904
-9.22337203685479e18	9223372036854790144
-1.84e19	18400000000000000000
+select u from t1;
+u
+9223372036854775808
+9223372036854779904
+9223372036854790144
+18400000000000000000
 drop table t1;
 End of 5.0 tests

=== modified file 'mysql-test/t/myisampack.test'
--- a/mysql-test/t/myisampack.test	2007-11-07 08:55:28 +0000
+++ b/mysql-test/t/myisampack.test	2008-12-09 09:04:28 +0000
@@ -31,3 +31,28 @@ FLUSH TABLES;
 --exec $MYISAMCHK -s --unpack $MYSQLTEST_VARDIR/master-data/test/t1
 CHECK TABLE t1 EXTENDED;
 DROP TABLE t1;
+
+#
+# Bug#40949 Debug version of MySQL server crashes when run OPTIMIZE on compressed table.
+#
+--disable_warnings
+drop table if exists t1;
+--enable_warnings
+create table t1(f1 int, f2 varchar(255));
+insert into t1 values(1, 'foo'), (2, 'bar');
+insert into t1 select * from t1;
+insert into t1 select * from t1;
+insert into t1 select * from t1;
+insert into t1 select * from t1;
+insert into t1 select * from t1;
+insert into t1 select * from t1;
+insert into t1 select * from t1;
+insert into t1 select * from t1;
+insert into t1 select * from t1;
+insert into t1 select * from t1;
+insert into t1 select * from t1;
+insert into t1 select * from t1;
+flush tables;
+--exec $MYISAMPACK $MYSQLTEST_VARDIR/master-data/test/t1
+optimize table t1;
+drop table t1;

=== modified file 'mysql-test/t/type_float.test'
--- a/mysql-test/t/type_float.test	2008-12-07 17:41:29 +0000
+++ b/mysql-test/t/type_float.test	2008-12-09 09:27:28 +0000
@@ -296,7 +296,7 @@ insert into t1(d) values (9.223372036854
                          (1.84e19);
 
 update t1 set u = d;
-select * from t1;
+select u from t1;
 drop table t1;
 
 --echo End of 5.0 tests

=== modified file 'sql/mysql_priv.h'
--- a/sql/mysql_priv.h	2008-12-05 01:05:05 +0000
+++ b/sql/mysql_priv.h	2008-12-09 09:27:28 +0000
@@ -594,7 +594,6 @@ enum open_table_mode
 #define UNCACHEABLE_PREPARE    16
 /* For uncorrelated SELECT in an UNION with some correlated SELECTs */
 #define UNCACHEABLE_UNITED     32
-#define UNCACHEABLE_CHECKOPTION   64
 
 /* Used to check GROUP BY list in the MODE_ONLY_FULL_GROUP_BY mode */
 #define UNDEF_POS (-1)

=== modified file 'sql/sql_table.cc'
--- a/sql/sql_table.cc	2008-12-01 16:11:34 +0000
+++ b/sql/sql_table.cc	2008-12-09 09:27:28 +0000
@@ -4362,6 +4362,7 @@ static bool mysql_admin_table(THD* thd, 
       table->table=0;				// For query cache
       if (protocol->write())
 	goto err;
+      thd->main_da.reset_diagnostics_area();
       continue;
       /* purecov: end */
     }