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

Merge magare.gmz:/home/kgeorge/mysql/autopush/B29325-5.0-opt

Browse Source 
into  magare.gmz:/home/kgeorge/mysql/work/B29325-merge-5.1-opt


client/mysql.cc:
  Auto merged
include/my_base.h:
  Auto merged
mysql-test/r/ctype_collate.result:
  Auto merged
mysql-test/r/gis-rtree.result:
  Auto merged
mysql-test/t/gis-rtree.test:
  Auto merged
storage/myisam/mi_create.c:
  Auto merged
strings/ctype-simple.c:
  Auto merged
mysys/my_conio.c:
  5.0-opt -> 5.1.-opt merge
storage/myisam/sp_key.c:
  5.0-opt -> 5.1.-opt merge
This commit is contained in:
unknown
2007-07-11 12:44:49 +03:00
parent 2ca32b764b 3881f2a24d
commit ecbd9efeb0
9 changed files with 95 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
strings/ctype-simple.c
View File

@ -185,7 +185,7 @@ int my_strnncollsp_simple(CHARSET_INFO * cs, const uchar *a, size_t a_length,
}
for (end= a + a_length-length; a < end ; a++)
{
if (*a != ' ')
if (map[*a] != ' ')
return (map[*a] < ' ') ? -swap : swap;
}
}