Below is the list of changes that have just been committed into a local
5.1 repository of monty. When monty 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
1.2397 06/05/04 19:39:47 monty@stripped +21 -0
Fixed compiler warnings
Move plugin declarations after system functions have been checked
(Fixes problem with ndb_config failing becasue SHM is not declared)
Fixed some memory leaks
mysql-test/t/ndb_config2.test
1.1 06/05/04 19:39:43 monty@stripped +7 -0
New BitKeeper file ``mysql-test/t/ndb_config2.test''
mysql-test/r/ndb_config2.result
1.1 06/05/04 19:39:43 monty@stripped +1 -0
New BitKeeper file ``mysql-test/r/ndb_config2.result''
sql/sql_view.cc
1.90 06/05/04 19:39:43 monty@stripped +1 -0
Fixed memory leak
sql/sql_partition.cc
1.68 06/05/04 19:39:43 monty@stripped +1 -0
Fixed memory leak
sql/sql_lex.cc
1.177 06/05/04 19:39:43 monty@stripped +11 -5
More debugging
Faster lex_end()
sql/share/errmsg.txt
1.98 06/05/04 19:39:43 monty@stripped +5 -11
Removed wrong error messages
sql/mysqld.cc
1.552 06/05/04 19:39:43 monty@stripped +1 -1
Fixed memory leak in skip_grant.test
mysql-test/t/ndb_config2.test
1.0 06/05/04 19:39:43 monty@stripped +0 -0
BitKeeper file /home/my/mysql-5.1/mysql-test/t/ndb_config2.test
mysql-test/r/ndb_config2.result
1.0 06/05/04 19:39:43 monty@stripped +0 -0
BitKeeper file /home/my/mysql-5.1/mysql-test/r/ndb_config2.result
sql/mysql_priv.h
1.397 06/05/04 19:39:42 monty@stripped +1 -1
After merge fix
sql/ha_partition.cc
1.48 06/05/04 19:39:42 monty@stripped +2 -1
Fixed compiler warning
sql/ha_ndbcluster.cc
1.299 06/05/04 19:39:42 monty@stripped +1 -0
Fixed compiler warning
sql/ha_myisammrg.cc
1.86 06/05/04 19:39:42 monty@stripped +2 -1
Fixed compiler warning
sql/ha_myisam.cc
1.180 06/05/04 19:39:42 monty@stripped +2 -1
Fixed compiler warning
sql/ha_innodb.cc
1.273 06/05/04 19:39:42 monty@stripped +1 -0
Fixed compiler warning
sql/ha_heap.cc
1.89 06/05/04 19:39:42 monty@stripped +1 -0
Fixed compiler warning
sql/ha_berkeley.cc
1.176 06/05/04 19:39:42 monty@stripped +2 -1
Fixed compiler warning
sql/event_timed.cc
1.51 06/05/04 19:39:42 monty@stripped +0 -4
Removed not needed line
mysql-test/t/ndb_partition_error.test
1.7 06/05/04 19:39:42 monty@stripped +1 -1
Update error numbers
mysql-test/t/ndb_config.test
1.13 06/05/04 19:39:42 monty@stripped +0 -6
Moved test depending on SHM to ndb_config2.test
mysql-test/t/log_tables.test
1.8 06/05/04 19:39:42 monty@stripped +4 -4
Update error numbers
mysql-test/t/disabled.def
1.151 06/05/04 19:39:42 monty@stripped +2 -1
Disabled ndb_load, as it is in 5.0
(Fails randomly in binlog_close_connection())
configure.in
1.347 06/05/04 19:39:42 monty@stripped +96 -96
Move plugin declarations after system functions have been checked
(Fixes problem with ndb_config failing becasue SHM is not declared)
# 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: monty
# Host: narttu.mysql.fi
# Root: /home/my/mysql-5.1
--- 1.346/configure.in 2006-05-02 14:10:54 +03:00
+++ 1.347/configure.in 2006-05-04 19:39:42 +03:00
@@ -48,92 +48,9 @@
italian japanese korean norwegian norwegian-ny polish portuguese \
romanian russian serbian slovak spanish swedish ukrainian"
-#--------------------------------------------------------------------
-# Declare our plugin modules
-#--------------------------------------------------------------------
-
-MYSQL_STORAGE_ENGINE(archive,, [Archive Storage Engine],
- [Archive Storage Engine], [max,max-no-ndb])
-MYSQL_PLUGIN_DIRECTORY(archive, [storage/archive])
-MYSQL_PLUGIN_STATIC(archive, [libarchive.a])
-MYSQL_PLUGIN_DYNAMIC(archive, [ha_archive.la])
-
-MYSQL_STORAGE_ENGINE(berkeley, berkeley-db, [BerkeleyDB Storage Engine],
- [Transactional Tables using BerkeleyDB], [max,max-no-ndb])
-MYSQL_PLUGIN_DIRECTORY(berkeley,[storage/bdb])
-MYSQL_PLUGIN_STATIC(berkeley, [[\$(bdb_libs_with_path)]])
-MYSQL_PLUGIN_ACTIONS(berkeley, [MYSQL_SETUP_BERKELEY_DB])
-
-MYSQL_STORAGE_ENGINE(blackhole,,[Blackhole Storage Engine],
- [Basic Write-only Read-never tables], [max,max-no-ndb])
-MYSQL_PLUGIN_DIRECTORY(blackhole, [storage/blackhole])
-MYSQL_PLUGIN_STATIC(blackhole, [libblackhole.a])
-MYSQL_PLUGIN_DYNAMIC(blackhole, [ha_blackhole.la])
-
-MYSQL_STORAGE_ENGINE(csv,, [CSV Storage Engine],
- [Stores tables in text CSV format])
-MYSQL_PLUGIN_DIRECTORY(csv, [storage/csv])
-MYSQL_PLUGIN_STATIC(csv, [libcsv.a])
-MYSQL_PLUGIN_MANDATORY(csv) dnl Used for logging
-
-MYSQL_STORAGE_ENGINE(example,, [Example Storage Engine],
- [Skeleton for Storage Engines for developers], [max,max-no-ndb])
-MYSQL_PLUGIN_DIRECTORY(example, [storage/example])
-MYSQL_PLUGIN_STATIC(example, [libexample.a])
-MYSQL_PLUGIN_DYNAMIC(example, [ha_example.la])
-
-MYSQL_STORAGE_ENGINE(federated,,[Federated Storage Engine],
- [Connects to tables on remote MySQL servers], [max,max-no-ndb])
-
-MYSQL_PLUGIN(ftexample, [Simple Parser],
- [Simple full-text parser plugin])
-MYSQL_PLUGIN_DIRECTORY(ftexample, [plugin/fulltext])
-MYSQL_PLUGIN_DYNAMIC(ftexample, [mypluglib.la])
-
-MYSQL_STORAGE_ENGINE(heap,no, [Memory Storage Engine],
- [Volatile memory based tables])
-MYSQL_PLUGIN_DIRECTORY(heap, [storage/heap])
-MYSQL_PLUGIN_STATIC(heap, [libheap.a])
-MYSQL_PLUGIN_MANDATORY(heap) dnl Memory tables
-
-MYSQL_STORAGE_ENGINE(innobase, innodb, [InnoDB Storage Engine],
- [Transactional Tables using InnoDB], [max,max-no-ndb])
-MYSQL_PLUGIN_DIRECTORY(innobase, [storage/innobase])
-MYSQL_PLUGIN_STATIC(innobase, [libinnobase.a])
-MYSQL_PLUGIN_ACTIONS(innobase, [
- AC_CHECK_LIB(rt, aio_read, [innodb_system_libs="-lrt"])
- AC_SUBST(innodb_system_libs)
-])
-
-MYSQL_STORAGE_ENGINE(myisam,no, [MyISAM Storage Engine],
- [Traditional non-transactional MySQL tables])
-MYSQL_PLUGIN_DIRECTORY(myisam, [storage/myisam])
-MYSQL_PLUGIN_STATIC(myisam, [libmyisam.a])
-MYSQL_PLUGIN_MANDATORY(myisam) dnl Default
-
-MYSQL_STORAGE_ENGINE(myisammrg,no,[MyISAM MERGE Engine],
- [Merge multiple MySQL tables into one])
-MYSQL_PLUGIN_DIRECTORY(myisammrg,[storage/myisammrg])
-MYSQL_PLUGIN_STATIC(myisammrg, [libmyisammrg.a])
-MYSQL_PLUGIN_MANDATORY(myisammrg)
-
-MYSQL_STORAGE_ENGINE(ndbcluster, ndbcluster, [Cluster Storage Engine],
- [High Availability Clustered tables], [max])
-MYSQL_PLUGIN_DIRECTORY(ndbcluster,[storage/ndb])
-MYSQL_PLUGIN_STATIC(ndbcluster, [[\$(ndbcluster_libs) \$(ndbcluster_system_libs) \$(NDB_SCI_LIBS)]])
-MYSQL_PLUGIN_ACTIONS(ndbcluster,[MYSQL_SETUP_NDBCLUSTER])
-
-MYSQL_STORAGE_ENGINE(partition, partition, [Partition Support],
- [MySQL Partitioning Support], [max,max-no-ndb])
-
-dnl -- ndbcluster requires partition to be enabled
-MYSQL_PLUGIN_DEPENDS(ndbcluster, [partition])
-
-
#####
#####
-
AC_SUBST(MYSQL_NO_DASH_VERSION)
AC_SUBST(MYSQL_BASE_VERSION)
AC_SUBST(MYSQL_VERSION_ID)
@@ -763,16 +680,6 @@
AC_TYPE_SIZE_T
#--------------------------------------------------------------------
-# Check for requested features
-#--------------------------------------------------------------------
-
-MYSQL_CHECK_BIG_TABLES
-MYSQL_CHECK_MAX_INDEXES
-MYSQL_CHECK_REPLICATION
-
-MYSQL_CONFIGURE_PLUGINS([none])
-
-#--------------------------------------------------------------------
# Check for system header files
#--------------------------------------------------------------------
@@ -2288,6 +2195,102 @@
fi
AC_MSG_RESULT("$netinet_inc")
+#--------------------------------------------------------------------
+# Check for requested features
+#--------------------------------------------------------------------
+
+MYSQL_CHECK_BIG_TABLES
+MYSQL_CHECK_MAX_INDEXES
+MYSQL_CHECK_REPLICATION
+MYSQL_CHECK_VIO
+MYSQL_CHECK_OPENSSL
+MYSQL_CHECK_YASSL
+
+#--------------------------------------------------------------------
+# Declare our plugin modules
+# Has to be done late, as the plugin may need to check for existence of
+# functions tested above
+#--------------------------------------------------------------------
+
+MYSQL_STORAGE_ENGINE(archive,, [Archive Storage Engine],
+ [Archive Storage Engine], [max,max-no-ndb])
+MYSQL_PLUGIN_DIRECTORY(archive, [storage/archive])
+MYSQL_PLUGIN_STATIC(archive, [libarchive.a])
+MYSQL_PLUGIN_DYNAMIC(archive, [ha_archive.la])
+
+MYSQL_STORAGE_ENGINE(berkeley, berkeley-db, [BerkeleyDB Storage Engine],
+ [Transactional Tables using BerkeleyDB], [max,max-no-ndb])
+MYSQL_PLUGIN_DIRECTORY(berkeley,[storage/bdb])
+MYSQL_PLUGIN_STATIC(berkeley, [[\$(bdb_libs_with_path)]])
+MYSQL_PLUGIN_ACTIONS(berkeley, [MYSQL_SETUP_BERKELEY_DB])
+
+MYSQL_STORAGE_ENGINE(blackhole,,[Blackhole Storage Engine],
+ [Basic Write-only Read-never tables], [max,max-no-ndb])
+MYSQL_PLUGIN_DIRECTORY(blackhole, [storage/blackhole])
+MYSQL_PLUGIN_STATIC(blackhole, [libblackhole.a])
+MYSQL_PLUGIN_DYNAMIC(blackhole, [ha_blackhole.la])
+
+MYSQL_STORAGE_ENGINE(csv,, [CSV Storage Engine],
+ [Stores tables in text CSV format])
+MYSQL_PLUGIN_DIRECTORY(csv, [storage/csv])
+MYSQL_PLUGIN_STATIC(csv, [libcsv.a])
+MYSQL_PLUGIN_MANDATORY(csv) dnl Used for logging
+
+MYSQL_STORAGE_ENGINE(example,, [Example Storage Engine],
+ [Skeleton for Storage Engines for developers], [max,max-no-ndb])
+MYSQL_PLUGIN_DIRECTORY(example, [storage/example])
+MYSQL_PLUGIN_STATIC(example, [libexample.a])
+MYSQL_PLUGIN_DYNAMIC(example, [ha_example.la])
+
+MYSQL_STORAGE_ENGINE(federated,,[Federated Storage Engine],
+ [Connects to tables on remote MySQL servers], [max,max-no-ndb])
+
+MYSQL_PLUGIN(ftexample, [Simple Parser],
+ [Simple full-text parser plugin])
+MYSQL_PLUGIN_DIRECTORY(ftexample, [plugin/fulltext])
+MYSQL_PLUGIN_DYNAMIC(ftexample, [mypluglib.la])
+
+MYSQL_STORAGE_ENGINE(heap,no, [Memory Storage Engine],
+ [Volatile memory based tables])
+MYSQL_PLUGIN_DIRECTORY(heap, [storage/heap])
+MYSQL_PLUGIN_STATIC(heap, [libheap.a])
+MYSQL_PLUGIN_MANDATORY(heap) dnl Memory tables
+
+MYSQL_STORAGE_ENGINE(innobase, innodb, [InnoDB Storage Engine],
+ [Transactional Tables using InnoDB], [max,max-no-ndb])
+MYSQL_PLUGIN_DIRECTORY(innobase, [storage/innobase])
+MYSQL_PLUGIN_STATIC(innobase, [libinnobase.a])
+MYSQL_PLUGIN_ACTIONS(innobase, [
+ AC_CHECK_LIB(rt, aio_read, [innodb_system_libs="-lrt"])
+ AC_SUBST(innodb_system_libs)
+])
+
+MYSQL_STORAGE_ENGINE(myisam,no, [MyISAM Storage Engine],
+ [Traditional non-transactional MySQL tables])
+MYSQL_PLUGIN_DIRECTORY(myisam, [storage/myisam])
+MYSQL_PLUGIN_STATIC(myisam, [libmyisam.a])
+MYSQL_PLUGIN_MANDATORY(myisam) dnl Default
+
+MYSQL_STORAGE_ENGINE(myisammrg,no,[MyISAM MERGE Engine],
+ [Merge multiple MySQL tables into one])
+MYSQL_PLUGIN_DIRECTORY(myisammrg,[storage/myisammrg])
+MYSQL_PLUGIN_STATIC(myisammrg, [libmyisammrg.a])
+MYSQL_PLUGIN_MANDATORY(myisammrg)
+
+MYSQL_STORAGE_ENGINE(ndbcluster, ndbcluster, [Cluster Storage Engine],
+ [High Availability Clustered tables], [max])
+MYSQL_PLUGIN_DIRECTORY(ndbcluster,[storage/ndb])
+MYSQL_PLUGIN_STATIC(ndbcluster, [[\$(ndbcluster_libs) \$(ndbcluster_system_libs) \$(NDB_SCI_LIBS)]])
+MYSQL_PLUGIN_ACTIONS(ndbcluster,[MYSQL_SETUP_NDBCLUSTER])
+
+MYSQL_STORAGE_ENGINE(partition, partition, [Partition Support],
+ [MySQL Partitioning Support], [max,max-no-ndb])
+
+dnl -- ndbcluster requires partition to be enabled
+MYSQL_PLUGIN_DEPENDS(ndbcluster, [partition])
+
+MYSQL_CONFIGURE_PLUGINS([none])
+
# Only build client code?
AC_ARG_WITH(server,
[ --without-server Only build the client.],
@@ -2353,9 +2356,6 @@
AC_SUBST(tools_dirs)
#MYSQL_CHECK_CPU
-MYSQL_CHECK_VIO
-MYSQL_CHECK_OPENSSL
-MYSQL_CHECK_YASSL
libmysqld_dirs=
linked_libmysqld_targets=
--- 1.175/sql/ha_berkeley.cc 2006-05-02 14:10:54 +03:00
+++ 1.176/sql/ha_berkeley.cc 2006-05-04 19:39:42 +03:00
@@ -2742,7 +2742,8 @@
berkeley_hton_comment,
NULL, /* Plugin Init */
NULL, /* Plugin Deinit */
- 0x0100 /* 1.0 */,
+ 0x0100, /* 1.0 */
+ 0
}
mysql_declare_plugin_end;
--- 1.88/sql/ha_heap.cc 2006-05-02 14:10:55 +03:00
+++ 1.89/sql/ha_heap.cc 2006-05-04 19:39:42 +03:00
@@ -720,6 +720,7 @@
heap_hton_comment,
NULL,
NULL,
+ 0x0100, /* 1.0 */
0
}
mysql_declare_plugin_end;
--- 1.179/sql/ha_myisam.cc 2006-05-04 15:34:26 +03:00
+++ 1.180/sql/ha_myisam.cc 2006-05-04 19:39:42 +03:00
@@ -1807,6 +1807,7 @@
myisam_hton_comment,
NULL, /* Plugin Init */
NULL, /* Plugin Deinit */
- 0x0100 /* 1.0 */,
+ 0x0100, /* 1.0 */
+ 0
}
mysql_declare_plugin_end;
--- 1.85/sql/ha_myisammrg.cc 2006-05-02 14:10:55 +03:00
+++ 1.86/sql/ha_myisammrg.cc 2006-05-04 19:39:42 +03:00
@@ -589,6 +589,7 @@
myisammrg_hton_comment,
NULL, /* Plugin Init */
NULL, /* Plugin Deinit */
- 0x0100 /* 1.0 */,
+ 0x0100, /* 1.0 */
+ 0
}
mysql_declare_plugin_end;
--- 1.396/sql/mysql_priv.h 2006-05-02 22:08:17 +03:00
+++ 1.397/sql/mysql_priv.h 2006-05-04 19:39:42 +03:00
@@ -92,7 +92,7 @@
do { \
DBUG_ASSERT(strncmp(Ver, MYSQL_SERVER_VERSION, sizeof(Ver)-1) >= 0); \
push_warning_printf(((THD *)Thd), MYSQL_ERROR::WARN_LEVEL_WARN, \
- ER_WARN_DEPRECATED, ER(ER_WARN_DEPRECATED), \
+ ER_WARN_DEPRECATED_SYNTAX, ER(ER_WARN_DEPRECATED_SYNTAX), \
(Old), (Ver), (New)); \
} while(0)
--- 1.551/sql/mysqld.cc 2006-05-04 00:12:22 +03:00
+++ 1.552/sql/mysqld.cc 2006-05-04 19:39:43 +03:00
@@ -1185,8 +1185,8 @@
#ifdef HAVE_DLOPEN
udf_free();
#endif
- plugin_free();
}
+ plugin_free();
if (tc_log)
tc_log->close();
xid_cache_free();
--- 1.176/sql/sql_lex.cc 2006-04-13 10:57:37 +03:00
+++ 1.177/sql/sql_lex.cc 2006-05-04 19:39:43 +03:00
@@ -168,8 +168,6 @@
lex->select_lex.ftfunc_list= &lex->select_lex.ftfunc_list_alloc;
lex->select_lex.group_list.empty();
lex->select_lex.order_list.empty();
- lex->current_select= &lex->select_lex;
- lex->yacc_yyss=lex->yacc_yyvs=0;
lex->ignore_space=test(thd->variables.sql_mode & MODE_IGNORE_SPACE);
lex->sql_command= lex->orig_sql_command= SQLCOM_END;
lex->duplicates= DUP_ERROR;
@@ -197,8 +195,15 @@
void lex_end(LEX *lex)
{
- x_free(lex->yacc_yyss);
- x_free(lex->yacc_yyvs);
+ DBUG_ENTER("lex_end");
+ if (lex->yacc_yyss)
+ {
+ my_free(lex->yacc_yyss, MYF(0));
+ my_free(lex->yacc_yyvs, MYF(0));
+ lex->yacc_yyss= 0;
+ lex->yacc_yyvs= 0;
+ }
+ DBUG_VOID_RETURN;
}
@@ -1633,7 +1638,8 @@
*/
st_lex::st_lex()
- :result(0), sql_command(SQLCOM_END), query_tables_own_last(0)
+ :result(0), yacc_yyss(0), yacc_yyvs(0),
+ sql_command(SQLCOM_END), query_tables_own_last(0)
{
hash_init(&sroutines, system_charset_info, 0, 0, 0, sp_sroutine_key, 0, 0);
sroutines_list.empty();
--- 1.50/sql/event_timed.cc 2006-05-03 16:55:30 +03:00
+++ 1.51/sql/event_timed.cc 2006-05-04 19:39:42 +03:00
@@ -19,10 +19,6 @@
#include "event.h"
#include "sp.h"
-
-
-extern int MYSQLparse(void *thd);
-
/*
Init all member variables
--- 1.97/sql/share/errmsg.txt 2006-05-04 15:58:26 +03:00
+++ 1.98/sql/share/errmsg.txt 2006-05-04 19:39:43 +03:00
@@ -4898,10 +4898,7 @@
por "Dado truncado, NULL fornecido para NOT NULL coluna '%s' na linha %ld"
ER_WARN_DATA_OUT_OF_RANGE 22003
- eng "Out of range value adjusted for column '%s' at row %ld"
- por "Dado truncado, fora de alcance para coluna '%s' na linha %ld"
+ eng "Out of range value for column '%s' at row %ld"
WARN_DATA_TRUNCATED 01000
eng "Data truncated for column '%s' at row %ld"
@@ -5619,11 +5616,8 @@
eng "non-grouping field '%-.64s' is used in %-.64s clause"
ER_TABLE_CANT_HANDLE_SPKEYS
eng "The used table type doesn't support SPATIAL indexes"
-ER_WARN_DEPRECATED_SYNTAX
- eng "The syntax '%s' is deprecated and will be removed in MySQL %s. Please use %s instead."
- ger "'%s' ist veraltet. Bitte benutzen Sie '%s'"
+ER_ILLEGAL_HA_CREATE_OPTION
+ eng "Table storage engine '%-.64s' does not support the create option '%.64s'"
ER_PARTITION_REQUIRES_VALUES_ERROR
eng "%-.64s PARTITIONING requires definition of VALUES %-.64s for each partition"
@@ -5820,6 +5814,8 @@
ER_DROP_INDEX_FK
eng "Cannot drop index '%-.64s': needed in a foreign key constraint"
+ER_WARN_DEPRECATED_SYNTAX
+ eng "The syntax '%s' is deprecated and will be removed in MySQL %s. Please use %s instead."
ER_CANT_WRITE_LOCK_LOG_TABLE
eng "You can't write-lock a log table. Only read access is possible."
ER_CANT_READ_LOCK_LOG_TABLE
@@ -5844,7 +5840,5 @@
ER_WRONG_PARTITION_NAME
eng "Incorrect partition name"
swe "Felaktigt partitionsnamn"
-ER_ILLEGAL_HA_CREATE_OPTION
- eng "Table storage engine '%-.64s' does not support the create option '%.64s'"
ER_CANT_CHANGE_TX_ISOLATION 25001
eng "Transaction isolation level can't be changed while a transaction is in progress"
--- 1.89/sql/sql_view.cc 2006-04-25 17:09:27 +03:00
+++ 1.90/sql/sql_view.cc 2006-05-04 19:39:43 +03:00
@@ -1197,6 +1197,7 @@
end:
if (arena)
thd->restore_active_arena(arena, &backup);
+ lex_end(thd->lex);
thd->lex= old_lex;
DBUG_RETURN(result);
--- 1.7/mysql-test/t/log_tables.test 2006-03-14 19:37:23 +02:00
+++ 1.8/mysql-test/t/log_tables.test 2006-05-04 19:39:42 +03:00
@@ -63,10 +63,10 @@
# check locking of the log tables
#
---error 1533
+--error ER_CANT_WRITE_LOCK_LOG_TABLE
lock tables mysql.general_log WRITE;
---error 1533
+--error ER_CANT_WRITE_LOCK_LOG_TABLE
lock tables mysql.slow_log WRITE;
#
@@ -75,10 +75,10 @@
# tables are always opened and locked by the logger.
#
---error 1534
+--error ER_CANT_READ_LOCK_LOG_TABLE
lock tables mysql.general_log READ;
---error 1534
+--error ER_CANT_READ_LOCK_LOG_TABLE
lock tables mysql.slow_log READ;
#
--- 1.12/mysql-test/t/ndb_config.test 2006-05-04 06:28:20 +03:00
+++ 1.13/mysql-test/t/ndb_config.test 2006-05-04 19:39:42 +03:00
@@ -15,9 +15,3 @@
--exec $NDB_TOOLS_DIR/ndb_config --defaults-group-suffix=.cluster0 --defaults-file=$MYSQL_TEST_DIR/std_data/ndb_config_mycnf2.cnf --query=type,nodeid,host --mycnf 2> /dev/null
--exec $NDB_TOOLS_DIR/ndb_config --defaults-group-suffix=.cluster1 --defaults-file=$MYSQL_TEST_DIR/std_data/ndb_config_mycnf2.cnf --query=type,nodeid,host --mycnf 2> /dev/null
--exec $NDB_TOOLS_DIR/ndb_config --defaults-group-suffix=.cluster2 --defaults-file=$MYSQL_TEST_DIR/std_data/ndb_config_mycnf2.cnf --query=type,nodeid,host --mycnf 2> /dev/null
-
-# Following doesn't work in all configurations
-
---disable_parsing
---exec $NDB_TOOLS_DIR/ndb_config --defaults-group-suffix=.cluster2 --defaults-file=$MYSQL_TEST_DIR/std_data/ndb_config_mycnf2.cnf --ndb-shm --connections --query=type,nodeid1,nodeid2,group,nodeidserver --mycnf 2> /dev/null
---enable_parsing
--- 1.150/mysql-test/t/disabled.def 2006-05-03 16:55:30 +03:00
+++ 1.151/mysql-test/t/disabled.def 2006-05-04 19:39:42 +03:00
@@ -18,6 +18,7 @@
ndb_binlog_discover : BUG#19395 2006-04-28 tomas/knielsen mysqld does not always detect cluster shutdown
#ndb_cache2 : BUG#18597 2006-03-28 brian simultaneous drop table and ndb statistics update triggers node failure
#ndb_cache_multi2 : BUG#18597 2006-04-10 kent simultaneous drop table and ndb statistics update triggers node failure
+ndb_load : Bug#17233 (This is also in 5.0)
partition_03ndb : BUG#16385 2006-03-24 mikael Partitions: crash when updating a range partitioned NDB table
ps_7ndb : BUG#18950 2006-02-16 jmiller create table like does not obtain LOCK_open
rpl_ndb_2innodb : BUG#19227 2006-04-20 pekka pk delete apparently not replicated
@@ -30,7 +31,7 @@
rpl_ndb_myisam2ndb : BUG#17400 2006-04-19 tomas Cluster Replication: delete & update of rows in table without pk fails on slave.
rpl_switch_stm_row_mixed : BUG#18590 2006-03-28 brian
rpl_row_blob_innodb : BUG#18980 2006-04-10 kent Test fails randomly
-rpl_row_func003 : BUG#19074 2006-13-04 andrei test failed
+rpl_row_func003 : BUG#19074 2006-13-04 andrei test failed
rpl_row_inexist_tbl : BUG#18948 2006-03-09 mats Disabled since patch makes this test wait forever
rpl_sp : BUG#16456 2006-02-16 jmiller
udf : BUG#18564 2006-03-27 ian (Permission by Brian)
--- 1.298/sql/ha_ndbcluster.cc 2006-05-02 14:10:55 +03:00
+++ 1.299/sql/ha_ndbcluster.cc 2006-05-04 19:39:42 +03:00
@@ -10296,6 +10296,7 @@
NULL, /* Plugin Init */
NULL, /* Plugin Deinit */
0x0100 /* 1.0 */,
+ 0
}
mysql_declare_plugin_end;
--- 1.272/sql/ha_innodb.cc 2006-05-03 17:54:11 +03:00
+++ 1.273/sql/ha_innodb.cc 2006-05-04 19:39:42 +03:00
@@ -7470,6 +7470,7 @@
NULL, /* Plugin Init */
NULL, /* Plugin Deinit */
0x0100 /* 1.0 */,
+ 0
}
mysql_declare_plugin_end;
--- New file ---
+++ mysql-test/r/ndb_config2.result 06/05/04 19:39:43
shm,3,4,35,3 shm,3,5,35,3 shm,3,6,35,3 shm,4,5,35,4 shm,4,6,35,4 shm,5,6,35,5 tcp,11,3,55,3 tcp,11,4,55,4 tcp,11,5,55,5 tcp,11,6,55,6 tcp,12,3,55,3 tcp,12,4,55,4 tcp,12,5,55,5 tcp,12,6,55,6 tcp,13,3,55,3 tcp,13,4,55,4 tcp,13,5,55,5 tcp,13,6,55,6 tcp,14,3,55,3 tcp,14,4,55,4 tcp,14,5,55,5 tcp,14,6,55,6 tcp,15,3,55,3 tcp,15,4,55,4 tcp,15,5,55,5 tcp,15,6,55,6 tcp,1,3,55,1 tcp,1,4,55,1 tcp,1,5,55,1 tcp,1,6,55,1 tcp,2,3,55,2 tcp,2,4,55,2 tcp,2,5,55,2 tcp,2,6,55,2
--- New file ---
+++ mysql-test/t/ndb_config2.test 06/05/04 19:39:43
-- source include/have_ndb.inc
-- source include/ndb_default_cluster.inc
-- source include/not_embedded.inc
# Following doesn't work in all configurations (if shm is not defined)
--exec $NDB_TOOLS_DIR/ndb_config --defaults-group-suffix=.cluster2 --defaults-file=$MYSQL_TEST_DIR/std_data/ndb_config_mycnf2.cnf --ndb-shm --connections --query=type,nodeid1,nodeid2,group,nodeidserver --mycnf 2> /dev/null
--- 1.47/sql/ha_partition.cc 2006-05-02 14:10:55 +03:00
+++ 1.48/sql/ha_partition.cc 2006-05-04 19:39:42 +03:00
@@ -5455,7 +5455,8 @@
partition_hton_comment,
NULL, /* Plugin Init */
NULL, /* Plugin Deinit */
- 0x0100 /* 1.0 */,
+ 0x0100, /* 1.0 */
+ 0
}
mysql_declare_plugin_end;
--- 1.67/sql/sql_partition.cc 2006-04-22 11:38:14 +03:00
+++ 1.68/sql/sql_partition.cc 2006-05-04 19:39:43 +03:00
@@ -3430,6 +3430,7 @@
result= FALSE;
end:
+ lex_end(thd->lex);
thd->free_list= thd_free_list;
thd->lex= old_lex;
thd->variables.character_set_client= old_character_set_client;
--- 1.6/mysql-test/t/ndb_partition_error.test 2006-03-14 19:37:23 +02:00
+++ 1.7/mysql-test/t/ndb_partition_error.test 2006-05-04 19:39:42 +03:00
@@ -66,6 +66,6 @@
partitions 2
(partition x123 values in (11, 12),
partition x234 values in (5, 1));
---error 1505
+--error ER_NO_PARTITION_FOR_GIVEN_VALUE
insert into t1 values (NULL,1,1);
drop table t1;
| Thread |
|---|
| • bk commit into 5.1 tree (monty:1.2397) | monty | 4 May |
