Commit graph

8251 commits

Author SHA1 Message Date
unknown
ff820c2724 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into myvenu.com:/home/venu/work/sql/dev-4.1


sql/item_cmpfunc.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
2003-06-03 18:45:53 -07:00
unknown
fc59ec4edd Windows build fixups with the latest source
sql/item_cmpfunc.cc:
  Remove unused variables
sql/mysqld.cc:
  fix the defination as this is different from the prototype (cl compiler failed)
sql/sql_insert.cc:
  fix the windows error (without cast)
sql/sql_show.cc:
  Remove unused variables
include/config-win.h:
  Fix for Windows build to go (charsets + collation default defs)
VC++Files/client/mysqlclient.dsp:
  Take care of newly added/removed files
VC++Files/libmysql/libmysql.dsp:
  Take care of newly added/removed files
VC++Files/sql/mysqld.dsp:
  Take care of newly added/removed files
2003-06-03 18:45:07 -07:00
unknown
0831433e8f SPACE() is now ucs2 compatible 2003-06-03 18:24:57 +05:00
unknown
89fcdec376 Collation & coercibility tests for LTRIM, RTRIM and TRIM 2003-06-03 17:13:19 +05:00
unknown
8ae717d319 LTRIM, RTRIM and TRIM now honors coercibility
LTRIM, RTRIM and TRIM now work fine with ucs2
2003-06-03 16:57:14 +05:00
unknown
27d95e9687 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.emb_bind
2003-06-03 15:29:45 +05:00
unknown
ce02ef6641 Obsolete files removed
BitKeeper/deleted/.del-mini_client.h~be0e3c44e9b0f67d:
  Delete: sql/mini_client.h
BitKeeper/deleted/.del-mini_client.cc~8677895ec8169183:
  Delete: sql/mini_client.cc
BitKeeper/etc/ignore:
  Added sql/client.c to the ignore list
2003-06-03 15:27:17 +05:00
unknown
f178aa987f Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.emb_bind


libmysqld/Makefile.am:
  Auto merged
sql/Makefile.am:
  Auto merged
2003-06-03 15:03:29 +05:00
unknown
aed6de39b6 SCRUM:
splittiln common client's parts


include/sql_common.h:
  superfluous #ifdef-s removed
libmysql/client_settings.h:
  superfluous #ifdef-s removed
libmysql/libmysql.c:
  some litter removed
libmysqld/lib_sql.cc:
  here we had wrong parameters
mysys/default.c:
  this is not needed anymore - calling code fixed
sql-common/client.c:
  code trimmed and simplified
sql/client_settings.h:
  code trimmed
sql/repl_failsafe.cc:
  option's initialization added
sql/slave.cc:
  option's initialization added
2003-06-03 15:02:57 +05:00
unknown
93d3ba840d MY_CS_NONTEXT flag for sprintf() incompatible charsets (ucs2 if the only one now)
Some default_charset_info were removed
2003-06-03 14:59:17 +05:00
unknown
4beedd513e "Collation" has been moved to SHOW FULL FIELDS
SHOW COLLATION columns have been removed:
  D -> Default
  C -> Compiled
  Y -> Yes
2003-06-02 17:19:06 +05:00
unknown
31121b36b6 ctype-ucs2.c:
define ILSEQ for platforms that do not define it themself


strings/ctype-ucs2.c:
  define ILSEQ for platforms that do not define it themself
2003-06-02 14:12:46 +05:00
unknown
62c7d2cd27 SCRUM:
Here is another pack of changes about gathering common client code in
sql-common/client.c.
Now i symlink the client.c from sql/ and libmysql/. These directories
have client_settings.h files to be included to client.c. It contains
defines and declarations to compile client.c in appropriate manner.
Also i've added include/sql_common.h, containing declarations of what
is exported from client.c

I removed as many #ifdef-s from client.c as i dared to. I think it's better
push it with some extra #ifdef-s now (of course, if everythihg besides it is
ok) so other people can check the code.


Makefile.am:
  symlinking of sql-common/client.c was added
include/mysql.h:
  MYSQL_CLIENT define moved here from libmysql/Makefile
libmysql/Makefile.am:
  ../libmysql/client_settings.h added to the list of necessary h-files
libmysql/Makefile.shared:
  client.lo added to the list of objects
libmysql/libmysql.c:
  a lot of changes about separating code between libmysql.c and client.c
mysys/default.c:
  changed to keep compiler happy
sql-common/client.c:
  a lot of changes about code separating
sql/Makefile.am:
  mini_client.h has to be removed
sql/repl_failsafe.cc:
  mysql_real_connect prototype was unified, so we've got to set connection timeout separately
sql/slave.cc:
  trimming code to the changed function's prototypes
sql/sql_repl.cc:
  mini_client isn't needed anymore
2003-05-31 15:15:46 +05:00
unknown
8b7e79be78 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-30 21:09:38 +03:00
unknown
f7972fb2a2 after review changes 2003-05-30 21:09:37 +03:00
unknown
82fd4268a0 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-30 21:09:36 +03:00
unknown
487a64963b mysqlshow and mysqldump now send their vharacter set to server
character_set_results is now the same with character_set_client by default
2003-05-30 23:09:35 +05:00
unknown
d1e7a597ae Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.r18.ru:/usr/home/ram/work/4.1.latest


BitKeeper/etc/ignore:
  auto-union
2003-05-30 23:09:34 +05:00
unknown
598f7ec5e3 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.emb_bind
2003-05-30 23:09:33 +05:00
unknown
b4cc1e0ca3 Merge abarkov@build.mysql.com:/home/bk/mysql-4.1
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
2003-05-30 23:09:33 +05:00
unknown
4e6acef89c Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/NEW_HELP/4.1.clear
2003-05-30 14:09:32 -04:00
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
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
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
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
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
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
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
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