diff options
| author | Konstantin Osipov <kostja@sun.com> | 2009-12-02 18:33:51 +0300 |
|---|---|---|
| committer | Konstantin Osipov <kostja@sun.com> | 2009-12-02 18:33:51 +0300 |
| commit | 7585067a47d2c745c6a8ddc2a06fdbbd4611edec (patch) | |
| tree | 8f7409984e9b370e120e52c77e5b83cc52092b51 /sql | |
| parent | 3104af49cdd1a3c041948b0da17558c49c3edb49 (diff) | |
| download | mariadb-git-7585067a47d2c745c6a8ddc2a06fdbbd4611edec.tar.gz | |
Backport of:
----------------------------------------------------------
revno: 2630.4.30
Konstantin Osipov 2008-06-11
Fix a potential cause of test failures.
sql/sql_base.cc:
0 may not be equal to (char*) 0 on 64 bit pointer/32 bit int machines.
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_base.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc index 61c071d3430..b1d2ec41367 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -2934,7 +2934,7 @@ Locked_tables_list::init_locked_tables(THD *thd) &db, db_len, &table_name, table_name_len, &alias, alias_len, - 0)) + NullS)) { unlock_locked_tables(0); return TRUE; |