Commit graph

8483 commits

Author SHA1 Message Date
unknown
c284a71287 fix some warnings in sql_help.cc
sql/sql_help.cc:
  fix some warnings
2003-05-30 14:08:58 -04:00
unknown
fadfa46796 Fix for compiling MySQL-4.0.13 with SSL support on OpenBSD 2003-05-30 18:41:19 +05:00
unknown
7a99669fbc Moved spatial functions to the sql/item_geofunc.cc file.
BitKeeper/etc/ignore:
  Added libmysqld/item_geofunc.cc to the ignore list
2003-05-30 15:22:34 +05:00
unknown
8b9fea0ce5 mysqldump.c:
mysqldump now produces SET NAMES. It can be disabled by --no-set-names


client/mysqldump.c:
  mysqldump now produces SET NAMES. It can be disabled by --no-set-names
2003-05-30 15:21:03 +05:00
unknown
7953039ded SET character_set_results=NULL is now working 2003-05-30 13:56:02 +05:00
unknown
677ece6612 set_var.cc, set_var.h:
character_set_connection new variable


sql/set_var.h:
  character_set_connection new variable
sql/set_var.cc:
  character_set_connection new variable
2003-05-30 13:24:24 +05:00
unknown
f46e958e1e character_set_server is now updatable
character_set_database was added
Code optimization: reuse more code for all character sets variables


sql/mysqld.cc:
  character_set_server is now updatable
  character_set_database was added
sql/set_var.cc:
  character_set_server is now updatable
  character_set_database was added
sql/set_var.h:
  character_set_server is now updatable
  character_set_database was added
sql/sql_base.cc:
  character_set_server is now updatable
  character_set_database was added
sql/sql_class.cc:
  character_set_server is now updatable
  character_set_database was added
sql/sql_class.h:
  character_set_server is now updatable
  character_set_database was added
sql/sql_db.cc:
  character_set_server is now updatable
  character_set_database was added
sql/sql_load.cc:
  character_set_server is now updatable
  character_set_database was added
sql/sql_table.cc:
  character_set_server is now updatable
  character_set_database was added
sql/sql_yacc.yy:
  character_set_server is now updatable
  character_set_database was added
BitKeeper/etc/ignore:
  Added scripts/mysql_create_system_tables to the ignore list
2003-05-30 13:03:56 +05:00
unknown
38c5034b19 Merge mysql.r18.ru:/usr/home/bk/mysql-4.1
into mysql.r18.ru:/usr/home/ram/work/4.1.latest
2003-05-30 13:03:50 +05:00
unknown
f8ed5e7129 Fix for the bug #537 (UDF example broken on 4.1). 2003-05-30 13:03:00 +05:00
unknown
69e084af1e new version of help 2003-05-29 17:47:31 -04:00
unknown
0829e8706d Fix for bug #529 ("x509" no allowed as field name) 2003-05-29 14:52:25 +05:00
unknown
936a8aecd5 srv0srv.c:
Prevent the InnoDB main thread from hogging CPU if a table lingers in the background drop queue (though it is essentially a bug if a table end up there at all)


innobase/srv/srv0srv.c:
  Prevent the InnoDB main thread from hogging CPU if a table lingers in the background drop queue (though it is essentially a bug if a table end up there at all)
