mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
Patches for NetBSD/macppc
Fixed bug in LEFT JOIN Added bdb_log_buffer_size Docs/manual.texi: Added documentation for mysqlhotcopy client/mysql.cc: Fixed core dump when column names couldn't be read configure.in: Fixed possible error mit-pthreads/Changes-mysql: Patches for NetBSD/macppc mit-pthreads/config/config.guess: Patches for NetBSD/macppc mit-pthreads/config/configure.in: Patches for NetBSD/macppc mit-pthreads/config/configure: Patches for NetBSD/macppc mysql-test/r/join_outer.result: New join test mysql-test/t/join_outer.test: New join test scripts/mysqlhotcopy.sh: Patches from ASK sql/ha_berkeley.cc: Adeed log buffer cache sql/ha_berkeley.h: Adeed log buffer cache sql/log.cc: Fixed possible overrun bug sql/mysqld.cc: Fix for Mac OS X public beta Added bdb_log_buffer_size sql/sql_select.cc: Fixed bug in LEFT JOIN tests/mail_to_db.pl: Removed unsubscribe tails tests/pmail.pl: Sort mails according to date
This commit is contained in:
@ -39,7 +39,7 @@
|
||||
#include "my_readline.h"
|
||||
#include <signal.h>
|
||||
|
||||
const char *VER="11.10";
|
||||
const char *VER="11.11";
|
||||
|
||||
gptr sql_alloc(unsigned size); // Don't use mysqld alloc for these
|
||||
void sql_element_free(void *ptr);
|
||||
@ -1192,7 +1192,8 @@ You can turn off this feature to get a quicker startup with -A\n\n");
|
||||
field_names=0;
|
||||
|
||||
/* hash all field names, both with the table prefix and without it */
|
||||
if (!tables) { /* no tables */
|
||||
if (!tables) /* no tables */
|
||||
{
|
||||
DBUG_VOID_RETURN;
|
||||
}
|
||||
mysql_data_seek(tables,0);
|
||||
@ -1201,7 +1202,6 @@ You can turn off this feature to get a quicker startup with -A\n\n");
|
||||
MYF(MY_WME));
|
||||
if (!field_names)
|
||||
DBUG_VOID_RETURN;
|
||||
field_names[mysql_num_rows(tables)]='\0';
|
||||
i=0;
|
||||
while ((table_row=mysql_fetch_row(tables)))
|
||||
{
|
||||
@ -1229,10 +1229,14 @@ You can turn off this feature to get a quicker startup with -A\n\n");
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
tee_fprintf(stdout,
|
||||
"Didn't find any fields in table '%s'\n",table_row[0]);
|
||||
field_names[i]=0;
|
||||
}
|
||||
i++;
|
||||
}
|
||||
field_names[i]=0; // End pointer
|
||||
DBUG_VOID_RETURN;
|
||||
}
|
||||
|
||||
@ -2018,11 +2022,11 @@ com_use(String *buffer __attribute__((unused)), char *line)
|
||||
if (mysql_select_db(&mysql,tmp))
|
||||
return put_info(mysql_error(&mysql),INFO_ERROR,mysql_errno(&mysql));
|
||||
}
|
||||
my_free(current_db,MYF(MY_ALLOW_ZERO_PTR));
|
||||
current_db=my_strdup(tmp,MYF(MY_WME));
|
||||
#ifdef HAVE_READLINE
|
||||
build_completion_hash(no_rehash,1);
|
||||
#endif
|
||||
my_free(current_db,MYF(MY_ALLOW_ZERO_PTR));
|
||||
current_db=my_strdup(tmp,MYF(MY_WME));
|
||||
}
|
||||
}
|
||||
else
|
||||
|
Reference in New Issue
Block a user