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

Manual merge 5.0->5.1

Browse Source 
BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
storage/innobase/include/lock0lock.h:
  Auto merged
storage/innobase/include/srv0srv.h:
  Auto merged
storage/innobase/lock/lock0lock.c:
  Auto merged
storage/innobase/srv/srv0srv.c:
  Auto merged
storage/ndb/test/src/NDBT_ResultRow.cpp:
  Auto merged
sql/slave.cc:
  Due to refactoring, this needs to be checked before the call.
sql/sql_acl.cc:
  Resolving conflicts due to bug fix and filter refactoring
This commit is contained in:
unknown
2005-05-06 15:04:07 +02:00
parent 303229750d 0baed276c3
commit 5bb9169118
122 changed files with 3100 additions and 1458 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/mysql_priv.h
View File

@ -1088,7 +1088,7 @@ extern my_bool opt_readonly, lower_case_file_system;
extern my_bool opt_enable_named_pipe, opt_sync_frm, opt_allow_suspicious_udfs;
extern my_bool opt_secure_auth;
extern my_bool sp_automatic_privileges;
extern my_bool opt_old_style_user_limits;
extern my_bool opt_old_style_user_limits, trust_routine_creators;
extern uint opt_crash_binlog_innodb;
extern char *shared_memory_base_name, *mysqld_unix_port;
extern bool opt_enable_shared_memory;