mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-31 11:01:52 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
18895 commits 2788 branches 343 tags 1.7 GiB
Commit graph

18895 commits

This branch
This branch
All branches
Author SHA1 Message Date
unknown
97d30585c5 Fix for valgrind failures in get_mm_tree. 
mysql-test/r/join_outer.result:
  Corrected table names
mysql-test/t/join_outer.test:
  Corrected table names
sql/item_cmpfunc.h:
  Fix for valgrind failure (unitialized read Item_func_trig_cond->const_item_cache in get_mm_tree):
   Since get_mm_tree can be called for an instance of Item_func_trig_cond, make Item_func_trig_cond::const_item() return false.
   get_mm_tree will assume Item_func_trig_cond are unknown functions and will not build range access plans for them
 2005-01-18 23:50:42 +03:00
unknown
445672f0e2 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-fix-vg1
 2005-01-18 19:49:00 +03:00
unknown
70c1334fd8 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
 2005-01-18 17:48:59 +01:00
unknown
c3874f0214 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0
 2005-01-18 19:48:58 +03:00
unknown
4ef9335d2f bug #7981: SHOW GLOBAL STATUS crashes server(fix after review) 2005-01-18 19:47:39 +03:00
unknown
af3e6774d7 compile error: moved inline 
compile warning: changed eq_range -> eq_r
 2005-01-18 16:31:05 +01:00
unknown
eae9d15175 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
 2005-01-18 16:11:30 +01:00
unknown
d89f9108c9 compile bug fix 2005-01-18 16:10:37 +01:00
unknown
0e2a6843ce Fix for bug #7981: SHOW GLOBAL STATUS crashes server 2005-01-18 17:37:45 +03:00
unknown
6c176f0ff7 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-fix-vg1
 2005-01-18 16:48:50 +03:00
unknown
c207dfd994 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/mysql_src/mysql-5.0-clean
 2005-01-18 14:46:27 +01:00
unknown
539eb23408 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-fix-vg1
 2005-01-18 16:46:26 +03:00
unknown
2ec0d73025 slave.cc: 
5.0 has a different way of knowing if master is < 3.23.57


sql/slave.cc:
  5.0 has a different way of knowing if master is < 3.23.57
 2005-01-18 14:46:26 +01:00
unknown
2048cfcce2 Merge mysql.com:/home/kostja/work/mysql-4.1-root 
into mysql.com:/home/kostja/work/mysql-5.0-root


configure.in:
  Auto merged
 2005-01-18 16:46:26 +03:00
unknown
90f8fd9b5f Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/mysql_src/mysql-5.0-clean
 2005-01-18 14:46:25 +01:00
unknown
3842b1df35 compile error fix 2005-01-18 14:46:24 +01:00
unknown
1457163c97 Fix 'make distclean' goal. 2005-01-18 16:23:10 +03:00
unknown
490d5530a8 Post-review fixes for the previous cset. No code behavior changes. 2005-01-18 16:16:55 +03:00
unknown
381659fff5 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/mysql_src/mysql-4.1-clean
 2005-01-18 14:07:47 +01:00
unknown
5c594201a5 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0


client/mysql.cc:
  Auto merged
myisam/mi_open.c:
  Auto merged
 2005-01-18 13:55:39 +01:00
unknown
484dd6e516 Merge mysql.com:/space/my/mysql-4.1 into mysql.com:/space/my/mysql-5.0 2005-01-18 12:09:27 +01:00
unknown
2c6b02ca32 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/space/my/mysql-4.1
 2005-01-18 11:41:51 +01:00
unknown
f531321491 Merge mysql.com:/home/mysql_src/mysql-4.1-clean 
into mysql.com:/home/mysql_src/mysql-5.0-clean


sql/slave.cc:
  Auto merged
 2005-01-18 11:06:37 +01:00
unknown
813e748d4f Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/mysql_src/mysql-4.1-clean
 2005-01-18 10:24:25 +01:00
unknown
fd48151791 Merge mysql.com:/usr/home/bar/mysql-4.1 
into mysql.com:/usr/home/bar/mysql-5.0


mysql-test/r/ctype_utf8.result:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
 2005-01-18 10:45:09 +04:00
unknown
ec0daa744f #7874: CONCAT() gives wrong results mixing latin1 field and utf8 string literals 
We should not overwrite res if it is returned from a const item.
 2005-01-18 10:42:29 +04:00
unknown
a8afc13792 After merge fixes 
mysql-test/r/order_by.result:
  After merge fix
mysql-test/t/symlink.test:
  Comments
 2005-01-18 05:07:22 +02:00
unknown
7aecbab85c Merge with global tree 
BitKeeper/etc/logging_ok:
  auto-union
