mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-02 03:51:50 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
11558 commits 2793 branches 343 tags 1.7 GiB
Commit graph

11558 commits

This branch
This branch
All branches
Author SHA1 Message Date
unknown
80057de54e Merge miguel@bk-internal.mysql.com:/home/bk/mysql-4.1 
into hegel.local:/home/miguel/bk/mysql-4.1


sql/log_event.cc:
  Auto merged
 2004-03-16 15:55:51 -03:00
unknown
f2f9b653ee Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-rand-4.1


sql/item_func.cc:
  Auto merged
 2004-03-16 20:55:51 +02:00
unknown
9e1fdaf444 Merge bk-internal:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-03-16 19:55:50 +01:00
unknown
68c4a7672f Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 
into teton.kitebird.com:/home/paul/mysql-4.1


include/m_string.h:
  Auto merged
sql/share/czech/errmsg.txt:
  Auto merged
sql/share/danish/errmsg.txt:
  Auto merged
sql/share/dutch/errmsg.txt:
  Auto merged
sql/share/english/errmsg.txt:
  Auto merged
sql/share/estonian/errmsg.txt:
  Auto merged
sql/share/french/errmsg.txt:
  Auto merged
sql/share/german/errmsg.txt:
  Auto merged
sql/share/greek/errmsg.txt:
  Auto merged
sql/share/hungarian/errmsg.txt:
  Auto merged
sql/share/italian/errmsg.txt:
  Auto merged
sql/share/japanese/errmsg.txt:
  Auto merged
sql/share/korean/errmsg.txt:
  Auto merged
sql/share/norwegian-ny/errmsg.txt:
  Auto merged
sql/share/norwegian/errmsg.txt:
  Auto merged
sql/share/polish/errmsg.txt:
  Auto merged
sql/share/portuguese/errmsg.txt:
  Auto merged
sql/share/romanian/errmsg.txt:
  Auto merged
sql/share/russian/errmsg.txt:
  Auto merged
sql/share/serbian/errmsg.txt:
  Auto merged
sql/share/slovak/errmsg.txt:
  Auto merged
sql/share/spanish/errmsg.txt:
  Auto merged
sql/share/swedish/errmsg.txt:
  Auto merged
sql/share/ukrainian/errmsg.txt:
  Auto merged
 2004-03-16 12:55:49 -06:00
unknown
d2c30cd473 Merge bk-internal:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-03-16 19:55:49 +01:00
unknown
217a102fa8 ut0mem.h, ut0mem.c: 
Add ut_strdup
os0file.h, os0file.c:
  Add creation of directories


innobase/os/os0file.c:
  Add creation of directories
innobase/ut/ut0mem.c:
  Add ut_strdup
innobase/include/os0file.h:
  Add creation of directories
innobase/include/ut0mem.h:
  Add ut_strdup
 2004-03-16 20:55:49 +02:00
unknown
d626b52f7f Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into eagle.mysql.r18.ru:/home/vva/work/BUG_3160/mysql-4.1
 2004-03-16 22:55:48 +04:00
unknown
db57be391f roll back change in client/mysqladmin.c for bug 
#3160 '"mysqladmin password" doesn't work if --skip-grant-tables'
because we can't find out the mysql.user.host properly

now mysqladmin just print an advice error-message in this case


client/mysqladmin.c:
  roll back change for bug 
  #3160 '"mysqladmin password" doesn't work if --skip-grant-tables'
  because we can't find out the mysql.user.host properly
  
  now mysqladmin just print an advice error-message in this case
 2004-03-16 22:54:25 +04:00
unknown
f0587eeaa6 merge 
sql/sql_select.cc:
  Auto merged
 2004-03-16 20:23:07 +02:00
unknown
71c61a9ebe after review & some other fixes 
mysql-test/r/subselect.result:
  after merge fix
sql/item_func.cc:
  fixed used_tables_cache
sql/item_func.h:
  fixed used_tables_cache
sql/sql_select.cc:
  removed != and !
 2004-03-16 20:19:36 +02:00
unknown
5164e2911e Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.0 
into teton.kitebird.com:/home/paul/mysql-4.0
 2004-03-16 11:43:53 -06:00
