Commit graph

10635 commits

Author SHA1 Message Date
unknown
d228cd2e0f Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b2361
2004-01-14 14:36:57 +04:00
unknown
c6863b04e0 item_strfunc.cc:
Comment typo fix
  ,


sql/item_strfunc.cc:
  Comment typo fix
  ,
2004-01-14 14:02:51 +04:00
unknown
7eea262321 - Added missing documentation to some mysql.cc options.
- Fixed Bug#2346
- Fixed Bug#2378
- Fixed bug in pager (no Bug#ID (?))
- Added support for new special situations option type, GET_DISABLED.
  See handling of --debug in mysql.cc. compiled wihtout debugging, as an
  example.


client/mysql.cc:
  - Added missing documentation to some options.
  - Fixed a bug in pager (no Bug#ID found (?)), but reported on internals list
    with subject "[PATCH] Fix pager problems in mysql client"
  - Fixed Bug#2346, "unique prefix is enough" option behaviour can be confusing with --debug
include/my_getopt.h:
  Added new option type, GET_DISABLED.
include/mysys_err.h:
  New exit code for my_getopt.
mysys/my_getopt.c:
  - Added handling for GET_DISABLED option type (Fix for Bug#2346)
  - Fixed Bug#2378, "Problem with option abbreviation"
2004-01-14 04:58:37 +02:00
unknown
38a87d0eea - link the mysql client RPM against libreadline instead of libedit
(BUG 2289)


support-files/mysql.spec.sh:
   - link the mysql client against libreadline instead of libedit (BUG 2289)
2004-01-13 19:55:37 +01:00
unknown
9dfada0cba srv0start.c, srv0srv.c:
If UNIV_SYNC_DEBUG was switched on, the error monitor thread could reserve a mutex BEFORE the sync debug system was initialized, and that caused a sync debug assertion in startup: move the 2 sec. sleep to a safer place; note that this is only heuristics, and in theory it can assert still


innobase/srv/srv0srv.c:
  If UNIV_SYNC_DEBUG was switched on, the error monitor thread could reserve a mutex BEFORE the sync debug system was initialized, and that caused a sync debug assertion in startup: move the 2 sec. sleep to a safer place; note that this is only heuristics, and in theory it can assert still
innobase/srv/srv0start.c:
  If UNIV_SYNC_DEBUG was switched on, the error monitor thread could reserve a mutex BEFORE the sync debug system was initialized, and that caused a sync debug assertion in startup: move the 2 sec. sleep to a safer place; note that this is only heuristics, and in theory it can assert still
2004-01-13 17:13:03 +02:00
unknown
bf7e46938b item_strfunc.cc:
Unnesessary code was removed. Comment was added.


sql/item_strfunc.cc:
  Unnesessary code was removed. Comment was added.
2004-01-13 17:27:21 +04:00
unknown
76cb96757d Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b2361
2004-01-13 17:27:13 +04:00
unknown
21e2c72bfb a fix (bug #2361: ALTER TABLE ... DROP PRIMARY KEY drops a non-primary key). 2004-01-13 16:18:37 +04:00
unknown
491ab7f72e Minor Novell supplied changes for 4.1 (inside netware directory)
netware/init_db.sql:
  Add new tables for 4.1
netware/libmysql.imp:
  Comment out simple_command
2004-01-13 01:10:21 -01:00
unknown
79a4b2cd49 row0sel.c:
Improve previous push: save 1000 bytes of thread stack in non-error cases


innobase/row/row0sel.c:
  Improve previous push: save 1000 bytes of thread stack in non-error cases
2004-01-13 04:10:20 +02:00
unknown
ea85432715 row0sel.c:
If MySQL tries to do SELECT from an InnoDB table, but has set no table locks at all in ::external_lock(), print a descriptive error message and assert; some subquery bugs were of this type


innobase/row/row0sel.c:
  If MySQL tries to do SELECT from an InnoDB table, but has set no table locks at all in ::external_lock(), print a descriptive error message and assert; some subquery bugs were of this type
2004-01-13 04:05:38 +02:00
unknown
fff44f71fa Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1
2004-01-12 21:06:21 +01:00
unknown
e90eb6f43e Fix for BUG#2333 "ALTER DATABASE on inexistent database hangs the client":
mysql_alter_db() now returns -1 in case of error, so that mysql_execute_command()
calls send_error().


sql/sql_db.cc:
  In case of error, return -1 so that mysql_execute_command()
  understands that it must send_error().
  The double (( at the left of 'error' in the 'if' are to avoid a compiler warning.
2004-01-12 21:05:41 +01:00
unknown
41b3fb05d5 Merge serg.mylan:/usr/home/serg/Abk/mysql-4.1
into serg.mylan:/usr/home/serg/Abk/mysql-4.1-bug
2004-01-12 18:11:54 +01:00
unknown
5b8b45f19f checking 2nd level of FT index destroyed info->lastkey and CHECK TABLE erroneously treated table as corrupted
bug#2190
2004-01-12 17:43:39 +01:00
unknown
6c8045d469 charset.c:
Fixed: client crashed when there are no Index.xml file.


mysys/charset.c:
  Fixed: client crashed when there are no Index.xml file.
2004-01-12 14:31:04 +04:00
unknown
24f8054460 Detect unexpected return codes of mysqltest in mysql-test-run.
This way, a crash of mysqltest will be visible in the test logs
(output of mysql-test-run).


mysql-test/mysql-test-run.sh:
  by design mysqltest returns 0 or 1 or 2 (see the exit()s and the return()
  of main()). So any greater code is a crash, I guess.
  On build and on my machine, 139 is segfault and 134 is assertion failure.
2004-01-11 18:15:19 +01:00
unknown
b321b7c00d row0mysql.c:
Fix typo


innobase/row/row0mysql.c:
  Fix typo
2004-01-08 18:56:21 +02:00
unknown
582886a3e9 Fix for 1224 (USER() CURRENT_USER() functions in embedded library)
Now we return user@host for USER() in embedded library
CURRENT_USER returns empty string if library compiled with
NO_EMBEDDED_ACCESS_CHECKS


libmysqld/embedded_priv.h:
  function's declarations trimmed
libmysqld/lib_sql.cc:
  user/host names handling added
libmysqld/libmysqld.c:
  user/host names handling added
sql/sql_class.cc:
  we shouldn't free user/host names in embedded library
2004-01-07 21:30:15 +04:00
unknown
902c361910 SCRUM
WL#1246 (Query cache in embedded library)
Some fixes after testing


libmysqld/emb_qcache.cc:
  code added to check if the recordset has no rows
sql/sql_cache.cc:
  this code should not work if the query isn't cacheable
2004-01-07 16:41:09 +04:00
unknown
fae79aeca5 SCRUM
WL#1246 (Query cache in embedded library)
Small fix - code removed that prevents using query cache in embedded library


include/mysql_embed.h:
  Now we have the query_cache in embedded library
2004-01-07 14:45:04 +04:00
unknown
690404bdc8 Merge
libmysqld/lib_sql.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_parse.cc:
  SCCS merged
2004-01-07 12:54:28 +04:00
unknown
079b4819a4 srv0start.c:
More instructions about a downgrade 4.1.1 -> 4.0.18


innobase/srv/srv0start.c:
  More instructions about a downgrade 4.1.1 -> 4.0.18
2004-01-06 20:03:06 +02:00
unknown
0d770c43db srv0start.c:
Add comment that the insert buffer format changed between 4.0 and 4.1.1, but the undo log format did not


innobase/srv/srv0start.c:
  Add comment that the insert buffer format changed between 4.0 and 4.1.1, but the undo log format did not
2004-01-06 13:10:57 +02:00
unknown
d4a7fa95ee Fixed Bug#2205. 2004-01-05 21:45:14 +02:00
unknown
63f15064a4 log0recv.h, log0recv.c:
Merge a log replay change required by ibbackup


innobase/log/log0recv.c:
  Merge a log replay change required by ibbackup
innobase/include/log0recv.h:
  Merge a log replay change required by ibbackup
2004-01-02 16:21:58 +02:00
unknown
3940368293 row0purge.c:
Fix bug: if purge of a table was not possible because its .ibd file was missing, trx->dict_operation_lock_mode was left to a wrong value, causing an assertion failure


innobase/row/row0purge.c:
  Fix bug: if purge of a table was not possible because its .ibd file was missing, trx->dict_operation_lock_mode was left to a wrong value, causing an assertion failure
2004-01-01 01:51:36 +02:00
unknown
92fdbe5e03 #2244 User variables collation conflict is not detected 2003-12-31 19:01:03 +04:00
unknown
8b4e00ffb7 Fixed Bug#1472, mysql \h output out of order. 2003-12-30 17:58:39 +02:00
unknown
c7b62fcde7 latin1.xml, Index.xml:
Modern Spanish collation


sql/share/charsets/Index.xml:
  Modern Spanish collation
sql/share/charsets/latin1.xml:
  Modern Spanish collation
2003-12-29 19:58:18 +04:00
unknown
64d039833e logging_ok:
Logging to logging@openlogging.org accepted
item_strfunc.cc:
  Bug wich appeared in ctype_tis620 is fixed


sql/item_strfunc.cc:
  Bug wich appeared in ctype_tis620 is fixed
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2003-12-29 18:45:13 +04:00
unknown
d55382369e Bug 1552:
TIS620 to Unicode and Unicode to TIS620 conversion check.
2003-12-25 20:11:01 +04:00
unknown
e52ae56f33 dump_map.c:
new file
2003-12-25 19:07:44 +04:00
unknown
398f7b7700 languages.html:
new file
2003-12-25 17:46:30 +04:00
unknown
8fac0f4d27 Bug 2202: CAST from binary to char still returns a binary string 2003-12-25 17:42:17 +04:00
unknown
229cc61277 sql_parse.cc:
Fix for the bug 1175: Usernames will not converted to utf8 during connect


sql/sql_parse.cc:
  Fix for the bug 1175: Usernames will not converted to utf8 during connect
2003-12-24 17:58:06 +04:00
unknown
4bff43a724 "like" did not work in some cases with character set big5 2003-12-24 16:59:48 +04:00
unknown
56f4840563 charset.c:
he mysqld server crashes if issued a command select convert(...)
  with a
  non-compiled character set:


mysys/charset.c:
  he mysqld server crashes if issued a command select convert(...)
  with a
  non-compiled character set:
2003-12-24 16:04:26 +04:00
unknown
b72efef6f8 install_test_db.sh:
install-test-db did not substiture the path to charsets file, so tests failed with non-default collation incompiled, for example --with-collation=latin1_german1_ci
mysqld.cc:
  better error messaging


sql/mysqld.cc:
  better error messaging
mysql-test/install_test_db.sh:
  install-test-db did not substiture the path to charsets file, so tests failed with non-default collation incompiled, for example --with-collation=latin1_german1_ci
2003-12-24 16:04:25 +04:00
unknown
20a1da7864 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.2046


libmysqld/libmysqld.c:
  Auto merged
2003-12-24 16:04:24 +04:00
unknown
2b1aa3fc2a Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into teton.kitebird.com:/home/paul/mysql-4.1


libmysql/libmysql.c:
  Auto merged
2003-12-23 09:47:02 -06:00
unknown
c00c385135 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.2181
2003-12-23 18:25:45 +04:00
unknown
02531752eb Fix for #2181 (mysql_execute crashed instead of returning error on embedded
server)
We didn't perform the check for the error for embedded server


libmysql/libmysql.c:
  error checking moved to the mysql_execute level
2003-12-23 18:24:33 +04:00
unknown
11d47779a2 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/kostja/mysql/mysql-4.1-prep
2003-12-23 16:17:46 +03:00
unknown
7136e3866c Fix for #2184 (Prepared statements if embedded library broken)
There was an error with same function/class member names


sql/sql_prepare.cc:
  Name scope specified
2003-12-23 17:17:45 +04:00
unknown
923af04fc1 short patch for bug #2184 'Prepared statements in embedded library was
broken with recent changes' (attempt 2).
Adding Statement_core is better because:
- set_statement() code is shorter and you don't need to modify it when adding
new members to Statement_core
- a bit faster (you don't have virtual call and don't free_root() twice)
Do that short patch instead in hope that set_statement() will be sooner or
later removed entirely


sql/sql_class.cc:
  short patch for bug #2184 'Prepared statements in embedded library was 
  broken with recent changes'
sql/sql_class.h:
  short patch for bug #2184 'Prepared statements in embedded library 
  was broken with recent changes'
2003-12-23 15:38:19 +03:00
unknown
85938910d5 Minor comment edits. 2003-12-22 13:08:16 -06:00
unknown
19e15109d0 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into teton.kitebird.com:/home/paul/mysql-4.1
2003-12-22 09:41:21 -06:00
unknown
37d11ff858 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/kostja/mysql/mysql-4.1-root
2003-12-22 15:57:59 +03:00
unknown
f2ddb590e3 Names of all client methods (static functions inside client.c) now
uniform: cli_ + member name.
2003-12-22 15:57:34 +03:00