1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix embedded tests

Browse Source 
(mainly by backporting 5.5. changes)

mysql-test/suite/maria/t/distinct.test:
  Remove the test that requires SSL. One test case for a bug is enough.
sql/scheduler.cc:
  make it the same as in 5.5
storage/innodb_plugin/row/row0mysql.c:
  make it the same as in 5.5
storage/innodb_plugin/row/row0sel.c:
  make it the same as in 5.5
storage/xtradb/row/row0mysql.c:
  make it the same as in 5.5
storage/xtradb/row/row0sel.c:
  make it the same as in 5.5
This commit is contained in:
Sergei Golubchik 2014-02-13 08:09:07 +01:00
parent 52f038c5c3
commit 5f5d2db141
7 changed files with 0 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mysql-test/suite/maria/r/distinct.result
View File

@ -15,11 +15,3 @@ GROUP_CONCAT(a)
3 3
1 1
DROP TABLE t1; DROP TABLE t1;
CREATE TABLE t1 (a INT, b VARCHAR(1)) ENGINE=MyISAM;
INSERT INTO t1 VALUES (7,'q'),(2,NULL),(7,'g'),(6,'x');
SELECT DISTINCT MAX( a ) FROM t1 GROUP BY b ORDER BY DES_DECRYPT( b );
MAX( a )
2
7
6
DROP TABLE t1;

4
mysql-test/suite/maria/t/distinct.test
View File

@ -19,7 +19,3 @@ SELECT GROUP_CONCAT(a) FROM t1 GROUP BY b;
SELECT DISTINCT GROUP_CONCAT(a) FROM t1 GROUP BY b; SELECT DISTINCT GROUP_CONCAT(a) FROM t1 GROUP BY b;
DROP TABLE t1; DROP TABLE t1;
CREATE TABLE t1 (a INT, b VARCHAR(1)) ENGINE=MyISAM;
INSERT INTO t1 VALUES (7,'q'),(2,NULL),(7,'g'),(6,'x');
SELECT DISTINCT MAX( a ) FROM t1 GROUP BY b ORDER BY DES_DECRYPT( b );
DROP TABLE t1;

1
sql/scheduler.cc
View File

