diff options
| author | unknown <monty@mysql.com> | 2004-06-21 10:21:20 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-06-21 10:21:20 +0300 |
| commit | b5dfd05662464d2c19da349942914cce897cdbaf (patch) | |
| tree | a55d40c04126c696aec19a9bdd340a11258e07e6 /innobase | |
| parent | 2b9a8afa50c3575f924587588ce13852933d4d15 (diff) | |
| download | mariadb-git-b5dfd05662464d2c19da349942914cce897cdbaf.tar.gz | |
After merge fixes
Return NULL if a time argument is given to date_add(). (Warning will be shown after Dimitri's timezone patch is pushed)
client/mysqltest.c:
Added MAX_VAR_NAME which was lost in merge
Added more debugging
Fixed bug in 'eval'
innobase/data/data0type.c:
After merge fix
innobase/fil/fil0fil.c:
After merge fix
innobase/log/log0recv.c:
After merge fix
myisam/mi_unique.c:
Better checksum handling
mysql-test/r/func_time.result:
Return NULL if a time argument is given to date_add()
mysql-test/r/rpl_free_items.result:
After merge fix
mysql-test/r/rpl_get_lock.result:
Test was depending on when server was restarted.
mysql-test/r/type_date.result:
After merge fix
mysql-test/r/type_decimal.result:
After merge fix
mysql-test/t/func_time.test:
Removed comment that is not needed anymore
(After Dimitri's timezone patch is pushed, we should get a warning for the date_add(time...) entry)
mysql-test/t/rpl_get_lock.test:
Test was depending on when server was restarted.
mysql-test/t/type_date.test:
Addded missing explanation for bug
netware/mysqld_safe.c:
Removed end \r
Run program through indent-ex to get MySQL indentation
sql-common/client.c:
After merge fix
sql/field.cc:
Fixed that get_date(time) gives a warning
sql/field.h:
After merge fix
sql/net_serv.cc:
More debugging (if DEBUG_DATA_PACKETS is set)
sql/sql_class.cc:
Removed compiler warning
sql/table.cc:
Better comment
Diffstat (limited to 'innobase')
| -rw-r--r-- | innobase/data/data0type.c | 1 | ||||
| -rw-r--r-- | innobase/fil/fil0fil.c | 3 | ||||
| -rw-r--r-- | innobase/log/log0recv.c | 1 |
3 files changed, 1 insertions, 4 deletions
diff --git a/innobase/data/data0type.c b/innobase/data/data0type.c index 1e08bb41c36..97d93b1b0ec 100644 --- a/innobase/data/data0type.c +++ b/innobase/data/data0type.c @@ -104,7 +104,6 @@ dtype_form_prtype( return(old_prtype + (charset_coll << 16)); } -#ifdef UNIV_DEBUG /************************************************************************* Validates a data type structure. */ diff --git a/innobase/fil/fil0fil.c b/innobase/fil/fil0fil.c index a200116797a..6a13c1de6e3 100644 --- a/innobase/fil/fil0fil.c +++ b/innobase/fil/fil0fil.c @@ -2825,8 +2825,7 @@ fil_load_single_table_tablespaces(void) if (!dbpath) { dbpath = mem_alloc(dbpath_len); } else { - dbpath = mem_realloc(dbpath, dbpath_len, - __FILE__, __LINE__); + dbpath = ut_realloc(dbpath, dbpath_len); } } sprintf(dbpath, "%s/%s", fil_path_to_mysql_datadir, diff --git a/innobase/log/log0recv.c b/innobase/log/log0recv.c index a1e9ae8c288..7e57efcf9e1 100644 --- a/innobase/log/log0recv.c +++ b/innobase/log/log0recv.c @@ -1513,7 +1513,6 @@ skip_this_recv_addr: recv_sys_empty_hash(); } -#endif /* UNIV_HOTBACKUP */ #ifdef notdefined /*********************************************************************** |