Commit graph

4158 commits

Author SHA1 Message Date
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
3f7dfc4df3 Small fixes (nothing nameworthy)
mysql-test/r/errors.result:
  Rename: mysql-test/r/err000001.result -> mysql-test/r/errors.result
include/my_global.h:
  typedef for future functions that needs string length as an argument
innobase/os/os0file.c:
  Added operation to error messages
mysql-test/t/errors.test:
  Cleaned up file to new error number standard
mysys/thr_alarm.c:
  Made end_thr_alarm() work also with internal alarm thread.
  (Not critical for MySQL)
sql/mysqld.cc:
  Added sigemptyset() (bug found by valgrind)
  Removed some wrong usage of thd when writing variable values
2003-06-01 23:40:01 +03:00
unknown
2d23d49b1f Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0


sql/mysql_priv.h:
  Auto merged
2003-06-01 12:33:23 +03:00
unknown
2ef52d46a4 Fixed bug in ALTER TABLE DISABLE KEYS and INSERT DELAYED. Bug #478
mysql-test/r/alter_table.result:
  new results
mysql-test/r/lowercase_table.result:
  new results
mysql-test/t/alter_table.test:
  Test of ALTER TABLE DISABLE KEYS + INSERT DELAYED
mysql-test/t/lowercase_table.test:
  Added test of alias name comparison
sql/mysql_priv.h:
  Made closed_cached_table local
sql/sql_table.cc:
  Fixed bug in ALTER TABLE DISABLE KEYS and INSERT DELAYED
2003-06-01 12:32:53 +03:00
unknown
91f1d59913 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.0
2003-06-01 10:51:33 +03: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
e0c9de6e62 URGENT
SCRUM
BUG
correct wrong code in group_concat


mysql-test/r/func_gconcat.result:
  add new tests
mysql-test/t/func_gconcat.test:
  add new tests
sql/field.cc:
  add new variable for group_concat
sql/field.h:
  add new variable for group_concat
sql/item_sum.cc:
  correct wrong code
sql/item_sum.h:
  correct wrong code
2003-05-31 15:44:19 +06:00
unknown
185f0092bc fixed bug 549 - incorect query cache memory formating on very small query cache sizes
mysql-test/r/query_cache.result:
  test of 2 parts of bug 549
mysql-test/t/query_cache.test:
  test of 2 parts of bug 549
sql/sql_cache.cc:
  fixed query cache size showing
  fixed query cache low memory detection
2003-05-31 01:41:11 +03:00
unknown
e263b81472 priventing allocation unused Item_buff (alloc_group_fields())
mysql-test/r/subselect.result:
  new test for code coverage
mysql-test/t/subselect.test:
  new test for code coverage
sql/sql_select.cc:
  priventing allocation unused Item_buff
sql/sql_select.h:
  priventing allocation unused Item_buff
2003-05-30 22:14:52 +03: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
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
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
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
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
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
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
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
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
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
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