diff options
author | unknown <monty@mashka.mysql.fi> | 2002-09-03 15:44:25 +0300 |
---|---|---|
committer | unknown <monty@mashka.mysql.fi> | 2002-09-03 15:44:25 +0300 |
commit | 0f2ab68c6f6bc6243c2f8fe7580316f48ffafac6 (patch) | |
tree | 14062338992e5b5bda3d4e4cc498b6dd65a5a9c0 /sql/mysqld.cc | |
parent | e360f20f73ef48d80fe697f5c4f495ce9b852f17 (diff) | |
download | mariadb-git-0f2ab68c6f6bc6243c2f8fe7580316f48ffafac6.tar.gz |
Some trivial optimzations
Check if AND/OR expression can be NULL; Fixed bug in GROUP BY and-or-expression where expression could be NULL
Bug fix for SHOW OPEN TABLES when user didn't have privilege to access all open tables.
Better fix for ALTER TABLE on BDB tables.
Docs/manual.texi:
Changelog
client/mysql.cc:
Simple optimization
libmysql/libmysql.c:
Removed initialization of varibles that are already set to zero
myisam/myisamchk.c:
Fixed comment for extend-check
mysql-test/r/bdb-alter-table-1.result:
Updated results
mysql-test/r/bdb-alter-table-2.result:
Updated results
mysql-test/r/distinct.result:
Updated results after bug fix
mysql-test/r/handler.result:
Updated results
mysql-test/r/innodb_handler.result:
Updated results
mysql-test/r/select.result:
Updated results
mysql-test/r/varbinary.result:
Updated results
mysql-test/t/bdb-alter-table-1.test:
Added comments
mysql-test/t/bdb-alter-table-2.test:
Added comments
mysql-test/t/select.test:
Remove OPTION in SET OPTION
Added tests for ORDER BY key LIMIT
sql/item_cmpfunc.cc:
Check if AND/OR expression can be NULL
sql/mysqld.cc:
mysqld --help now shows value of datadir
sql/share/english/errmsg.txt:
Better error message for syntax error
sql/sql_base.cc:
Bug fix for SHOW OPEN TABLES
sql/sql_class.cc:
Moved virtual function to .cc file to avoid that we have to include assert.h everywhere.
sql/sql_class.h:
Moved virtual function to .cc file to avoid that we have to include assert.h everywhere.
sql/sql_parse.cc:
Removed old dead code from 3.23
sql/sql_select.cc:
Improved optimization of ORDER BY key LIMIT
sql/sql_table.cc:
More comments,
Better fix for ALTER TABLE on BDB tables.
Diffstat (limited to 'sql/mysqld.cc')
-rw-r--r-- | sql/mysqld.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index be703c894f2..6c4fe5047c0 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -377,11 +377,10 @@ char mysql_real_data_home[FN_REFLEN], blob_newline,f_fyllchar,max_sort_char,*mysqld_user,*mysqld_chroot, *opt_init_file; char *language_ptr= language; +char mysql_data_home_buff[2], *mysql_data_home=mysql_real_data_home; #ifndef EMBEDDED_LIBRARY -char mysql_data_home_buff[2], *mysql_data_home=mysql_data_home_buff; bool mysql_embedded=0; #else -char *mysql_data_home=mysql_real_data_home; bool mysql_embedded=1; #endif @@ -1959,6 +1958,7 @@ int main(int argc, char **argv) { unireg_abort(1); /* purecov: inspected */ } + mysql_data_home= mysql_data_home_buff; mysql_data_home[0]=FN_CURLIB; // all paths are relative from here mysql_data_home[1]=0; server_init(); |