1
0
mirror of https://github.com/MariaDB/server.git synced 2025-09-02 09:41:40 +03:00
Commit Graph

28021 Commits

Author SHA1 Message Date
unknown
726170e8c4 mysql.spec.sh:
For 5.x, always compile with --with-big-tables
  Copy the config.log file to location outside
  the build tree


support-files/mysql.spec.sh:
  For 5.x, always compile with --with-big-tables
  Copy the config.log file to location outside
  the build tree
2005-10-14 22:49:53 +02:00
unknown
f242afb0c7 mysql.spec.sh:
Removed unneeded/obsolte configure options
  Added archive engine to standard server
  Removed the embedded server from experimental server
  Changed suffix "-Max" => "-max"
  Changed comment string "Max" => "Experimental"


support-files/mysql.spec.sh:
  Removed unneeded/obsolte configure options
  Added archive engine to standard server
  Removed the embedded server from experimental server
  Changed suffix "-Max" => "-max"
  Changed comment string "Max" => "Experimental"
2005-10-14 22:11:52 +02:00
unknown
171bf93839 Use Field_longlong::store(longlong nr, bool unsigned_val) for ulonglong values
instead of Field_longlong::store(double nr).
2005-10-14 19:12:54 +05:00
unknown
326544b8ed Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/home/mysql_src/mysql-4.1
2005-10-14 15:35:57 +02:00
unknown
5dfd72a038 fix for Valgrind errors: query_id needs to be inited early (already fixed in 5.0 by Konstantin) and so does client_capabilities (not fixed in 5.0);
because they are used by net_printf() and push_warning(), which can be called if check_connection() fails.


sql/mysqld.cc:
  not needed anymore
sql/repl_failsafe.cc:
  not needed anymore
sql/slave.cc:
  not needed anymore
sql/sql_class.cc:
  query_id needs to be inited early (already fixed in 5.0 by Konstantin) and so does client_capabilities (not fixed in 5.0);
  because they are used by net_printf() and push_warning(), which may be called if check_connection() fails.
2005-10-14 15:34:52 +02:00
unknown
ee74d3a54a Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-10-14 14:14:47 +02:00
unknown
83afcc9c6a Change the "Password" column type for the Perl suite running the tests. bug#14023
mysql-test/lib/init_db.sql:
  Data type of the "Password" column has been changed in "mysql_create_system_tables",
  this must be reflected here (until they are united). bug#14023
2005-10-14 13:35:36 +02:00
unknown
81766b9ab7 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-10-14 11:52:52 +02:00
unknown
e268eaca5d Merge mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0


sql/ha_ndbcluster.cc:
  merge
2005-10-14 11:28:01 +02:00
unknown
e2cd597dca Fix for Bug #13961 Triggers on tables with auto_increment insert bogus values into table (clean version) 2005-10-14 11:23:02 +02:00
unknown
9e3df6cc17 mysql.cc:
After merge fix.


client/mysql.cc:
  After merge fix.
2005-10-14 14:19:15 +05:00
unknown
344a892b8d Merge mysql.com:/usr/home/bar/mysql-4.1
into  mysql.com:/usr/home/bar/mysql-5.0


client/mysql.cc:
  after merge fix.
2005-10-14 14:17:15 +05:00
unknown
91018ea6d4 configure.in:
- reverted NDB version number, too


configure.in:
  - reverted NDB version number, too
2005-10-14 11:11:19 +02:00
unknown
08bf55c71f Merge mysql.com:/usr/home/bar/mysql-4.1.b13487
into  mysql.com:/usr/home/bar/mysql-4.1


client/mysql.cc:
  Auto merged
2005-10-14 14:07:22 +05:00
unknown
b395e11c9d - revert version number in configure.in to 5.0.15
configure.in:
  - revert version number to 5.0.15
2005-10-14 11:03:40 +02:00
unknown
40157b14e0 Merge mysql.com:/usr/home/bar/mysql-4.1
into  mysql.com:/usr/home/bar/mysql-5.0


strings/ctype-latin1.c:
  Auto merged
2005-10-14 14:02:21 +05:00
unknown
05414133af Merge mysql.com:/usr/home/bar/mysql-4.1.b13145
into  mysql.com:/usr/home/bar/mysql-4.1


mysql-test/r/ctype_latin1.result:
  Auto merged
mysql-test/t/ctype_latin1.test:
  Auto merged