2003-05-28 20:31:33 +03:00
unknown
f440077bd0 manual types casting to satisfy gcc 3.2.1 compiler 2003-05-28 18:02:14 +03:00
unknown
4ecdc7a416 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-mem_root-4.1
2003-05-28 16:54:56 +03:00
unknown
a100c0e951 added mem_root switching for subselect if it is necessary
(bug #518 fixed)


mysql-test/r/subselect.result:
  test of bug #518
mysql-test/t/subselect.test:
  test of bug #518
sql/item_subselect.cc:
  test and switch mem_root if it is necessary
  exec() - wrapper around engine->exec() to test and switch mem_root if necessary
sql/item_subselect.h:
  added storing THD for mem_root testinmg & switching
  exec() - wrapper around engine->exec() to test and switch mem_root if necessary
2003-05-28 16:52:56 +03:00
unknown
5f9d3e4276 CAST(expr AS char) now supports character set with conversion:
SELECT CAST(_latin1'string' AS CHAR CHARACTER SET latin2)
2003-05-28 17:57:58 +05:00
unknown
9166602342 ctype-win1250ch.c:
bug #521 fix: ('3'='4')  was true in cp1250_czech_ci


strings/ctype-win1250ch.c:
  bug #521 fix: ('3'='4')  was true in cp1250_czech_ci
2003-05-28 16:48:48 +05:00
unknown
eb4f5e2d6c --with-collation argument for configure. Now one can for example use this:
./configure --with-charset=latin1 --with-collation=latin1_danish_ci
2003-05-28 16:23:04 +05:00
unknown
af512c8d8c ctype-win1250ch.c:
ifdef wrong structure has been fixed


strings/ctype-win1250ch.c:
  ifdef wrong structure has been fixed
2003-05-28 14:46:25 +05:00
unknown
002b1f8680 resolving of merging conflict
libmysql/libmysql.c:
  conflict resolved
2003-05-28 14:13:14 +05:00
unknown
7b2e06b281 Lots of conflicts resolved
libmysqld/Makefile.am:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/slave.cc:
  Auto merged
libmysql/libmysql.c:
  Resolved conflicts
sql/mini_client.cc:
  resolved conflicts
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2003-05-28 13:54:58 +05:00
unknown
1328c29e94 "mysql" now sends client character set to server. 2003-05-28 13:54:18 +05:00
unknown
99d306b77e item_cmpfunc.cc:
Fix for multibyte charsets


sql/item_cmpfunc.cc:
  Fix for multibyte charsets
2003-05-28 11:24:48 +05:00
unknown
dbdcae8bef Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0
2003-05-28 03:37:10 +03:00
unknown
838c616397 Removed not used variable 2003-05-28 03:36:44 +03:00
unknown
15b3f3a0d8 after-review fix 2003-05-28 02:06:56 +03:00
unknown
2e3f106578 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
2003-05-28 01:48:47 +03:00
unknown
2029fa02c3 fixed priority checking bug in sub select handling
mysql-test/r/subselect.result:
  fixed subselect test
mysql-test/t/subselect.test:
  fixed subselect test
2003-05-28 00:49:24 +03:00
unknown
546b2221a2 A trick (a useless update) to force the slave to wait for TWO rotate events
before stopping. This is to make the test's result predictable (depending
on the machine the results could formerly be slightly different, though
everything is sane in the code; it's not a bug).


mysql-test/r/rpl_log.result:
  result update
2003-05-27 23:07:32 +02:00
unknown
7f459bccbb - removed all traces of internals.texi from Docs/Makefile.am to avoid
compile problems


Docs/Makefile.am:
   - removed all traces of internals.texi to avoid compile problems
2003-05-27 20:22:47 +02:00
unknown
d272a9e4d6 - removed internals.texi (has been moved to mysqldoc BK tree)
BitKeeper/deleted/.del-internals.texi~62b6f580a41c2a43:
  Delete: Docs/internals.texi
Docs/Makefile.am:
   - removed all traces of internals.texi
2003-05-27 18:47:50 +02:00
unknown
8e20fc57ed - removed internals.texi (has been moved to the "mysqldoc" BK tree)
BitKeeper/deleted/.del-internals.texi~62b6f580a41c2a43:
  Delete: Docs/internals.texi
2003-05-27 18:34:03 +02:00
unknown
da8f7ecadd Merge gbichot@213.136.52.20:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
2003-05-27 18:19:32 +02:00
unknown
c1607401de Removed bad mutex locking 2003-05-27 18:16:50 +02:00
unknown
ef6d3a8060 ORDER BY optimization
Fixed new bug when reading field types


client/mysql.cc:
  Fixed output for -T
libmysql/libmysql.c:
  Filled missing fields in new MYSQL_FIELD structure
  Fixed new bug when reading field types
mysql-test/r/order_by.result:
  Result after new order by optimization
sql/opt_range.cc:
  New ORDER BY optimization
sql/opt_range.h:
  New ORDER BY optimization
sql/set_var.cc:
  Speed optimization
sql/sql_select.cc:
  New ORDER BY optimization
  
  This alllows MySQL to change a ref/range index from (a,b) to (a,c) when 'b' was not used to find rows and one did
  ORDER BY a,c or ORDER BY c
2003-05-27 18:40:37 +03:00
unknown
1540912eca Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into narttu.mysql.fi:/my/mysql-4.1
2003-05-27 16:44:06 +03:00
unknown
510e23a8cd Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0
2003-05-27 16:40:39 +03:00
unknown
4920a3326f Fixed problem with mysql prompt when server disconnect. (Bug 356)
Fixed problem with localtime -> gmt where some times resulted in
different (but correct) timestamps. Now MySQL should use the smallest
possible timestamp value in this case.  (Bug 316)


client/mysql.cc:
  Fixed problem with prompt when server disconnect. (Bug 356)
client/mysqltest.c:
  More debug information
mysql-test/mysql-test-run.sh:
  Added support for --timezone in -master.opt
mysql-test/t/raid.test:
  Fixed test if raid is enabled
sql/field.cc:
  New my_gmt_sec() parameters
sql/mysql_priv.h:
  New my_gmt_sec() parameters
sql/mysqld.cc:
  Remove LOCK_timezone.
  Code cleanup
sql/time.cc:
  Fixed problem with localtime -> gmt where some times resulted in
  different (but correct) timestamps. Now MySQL should use the smallest
  possible timestamp value in this case.  (Bug 316)
2003-05-27 16:40:14 +03:00
unknown
685498e0ad Deleted internals.texi (moved to mysqldoc tree - Monty req).
BitKeeper/deleted/.del-internals.texi~62b6f580a41c2a43:
  Delete: Docs/internals.texi
2003-05-27 15:31:18 +02:00
unknown
da338c599c temporary update of the test to satisfy merge; will commit a final update
soon.


mysql-test/r/rpl_insert_id.result:
  Auto merged
2003-05-27 14:50:14 +02:00
unknown
245c5086c1 fixed small merge bug
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2003-05-27 16:58:57 +05:00
unknown
b090bd08b8 conf_to_src.c:
Changes according to CHARSET_INFO structure


strings/conf_to_src.c:
  Changes according to CHARSET_INFO structure
2003-05-27 12:59:08 +05:00
unknown
cf240ee47c Index.xml:
utf8 was not marked as compiled


sql/share/charsets/Index.xml:
  utf8 was not marked as compiled
2003-05-27 12:57:02 +05:00
unknown
b68d3f459f Merge kishkin.ru:/home/wax/mysql-4n into kishkin.ru:/home/wax/mysql-4sm
sql/mysqld.cc:
  Auto merged
2003-05-27 04:42:47 +06:00
unknown
a132e799c5 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into narttu.mysql.fi:/my/mysql-4.1


sql/field.h:
  Auto merged
2003-05-26 20:59:40 +03:00
unknown
1ef96d2b76 Portability fix 2003-05-26 20:59:09 +03:00
unknown
da9bf1dec3 ixed wrong unlock of tables (new bug)
sql/sql_delete.cc:
  Comment cleanup
sql/sql_insert.cc:
  Comment cleanup
sql/sql_load.cc:
  Comment cleanup
sql/sql_update.cc:
  Fixed wrong unlock of tables.
  (Unlock must be done after writing to binary log
2003-05-26 20:48:40 +03:00
unknown
926add9c88 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mashka.mysql.fi:/home/my/mysql-4.1-narttu
2003-05-26 20:38:47 +03:00
unknown
515ca2c4b4 Merge narttu.mysql.fi:/my/mysql-3.23 into narttu.mysql.fi:/my/mysql-4.0
sql/mysqld.cc:
  Auto merged
2003-05-26 20:35:27 +03:00
unknown
cd554e9ed6 Fixed bug when installing mysqld as a service with 2 arguments (option + service-name) 2003-05-26 20:09:53 +03:00