unknown
e5fa42d9e8 Fix usage line. 2004-03-16 11:42:35 -06:00
unknown
7812cd8737 InnoDB: Remove some debug variables unless UNIV_SEARCH_PERF_STAT is defined 
innobase/btr/btr0sea.c:
  Remove variable btr_search_n_succ unless #ifdef UNIV_SEARCH_PERF_STAT
innobase/include/btr0sea.h:
  Remove variable btr_search_n_succ unless #ifdef UNIV_SEARCH_PERF_STAT
innobase/page/page0cur.c:
  Make page_rnd a static variable
  Remove variable page_cur_short_succ unless #ifdef UNIV_SEARCH_PERF_STAT
innobase/include/page0cur.h:
  Remove variable page_cur_short_succ unless #ifdef UNIV_SEARCH_PERF_STAT
 2004-03-16 18:55:44 +02:00
unknown
cb3cb957b2 uuid() tests 2004-03-16 16:35:53 +01:00
unknown
1f0b9d14c3 Merge bk-internal:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1


sql/sql_yacc.yy:
  Auto merged
 2004-03-16 16:35:52 +01:00
unknown
8242d1f19d Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-select_list-4.1
 2004-03-16 17:35:50 +02:00
unknown
6170af8c38 warnings removed 2004-03-16 16:35:49 +01:00
unknown
22da65838d merge 
sql/sql_yacc.yy:
  Auto merged
 2004-03-16 17:35:49 +02:00
unknown
e0f8b4fa3f Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-in-4.1
 2004-03-16 17:35:48 +02:00
unknown
1e2761e286 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-rand-4.1
 2004-03-16 17:35:47 +02:00
unknown
9c6b9eba65 EOVERFLOW moved to my_base.h - it is used not only in strtod.c 
error message corrected


include/my_base.h:
  EOVERFLOW moved to my_base.h - it is used not only in strtod.c
mysql-test/r/variables.result:
  error message corrected
mysql-test/t/variables.test:
  error message corrected
sql/item_func.cc:
  error message corrected
sql/sql_yacc.yy:
  error message corrected
strings/strtod.c:
  EOVERFLOW moved to my_base.h - it is used not only in strtod.c
 2004-03-16 16:35:47 +01:00
unknown
e1f771b23e Merge bk@gate:/home/bk/mysql-4.1 
into eagle.mysql.r18.ru:/home/vva/work/BUG_3160/mysql-4.1
 2004-03-16 19:35:46 +04:00
unknown
fe7159bb1b fixed bug #3160 '"mysqladmin password" doesn't work if --skip-grant-tables' 2004-03-16 19:30:22 +04:00
unknown
9d8dee2122 after merge fix 
mysql-test/r/subselect.result:
  changes in plans because we do not check nulls where nuul is impossible
  changed warning number
 2004-03-16 16:30:10 +02:00
unknown
1a886333d6 fix test during merge 
sql/item_subselect.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
 2004-03-16 16:30:09 +02:00
unknown
d69111f535 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-rand-4.1


sql/item_func.cc:
  Auto merged
 2004-03-16 16:30:08 +02:00
unknown
efecd744f9 Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
 2004-03-16 16:30:07 +02:00
unknown
250b4d40d6 Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into eagle.mysql.r18.ru:/home/vva/work/BUG_2082/mysql-4.1


client/mysqltest.c:
  Auto merged
 2004-03-16 18:30:06 +04:00
unknown
1910f4dd04 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1 
into eagle.mysql.r18.ru:/home/vva/work/BUG_2082/mysql-4.1
 2004-03-16 18:28:23 +04:00
unknown
d1be3943e5 fixed a lot of warnings in processing of 
Q_QUERY_VERTICAL/Q_QYERY_HORIZONTAL in client/mysqltest.c 
(changed switch to ?:)


client/mysqltest.c:
  fixed a lot of warnings in processing of 
  Q_QUERY_VERTICAL/Q_QYERY_HORIZONTAL (changed switch to ?:)
 2004-03-16 18:26:00 +04:00
unknown
8d2bb926fb InnoDB: Make btr_cur_unmark_extern_fields() a static function 
innobase/btr/btr0cur.c:
  Make btr_cur_unmark_extern_fields() a static function
innobase/include/btr0cur.h:
  Remove btr_cur_unmark_extern_fields()
 2004-03-16 15:26:33 +02:00
