Below is the list of changes that have just been committed into a local
5.1 repository of tim. When tim does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet@stripped, 2006-12-26 16:49:10-07:00, tsmith@stripped +33 -0
Merge siva.hindu.god:/usr/home/tim/m/bk/g51
into siva.hindu.god:/usr/home/tim/m/bk/tmp/mrg51-dec26
MERGE: 1.2343.1.46
Makefile.am@stripped, 2006-12-26 16:10:36-07:00, tsmith@stripped +0 -0
Auto merged
MERGE: 1.106.1.1
client/mysqlbinlog.cc@stripped, 2006-12-26 16:10:36-07:00, tsmith@stripped +0 -0
Auto merged
MERGE: 1.138.1.1
client/mysqltest.c@stripped, 2006-12-26 16:10:37-07:00, tsmith@stripped +0 -0
Auto merged
MERGE: 1.257.1.1
configure.in@stripped, 2006-12-26 16:10:36-07:00, tsmith@stripped +0 -0
Auto merged
MERGE: 1.405.1.1
include/config-win.h@stripped, 2006-12-26 16:10:37-07:00, tsmith@stripped +0 -0
Auto merged
MERGE: 1.91.1.1
include/my_global.h@stripped, 2006-12-26 16:10:37-07:00, tsmith@stripped +0 -0
Auto merged
MERGE: 1.152.1.1
include/my_pthread.h@stripped, 2006-12-26 16:10:37-07:00, tsmith@stripped +0 -0
Auto merged
MERGE: 1.98.1.1
include/mysql.h@stripped, 2006-12-26 16:10:37-07:00, tsmith@stripped +0 -0
Auto merged
MERGE: 1.173.1.2
include/typelib.h@stripped, 2006-12-26 16:10:37-07:00, tsmith@stripped +0 -0
Auto merged
MERGE: 1.3.1.1
mysql-test/Makefile.am@stripped, 2006-12-26 16:10:37-07:00, tsmith@stripped +0 -0
Auto merged
MERGE: 1.91.1.3
mysql-test/r/sp.result@stripped, 2006-12-26 16:10:37-07:00, tsmith@stripped +0 -0
Auto merged
MERGE: 1.239.1.1
mysql-test/r/type_timestamp.result@stripped, 2006-12-26 16:10:38-07:00, tsmith@stripped +0 -0
Auto merged
MERGE: 1.35.1.1
mysql-test/r/warnings.result@stripped, 2006-12-26 16:10:38-07:00, tsmith@stripped +0 -0
Auto merged
MERGE: 1.54.1.1
mysys/default.c@stripped, 2006-12-26 16:10:38-07:00, tsmith@stripped +0 -0
Auto merged
MERGE: 1.83.1.1
mysys/my_wincond.c@stripped, 2006-12-26 16:10:38-07:00, tsmith@stripped +0 -0
Auto merged
MERGE: 1.6.1.1
mysys/typelib.c@stripped, 2006-12-26 16:10:38-07:00, tsmith@stripped +0 -0
Auto merged
MERGE: 1.14.2.1
server-tools/instance-manager/Makefile.am@stripped, 2006-12-26 16:10:38-07:00, tsmith@stripped +0 -0
Auto merged
MERGE: 1.43.1.1
server-tools/instance-manager/guardian.cc@stripped, 2006-12-26 16:10:38-07:00, tsmith@stripped +0 -0
Auto merged
MERGE: 1.35.1.1
server-tools/instance-manager/instance.cc@stripped, 2006-12-26 16:10:38-07:00, tsmith@stripped +0 -0
Auto merged
MERGE: 1.47.1.1
sql/field.cc@stripped, 2006-12-26 16:10:38-07:00, tsmith@stripped +0 -0
Auto merged
MERGE: 1.359.1.3
sql/field.h@stripped, 2006-12-26 16:49:05-07:00, tsmith@stripped +0 -0
Manual merge
MERGE: 1.196.1.3
sql/item_sum.cc@stripped, 2006-12-26 16:10:39-07:00, tsmith@stripped +0 -0
Auto merged
MERGE: 1.206.1.1
sql/item_sum.h@stripped, 2006-12-26 16:10:39-07:00, tsmith@stripped +0 -0
Auto merged
MERGE: 1.109.1.2
sql/log_event.cc@stripped, 2006-12-26 16:49:05-07:00, tsmith@stripped +0 -6
Manual merge
MERGE: 1.259.1.1
sql/net_serv.cc@stripped, 2006-12-26 16:10:39-07:00, tsmith@stripped +0 -0
Auto merged
MERGE: 1.99.1.1
sql/opt_range.cc@stripped, 2006-12-26 16:10:40-07:00, tsmith@stripped +0 -0
Auto merged
MERGE: 1.252.1.2
sql/share/charsets/hebrew.xml@stripped, 2006-12-26 16:10:42-07:00, tsmith@stripped +0 -0
Auto merged
MERGE: 1.4.1.1
sql/sql_class.h@stripped, 2006-12-26 16:10:40-07:00, tsmith@stripped +0 -0
Auto merged
MERGE: 1.331.1.2
sql/sql_parse.cc@stripped, 2006-12-26 16:10:40-07:00, tsmith@stripped +0 -0
Auto merged
MERGE: 1.611.1.2
sql/sql_show.cc@stripped, 2006-12-26 16:10:42-07:00, tsmith@stripped +0 -0
Auto merged
MERGE: 1.379.1.1
storage/federated/ha_federated.cc@stripped, 2006-12-26 16:10:42-07:00, tsmith@stripped +0 -0
Auto merged
MERGE: 1.90.1.1
strings/conf_to_src.c@stripped, 2006-12-26 16:10:42-07:00, tsmith@stripped +0 -0
Auto merged
MERGE: 1.18.1.1
vio/viossl.c@stripped, 2006-12-26 16:10:42-07:00, tsmith@stripped +0 -0
Auto merged
MERGE: 1.41.1.1
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: tsmith
# Host: siva.hindu.god
# Root: /usr/home/tim/m/bk/tmp/mrg51-dec26/RESYNC
--- 1.107/Makefile.am 2006-12-26 16:49:23 -07:00
+++ 1.108/Makefile.am 2006-12-26 16:49:23 -07:00
@@ -2,8 +2,7 @@
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation; version 2 of the License.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
--- 1.92/include/config-win.h 2006-12-26 16:49:23 -07:00
+++ 1.93/include/config-win.h 2006-12-26 16:49:23 -07:00
@@ -2,8 +2,7 @@
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
+ the Free Software Foundation; version 2 of the License.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
--- 1.102/include/my_pthread.h 2006-12-26 16:49:23 -07:00
+++ 1.103/include/my_pthread.h 2006-12-26 16:49:23 -07:00
@@ -2,8 +2,7 @@
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
+ the Free Software Foundation; version 2 of the License.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
--- 1.175/include/mysql.h 2006-12-26 16:49:23 -07:00
+++ 1.176/include/mysql.h 2006-12-26 16:49:23 -07:00
@@ -64,9 +64,9 @@ typedef int my_socket;
#endif /* my_socket_defined */
#endif /* _global_h */
+#include "mysql_version.h"
#include "mysql_com.h"
#include "mysql_time.h"
-#include "mysql_version.h"
#include "typelib.h"
#include "my_list.h" /* for LISTs used in 'MYSQL' and 'MYSQL_STMT' */
--- 1.84/mysys/default.c 2006-12-26 16:49:23 -07:00
+++ 1.85/mysys/default.c 2006-12-26 16:49:23 -07:00
@@ -2,8 +2,7 @@
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
+ the Free Software Foundation; version 2 of the License.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
--- 1.8/mysys/my_wincond.c 2006-12-26 16:49:23 -07:00
+++ 1.9/mysys/my_wincond.c 2006-12-26 16:49:23 -07:00
@@ -2,8 +2,7 @@
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
+ the Free Software Foundation; version 2 of the License.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
--- 1.16/mysys/typelib.c 2006-12-26 16:49:23 -07:00
+++ 1.17/mysys/typelib.c 2006-12-26 16:49:23 -07:00
@@ -2,8 +2,7 @@
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
+ the Free Software Foundation; version 2 of the License.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
--- 1.362/sql/field.cc 2006-12-26 16:49:23 -07:00
+++ 1.363/sql/field.cc 2006-12-26 16:49:23 -07:00
@@ -8030,6 +8030,16 @@ void Field_enum::sql_type(String &res) c
}
+Field *Field_enum::new_field(MEM_ROOT *root, struct st_table *new_table,
+ bool keep_type)
+{
+ Field_enum *res= (Field_enum*) Field::new_field(root, new_table, keep_type);
+ if (res)
+ res->typelib= copy_typelib(root, typelib);
+ return res;
+}
+
+
/*
set type.
This is a string which can have a collection of different values.
--- 1.199/sql/field.h 2006-12-26 16:49:23 -07:00
+++ 1.200/sql/field.h 2006-12-26 16:49:23 -07:00
@@ -1366,6 +1366,7 @@ public:
{
flags|=ENUM_FLAG;
}
+ Field *new_field(MEM_ROOT *root, struct st_table *new_table, bool keep_type);
enum_field_types type() const { return MYSQL_TYPE_STRING; }
enum Item_result cmp_type () const { return INT_RESULT; }
enum Item_result cast_to_int_type () const { return INT_RESULT; }
--- 1.209/sql/item_sum.cc 2006-12-26 16:49:23 -07:00
+++ 1.210/sql/item_sum.cc 2006-12-26 16:49:23 -07:00
@@ -2,8 +2,7 @@
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
+ the Free Software Foundation; version 2 of the License.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
--- 1.111/sql/item_sum.h 2006-12-26 16:49:23 -07:00
+++ 1.112/sql/item_sum.h 2006-12-26 16:49:23 -07:00
@@ -682,8 +682,10 @@ public:
double val_real();
longlong val_int()
{ /* can't be fix_fields()ed */ return (longlong) rint(val_real()); }
- String *val_str(String*);
- my_decimal *val_decimal(my_decimal *);
+ String *val_str(String *str)
+ { return val_string_from_real(str); }
+ my_decimal *val_decimal(my_decimal *dec_buf)
+ { return val_decimal_from_real(dec_buf); }
bool is_null() { update_null_value(); return null_value; }
enum_field_types field_type() const
{
@@ -705,6 +707,14 @@ public:
= (sum(ai^2) - 2*sum(a)*sum(a)/count(a) + count(a)*sum(a)^2/count(a)^2 )/count(a) =
= (sum(ai^2) - 2*sum(a)^2/count(a) + sum(a)^2/count(a) )/count(a) =
= (sum(ai^2) - sum(a)^2/count(a))/count(a)
+
+But, this falls prey to catastrophic cancellation. Instead, use the recurrence formulas
+
+ M_{1} = x_{1}, ~ M_{k} = M_{k-1} + (x_{k} - M_{k-1}) / k newline
+ S_{1} = 0, ~ S_{k} = S_{k-1} + (x_{k} - M_{k-1}) times (x_{k} - M_{k}) newline
+ for 2 <= k <= n newline
+ ital variance = S_{n} / (n-1)
+
*/
class Item_sum_variance : public Item_sum_num
@@ -713,9 +723,8 @@ class Item_sum_variance : public Item_su
public:
Item_result hybrid_type;
- double sum, sum_sqr;
- my_decimal dec_sum[2], dec_sqr[2];
int cur_dec;
+ double recurrence_m, recurrence_s; /* Used in recurrence relation. */
ulonglong count;
uint f_precision0, f_scale0;
uint f_precision1, f_scale1;
@@ -724,7 +733,7 @@ public:
uint prec_increment;
Item_sum_variance(Item *item_par, uint sample_arg) :Item_sum_num(item_par),
- hybrid_type(REAL_RESULT), cur_dec(0), count(0), sample(sample_arg)
+ hybrid_type(REAL_RESULT), count(0), sample(sample_arg)
{}
Item_sum_variance(THD *thd, Item_sum_variance *item);
enum Sumfunctype sum_func () const { return VARIANCE_FUNC; }
@@ -744,7 +753,6 @@ public:
enum Item_result result_type () const { return REAL_RESULT; }
void cleanup()
{
- cur_dec= 0;
count= 0;
Item_sum_num::cleanup();
}
--- 1.262/sql/log_event.cc 2006-12-26 16:49:23 -07:00
+++ 1.263/sql/log_event.cc 2006-12-26 16:49:23 -07:00
@@ -5558,8 +5558,8 @@ unpack_row(RELAY_LOG_INFO *rli,
if (bitmap_is_set(cols, field_ptr - begin_ptr))
{
DBUG_ASSERT((const char *)table->record[0] <= f->ptr);
- DBUG_ASSERT(f->ptr < ((const char *)table->record[0] + table->s->reclength +
- (f->pack_length_in_rec() == 0)));
+ DBUG_ASSERT(f->ptr < (char*)(table->record[0] + table->s->reclength +
+ (f->pack_length_in_rec() == 0)));
DBUG_PRINT("info", ("unpacking column '%s' to 0x%lx", f->field_name,
(long) f->ptr));
--- 1.139/client/mysqlbinlog.cc 2006-12-26 16:49:23 -07:00
+++ 1.140/client/mysqlbinlog.cc 2006-12-26 16:49:24 -07:00
@@ -2,8 +2,7 @@
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
+ the Free Software Foundation; version 2 of the License.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
--- 1.100/sql/net_serv.cc 2006-12-26 16:49:24 -07:00
+++ 1.101/sql/net_serv.cc 2006-12-26 16:49:24 -07:00
@@ -2,8 +2,7 @@
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
+ the Free Software Foundation; version 2 of the License.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
--- 1.254/sql/opt_range.cc 2006-12-26 16:49:24 -07:00
+++ 1.255/sql/opt_range.cc 2006-12-26 16:49:24 -07:00
@@ -5011,7 +5011,8 @@ static SEL_TREE *get_func_mm_tree(RANGE_
for (uint idx= 0; idx < param->keys; idx++)
{
SEL_ARG *new_interval, *last_val;
- if (((new_interval= tree2->keys[idx])) &&
+ if (((new_interval= tree2->keys[idx])) &&
+ (tree->keys[idx]) &&
((last_val= tree->keys[idx]->last())))
{
new_interval->min_value= last_val->max_value;
--- 1.336/sql/sql_class.h 2006-12-26 16:49:24 -07:00
+++ 1.337/sql/sql_class.h 2006-12-26 16:49:24 -07:00
@@ -2,8 +2,7 @@
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
+ the Free Software Foundation; version 2 of the License.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
--- 1.614/sql/sql_parse.cc 2006-12-26 16:49:24 -07:00
+++ 1.615/sql/sql_parse.cc 2006-12-26 16:49:24 -07:00
@@ -2954,6 +2954,12 @@ mysql_execute_command(THD *thd)
goto end_with_restore_list;
#ifndef HAVE_READLINK
+ if (lex->create_info.data_file_name)
+ push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN, 0,
+ "DATA DIRECTORY option ignored");
+ if (lex->create_info.index_file_name)
+ push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN, 0,
+ "INDEX DIRECTORY option ignored");
lex->create_info.data_file_name=lex->create_info.index_file_name=0;
#else
/* Fix names if symlinked tables */
--- 1.19/strings/conf_to_src.c 2006-12-26 16:49:24 -07:00
+++ 1.20/strings/conf_to_src.c 2006-12-26 16:49:24 -07:00
@@ -2,8 +2,7 @@
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
+ the Free Software Foundation; version 2 of the License.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
--- 1.5/sql/share/charsets/hebrew.xml 2006-12-26 16:49:24 -07:00
+++ 1.6/sql/share/charsets/hebrew.xml 2006-12-26 16:49:24 -07:00
@@ -7,8 +7,7 @@
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
+ the Free Software Foundation; version 2 of the License.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
--- 1.44/server-tools/instance-manager/Makefile.am 2006-12-26 16:49:24 -07:00
+++ 1.45/server-tools/instance-manager/Makefile.am 2006-12-26 16:49:24 -07:00
@@ -2,8 +2,7 @@
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation; version 2 of the License.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
--- 1.153/include/my_global.h 2006-12-26 16:49:24 -07:00
+++ 1.154/include/my_global.h 2006-12-26 16:49:24 -07:00
@@ -2,8 +2,7 @@
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
+ the Free Software Foundation; version 2 of the License.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
--- 1.4/include/typelib.h 2006-12-26 16:49:24 -07:00
+++ 1.5/include/typelib.h 2006-12-26 16:49:24 -07:00
@@ -2,8 +2,7 @@
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
+ the Free Software Foundation; version 2 of the License.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
--- 1.260/client/mysqltest.c 2006-12-26 16:49:24 -07:00
+++ 1.261/client/mysqltest.c 2006-12-26 16:49:24 -07:00
@@ -2,8 +2,7 @@
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
+ the Free Software Foundation; version 2 of the License.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
--- 1.93/storage/federated/ha_federated.cc 2006-12-26 16:49:24 -07:00
+++ 1.94/storage/federated/ha_federated.cc 2006-12-26 16:49:24 -07:00
@@ -2944,7 +2944,7 @@ static int federated_commit(handlerton *
if (old)
old->trx_next= NULL;
error= ptr->connection_commit();
- if (error && !return_val);
+ if (error && !return_val)
return_val= error;
}
thd->ha_data[hton->slot]= NULL;
--- 1.241/mysql-test/r/sp.result 2006-12-26 16:49:24 -07:00
+++ 1.242/mysql-test/r/sp.result 2006-12-26 16:49:24 -07:00
@@ -5816,4 +5816,20 @@ DROP TABLE bug23760, bug23760_log|
DROP PROCEDURE bug23760_update_log|
DROP PROCEDURE bug23760_test_row_count|
DROP FUNCTION bug23760_rc_test|
+DROP PROCEDURE IF EXISTS bug24117|
+DROP TABLE IF EXISTS t3|
+CREATE TABLE t3(c1 ENUM('abc'))|
+INSERT INTO t3 VALUES('abc')|
+CREATE PROCEDURE bug24117()
+BEGIN
+DECLARE t3c1 ENUM('abc');
+DECLARE mycursor CURSOR FOR SELECT c1 FROM t3;
+OPEN mycursor;
+FLUSH TABLES;
+FETCH mycursor INTO t3c1;
+CLOSE mycursor;
+END|
+CALL bug24117()|
+DROP PROCEDURE bug24117|
+DROP TABLE t3|
drop table t1,t2;
--- 1.36/server-tools/instance-manager/guardian.cc 2006-12-26 16:49:24 -07:00
+++ 1.37/server-tools/instance-manager/guardian.cc 2006-12-26 16:49:24 -07:00
@@ -2,8 +2,7 @@
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
+ the Free Software Foundation; version 2 of the License.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
--- 1.48/server-tools/instance-manager/instance.cc 2006-12-26 16:49:24 -07:00
+++ 1.49/server-tools/instance-manager/instance.cc 2006-12-26 16:49:24 -07:00
@@ -2,8 +2,7 @@
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
+ the Free Software Foundation; version 2 of the License.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
--- 1.95/mysql-test/Makefile.am 2006-12-26 16:49:24 -07:00
+++ 1.96/mysql-test/Makefile.am 2006-12-26 16:49:24 -07:00
@@ -2,8 +2,8 @@
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Library General Public
-# License as published by the Free Software Foundation; either
-# version 2 of the License, or (at your option) any later version.
+# License as published by the Free Software Foundation; version 2
+# of the License.
#
# This library is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
--- 1.55/mysql-test/r/warnings.result 2006-12-26 16:49:24 -07:00
+++ 1.56/mysql-test/r/warnings.result 2006-12-26 16:49:24 -07:00
@@ -166,13 +166,6 @@ show variables like 'max_error_count';
Variable_name Value
max_error_count 10
drop table t1;
-create table t1 (id int) engine=NDB;
-Warnings:
-Warning 1266 Using storage engine MyISAM for table 't1'
-alter table t1 engine=NDB;
-Warnings:
-Warning 1266 Using storage engine MyISAM for table 't1'
-drop table t1;
set table_type=MYISAM;
Warnings:
Warning 1543 The syntax 'table_type' is deprecated and will be removed in MySQL 5.2. Please use 'storage_engine' instead
--- 1.42/vio/viossl.c 2006-12-26 16:49:24 -07:00
+++ 1.43/vio/viossl.c 2006-12-26 16:49:24 -07:00
@@ -2,8 +2,7 @@
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
+ the Free Software Foundation; version 2 of the License.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
| Thread |
|---|
| • bk commit into 5.1 tree (tsmith:1.2368) | tim | 27 Dec |
