VladPolskiy/MariaDB-open-code
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-15 22:37:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge polly.(none):/home/kaa/src/maint/mysql-5.0-maint

Browse Source 
into  polly.(none):/home/kaa/src/maint/mysql-5.1-maint


include/my_sys.h:
  Auto merged
libmysql/Makefile.shared:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/records.cc:
  Auto merged
sql/sql_array.h:
  Auto merged
sql/sql_help.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
storage/myisam/ft_boolean_search.c:
  Auto merged
storage/myisam/ft_nlq_search.c:
  Auto merged
storage/myisam/myisampack.c:
  Auto merged
mysys/mf_keycache.c:
  Manual merge.
mysys/mf_sort.c:
  Manual merge.
mysys/my_lib.c:
  Manual merge.
mysys/queues.c:
  Manual merge.
sql/sql_acl.cc:
  Manual merge.
sql/sql_table.cc:
  Manual merge.
storage/csv/ha_tina.cc:
  Manual merge.
storage/myisam/sort.c:
  Manual merge.
This commit is contained in:
unknown
2007-10-18 14:32:43 +04:00
parent 9014e8e951 85f9df837c
commit ddaecb2161
21 changed files with 63 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysys/queues.c
View File

@ -382,7 +382,7 @@ void queue_fix(QUEUE *queue)
make test_priority_queue
./test_priority_queue
Written by Mikael Ronstr<EFBFBD>m, 2005
Written by Mikael Ronström, 2005
*/
static uint num_array[1025];