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

23664 commits

This branch
This branch
All branches
Author SHA1 Message Date
unknown
0473ce99fa Fix for bug #11314 (HAVING DEFAULT() hangs) 
mysql-test/t/func_default.test:
  test result fixed
sql/item.cc:
  code simplified using real_item() method,
  error returning added
 2005-06-14 17:43:51 +05:00
unknown
ff40f30349 Merge mysql.com:/home/bk/b6883-mysql-4.1 
into mysql.com:/home/bk/mysql-5.0
 2005-06-13 11:56:45 +02:00
unknown
50260639aa Merge mysql.com:/home/bkroot/mysql-5.0 into mysql.com:/home/bk/mysql-5.0 
BitKeeper/etc/logging_ok:
  auto-union
sql/sql_parse.cc:
  Auto merged
 2005-06-13 11:13:06 +02:00
unknown
8c4fe301d0 Merge mysql.com:/home/bkroot/mysql-4.1 
into mysql.com:/home/bk/b6883-mysql-4.1
 2005-06-13 11:12:10 +02:00
unknown
828c463361 merge 
ndb/src/common/logger/Logger.cpp:
  Auto merged
ndb/test/ndbapi/testBlobs.cpp:
  Auto merged
ndb/tools/restore/consumer_restore.cpp:
  Auto merged
 2005-06-13 10:42:12 +02:00
unknown
53a92c875b Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1-push
 2005-06-13 09:12:51 +02:00
unknown
861cecf3f5 Merge mysql.com:/home/jonas/src/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1-push
 2005-06-13 09:10:45 +02:00
unknown
06ab901376 bug#10294 - ndb restore with #concurrent transactions < parallelism 
Enable retry on startTransaction


ndb/tools/restore/consumer_restore.cpp:
  Enable retry on startTransaction==NULL
 2005-06-13 09:09:50 +02:00
unknown
b85705cce1 Merge 
mysql-test/Makefile.am:
  Auto merged
extra/yassl/taocrypt/include/modes.hpp:
  SCCS merged
 2005-06-11 15:48:11 +05:00
unknown
871977f26f Merge mysql.com:/home/jimw/my/mysql-4.1-clean 
into  mysql.com:/home/jimw/my/mysql-5.0-clean


client/mysql.cc:
  Auto merged
mysql-test/r/lowercase_table2.result:
  Auto merged
sql/mysqld.cc:
  Auto merged
 2005-06-10 20:11:20 -07:00
unknown
da4838a0f8 Merge jwinstead@production.mysql.com:my/mysql-4.1-10840 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-06-10 14:46:03 -07:00
unknown
9b7f8f7096 Merge mdk10.(none):/home/reggie/bk/mysql-4.1-base 
into mdk10.(none):/home/reggie/bk/mysql-5.0-base


myisam/mi_open.c:
  Auto merged
 2005-06-10 16:45:54 -05:00
unknown
0670a02ca2 Merge mysql.com:/home/jimw/my/mysql-4.1-9500 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-06-10 14:44:25 -07:00
unknown
d02e86de9e Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mdk10.(none):/home/reggie/bk/50test2
 2005-06-10 14:18:53 -05:00
unknown
41bb9bf94b Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mdk10.(none):/home/reggie/bk/41test3
 2005-06-10 14:17:32 -05:00
unknown
c2c0d6530f Bug #10947 mysqlshow wildcard failure on Windows 
client/mysqlshow.c:
  change to using mysql_real_escape_string
  Also, passing in length of from string "table" instead of to string "rows"
 2005-06-10 14:03:22 -05:00
unknown
4ecc9757b2 Merge bk-internal:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0


mysql-test/mysql-test-run.sh:
  Auto merged
 2005-06-10 20:23:37 +02:00
unknown
5d4a3fa518 Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-tmp 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0


mysql-test/r/ps_6bdb.result:
  Auto merged
mysql-test/r/ps_7ndb.result:
  Auto merged
 2005-06-10 20:12:45 +02:00
unknown
adb8df424b Merge bk-internal:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-06-10 18:40:33 +02:00
unknown
f83cd87c72 Merge bk-internal:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-06-10 18:11:40 +02:00
unknown
bea2fe879c Post-merge fix. 2005-06-10 18:06:12 +02:00
unknown
039a01a1eb bug#11225 - distinct.test fails 2005-06-10 18:02:19 +02:00
unknown
0a4600a1f3 Merge mysqldev@production.mysql.com:my/mysql-5.0-release 
into mysql.com:/home/svoj/devel/mysql/yassl-mysql-5.0
 2005-06-10 20:55:36 +05:00
unknown
2314cb1c56 Merge with latest yaSSL. 
Fixes IsAligned yaSSL assertion failure.


