diff options
author | unknown <monty@narttu.mysql.fi> | 2003-04-03 13:08:28 +0300 |
---|---|---|
committer | unknown <monty@narttu.mysql.fi> | 2003-04-03 13:08:28 +0300 |
commit | 7bc65cd8233a897e806a2d94145f794cd82fc254 (patch) | |
tree | 0365c7e0ef038809d3d327a8ba3b4040b47854e2 /sql/ha_myisam.cc | |
parent | f5feb33773cfbce726342e00bea5c436a5553554 (diff) | |
parent | 2090bc6e4347fe69189302a5b520ae3051785746 (diff) | |
download | mariadb-git-7bc65cd8233a897e806a2d94145f794cd82fc254.tar.gz |
Merge narttu.mysql.fi:/my/mysql-3.23 into narttu.mysql.fi:/my/mysql-4.0
mysys/my_vsnprintf.c:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/log.cc:
Auto merged
Diffstat (limited to 'sql/ha_myisam.cc')
-rw-r--r-- | sql/ha_myisam.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/ha_myisam.cc b/sql/ha_myisam.cc index fd1a115ddff..a1fb09d049b 100644 --- a/sql/ha_myisam.cc +++ b/sql/ha_myisam.cc @@ -1037,7 +1037,7 @@ int ha_myisam::create(const char *name, register TABLE *table_arg, &keydef, table_arg->keys*sizeof(MI_KEYDEF), &keyseg, ((table_arg->key_parts + table_arg->keys) * sizeof(MI_KEYSEG)), - 0))) + NullS))) DBUG_RETURN(1); pos=table_arg->key_info; |