mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-06 23:25:34 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge mysql.com:/home/jimw/my/mysql-4.1-clean

Browse source 
into  mysql.com:/home/jimw/my/mysql-5.0-clean


mysql-test/my_manage.c:
  Auto merged
mysql-test/mysql_test_run_new.c:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
mysql-test/r/variables.result:
  Resolve conflicts
mysql-test/t/variables.test:
  Resolve conflicts
sql/sql_acl.cc:
  Resolve conflicts
strings/ctype-simple.c:
  Resolve conflicts
strings/ctype-ucs2.c:
  Resolve conflicts
This commit is contained in:
unknown 2005-10-19 13:47:05 -07:00
commit 3d53c870d3
9 changed files with 39 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
strings/ctype-ucs2.c
View file

@ -1063,7 +1063,7 @@ int my_ll10tostr_ucs2(CHARSET_INFO *cs __attribute__((unused)),
while (long_val != 0)
{
long quo= long_val/10;
*--p = '0' + (char)(long_val - quo*10);
*--p = (char) ('0' + (long_val - quo*10));
long_val= quo;
}