diff options
| author | unknown <kostja@bodhi.local> | 2007-04-03 14:34:37 +0400 |
|---|---|---|
| committer | unknown <kostja@bodhi.local> | 2007-04-03 14:34:37 +0400 |
| commit | 7b1bfbb77a2c753a705b5b594ed4b75d7fb3c9e2 (patch) | |
| tree | 6e120dc301ebc2a12e142e8b8dcb20f4a8fe3986 /sql/sql_servers.cc | |
| parent | 516b8b2137e27661960372c8bf5f757ffb2f2883 (diff) | |
| parent | c1020aa4c67d48e061065f60400127d04a0adb30 (diff) | |
| download | mariadb-git-7b1bfbb77a2c753a705b5b594ed4b75d7fb3c9e2.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into bodhi.local:/opt/local/work/mysql-5.1-runtime
mysql-test/r/events_bugs.result:
Auto merged
mysql-test/r/ps.result:
Auto merged
mysql-test/t/events.test:
Auto merged
sql/event_data_objects.cc:
Auto merged
sql/event_data_objects.h:
Auto merged
sql/event_db_repository.h:
Auto merged
sql/event_queue.cc:
Auto merged
sql/events.cc:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_servers.cc:
Auto merged
sql/sql_view.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.h:
Auto merged
sql/share/errmsg.txt:
Auto merged
mysql-test/r/events.result:
Manual merge.
sql/event_db_repository.cc:
Manual merge.
sql/sql_parse.cc:
Manual merge.
Diffstat (limited to 'sql/sql_servers.cc')
| -rw-r--r-- | sql/sql_servers.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_servers.cc b/sql/sql_servers.cc index d21864e8572..a62ce98850b 100644 --- a/sql/sql_servers.cc +++ b/sql/sql_servers.cc @@ -237,7 +237,7 @@ bool servers_reload(THD *thd) if (simple_open_n_lock_tables(thd, tables)) { - sql_print_error("Fatal error: Can't open and lock privilege tables: %s", + sql_print_error("Can't open and lock privilege tables: %s", thd->net.last_error); goto end; } |