2005-10-14 13:57:38 +05:00
unknown
40219cd14d Merge mysql.com:/data0/mysqldev/my/mysql-5.0
into mysql.com:/data0/mysqldev/my/mysql-5.0-release
2005-10-14 10:54:59 +02:00
unknown
7fa49e77f4 Merge abarkov@bk-internal:/home/bk/mysql-5.0
into  mysql.com:/usr/home/bar/mysql-5.0.char1
2005-10-14 13:50:38 +05:00
unknown
800061bdb0 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/my/mysql-5.0
2005-10-14 11:45:20 +03:00
unknown
91afe31fe0 Fixed compile errors on windows
VC++Files/test1/mysql_thr.c:
  Fixed typo
VC++Files/thr_test/thr_test.c:
  Fixed typo
sql/log_event.cc:
  Removed compiler warning
  Fixed compile error on windows
2005-10-14 11:44:46 +03:00
unknown
04d52fab7a Merge mysql.com:/usr/home/bar/mysql-5.0.b12547
into  mysql.com:/usr/home/bar/mysql-5.0.char1


strings/ctype-cp932.c:
  Auto merged
2005-10-14 13:37:19 +05:00
unknown
92f80fbb86 ctype_utf8.result:
after merge fix
  ,


mysql-test/r/ctype_utf8.result:
  after merge fix
  ,
2005-10-14 13:24:21 +05:00
unknown
df3e57f51f Merge mysql.com:/usr/home/bar/mysql-4.1.b13751
into  mysql.com:/usr/home/bar/mysql-5.0.char1


mysql-test/t/ctype_utf8.test:
  Auto merged
sql/item_func.cc:
  Auto merged
mysql-test/r/ctype_utf8.result:
  after merge fix.
sql/sql_update.cc:
  discarding this change in 5.0.
2005-10-14 12:07:13 +05:00
unknown
9cc7d75ea3 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/usr/home/bar/mysql-4.1.b13751
2005-10-14 11:54:10 +05:00
unknown
7ec9653938 Had to revert change, because it breaks compilation for
Netware. Hartmut informed about this.
2005-10-14 09:32:30 +03:00
unknown
d184778ec7 Merge abarkov@bk-internal:/home/bk/mysql-5.0
into  mysql.com:/usr/home/bar/mysql-5.0.char1
2005-10-14 10:49:32 +05:00
unknown
babdedd52f Small fixes for Netware.
netware/mysql_test_run.c:
  Fixed typo.
netware/pack_isam.def:
  Added screenname.
scripts/make_binary_distribution.sh:
  Fixed mistake in merge.
2005-10-14 08:45:41 +03:00
unknown
1e11d278c3 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/usr/home/bar/mysql-4.1.b13751
2005-10-14 09:09:25 +05:00
unknown
2aa10d2464 Merge abarkov@bk-internal:/home/bk/mysql-5.0
into  mysql.com:/usr/home/bar/mysql-5.0.char1
2005-10-14 08:20:02 +05:00
unknown
ee52c9d6c2 Fix link failure on OS X
ndb/src/mgmsrv/Services.cpp:
  Remove explicit instantiation to fix link failure on OS X
2005-10-13 22:17:47 -04:00
unknown
4303114e34 .del-mysqlwatch.vcproj~91c7061bceb731ad:
Delete: VC++Files/mysqlwatch/mysqlwatch.vcproj
.del-mysqlshutdown.vcproj~b956e6769cf4fe76:
  Delete: VC++Files/mysqlshutdown/mysqlshutdown.vcproj
.del-pack_isam_ia64.dsp~6172aec32da6de5d:
  Delete: VC++Files/pack_isam/pack_isam_ia64.dsp
.del-pack_isam.vcproj~82b3c430c0c623f2:
  Delete: VC++Files/pack_isam/pack_isam.vcproj
.del-pack_isam.dsp~1f236852e0bcc13d:
  Delete: VC++Files/pack_isam/pack_isam.dsp
.del-isamchk_ia64.dsp~abb473e7d3025305:
  Delete: VC++Files/isamchk/isamchk_ia64.dsp
.del-isamchk.vcproj~19838e6a73320284:
  Delete: VC++Files/isamchk/isamchk.vcproj
.del-isamchk.dsp~6349525f4cf767a4:
  Delete: VC++Files/isamchk/isamchk.dsp
