mirror of
https://github.com/MariaDB/server.git
synced 2026-05-09 16:44:29 +02:00
Fixed bug in UNION
Fixed replication bug in load_master_data BitKeeper/deleted/.del-global.h~e80d28157acfdcb5: Delete: include/global.h Docs/manual.texi: Cleaned up "Things to do in 4.0" mysql-test/r/union.result: New test mysql-test/t/union.test: New test mysys/my_lib.c: Cleanup sql/mysql_priv.h: Fixed replication bug load_master_data sql/sql_base.cc: Fixed bug in UNION sql/sql_db.cc: Fixed replication bug load_master_data sql/sql_parse.cc: Fixed replication bug load_master_data sql/sql_repl.cc: Fixed replication bug load_master_data sql/sql_union.cc: Fixed bug in UNION tools/mysqlmanager.c: Portability fix
This commit is contained in:
parent
cca5066521
commit
af19fa4628
12 changed files with 105 additions and 1060 deletions
|
|
@ -73,10 +73,11 @@ int mysql_union(THD *thd, LEX *lex,select_result *result)
|
|||
(ORDER*) sl->group_list.first,
|
||||
sl->having,
|
||||
(ORDER*) NULL,
|
||||
sl->options | thd->options | SELECT_NO_UNLOCK | SELECT_DESCRIBE,
|
||||
(sl->options | thd->options | SELECT_NO_UNLOCK |
|
||||
SELECT_DESCRIBE),
|
||||
result);
|
||||
}
|
||||
return 0;
|
||||
DBUG_RETURN(0);
|
||||
}
|
||||
|
||||
order = (ORDER *) last_sl->order_list.first;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue