diff options
author | monty@mashka.mysql.fi <> | 2002-09-03 15:44:25 +0300 |
---|---|---|
committer | monty@mashka.mysql.fi <> | 2002-09-03 15:44:25 +0300 |
commit | a01a0840dcb9fb7622e2c994ead985174df8daab (patch) | |
tree | 14062338992e5b5bda3d4e4cc498b6dd65a5a9c0 /libmysql | |
parent | a5f9e95a932fb08d8998de2a49b7fc7b5c734b95 (diff) | |
download | mariadb-git-a01a0840dcb9fb7622e2c994ead985174df8daab.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.
Diffstat (limited to 'libmysql')
-rw-r--r-- | libmysql/libmysql.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index b5e013c8e67..0c91ec11671 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -1351,13 +1351,12 @@ mysql_init(MYSQL *mysql) if (!(mysql=(MYSQL*) my_malloc(sizeof(*mysql),MYF(MY_WME | MY_ZEROFILL)))) return 0; mysql->free_me=1; - mysql->net.vio = 0; } else bzero((char*) (mysql),sizeof(*(mysql))); mysql->options.connect_timeout=CONNECT_TIMEOUT; mysql->last_used_con = mysql->next_slave = mysql->master = mysql; - mysql->last_used_slave = 0; + /* By default, we are a replication pivot. The caller must reset it after we return if this is not the case. |