extra/yassl/include/buffer.hpp:
  Merge with latest yaSSL.
extra/yassl/include/factory.hpp:
  Merge with latest yaSSL.
extra/yassl/include/openssl/ssl.h:
  Merge with latest yaSSL.
extra/yassl/include/yassl_int.hpp:
  Merge with latest yaSSL.
extra/yassl/include/yassl_types.hpp:
  Merge with latest yaSSL.
extra/yassl/mySTL/stdexcept.hpp:
  Merge with latest yaSSL.
extra/yassl/src/buffer.cpp:
  Merge with latest yaSSL.
extra/yassl/src/socket_wrapper.cpp:
  Merge with latest yaSSL.
extra/yassl/src/ssl.cpp:
  Merge with latest yaSSL.
extra/yassl/taocrypt/include/block.hpp:
  Merge with latest yaSSL.
extra/yassl/taocrypt/include/hash.hpp:
  Merge with latest yaSSL.
extra/yassl/taocrypt/include/hmac.hpp:
  Merge with latest yaSSL.
extra/yassl/taocrypt/include/integer.hpp:
  Merge with latest yaSSL.
extra/yassl/taocrypt/include/modes.hpp:
  Merge with latest yaSSL.
extra/yassl/taocrypt/include/rsa.hpp:
  Merge with latest yaSSL.
extra/yassl/taocrypt/src/aes.cpp:
  Merge with latest yaSSL.
extra/yassl/taocrypt/src/dsa.cpp:
  Merge with latest yaSSL.
extra/yassl/taocrypt/src/hash.cpp:
  Merge with latest yaSSL.
extra/yassl/taocrypt/src/integer.cpp:
  Merge with latest yaSSL.
extra/yassl/taocrypt/src/md5.cpp:
  Merge with latest yaSSL.
extra/yassl/taocrypt/src/misc.cpp:
  Merge with latest yaSSL.
extra/yassl/taocrypt/src/ripemd.cpp:
  Merge with latest yaSSL.
extra/yassl/taocrypt/src/rsa.cpp:
  Merge with latest yaSSL.
extra/yassl/taocrypt/src/sha.cpp:
  Merge with latest yaSSL.
 2005-06-10 20:09:41 +05:00
unknown
4b0264dffd Merge mysql.com:/usr/local/bk/mysql-5.0 
into mysql.com:/home/pem/work/mysql-5.0


mysql-test/r/sp.result:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sp_rcontext.cc:
  Auto merged
 2005-06-10 16:56:34 +02:00
unknown
03949f8ce8 Post review and additional fix for BUG#10968: Stored procedures: crash if long loop. 
Fixed valgrind complaints. This fixes the memory leak problems for
  procedured, and partially for functions. There's still a leak involving
  results from functions that turned out to be too involved, so it will be
  fixed separately.


mysql-test/r/sp.result:
  Fixed some minor mistake (spotted while debugging).
mysql-test/t/sp.test:
  Fixed some minor mistake (spotted while debugging).
sql/item_func.cc:
  Moved Item_func_sp::cleanup() from item_func.h to ease debugging,
  and made a debug output come out right.
sql/item_func.h:
  Moved Item_func_sp::cleanup() to item_func.cc to ease debugging.
sql/sp_head.cc:
  Fixed valgrind problems with the previous memory leak fix (unit cleanup and
  putting result field in a differen mem_root), and removed prealloc flag from
  init_alloc_root() calls.
sql/sp_rcontext.cc:
  New mem_root pointer used for return fields from functions.
sql/sp_rcontext.h:
  New mem_root pointer used for return fields from functions.
 2005-06-10 16:14:01 +02:00
unknown
846d6be749 Merge obarnir@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/omer/source/src50_0609


BitKeeper/etc/logging_ok:
  auto-union
 2005-06-10 06:58:26 -07:00
unknown
d7a17f0d87 Merge mysql.com:/space/my/mysql-4.1-build 
into mysql.com:/space/my/mysql-5.0


mysql-test/Makefile.am:
  Auto merged
 2005-06-10 15:41:30 +02:00
unknown
7568579aab Merge mysql.com:/space/my/mysql-4.1-merge 
into mysql.com:/space/my/mysql-4.1-build
 2005-06-10 15:37:21 +02:00
unknown
d9813c8ed7 Merge mysql.com:/space/my/mysql-4.1-merge 
into mysql.com:/space/my/mysql-5.0.7-clone


mysql-test/Makefile.am:
  Auto merged
 2005-06-10 15:31:08 +02:00
unknown
9b294f596a - added missing files std_data/server-cert.pem and std_data/server-key.pem to make 
the SSL tests pass
 2005-06-10 15:30:16 +02:00
unknown
05b341943a ndb - 
Fix mem leak in testBlobs


