Commit graph

495 commits

Author SHA1 Message Date
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
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
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
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
fa771db2e7 Merge akeremidarski@work.mysql.com:/home/bk/mysql
into geopard.(none):/storage/bk/mysql-3.23


BitKeeper/etc/gone:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
2002-11-11 10:52:39 +02:00
unknown
c88b910208 Portability fixes for Fortre C++ 5.0 (on Sun) in 32 and 64 bit modes.
client/mysqlbinlog.cc:
  Portability fix
configure.in:
  Added use of ASFLAGS (For Solaris with Forte 5.0)
include/my_global.h:
  Portability fix
include/myisam.h:
  Portability fix
include/queues.h:
  Portability fix
innobase/include/ut0ut.h:
  Portability fix
innobase/log/log0log.c:
  Portability fix
innobase/rem/rem0cmp.c:
  Portability fix
innobase/trx/trx0sys.c:
  Portability fix
isam/pack_isam.c:
  Portability fix
myisam/ft_boolean_search.c:
  Portability fix
myisam/mi_dynrec.c:
  Code change to go around bug in Forte 5.0
myisam/sort.c:
  Portability fix
mysys/my_aes.c:
  Portability fix
scripts/Makefile.am:
  Support for ASFLAGS
scripts/mysqlbug.sh:
  Support for ASFLAGS
sql/field.cc:
  Portability fix
sql/filesort.cc:
  Portability fix
sql/gen_lex_hash.cc:
  Portability fix
sql/ha_innodb.cc:
  Portability fix
  Changed SHOW INNODB STATUS to return error instead of writing message to log file.
sql/ha_isammrg.cc:
  Portability fix
sql/ha_myisam.cc:
  Portability fix
sql/ha_myisammrg.cc:
  Portability fix
sql/hash_filo.h:
  Portability fix
sql/hostname.cc:
  Portability fix
sql/item_cmpfunc.h:
  Indentation change
sql/item_func.cc:
  Portability fix
sql/item_func.h:
  Portability fix
sql/log.cc:
  Portability fix
sql/log_event.cc:
  Portability fix
sql/mysql_priv.h:
  Portability fix
sql/mysqld.cc:
  Portability fix
  Fixed bug with rpl_recovery_rank command line option on 64 bit systems
sql/opt_range.cc:
  Portability fix
sql/repl_failsafe.cc:
  Portability fix
sql/slave.cc:
  Portability fix
sql/slave.h:
  Portability fix
sql/sql_acl.cc:
  Portability fix
sql/sql_base.cc:
  Portability fix
sql/sql_cache.cc:
  Portability fix
sql/sql_cache.h:
  Portability fix
sql/sql_class.cc:
  Portability fix
sql/sql_delete.cc:
  Portability fix
sql/sql_insert.cc:
  Portability fix
sql/sql_manager.cc:
  Portability fix
sql/sql_parse.cc:
  Portability fix
BUILD/compile-solaris-sparc-forte:
  C
sql/sql_udf.cc:
  Portability fix
sql/sql_update.cc:
  Portability fix
strings/Makefile.am:
  Portability fix
strings/bmove_upp-sparc.s:
  Fix so that this works on 32 and 64 bit sparcs
strings/str_test.c:
  Cleanup
strings/strappend-sparc.s:
  Fix so that this works on 32 and 64 bit sparcs
strings/strend-sparc.s:
  Fix so that this works on 32 and 64 bit sparcs
strings/strmake-sparc.s:
  Fix so that this works on 32 and 64 bit sparcs
strings/strmov-sparc.s:
  Fix so that this works on 32 and 64 bit sparcs
strings/strnmov-sparc.s:
  Fix so that this works on 32 and 64 bit sparcs
strings/strstr-sparc.s:
  Fix so that this works on 32 and 64 bit sparcs
strings/strxmov-sparc.s:
  Fixes to make this more portable, but it's still not usable on 64 bit systems :(
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2002-11-07 03:54:00 +02:00
unknown
f6b9a33fb6 Some changes for SSL
sql-bench/bench-init.pl.sh:
  Add option connect-options(using with SSL)
