Commit graph

575 commits

Author SHA1 Message Date
unknown
a65f5081ba Add QUICK as mysql-recover option in mysqld --help
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2003-09-05 14:44:21 +02:00
unknown
fc4c66d254 Change set for gcc patch on OpenUNIX and UnixWare SCO is the OS vendor.
configure.in:
  Changes for UnixWare 7.1.X andOpenUNIX 8.0.0 to allow gcc.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2003-09-03 08:07:58 -06:00
unknown
54fa39256b removed stale comment
13:58 <monty> konstantin: the comment is missplaced (probably after merge).
          You can remove it


sql/sql_parse.cc:
  removed stale comment
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2003-08-29 14:38:39 +04:00
unknown
7d6f474777 Bootstrap:
Corrections to Bootstrap for --win-dist



Build-tools/Bootstrap:
  Corrections to for --win-dist
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2003-08-13 02:13:45 +02:00
unknown
8cc7d7d516 Merge mysql.com:/home/wax/mysql/mysql-4.0
into mysql.com:/home/wax/mysql/mysql-4.0chsize


BitKeeper/etc/logging_ok:
  auto-union
2003-08-10 05:40:16 +06:00
unknown
5f016696ec openssl_1.result, openssl_1.test:
Aligned test with regenerated SSL certs
Many files:
  Regenerated expired certificates


SSL/cacert.pem:
  Regenerated expired certificates
SSL/client-cert.pem:
  Regenerated expired certificates
SSL/client-key.pem:
  Regenerated expired certificates
SSL/client-req.pem:
  Regenerated expired certificates
SSL/server-cert.pem:
  Regenerated expired certificates
SSL/server-key.pem:
  Regenerated expired certificates
SSL/server-req.pem:
  Regenerated expired certificates
mysql-test/t/openssl_1.test:
  Aligned test with regenerated SSL certs
mysql-test/r/openssl_1.result:
  Aligned test with regenerated SSL certs
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2003-08-07 15:20:15 +02:00
unknown
ff5372592d Merge mysql.com:/home/wax/mysql/mysql-4.0
into mysql.com:/home/wax/mysql/mysql-4.0chsize


BitKeeper/etc/logging_ok:
  auto-union
2003-07-31 04:17:42 +06:00
unknown
d4494c9f21 BUG
Add functions SetFilePointerEx and SetEndOfFile for huge 
tables instead of chsize
Move chsize to right place


include/config-win.h:
  add HAVE_SETFILEPOINTER
mysys/my_chsize.c:
  Add functions SetFilePointerEx and SetEndOfFile for huge tables
  Move chsize to right place
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2003-07-31 04:14:36 +06:00
unknown
880088ba50 Fix security bug. mysqld server without ssl support was completly
ignorant about ssl_type attribute


sql/sql_acl.cc:
  Now acl_getroot() honors ssl_type attribute even if we compile without openssl
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2003-07-30 03:33:48 +04:00
unknown
16bb14180b Portability fixes for Redhat 9
acinclude.m4:
  Fixed problem with openssl on RedHat 9
vio/viosocket.c:
  Removed compiler warning
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2003-07-18 12:35:29 +03:00
unknown
91eb7ce162 perror.c:
fix typo.


extra/perror.c:
  fix typo.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2003-07-12 11:45:43 -05:00
unknown
5a3c12effb Merge with 3.23 tree to get latest bug fixes
BitKeeper/etc/logging_ok:
  auto-union
sql/item_func.cc:
  Auto merged
mysql-test/t/user_var.test:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/log_event.h:
  Auto merged
sql/nt_servc.cc:
  Auto merged
configure.in:
  Use local version
innobase/os/os0file.c:
  Use local version
innobase/page/page0page.c:
  Use local version
innobase/row/row0sel.c:
  Use local version
innobase/row/row0vers.c:
  Use local version
mysql-test/r/order_by.result:
  Use local version
mysql-test/r/user_var.result:
  merge with 3.23
mysql-test/t/order_by.test:
  Use local version (test is already in range.test)
sql/log.cc:
  Use local version
sql/share/spanish/errmsg.txt:
  merge
sql/slave.cc:
  Use local version
sql/sql_class.h:
  Use local version
sql/sql_select.cc:
  Use patch in 4.0 for range with NULL problem
2003-07-01 15:02:16 +03:00
unknown
209d8a4e57 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into sergbook.mylan:/usr/home/serg/Abk/mysql-4.0


BitKeeper/etc/logging_ok:
  auto-union
