diff options
| author | unknown <mats@kindahl-laptop.dnsalias.net> | 2007-06-13 12:28:35 +0200 |
|---|---|---|
| committer | unknown <mats@kindahl-laptop.dnsalias.net> | 2007-06-13 12:28:35 +0200 |
| commit | 7eebcf2f999b617544ce7e3f131e7a54c9c9cb88 (patch) | |
| tree | bab0b5627b8034b3c3a733fa1a95c5f38c29c43b /sql/sql_class.h | |
| parent | 95d678f84166348a46688d6f6c4f7f59abbfc058 (diff) | |
| download | mariadb-git-7eebcf2f999b617544ce7e3f131e7a54c9c9cb88.tar.gz | |
BUG#23051 (READ COMMITTED breaks mixed and statement-based replication):
Post-merge fixes.
BitKeeper/deleted/.del-ndb_binlog_basic2.test:
Delete: mysql-test/t/ndb_binlog_basic2.test
BitKeeper/deleted/.del-ndb_binlog_basic2.result:
Delete: mysql-test/r/ndb_binlog_basic2.result
mysql-test/r/binlog_innodb.result:
Result change
mysql-test/r/binlog_multi_engine.result:
Result change
mysql-test/t/binlog_multi_engine.test:
Changed error code
mysql-test/t/partition_hash.test:
Changed error code
sql/sql_class.h:
Fixes to select_create constructor argument list.
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index 87b73594e78..fe22d182088 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -1998,13 +1998,14 @@ class select_create: public select_insert { public: select_create (TABLE_LIST *table_arg, HA_CREATE_INFO *create_info_par, - List<create_field> &fields_par, - List<Key> &keys_par, + Alter_info *alter_info_arg, List<Item> &select_fields,enum_duplicates duplic, bool ignore, TABLE_LIST *select_tables_arg) :select_insert (NULL, NULL, &select_fields, 0, 0, duplic, ignore), create_table(table_arg), - create_info(create_info_par), select_tables(select_tables_arg) + create_info(create_info_par), + select_tables(select_tables_arg), + alter_info(alter_info_arg) {} int prepare(List<Item> &list, SELECT_LEX_UNIT *u); |