client/mysql.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
myisam/mi_open.c:
  Auto merged
mysql-test/r/order_by.result:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
mysql-test/t/order_by.test:
  Merge
sql/sql_lex.cc:
  Merge
sql/sql_yacc.yy:
  Use local copy
 2005-01-18 04:03:26 +02:00
unknown
985805ce6a Merge mysql.com:/home/my/mysql-4.0 into mysql.com:/home/my/mysql-4.1 
sql/filesort.cc:
  Auto merged
 2005-01-18 03:52:15 +02:00
unknown
96f64b4440 Fixed new bug that caused symlink test to fail 
mysys/my_symlink.c:
  More debugging
 2005-01-18 03:49:39 +02:00
unknown
896cdbe5df Anoter fix for moved IO_CACHE object 2005-01-18 02:04:41 +02:00
unknown
8f04aaae87 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-valgrind-4.1
 2005-01-18 01:11:02 +02:00
unknown
608729f711 Fix for BUG#7965 "Slave_IO_State Stuck at 'Checking Master Version'": 
Working around hang of master < 3.23.50 on SELECT @@unknown_var
(to enable 3.23.49->4.1.10 replication)


sql/slave.cc:
  Working around hang of master < 3.23.50 on SELECT @@unknown_var
  (to enable 3.23.49->4.1.10 replication)
 2005-01-17 21:26:14 +01:00
unknown
5847d10712 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1 
into bob.(none):/home/reggie/bk/mysql-4.1


BitKeeper/etc/logging_ok:
  auto-union
client/mysql.cc:
  Auto merged
 2005-01-17 14:08:36 -06:00
unknown
f6f90e7dc1 Bug #7966 query cache doesn't work properly with batch statements 
sql_lex.cc:
  Set query to not cacheable if we are using multistatements and there are multiple statements in this query


sql/sql_lex.cc:
  Set query to not cacheable if we are using multistatements and there are multiple statements in this query
 2005-01-17 13:40:36 -06:00
unknown
3392ee95f5 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/space/my/mysql-4.1
 2005-01-17 20:33:33 +01:00
unknown
0b076d2c1f Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 
into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1
 2005-01-17 12:38:17 -06:00
unknown
e24e848be3 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/space/my/mysql-4.1
 2005-01-17 19:09:33 +01:00
unknown
5854c32283 Merge mysql.com:/space/my/mysql-4.0 
into mysql.com:/space/my/mysql-4.1-build


Build-tools/Do-pkg:
  Auto merged
 2005-01-17 18:53:10 +01:00
unknown
f9bcb9ab5c backported from 5.0 patch initialization of main select for commands where subqueries are possible 2005-01-17 19:52:07 +02:00
unknown
2524517978 Allow "classic" builds (= without InnoDB) by eliminating an "unresolved reference" (bug#7961). 
sql/mysqld.cc:
  To allow builds without InnoDB ("classic"), the reference to 'innobase_use_checksums' must be guarded by an appropriate '#ifdef' (bug#7961).
 2005-01-17 18:08:07 +01:00
unknown
94249ec86d Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 
into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1
 2005-01-17 10:47:43 -06:00
unknown
57f7c497cf - Enabled the handling of architecture extensions e.g. "-64bit" when building 
Mac OS X PKGs with Do-pkg


Build-tools/Do-pkg:
  - enable handling of architecture extensions e.g. "-64bit"
 2005-01-17 17:22:17 +01:00
unknown
4fc1801d08 Fixed memory leak in handle_local_infile() 
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
 2005-01-17 19:21:01 +03:00
unknown
81c97e42f0 Fix for BUG#7331 merged manually from 4.1. 
mysql-test/r/order_by.result:
  Test result for BUG#7331.
mysql-test/t/order_by.test:
  Test for BUG#7331.
sql/sql_select.cc:
  Fix for BUG#7331.
 2005-01-17 17:19:33 +02:00
unknown
e0cbfe7658 Merge mysql.com:/home/timka/mysql/src/4.1-virgin 
into mysql.com:/home/timka/mysql/src/4.1-bug-7331
 2005-01-17 15:46:44 +02:00
unknown
404fc5aca0 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
 2005-01-17 12:53:50 +01:00
unknown
a05bacb06e Bug#7937 2005-01-17 12:29:43 +01:00
unknown
f1328f1337 Merge mysql.com:/home/timka/mysql/src/4.1-virgin 
into mysql.com:/home/timka/mysql/src/4.1-bug-7331


sql/sql_select.cc:
  Auto merged
 2005-01-17 12:41:59 +02:00
unknown
758769eef4 user_var.result: 
after merge fix


mysql-test/r/user_var.result:
  after merge fix
 2005-01-17 13:58:16 +04:00