2003-06-23 12:49:38 +02:00
unknown
09c7b48d43 fixed bug in references column grants
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2003-06-23 12:48:55 +02:00
unknown
332334e837 Fix error msg. Bug #681
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2003-06-19 12:38:14 -04:00
unknown
b47c40734f Tagged ChangeSet 1.1385 as mysql-3.23.57
configure.in:
  Updated AM_INIT_AUTOMAKE to following version
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2003-06-19 04:02:29 -04:00
unknown
bd34122680 InstallShield Files requested by Greg
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2003-06-18 15:50:33 -04:00
unknown
a59410fd68 Bugfix for #614
Item_extract needs special implementation for eq().
Item_func::eq doesn't work correctly because we have to compare 
Item_extract::int_type parameters also

We need to propagate this to 4.1


sql/item_timefunc.cc:
  Item_extract::eq implementation added
sql/item_timefunc.h:
  Item_extract::eq definition added
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2003-06-11 20:09:37 +05:00
unknown
87473e96b7 Translation updated
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2003-06-08 02:53:41 -04:00
unknown
5dfc7130a8 Merge jani@192.168.0.2:/my/mysql-4.0
into ua126d19.elisa.omakaista.fi:/home/my/bk/mysql-4.0


BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2003-05-26 15:50:05 +03:00
unknown
71df0f640a my_global.h:
- QNX 6.2.1 actually defines HAVE_RINT
  - fixed rint(A) #define as it was causing compile errors on QNX


include/my_global.h:
  - QNX 6.2.1 actually defines HAVE_RINT
  - fixed rint(A) #define as it was causing compile errors on QNX
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2003-05-16 13:03:47 +02:00
unknown
d4b465e2f3 Merge bk-internal.mysql.com:/home/bk/mysql-3.23
into narttu.mysql.fi:/my/mysql-3.23
2003-04-29 23:00:48 +03:00
unknown
d098137155 CURRENT_USER() and "access denied" error messages now report hostname exactly as it was specified in the GRANT command (with wildcards, that is)
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2003-04-29 00:15:18 +02:00
unknown
7c04ced1e0 Merge bk-internal:/home/bk/mysql-3.23/
into serg.mylan:/usr/home/serg/Abk/mysql


client/mysqldump.c:
  Auto merged
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2003-04-28 20:09:38 +02:00
unknown
4832d06f92 fixed incorrect number of affected rows in REPLACE...SELECT... (bug 130)
sql/sql_insert.cc:
  fixed incorrect number of affected rows in REPLACE...SELECT...
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2003-04-26 15:53:27 +03:00
unknown
975598a383 Put changeset number in emails 2003-04-24 00:09:19 +03:00
unknown
d7fee29e2f config-win.h:
Enable 'LOAD LOCAL INFILE', for parity with unix binaries.


include/config-win.h:
  Enable 'LOAD LOCAL INFILE', for parity with unix binaries.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2003-04-23 13:43:31 -05:00
unknown
562fe48731 Modify PeterG's internals documentation per Monty. Added
more detailed explanation of record header and column 
storage.


BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2003-04-23 11:43:30 -07:00
unknown
654d1026e4 fux bug #183
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2003-04-03 20:26:13 -04:00
unknown
592a398f75 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0
into eagle.mysql.r18.ru:/home/vva/work/LOADDATA_BUG/mysql-4.0


BitKeeper/etc/logging_ok:
  auto-union
sql/log_event.cc:
  Auto merged
2003-03-25 19:58:40 -04:00
unknown
f4305a899a fix bug with parameters of LOAD DATA INFILE in exec_event
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2003-03-25 19:57:38 -04:00
unknown
8f739cd674 Do not silently do RESET MASTER when one does 'mysqldump --master-data' ;
only do it if the user specifies --delete-master-logs (new option).
Safer + fixes bug #159.


client/client_priv.h:
  New option --delete-master-logs for mysqldump
client/mysqldump.c:
  New option --delete-master-logs for mysqldump
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2003-03-19 15:16:51 +01:00
unknown
3dfcd944fe Added PeterG's new internals documenation.
Docs/internals.texi:
  Added PeterG's new internals documentation.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2003-03-12 21:35:57 -08:00
unknown
f1662f3be9 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.0
into gluh.mysql.r18.ru:/home/gluh/mysql-4.0.last


BitKeeper/etc/logging_ok:
  auto-union
client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
2003-03-11 13:52:19 +04:00
unknown
3ab655681c Openssl test
client/mysqltest.c:
  For openssl test
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2003-03-11 13:41:53 +04:00
unknown
3223245de3 Handling of log-error added in embedded server
libmysqld/lib_sql.cc:
  handling of log-error added to embedded server
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2003-03-10 14:06:21 +04:00
unknown
f29fb98d34 When the SQL thread cannot read an event from the relay log
("Event too big" etc), stop this thread instead of going on
with the next event, which would certainly lead to slave's data
corruption.


BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2003-03-02 00:34:44 +01:00
unknown
0463b01dc8 opt_sum.cc:
Correction for min/max optimization of queries with outer joins


sql/opt_sum.cc:
  Correction for min/max optimization of queries with outer joins
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2003-02-23 04:27:03 +02:00
unknown
acbf3fa602 mwldnlm, mwenv, mwccnlm, mwasmnlm, nwconfigure, nwbootstrap:
new file


BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2003-02-18 17:48:04 -05:00
unknown
271dcc57e9 - really deleted makefile.w32 to resolve a namespace conflict on
case-insensitive File Systems (e.g. Mac OS X)
2003-02-03 14:39:15 +01:00
unknown
88301da1cd Many files:
new file
Makefile.am:
  Changes from Novell diff


netware/Makefile.am:
  Changes from Novell diff
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2003-02-01 00:42:26 +01:00
unknown
cec5bc1de7 fixed functions to be able work with group function as argument
made bisone 1.75 compatible code


mysql-test/r/group_by.result:
  test of function with agregate function inside
mysql-test/t/group_by.test:
  test of function with agregate function inside
sql/item_cmpfunc.cc:
  fixed functions to be able work with group function as argument
sql/item_cmpfunc.h:
  fixed functions to be able work with group function as argument
sql/item_func.cc:
  fixed functions to be able work with group function as argument
sql/item_func.h:
  fixed functions to be able work with group function as argument
sql/item_strfunc.cc:
  fixed functions to be able work with group function as argument
sql/item_strfunc.h:
  fixed functions to be able work with group function as argument
sql/sql_yacc.yy:
  made bisone 1.75 compatible code
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2003-01-29 10:38:56 +02:00
unknown
287906e972 Fix for the QUOTE() function.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2003-01-03 19:46:15 +04:00
unknown
25c8f58ac7 - Fix handling of suffix option
- Replace function 'check_reserved_words' with correct one


BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2002-12-12 11:06:55 +02:00
unknown
89991c65f3 merge Ranger's patches to crash-me, add new tests ( DEFAULT VALUES )
to crash-me 


sql-bench/crash-me.sh:
  new tests:
      - INSERT with DEFAULT:
      - INSERT with empty value list:
      - Insert DEFAULT VALUES;
  -------
  -checking of reserved keywords (by courtesy of Ranger)
  --------
  - added "--suffix" option 
  - added description of "--config-file" to help section
  - fixed test for DIFFERENCE()
  - fixed small bug in safe_query_result (was s/,/,/ should s/,/./)
     (by courtesy of Ranger)
sql-bench/server-cfg.sh:
  remove "KERNEL" and add "SAPDB" to sapdb version
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2002-12-10 18:40:38 +05:00
unknown
fac5864d88 A better way to get the ChangeSet revision for the Subject: line. 2002-11-28 12:45:01 +01:00
unknown
6a7f6fefa9 Add the ChangeSet id to Subject: in all emails.
BitKeeper/etc/ignore:
  Added autom4te-2.53.cache/output.0 autom4te-2.53.cache/requests autom4te-2.53.cache/traces.0 bdb/dist/autom4te-2.53.cache/output.0 bdb/dist/autom4te-2.53.cache/requests bdb/dist/autom4te-2.53.cache/traces.0 bkpull.log build.log innobase/autom4te-2.53.cache/output.0 innobase/autom4te-2.53.cache/requests innobase/autom4te-2.53.cache/traces.0 pull.log to the ignore list
2002-11-27 13:01:50 +01:00
unknown
ffd1d3df2a Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0 2002-11-14 12:35:33 +02:00
unknown
3648eb7da8 Portability fix when using -DBIG_TABLES
BitKeeper/etc/config:
  Changed Sasha to sys
client/mysqlbinlog.cc:
  Fixed that --position open works.
sql/item_timefunc.cc:
  Portability fix
sql/log_event.cc:
  Portability fix
sql/set_var.cc:
  Portability fix
2002-11-14 12:21:36 +02:00
unknown
9f8277f9a4 merged
BitKeeper/etc/gone:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
sql/ha_myisam.cc:
  Auto merged
innobase/row/row0sel.c:
  merged (ul - as 3.23's fix was a backport from 4.0)
mysql-test/r/myisam.result:
  merged - ul
2002-11-13 23:38:19 +01:00