database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge remote-tracking branch 'mysql/5.5' into bb-5.5-merge @ mysql-5.5.42

Browse Source
This commit is contained in:
Sergei Golubchik
2015-02-11 23:50:40 +01:00
parent 63108dc9d2 3ee8aa216d
commit 8e80f91fa3
54 changed files with 1215 additions and 526 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/udf_example.c
View File

@ -1,5 +1,5 @@
/*
Copyright (c) 2000, 2010, Oracle and/or its affiliates.
Copyright (c) 2000, 2014, Oracle and/or its affiliates.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@ -296,9 +296,12 @@ char *metaphon(UDF_INIT *initid __attribute__((unused)),
if (!word) /* Null argument */
{
/* The length is expected to be zero when the argument is NULL. */
assert(args->lengths[0] == 0);
*is_null=1;
return 0;
}
w_end=word+args->lengths[0];
org_result=result;