database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge with 4.0 to get fix for mysqlbinlog

Browse Source 
mysql-test/r/mysqlbinlog.result:
  Auto merged
mysql-test/r/select_found.result:
  Auto merged
mysql-test/t/select_found.test:
  Auto merged
sql/log_event.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_load.cc:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
client/mysqlbinlog.cc:
  Merge with 4.0
configure.in:
  Merge with 4.0
mysql-test/r/range.result:
  Use local file
mysql-test/t/range.test:
  Use local file
sql/share/english/errmsg.txt:
  Use local file
This commit is contained in:
unknown
2004-02-16 10:15:52 +02:00
parent a07e48eca0 40ad915493
commit d00fbce308
10 changed files with 110 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_load.cc
View File

@ -94,7 +94,7 @@ int mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list,
#endif
char *db = table_list->db; // This is never null
/* If no current database, use database where table is located */
char *tdb= thd->db ? thd->db : db;
char *tdb= thd->db ? thd->db : db; // Result is never null
bool transactional_table, log_delayed;
ulong skip_lines= ex->skip_lines;
DBUG_ENTER("mysql_load");