diff options
| author | unknown <monty@mysql.com> | 2004-02-16 10:15:52 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-02-16 10:15:52 +0200 |
| commit | d00fbce3083f11d071300447e11dab124debb2b7 (patch) | |
| tree | f9bef14abcf4ef1e6145cb3c16e63c9a56e221e9 /sql/sql_load.cc | |
| parent | a07e48eca04b1564da9868f229ba5d958994db69 (diff) | |
| parent | 40ad9154930ca5d42649b776f84989cc372b060c (diff) | |
| download | mariadb-git-d00fbce3083f11d071300447e11dab124debb2b7.tar.gz | |
Merge with 4.0 to get fix for mysqlbinlog
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
Diffstat (limited to 'sql/sql_load.cc')
| -rw-r--r-- | sql/sql_load.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_load.cc b/sql/sql_load.cc index 45b76e44f28..f910e947720 100644 --- a/sql/sql_load.cc +++ b/sql/sql_load.cc @@ -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"); |