database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl

Browse Source 
into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/51


include/m_ctype.h:
  Auto merged
mysql-test/Makefile.am:
  Auto merged
mysql-test/lib/mtr_report.pl:
  Auto merged
mysql-test/r/rpl_ssl.result:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
mysql-test/t/multi_update.test:
  Auto merged
mysql-test/t/rpl_row_until.test:
  Auto merged
mysql-test/t/rpl_ssl.test:
  Auto merged
mysql-test/t/rpl_stm_until.test:
  Auto merged
mysys/charset-def.c:
  Auto merged
mysys/charset.c:
  Auto merged
sql/item_create.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
strings/ctype-big5.c:
  Auto merged
strings/ctype-gbk.c:
  Auto merged
strings/ctype-sjis.c:
  Auto merged
strings/ctype-uca.c:
  Auto merged
strings/ctype.c:
  Auto merged
BitKeeper/deleted/.del-binlog_innodb.result:
  Delete: mysql-test/r/binlog_innodb.result
BitKeeper/deleted/.del-binlog_innodb.test:
  Delete: mysql-test/t/binlog_innodb.test
mysql-test/r/binlog_innodb.result:
  Fix merge of two independent binlog_innodb tests (from -rpl and -maint)
mysql-test/t/binlog_innodb.test:
  Fix merge of two independent binlog_innodb tests (from -rpl and -maint)
mysql-test/r/innodb.result:
  Use local (manual merge)
mysql-test/r/multi_update.result:
  Use remote (manual merge)
mysql-test/t/rpl_log_pos.test:
  Manual merge
mysql-test/r/rpl_log_pos.result:
  Manual merge, part 2
This commit is contained in:
unknown
2007-06-21 22:10:40 +02:00
parent 2da92ead65 274829b481
commit fc4ae9bc11
298 changed files with 24685 additions and 1022 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sql/mysql_priv.h
View File

@ -1275,6 +1275,7 @@ int simple_open_n_lock_tables(THD *thd,TABLE_LIST *tables);
bool open_and_lock_tables(THD *thd,TABLE_LIST *tables);
bool open_normal_and_derived_tables(THD *thd, TABLE_LIST *tables, uint flags);
int lock_tables(THD *thd, TABLE_LIST *tables, uint counter, bool *need_reopen);
int decide_logging_format(THD *thd, TABLE_LIST *tables);
TABLE *open_temporary_table(THD *thd, const char *path, const char *db,
const char *table_name, bool link_in_list);
bool rm_temporary_table(handlerton *base, char *path);