List:Commits« Previous MessageNext Message »
From:Jon Olav Hauglid Date:May 20 2009 10:39am
Subject:bzr push into mysql-6.0 branch (jon.hauglid:2778 to 2779)
View as plain text  
 2779 Jon Olav Hauglid	2009-05-19
      Two test cases added. One for ALTER column DROP DEFAULT and one 
      for LIMIT X OFFSET Y.

    modified:
      mysql-test/r/parser.result
      mysql-test/t/parser.test
 2778 Alexander Nozdrin	2009-05-16 [merge]
      Merge from 6.0

    added:
      include/mysql/service_my_snprintf.h
      include/mysql/service_thd_alloc.h
      include/mysql/services.h
      include/service_versions.h
      libservices/
      libservices/CMakeLists.txt
      libservices/Makefile.am
      libservices/my_snprintf_service.c
      libservices/thd_alloc_service.c
      mysql-test/collections/mysql-6.0-maria.push
      mysql-test/collections/mysql-6.0-rpl.push
      mysql-test/extra/rpl_tests/rpl_row_record_find.test
      mysql-test/suite/binlog/r/binlog_max_extension.result
      mysql-test/suite/binlog/t/binlog_max_extension.test
      mysql-test/suite/rpl/include/rpl_not_null.inc
      mysql-test/suite/rpl/r/rpl_bug41902.result
      mysql-test/suite/rpl/r/rpl_not_null_innodb.result
      mysql-test/suite/rpl/r/rpl_not_null_myisam.result
      mysql-test/suite/rpl/r/rpl_row_record_find_falcon.result
      mysql-test/suite/rpl/r/rpl_row_record_find_innodb.result
      mysql-test/suite/rpl/r/rpl_row_record_find_myisam.result
      mysql-test/suite/rpl/t/rpl_bug41902-slave.opt
      mysql-test/suite/rpl/t/rpl_bug41902.test
      mysql-test/suite/rpl/t/rpl_not_null_innodb.test
      mysql-test/suite/rpl/t/rpl_not_null_myisam.test
      mysql-test/suite/rpl/t/rpl_row_record_find_falcon.test
      mysql-test/suite/rpl/t/rpl_row_record_find_innodb.test
      mysql-test/suite/rpl/t/rpl_row_record_find_myisam.test
      sql/sql_plugin_services.h
    modified:
      .bzr-mysql/default.conf
      CMakeLists.txt
      Makefile.am
      README
      client/mysqlbinlog.cc
      configure.in
      extra/my_print_defaults.c
      include/Makefile.am
      include/config-win.h
      include/m_string.h
      include/maria.h
      include/my_bitmap.h
      include/my_global.h
      include/my_pthread.h
      include/my_sys.h
      include/myisam.h
      include/mysql/plugin.h
      include/mysql/plugin.h.pp
      libmysqld/Makefile.am
      mysql-test/include/mtr_check.sql
      mysql-test/include/setup_fake_relay_log.inc
      mysql-test/lib/My/File/Path.pm
      mysql-test/lib/My/SafeProcess.pm
      mysql-test/lib/My/SafeProcess/Base.pm
      mysql-test/lib/mtr_cases.pm
      mysql-test/lib/mtr_process.pl
      mysql-test/lib/mtr_report.pm
      mysql-test/lib/mtr_unique.pm
      mysql-test/mysql-test-run.pl
      mysql-test/r/init_file.result
      mysql-test/r/plugin.result
      mysql-test/suite/binlog/t/binlog_auto_increment_bug33029.test
      mysql-test/suite/binlog/t/disabled.def
      mysql-test/suite/funcs_1/datadict/is_routines.inc
      mysql-test/suite/funcs_1/r/is_routines.result
      mysql-test/suite/rpl/r/rpl_change_master.result
      mysql-test/suite/rpl/t/disabled.def
      mysql-test/suite/rpl/t/rpl_change_master.test
      mysql-test/t/init_file.test
      mysql-test/t/mysqlbinlog.test
      mysql-test/t/plugin.test
      mysys/default.c
      mysys/my_getopt.c
      mysys/my_getsystime.c
      mysys/typelib.c
      mysys/waiting_threads.c
      plugin/daemon_example/Makefile.am
      scripts/mysqld_safe.sh
      sql-common/client.c
      sql-common/my_time.c
      sql-common/pack.c
      sql/CMakeLists.txt
      sql/Makefile.am
      sql/field.cc
      sql/ha_partition.cc
      sql/handler.h
      sql/item.cc
      sql/item.h
      sql/item_cmpfunc.cc
      sql/item_func.cc
      sql/item_strfunc.cc
      sql/item_sum.cc
      sql/item_sum.h
      sql/item_timefunc.cc
      sql/log.cc
      sql/log.h
      sql/log_event.cc
      sql/log_event.h
      sql/log_event_old.cc
      sql/mysql_priv.h
      sql/replication.h
      sql/rpl_info.h
      sql/rpl_record.cc
      sql/rpl_record.h
      sql/set_var.cc
      sql/slave.cc
      sql/sql_base.cc
      sql/sql_bitmap.h
      sql/sql_class.cc
      sql/sql_class.h
      sql/sql_connect.cc
      sql/sql_delete.cc
      sql/sql_lex.cc
      sql/sql_parse.cc
      sql/sql_partition.cc
      sql/sql_plugin.cc
      sql/sql_plugin.h
      sql/sql_repl.cc
      sql/sql_select.cc
      sql/sql_udf.h
      sql/sql_update.cc
      sql/time.cc
      sql/transaction.cc
      storage/archive/archive_performance.c
      storage/archive/archive_test.c
      storage/example/Makefile.am
      storage/example/ha_example.cc
      storage/falcon/ha_falcon.cpp
      storage/maria/ma_bitmap.c
      storage/maria/ma_blockrec.c
      storage/maria/ma_create.c
      storage/maria/ma_key.c
      storage/maria/ma_loghandler.c
      storage/maria/ma_loghandler_lsn.h
      storage/maria/ma_pagecache.c
      storage/maria/ma_recovery.c
      storage/maria/maria_backup_engine.cc
      storage/maria/maria_def.h
      storage/maria/maria_pack.c
      storage/maria/trnman.h
      storage/maria/unittest/lockman2-t.c
      storage/maria/unittest/ma_control_file-t.c
      storage/maria/unittest/trnman-t.c
      storage/myisam/mi_create.c
      storage/myisam/myisam_backup_engine.cc
      storage/myisam/myisampack.c
      storage/mysql_storage_engine.cmake
      storage/ndb/src/ndbapi/NdbRecAttr.cpp
      storage/ndb/test/run-test/setup.cpp
      strings/ctype-ucs2.c
      strings/decimal.c
      strings/my_strtoll10.c
      strings/my_vsnprintf.c
      tests/mysql_client_test.c