@ -69,7 +69,6 @@ static bool no_threads_end(THD *thd, bool put_in_cache)
void one_thread_scheduler(scheduler_functions *func) void one_thread_scheduler(scheduler_functions *func)
{ {
func->max_threads= 1; func->max_threads= 1;
max_connections= 1;
func->max_connections= &max_connections; func->max_connections= &max_connections;
func->connection_count= &connection_count; func->connection_count= &connection_count;
#ifndef EMBEDDED_LIBRARY #ifndef EMBEDDED_LIBRARY

4
storage/innodb_plugin/row/row0mysql.c
View File

@ -1079,7 +1079,6 @@ row_insert_for_mysql(
ins_node_t* node = prebuilt->ins_node; ins_node_t* node = prebuilt->ins_node;
ut_ad(trx); ut_ad(trx);
ut_ad(trx->mysql_thread_id == os_thread_get_curr_id());
if (prebuilt->table->ibd_file_missing) { if (prebuilt->table->ibd_file_missing) {
ut_print_timestamp(stderr); ut_print_timestamp(stderr);
@ -1313,7 +1312,6 @@ row_update_for_mysql(
trx_t* trx = prebuilt->trx; trx_t* trx = prebuilt->trx;
ut_ad(prebuilt && trx); ut_ad(prebuilt && trx);
ut_ad(trx->mysql_thread_id == os_thread_get_curr_id());
UT_NOT_USED(mysql_rec); UT_NOT_USED(mysql_rec);
if (prebuilt->table->ibd_file_missing) { if (prebuilt->table->ibd_file_missing) {
@ -1483,7 +1481,6 @@ row_unlock_for_mysql(
trx_t* trx = prebuilt->trx; trx_t* trx = prebuilt->trx;
ut_ad(prebuilt && trx); ut_ad(prebuilt && trx);
ut_ad(trx->mysql_thread_id == os_thread_get_curr_id());
if (UNIV_UNLIKELY if (UNIV_UNLIKELY
(!srv_locks_unsafe_for_binlog (!srv_locks_unsafe_for_binlog
@ -2724,7 +2721,6 @@ row_truncate_table_for_mysql(
redo log records on the truncated tablespace, we will assign redo log records on the truncated tablespace, we will assign
a new tablespace identifier to the truncated tablespace. */ a new tablespace identifier to the truncated tablespace. */
ut_ad(trx->mysql_thread_id == os_thread_get_curr_id());
ut_ad(table); ut_ad(table);
if (srv_created_new_raw) { if (srv_created_new_raw) {

1
storage/innodb_plugin/row/row0sel.c
View File

@ -3434,7 +3434,6 @@ row_search_for_mysql(
rec_offs_init(offsets_); rec_offs_init(offsets_);
ut_ad(index && pcur && search_tuple); ut_ad(index && pcur && search_tuple);
ut_ad(trx->mysql_thread_id == os_thread_get_curr_id());
if (UNIV_UNLIKELY(prebuilt->table->ibd_file_missing)) { if (UNIV_UNLIKELY(prebuilt->table->ibd_file_missing)) {
ut_print_timestamp(stderr); ut_print_timestamp(stderr);

4
storage/xtradb/row/row0mysql.c
View File

@ -1084,7 +1084,6 @@ row_insert_for_mysql(
ins_node_t* node = prebuilt->ins_node; ins_node_t* node = prebuilt->ins_node;
ut_ad(trx); ut_ad(trx);
ut_ad(trx->mysql_thread_id == os_thread_get_curr_id());
if (prebuilt->table->ibd_file_missing) { if (prebuilt->table->ibd_file_missing) {
ut_print_timestamp(stderr); ut_print_timestamp(stderr);
@ -1326,7 +1325,6 @@ row_update_for_mysql(
trx_t* trx = prebuilt->trx; trx_t* trx = prebuilt->trx;
ut_ad(prebuilt && trx); ut_ad(prebuilt && trx);
ut_ad(trx->mysql_thread_id == os_thread_get_curr_id());
UT_NOT_USED(mysql_rec); UT_NOT_USED(mysql_rec);
if (prebuilt->table->ibd_file_missing) { if (prebuilt->table->ibd_file_missing) {
@ -1497,7 +1495,6 @@ row_unlock_for_mysql(
trx_t* trx = prebuilt->trx; trx_t* trx = prebuilt->trx;
ut_ad(prebuilt && trx); ut_ad(prebuilt && trx);
ut_ad(trx->mysql_thread_id == os_thread_get_curr_id());
if (UNIV_UNLIKELY if (UNIV_UNLIKELY
(!srv_locks_unsafe_for_binlog (!srv_locks_unsafe_for_binlog
@ -2830,7 +2827,6 @@ row_truncate_table_for_mysql(
redo log records on the truncated tablespace, we will assign redo log records on the truncated tablespace, we will assign
a new tablespace identifier to the truncated tablespace. */ a new tablespace identifier to the truncated tablespace. */
ut_ad(trx->mysql_thread_id == os_thread_get_curr_id());
ut_ad(table); ut_ad(table);
if (srv_created_new_raw) { if (srv_created_new_raw) {

1
storage/xtradb/row/row0sel.c
View File

@ -3435,7 +3435,6 @@ row_search_for_mysql(
rec_offs_init(offsets_); rec_offs_init(offsets_);
ut_ad(index && pcur && search_tuple); ut_ad(index && pcur && search_tuple);
ut_ad(trx->mysql_thread_id == os_thread_get_curr_id());
if (UNIV_UNLIKELY(prebuilt->table->ibd_file_missing)) { if (UNIV_UNLIKELY(prebuilt->table->ibd_file_missing)) {
ut_print_timestamp(stderr); ut_print_timestamp(stderr);