unknown
e424046a25 Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
 2004-03-16 15:14:12 +02:00
unknown
6c8a28288a Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into gluh.mysql.r18.ru:/home/gluh/mysql-4.1.clear
 2004-03-16 17:14:11 +04:00
unknown
825f5418a1 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-lower_case-4.1
 2004-03-16 15:14:11 +02:00
unknown
5de92fc753 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b2885
 2004-03-16 17:14:10 +04:00
unknown
222396165f Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-lower_case-4.1
 2004-03-16 15:14:10 +02:00
unknown
cff48963ea Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into eagle.mysql.r18.ru:/home/vva/work/BUG_2709/mysql-4.1


sql/sql_class.h:
  Auto merged
 2004-03-16 17:14:09 +04:00
unknown
55b1f98922 Fix for the bug #3118: Subquery and order by 2004-03-16 16:28:50 +04:00
unknown
e11a162bc4 Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/my/mysql-4.0
 2004-03-16 13:52:05 +02:00
unknown
771233cefb Increase max size of number of elements in key. This fixed a bug when using count(DISTINCT) with lot of distinct values and big 'max_heap_table_size' 2004-03-16 13:51:35 +02:00
unknown
26d0c4b1b4 Fix for #233 (final part) 
mysql-test/r/gis.result:
  test result added
mysql-test/t/gis.test:
  test case added
sql/field.h:
  now set_field_to_null can return -1
sql/field_conv.cc:
  now set_field_to_null* can return -1
 2004-03-16 14:59:22 +04:00
unknown
2bda791f27 InnoDB: Remove unused directory "cry" 
BitKeeper/deleted/.del-makefilewin~f993e50b7f057fde:
  Delete: innobase/cry/makefilewin
 2004-03-16 12:48:17 +02:00
unknown
2c5fb79089 InnoDB: remove debug code from non-debug version 
innobase/include/que0que.h:
  Remove que_graph_is_select()
  Make que_node_print_info() a static function
innobase/include/que0que.ic:
  Remove que_graph_is_select()
innobase/que/que0que.c:
  Remove que_node_print_info() unless #ifdef UNIV_DEBUG
 2004-03-16 12:18:02 +02:00
unknown
ded9313d32 Fix for bug#2586 Disallow global/session/local as structured var. instance names 2004-03-16 14:01:05 +04:00
unknown
9b6e7ac1af Merge marko@build.mysql.com:/home/bk/mysql-4.0 
into hundin.mysql.fi:/home/marko/l/mysql-4.0
 2004-03-16 11:49:13 +02:00
unknown
924255133b InnoDB: Remove log debug code when UNIV_LOG_DEBUG is not defined 
innobase/include/log0log.h:
  Remove debug variables unless #ifdef UNIV_LOG_DEBUG
innobase/include/log0log.ic:
  Remove log_check_log_recs() unless #ifdef UNIV_LOG_DEBUG
innobase/log/log0log.c:
  Remove log_debug_writes unless #ifdef UNIV_LOG_DEBUG
  log_io_complete_checkpoint(): Remove parameter; move debug output to log_io_complete(), the only caller
  Test log_debug_writes only #ifdef UNIV_LOG_DEBUG
innobase/log/log0recv.c:
  Test log_debug_writes only #ifdef UNIV_LOG_DEBUG
 2004-03-16 11:48:20 +02:00
unknown
f5b1078b1c Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into deer.(none):/home/hf/work/mysql-4.1.233


sql/item.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
 2004-03-16 13:27:25 +04:00
unknown
b0cfa449a6 Fix for #233 (the second one) 
sql/field.cc:
  Field_geom::store() returns -1 as a sign of fatal error
sql/field_conv.cc:
  set_field_to_null* return -1 now as the fatal error
sql/item.cc:
  no sign inversions needed
sql/opt_range.cc:
  -1 is the sign of fatal error now
sql/sql_base.cc:
  -1 is the fatal error
 2004-03-16 13:26:37 +04:00
unknown
c976eab11e Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b2885


sql/item_cmpfunc.cc:
  Auto merged
 2004-03-16 12:59:06 +04:00
unknown
cc5b1779c8 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.0 
into gluh.mysql.r18.ru:/home/gluh/Bugs/mysql-4.0.3067
 2004-03-16 11:33:36 +04:00