=== modified file 'mysql-test/r/parser.result'
--- a/mysql-test/r/parser.result	2009-05-11 17:58:07 +0000
+++ b/mysql-test/r/parser.result	2009-05-19 12:52:58 +0000
@@ -663,3 +663,54 @@ drop tablespace ndb_ts1 engine=myisam;
 ERROR HY000: Table storage engine 'MyISAM' does not support the create option 'TABLESPACE or LOGFILE GROUP'
 drop tablespace ndb_ts1;
 ERROR HY000: Table storage engine 'MyISAM' does not support the create option 'TABLESPACE or LOGFILE GROUP'
+DROP TABLE IF EXISTS t1;
+SET @save_sql_mode=@@sql_mode;
+SET sql_mode=strict_all_tables;
+CREATE TABLE t1 (a int NOT NULL default 42);
+INSERT INTO t1 VALUES ();
+SELECT * FROM t1;
+a
+42
+ALTER TABLE t1 ALTER COLUMN a DROP DEFAULT;
+INSERT INTO t1 values ();
+ERROR HY000: Field 'a' doesn't have a default value
+INSERT INTO t1 (a) VALUES (11);
+SELECT * FROM t1 ORDER BY a;
+a
+11
+42
+DROP TABLE t1;
+SET @@sql_mode=@save_sql_mode;
+DROP TABLE IF EXISTS t1;
+CREATE TABLE t1 (a int PRIMARY KEY auto_increment);
+INSERT INTO t1 VALUES (),(),(),(),(),(),(),(),(),();
+INSERT INTO t1 VALUES (),(),(),(),(),(),(),(),(),();
+SELECT a FROM t1 ORDER BY a LIMIT 10 OFFSET 1;
+a
+2
+3
+4
+5
+6
+7
+8
+9
+10
+11
+SELECT a FROM t1 ORDER BY a LIMIT 10 OFFSET 10;
+a
+11
+12
+13
+14
+15
+16
+17
+18
+19
+20
+SELECT a FROM t1 ORDER BY a LIMIT 2 OFFSET 14;
+a
+15
+16
+DROP TABLE t1;

=== modified file 'mysql-test/t/parser.test'
--- a/mysql-test/t/parser.test	2009-05-11 17:58:07 +0000
+++ b/mysql-test/t/parser.test	2009-05-19 12:52:58 +0000
@@ -811,3 +811,42 @@ drop logfile group ndb_lg1;
 drop tablespace ndb_ts1 engine=myisam;
 -- error ER_ILLEGAL_HA_CREATE_OPTION
 drop tablespace ndb_ts1;
+
+#
+# Test for ALTER column DROP DEFAULT
+#
+
+--disable_warnings
+DROP TABLE IF EXISTS t1;
+--enable_warnings
+
+SET @save_sql_mode=@@sql_mode;
+SET sql_mode=strict_all_tables;
+
+CREATE TABLE t1 (a int NOT NULL default 42);
+INSERT INTO t1 VALUES ();
+SELECT * FROM t1;
+ALTER TABLE t1 ALTER COLUMN a DROP DEFAULT;
+--error ER_NO_DEFAULT_FOR_FIELD
+INSERT INTO t1 values ();
+INSERT INTO t1 (a) VALUES (11);
+SELECT * FROM t1 ORDER BY a;
+DROP TABLE t1;
+
+SET @@sql_mode=@save_sql_mode;
+
+#
+# Test for LIMIT X OFFSET Y
+#
+
+--disable_warnings
+DROP TABLE IF EXISTS t1;
+--enable_warnings
+
+CREATE TABLE t1 (a int PRIMARY KEY auto_increment);
+INSERT INTO t1 VALUES (),(),(),(),(),(),(),(),(),();
+INSERT INTO t1 VALUES (),(),(),(),(),(),(),(),(),();
+SELECT a FROM t1 ORDER BY a LIMIT 10 OFFSET 1;
+SELECT a FROM t1 ORDER BY a LIMIT 10 OFFSET 10;
+SELECT a FROM t1 ORDER BY a LIMIT 2 OFFSET 14;
+DROP TABLE t1;


Attachment: [text/bzr-bundle] bzr/jon.hauglid@sun.com-20090519125258-g0rgl2z4ckbtj98d.bundle
Thread
bzr push into mysql-6.0 branch (jon.hauglid:2778 to 2779) Jon Olav Hauglid20 May