.del-isam_ia64.dsp~e6dffc47e113891:
  Delete: VC++Files/isam/isam_ia64.dsp
.del-isam.vcproj~53282403e12348c3:
  Delete: VC++Files/isam/isam.vcproj
.del-isam.dsw~c64a212cb134161a:
  Delete: VC++Files/isam/isam.dsw
.del-isam.dsp~9c26247a621084bf:
  Delete: VC++Files/isam/isam.dsp
mysql.sln:
  Removed isam from Visual Studio .Net project files, accidently merged over from 4.1


VC++Files/mysql.sln:
  Removed isam from Visual Studio .Net project files, accidently merged over from 4.1
BitKeeper/deleted/.del-isam.dsp~9c26247a621084bf:
  Delete: VC++Files/isam/isam.dsp
BitKeeper/deleted/.del-isam.dsw~c64a212cb134161a:
  Delete: VC++Files/isam/isam.dsw
BitKeeper/deleted/.del-isam.vcproj~53282403e12348c3:
  Delete: VC++Files/isam/isam.vcproj
BitKeeper/deleted/.del-isam_ia64.dsp~e6dffc47e113891:
  Delete: VC++Files/isam/isam_ia64.dsp
BitKeeper/deleted/.del-isamchk.dsp~6349525f4cf767a4:
  Delete: VC++Files/isamchk/isamchk.dsp
BitKeeper/deleted/.del-isamchk.vcproj~19838e6a73320284:
  Delete: VC++Files/isamchk/isamchk.vcproj
BitKeeper/deleted/.del-isamchk_ia64.dsp~abb473e7d3025305:
  Delete: VC++Files/isamchk/isamchk_ia64.dsp
BitKeeper/deleted/.del-pack_isam.dsp~1f236852e0bcc13d:
  Delete: VC++Files/pack_isam/pack_isam.dsp
BitKeeper/deleted/.del-pack_isam.vcproj~82b3c430c0c623f2:
  Delete: VC++Files/pack_isam/pack_isam.vcproj
BitKeeper/deleted/.del-pack_isam_ia64.dsp~6172aec32da6de5d:
  Delete: VC++Files/pack_isam/pack_isam_ia64.dsp
BitKeeper/deleted/.del-mysqlshutdown.vcproj~b956e6769cf4fe76:
  Delete: VC++Files/mysqlshutdown/mysqlshutdown.vcproj
BitKeeper/deleted/.del-mysqlwatch.vcproj~91c7061bceb731ad:
  Delete: VC++Files/mysqlwatch/mysqlwatch.vcproj
2005-10-14 03:19:22 +02:00
unknown
4083d45644 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
into  krsna.patg.net:/home/patg/mysql-build/mysql-5.0
2005-10-13 17:34:42 -07:00
unknown
5474a2407c Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-10-14 01:54:01 +02:00
unknown
178155bbae configure.in:
New version 5.0.16


configure.in:
  New version 5.0.16
2005-10-14 01:46:26 +02:00
unknown
2a49fa62a0 WL#2835: Base64 mysys functions
mysys/Makefile.am:
  Added Base64 to mysys
ndb/config/type_ndbapi.mk.am:
  NDBAPI now dependent on mysys
ndb/config/type_util.mk.am:
  NDB UTIL now dependent on mysys
ndb/src/common/util/Makefile.am:
  Remove Base64
ndb/src/common/util/Parser.cpp:
  Removed dead code
ndb/src/mgmapi/mgmapi.cpp:
  Use of mysys Base64
ndb/src/mgmsrv/Services.cpp:
  Use of mysys Base64
include/base64.h:
  Making Base64 mysys-style
mysys/base64.c:
  Making Base64 mysys-compatible