sql-bench/server-cfg.sh:
  Add option connect-option(using with SSL)
sql/sql_acl.cc:
  Fix bug when GRANT ... REQUIRE NONE doesn't unset SSL requirements
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2002-10-30 18:27:15 +04:00
unknown
df07abce94 Merge
BitKeeper/etc/gone:
  auto-union
BitKeeper/deleted/.del-skipkeys~3f37511a1865c4ea:
  'Auto converge rename'
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2002-10-24 23:09:16 +06:00
unknown
7ce04cdad3 BK automatic LOD removal.
BitKeeper/etc/skipkeys:
  auto add
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2002-10-24 21:33:28 +06:00
unknown
4e2de867b6 Merge akeremidarski@work.mysql.com:/home/bk/mysql
into geopard.(none):/storage/bk/mysql-3.23


BitKeeper/etc/gone:
  auto-union
BitKeeper/deleted/.del-skipkeys~508193a0775828ab:
  'Auto converge rename'
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2002-10-23 23:03:59 +03:00
unknown
2e169a979d BK automatic LOD removal.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
BitKeeper/etc/skipkeys:
  auto add
2002-10-23 23:01:49 +03:00
unknown
14cbecdc8b Merge abotchkov@work.mysql.com:/home/bk/mysql-4.0
into genie.(none):/home/hf/work/04


BitKeeper/etc/logging_ok:
  auto-union
2002-10-21 09:57:53 +05:00
unknown
911a8e1ba0 Embedded server bugfix
libmysqld/lib_sql.cc:
  Necessary thd->scramble initialization added
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2002-10-21 09:56:30 +05:00
unknown
6d25b5439c BK automatic LOD removal.
BitKeeper/etc/skipkeys:
  auto add
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2002-10-20 21:43:24 +02:00
unknown
768043db81 BK automatic LOD removal.
BitKeeper/etc/skipkeys:
  auto add
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2002-10-20 21:16:05 +02:00
unknown
b9ce760069 Merge pmartin@work.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/pem/work/mysql-4.0


BitKeeper/etc/logging_ok:
  auto-union
2002-10-15 16:12:53 +02:00
unknown
cba8acc1af Added optional services
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2002-10-15 02:04:43 -02:00
unknown
b36dbc4a43 Added verification of the Administrator user when installing the service
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2002-10-14 23:16:21 -03:00
unknown
9bca9fb751 Task 430: Allowing braces in joins by simply removing them.
This is a simple fix, allowing a join_table_list in the right reduction of a
normal_join sequence, instead of just a join_table. This makes things like
"t1, (t2 left join t3)" work, but it also allows "join" and "cross join" instead
of ",".

This should fix the bug reported as:
  Subject: ODBC SQL syntax issue 
  From: Ivan Vazharov 
  Date: Mon, 30 Sep 2002 12:02:42 +0200 


mysql-test/r/select.result:
  Results from new test cases for removing braces in joins.
mysql-test/t/select.test:
  New test cases for removing braces in joins.
sql/sql_yacc.yy:
  Allow (and remove) braces in all parts of a normal_join list, not just the
  first one.
  Also added three missing ';'.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2002-10-12 11:07:54 +02:00
unknown
642b759333 fixed race that caused sig11s on simultaneous FLUSH LOGS
(possibly also fixes binlog filename corruption problems--hasn't
been reproduced since)


sql/log.cc:
  Fixed race caused by calling MYSQL_LOG::is_open() outside of critical section.
sql/sql_parse.cc:
  added missing args to calls to MYSQL_LOG::new_file(bool)
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2002-10-07 15:42:10 -06:00
unknown
18d8d96f01 manual.texi Added docs about how to clone public 4.1 repository
Docs/manual.texi:
  Added docs about how to clone public 4.1 repository
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2002-10-07 11:32:10 +02:00