ndb/test/ndbapi/testBlobs.cpp:
  Fix mem leak in testBlobs
 2005-06-10 15:13:44 +02:00
unknown
25203acbb7 os0sync.c, os0file.c: 
Apply Georg Richter's fixes to remove compilation errors on 64-bit Windows


innobase/os/os0file.c:
  Apply Georg Richter's fixes to remove compilation errors on 64-bit Windows
innobase/os/os0sync.c:
  Apply Georg Richter's fixes to remove compilation errors on 64-bit Windows
 2005-06-10 14:18:36 +03:00
unknown
19d66f2be1 mysql-test/mysql-test-run.sh 
don't start ndb cluster if no test uses it.


mysql-test/mysql-test-run.sh:
  don't start ndb cluster if no test uses it.
 2005-06-10 12:58:05 +02:00
unknown
bb9268b803 ndb - autotest 
Fix stack overflow in ndb_cpcd on amd64


ndb/src/common/logger/Logger.cpp:
  Fix stack overflow in ndb_cpcd on amd64
 2005-06-10 12:31:55 +02:00
unknown
f429d536e3 ndb - autotest 
script fixes for solaris


ndb/src/cw/cpcd/main.cpp:
  fix usage of load_defaults, as it does have a short option
ndb/test/run-test/make-config.sh:
  fix script wrt solaris
ndb/test/run-test/ndb-autotest.sh:
  fix script wrt solaris
 2005-06-10 10:22:32 +02:00
unknown
5ec8d08ad9 Merge bk-internal:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-06-10 09:15:43 +02:00
unknown
751089491c Update test results. type_varchar changed because the size of the 
key now gets changed along with the size of the field as long
as the original key had the same length as the length of the field
(or is unspecified originally, as in the test).


mysql-test/r/heap.result:
  Update results
mysql-test/r/type_varchar.result:
  Update results
 2005-06-09 21:20:34 -07:00
unknown
5b81b2dc87 Merge mysql.com:/home/jimw/my/mysql-5.0-10543 
into  mysql.com:/home/jimw/my/mysql-5.0-clean


sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/sql_table.cc:
  Auto merged
 2005-06-09 19:29:55 -07:00
unknown
a3fe140963 Merge mysql.com:/home/jimw/my/mysql-4.1-clean 
into  mysql.com:/home/jimw/my/mysql-5.0-clean


mysys/hash.c:
  Auto merged
sql/ha_heap.h:
  Auto merged
configure.in:
  Resolve conflicts from 4.1
mysql-test/r/heap.result:
  Update results
mysql-test/t/heap.test:
  Merge from 4.1
 2005-06-09 19:27:45 -07:00
unknown
728ef761d4 mysqld.dsp: 
Corrected typo


VC++Files/sql/mysqld.dsp:
  Corrected typo
 2005-06-10 04:09:42 +02:00
unknown
cec24f7746 Merge mysql.com:/home/jimw/my/mysql-4.1-11122 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-06-09 18:03:55 -07:00
unknown
72724bd84b Merge mysql.com:/home/jimw/my/mysql-4.1-10566 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-06-09 18:03:18 -07:00
unknown
a323d527d4 Merge mysql.com:/home/jimw/my/mysql-4.1-10931 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-06-09 18:02:04 -07:00
unknown
967256ebd7 Merge mysql.com:/home/jimw/my/mysql-4.1-clean 
into  mysql.com:/home/jimw/my/mysql-5.0-clean


mysql-test/r/ps_6bdb.result:
  Auto merged
include/my_global.h:
  SCCS merged
 2005-06-09 18:00:47 -07:00
unknown
3e5491e6e9 Merge bk-internal:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-06-09 23:00:04 +02:00
unknown
9fc8020866 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0 
into brian-akers-computer.local:/Users/brian/mysql/mysql-5.0


sql/sql_acl.cc:
  Auto merged
 2005-06-09 13:11:54 -07:00
unknown
eae4072e4b remove old libmysqld.a before assembling a new one 2005-06-09 22:04:05 +02:00
unknown
6809ceb718 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
 2005-06-09 21:54:06 +03:00
unknown
5643df2d58 Fixes in function modify_defaults_file(): 
- Removed unneccessary variables.
- Made a function of that part of code, which actually changes 
  the line under modifications.
- Fixed memory overrun problem with my_malloc. Too little space
  was reserved.
- Fixed problem in case, when new option was added at the end
  of the section. Before, it was added as the last line of the
  section, even if it left empty lines between.
- Fixed so that the configuration file is not saved unneccessarily,
  if no modifications are done. (file timestamp remains)
- This should fix (at least partially) problems described in
  Bug#10806
 2005-06-09 21:50:22 +03:00