2005-10-14 01:14:23 +02:00
unknown
ca541b9ce1 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.0
into moonbone.local:/work/13855-bug-4.0-mysql
2005-10-14 03:12:32 +04:00
unknown
96e7df0cc3 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
into  krsna.patg.net:/home/patg/mysql-build/mysql-5.0
2005-10-13 15:41:52 -07:00
unknown
e84f7939ec Fix calculation of TIMESTAMPDIFF() of months and years. (Bug #13534)
mysql-test/r/func_time.result:
  Add new results
mysql-test/t/func_time.test:
  Add new regression test
sql/item_timefunc.cc:
  Fix calculation of years and months in TIMESTAMPDIFF().
2005-10-13 15:32:31 -07:00
unknown
4f204c528e configure.in:
rc => GA


configure.in:
  rc => GA
2005-10-14 00:03:30 +02:00
unknown
acb50e59e2 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/my/mysql-5.0
2005-10-14 00:29:33 +03:00
unknown
0390de8672 Fix bug #13855 select distinct with group by caused server crash
DISTINCT wasn't optimized away and caused creation of tmp table in wrong
case. This result in integer overrun and running out of memory.

Fix backported from 4.1. Now if optimizer founds that in result be only 1
row it removes distinct.


sql/sql_select.cc:
  Fix bug #13855 select distinct with group by caused server crash
mysql-test/r/select.result:
  Test case for bug#13855 select distinct with group by caused server crash
mysql-test/t/select.test:
   Test case for bug#13855 select distinct with group by caused server crash
2005-10-14 01:22:24 +04:00
unknown
b896d3343b Move handling of suffix_length from strnxfrm_bin() to filesort to ensure proper sorting of all kind of binary objects
field::sort_key() now adds length last for varbinary/blob
VARBINARY/BLOB is now sorted by filesort so that shorter strings comes before longer ones
Fixed issues in test cases from last merge



mysql-test/r/select.result:
  Change column name in test to get GROUP BY to use the alias
mysql-test/r/type_blob.result:
  Test BLOB and VARCHAR sorting
mysql-test/t/select.test:
  Change column name in test to get GROUP BY to use the alias
  Drop used tables at start of test
  Don't use table names 'a', 'b' or 'c'
mysql-test/t/type_blob.test:
  Test BLOB and VARCHAR sorting
sql/field.cc:
  Store length last in VARBINARY() and BLOB() columns to get shorter strings sorted before longer onces
sql/field.h:
  Added method 'sort_length()' to allow one to have length bytes last for VARBINARY/BLOB to get these to sort properly
sql/filesort.cc:
  Use 'sort_length()' instead of 'pack_length()' to get length of field.
  Store suffix_length last for varbinary (blob) objects.
  The above ensures that BLOB/VARBINARY are correctly sorted (shorter strings before longer ones)
sql/sql_class.h:
  Added sort suffix length (to get varbinary/blob to sort correctly)
sql/sql_select.cc:
  Use sort_length() instead of pack_lengths()
strings/ctype-bin.c:
  Don't let strnxfrm_bin store length last
  Better to do it in MySQL field object to ensure it's done properly for all cases
2005-10-14 00:04:52 +03:00
unknown
0dc3105ada Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into  sanja.is.com.ua:/home/bell/mysql/bk/work-qc-4.1
2005-10-14 00:04:40 +03:00
unknown
0069549021 - set 'updating' in both tables list if we have two of them (because of subquery) (BUG#13236)
- fixed test


mysql-test/r/rpl_multi_update2.result:
  fixed setting/reseting environment
  multi-update with subquery added
mysql-test/t/rpl_multi_update2.test:
  fixed setting/reseting environment
  multi-update with subquery added
sql/sql_update.cc:
  set 'updating' in both tables list if we have two of them (because of subquery)
2005-10-14 00:02:38 +03:00
unknown
365472f6e1 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
into  krsna.patg.net:/home/patg/mysql-build/mysql-5.0
2005-10-13 13:47:11 -07:00
unknown
b52b67eb58 BUG# 13146
Re-application of patch to clean 5.0 tree. Fixed issue with ANSI quotes 
when dumping triggers


client/mysqldump.c:
  BUG# 13146
  
  Re-application of fix to clean 5.0 tree. 
  
  Added comments for quote_name, moved declarations into proper order, 
  unset MASK_ANSI_QUOTES flag in opt_compatible_mode global when dumping
  triggers
mysql-test/r/mysqldump.result:
  BUG# 13146
  
  New test results
mysql-test/t/mysqldump.test:
  BUG# 13146
  
  New test
2005-10-13 13:42:56 -07:00
unknown
eb8be3261d Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
2005-10-13 22:29:50 +02:00
unknown
74121f4648 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/space/my/mysql-4.0
2005-10-13 22:29:29 +02:00
unknown
5eac62c7e4 Merge mysql.com:/space/my/mysql-4.1 into mysql.com:/space/my/mysql-5.0
support-files/mysql.spec.sh:
  Auto merged
2005-10-13 22:16:24 +02:00