Commit graph

11075 commits

Author SHA1 Message Date
unknown
4681ca8dfd Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2004-01-15 16:31:55 +01:00
unknown
ae4b94598c an obvious bug in _mi_key_cmp fixed (BUG#2295 - range on blobs) 2004-01-15 16:31:27 +01:00
unknown
81e869bcf2 - fixed early removing of socket file when multiple instances of mysqld are
started via mysqld_safe (BUG#2114) Thanks to Rodrigo Marchant for the
   suggestion


scripts/mysqld_safe.sh:
   - fixed early removing of socket file when multiple instances of mysqld are
     started via the script (BUG#2114) Thanks to Rodrigo Marchant for the
     suggestion
2004-01-15 16:14:30 +01:00
unknown
9a7ea95853 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into bar.intranet.mysql.r18.ru:/usr/home/bar/mysql-4.1
2004-01-15 17:08:45 +04:00
unknown
070647206a charset.c:
http://bugs.mysql.com/bug.php?id=2386
  Index.xml file larger than 1024*16
  Fix for the above bug.


mysys/charset.c:
  http://bugs.mysql.com/bug.php?id=2386
  Index.xml file larger than 1024*16
  Fix for the above bug.
2004-01-15 17:07:29 +04:00
unknown
758f4da316 - no C++ comments in .c files, please... 2004-01-15 13:32:12 +01:00
unknown
d372811cb2 I forgot to add the test in the previous commit :(
Blame me!
2004-01-15 16:10:44 +04:00
unknown
5dcab209c2 field.cc:
http://bugs.mysql.com/bug.php?id=2218
  updating utf-8 text field generate nonsense chars
  Fix for the above bug.


sql/field.cc:
  http://bugs.mysql.com/bug.php?id=2218
  updating utf-8 text field generate nonsense chars
  Fix for the above bug.
2004-01-15 15:58:06 +04:00
unknown
b3e6fb8bea Merge mysql.com:/space/my/mysql-4.0
into mysql.com:/space/my/mysql-4.0-build
2004-01-15 12:09:23 +01:00
unknown
fd427c063d Fic for Bug 2367: INSERT() behaviour is different for different charsets. 2004-01-15 13:27:20 +04:00
unknown
4239d4b24f item_strfunc.cc:
Unnesessary copying was fixed


sql/item_strfunc.cc:
  Unnesessary copying was fixed
2004-01-15 12:12:55 +04:00
unknown
484cf319c5 Fixed Bug#2123, mysqld segmentation faulted when it tried to
open a file that already existed. The problem was that end_io_cache()
was called even if init_io_cache() was not. This affected both
OUTFILE and DUMPFILE (both fixed). Sometimes wrongly aligned pointer was freed,
sometimes mysqld core dumped.

Other problem was that select_dump::send_error removed the dumpfile,
even if it was created by an earlier run, or by some other program, if
the file permissions just permitted it. Fixed it so that the file will
only be deleted, if an error occurred, but the file was created by mysqld
just a moment ago, in that thread.

On the other hand, select_export did not handle the corresponding garbage
file at all. Both fixed.

After these fixes, a big part of the select_export::prepare and select_dump::prepare
code became identical. Merged the code into a new function called create_file(),
which is now called by the two latter functions.

Regards,
Jani


mysys/mf_iocache.c:
  Fixed a bug in comment.
2004-01-15 06:48:31 +02:00
unknown
3ad098661a Fixed Bug#2281, --quote is now enabled by default. Can be disabled
with --disable-quote

Added --compatible=ansi mode.

Fixed a non-reported bug in compatible mode; there was a check for
/*!41000 */ at this part of the code, while it obviously should have been
/*!40100 */. So the mysqldump compatiple mode made for 4.0.1 will not work
until 4.10 or later server is released :P Fixed into 4.0.2.


client/mysqldump.c:
  Fixed Bug#2281, --quote is now enabled by default. Can be disabled
  with --disable-quote
  
  Added --compatible=ansi mode.
  
  Changed sapdb into maxdb, as this change has been made to server too.
  
  Fixed a non-reported bug in compatible mode; there was a check for
  /*!41000 */ at this part of the code, while it obviously should have been
  /*!40100 */. So the mysqldump compatiple mode made for 4.1.0 will not work
  until 4.10.0 or later server is released :P Fixed into 4.1.2.
2004-01-15 04:26:57 +02:00
unknown
f9bec44af1 Added handling for ; comment character as there was for #.
Bug#2080
2004-01-15 04:00:21 +02:00
unknown
391cb07be0 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1
into rhols221.adsl.netsonic.fi:/home/my/bk/mysql-4.1


client/mysql.cc:
  Auto merged
2004-01-14 17:49:17 +02:00
unknown
4d53f9961c Fixed a non-debug version compilation error and warning. 2004-01-14 17:48:38 +02:00
unknown
e9322b891a compilation error fixed 2004-01-14 16:42:08 +01:00
unknown
3570044b73 Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-01-14 16:40:51 +01:00
unknown
d7c2c8f1f9 row0ins.c:
Fix bug: FOREIGN KEY ... ON UPDATE/DELETE NO ACTION must check the foreign key constraint, not ignore it. Peter Gulutzan said that NO ACTION should check the constraint as deferred, at the end of the SQL statement, while RESTRICT should check it immediately. Since we do not have defered constraints in InnoDB, this bug fix makes InnoDB to check NO ACTION constraints immediately, like it checks RESTRICT constraints.


innobase/row/row0ins.c:
  Fix bug: FOREIGN KEY ... ON UPDATE/DELETE NO ACTION must check the foreign key constraint, not ignore it. Peter Gulutzan said that NO ACTION should check the constraint as deferred, at the end of the SQL statement, while RESTRICT should check it immediately. Since we do not have defered constraints in InnoDB, this bug fix makes InnoDB to check NO ACTION constraints immediately, like it checks RESTRICT constraints.
2004-01-14 16:21:54 +02:00
unknown
d229b2d971 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into bar.intranet.mysql.r18.ru:/usr/home/bar/mysql-4.1
2004-01-14 17:33:50 +04:00
unknown
502a9efbcf item_strfunc.cc:
We don't need to copy if start is 0, we can return the original value.


sql/item_strfunc.cc:
  We don't need to copy if start is 0, we can return the original value.
2004-01-14 17:26:30 +04:00
unknown
6eaa5c3a66 assigned correct lex->current_select for derived tables (BUG#2349)
moved LIMIT initialialization, because it is need only for single select derived table


mysql-test/r/derived.result:
  test suite for BUG#2349
mysql-test/t/derived.test:
  test suite for BUG#2349
sql/sql_derived.cc:
  assigned correct lex->current_select (BUG#2349)
  moved LIMIT initialialization, because it is need only for single select
2004-01-14 15:15:42 +02:00
unknown
2f69de8e0e Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1


sql/sql_show.cc:
  Auto merged
2004-01-14 14:08:56 +01:00
unknown
13cf5e6b0a fix for the 2361 bug: ALTER TABLE ... DROP PRIMARY KEY drops a non-primary key
"PRIMARY" has been replaced by primary_key_name.


sql/mysql_priv.h:
  "PRIMARY" replaced by primary_key_name.
sql/sql_help.cc:
  "PRIMARY" replaced by primary_key_name.
sql/sql_select.cc:
  "PRIMARY" replaced by primary_key_name.
sql/sql_show.cc:
  "PRIMARY" replaced by primary_key_name.
sql/sql_table.cc:
  fix for the 2361 bug: ALTER TABLE ... DROP PRIMARY KEY drops a non-primary key
  "PRIMARY" replaced by primary_key_name.
sql/table.cc:
  "PRIMARY" replaced by primary_key_name.
2004-01-14 16:01:55 +04:00
unknown
df9dd1d80f Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1-bug
2004-01-14 12:47:04 +01:00
unknown
fd7d543adc show create tests 2004-01-14 12:29:30 +01:00
unknown
cbc7488996 bugs #2280, #2281 - show create table should always return a valid sql statement 2004-01-14 11:52:25 +01:00
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
91c236cc77 Merge mysql.com:/space/my/mysql-4.0
into mysql.com:/space/my/mysql-4.0-build
2004-01-13 19:45:09 +01:00
unknown
4ee3e7dc69 - be able to build MySQL-shared-compat RPMs for other archs than i386 2004-01-13 19:44:33 +01:00
unknown
afa55213dc Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.0
into mysql.com:/space/my/mysql-4.0
2004-01-13 19:35:04 +01:00
unknown
54ee2705b0 - improved wording in mysql_install_db on what to do to set the password
for the MySQL root user (BUG#2375)


scripts/mysql_install_db.sh:
   - improved wording on what to do to set the password for the MySQL root
     user (BUG#2375)
2004-01-13 19:33:01 +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
3640f7e11b Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2004-01-13 12:31:51 +01:00
unknown
febc79bb5d BUG#2304 - HANDLER and tables in non-current db 2004-01-13 12:31:25 +01:00
unknown
e1d5f62041 Fixed Bug #2338 Trigonometric arithmetic problem
by fixing optimizer bug with help of 'volatile' keyword


mysql-test/r/func_math.result:
  added tests for BUG #2338 Trigonometric arithmetic problems
mysql-test/t/func_math.test:
  added tests for BUG #2338 Trigonometric arithmetic problems
sql/item_func.cc:
  added keyword volatile in Item_func_acos::val and Item_func_asin::val
  to calm optimizer down and to avoid it's bug
2004-01-12 22:47:26 -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
8ae9f14591 Checked and applied Novell-supplied patches inside the netware directory only.
netware/BUILD/compile-linux-tools:
  Need to run make on sql_yacc.cc.
netware/BUILD/compile-netware-END:
  Use .zip package.
netware/BUILD/compile-netware-all:
  Add compile-netware-src.
netware/BUILD/compile-netware-standard:
  Need backslash to avoid error.
netware/BUILD/mwenv:
  Add additional include, library paths, -dialect and -map flags for CW.
netware/BUILD/nwbootstrap:
  Additional status messages, update versions in .def files.
netware/Makefile.am:
  Cosmetic change, add @openssl_libs@ in case of OpenSSL feature usage.
netware/isamchk.def:
  Add SCREENNAME to allow interaction.
netware/my_manage.c:
  Take out unused args to mysqladmin.
netware/myisamchk.def:
  Add SCREENNAME to allow interaction.
netware/myisamlog.def:
  Add SCREENNAME to allow interaction.
netware/myisampack.def:
  Add SCREENNAME to allow interaction.
netware/mysql_test_run.c:
  Multiple changes to help test suite.
netware/mysqlbinlog.def:
  Add SCREENNAME to allow interaction.
netware/mysqlcheck.def:
  Add SCREENNAME to allow interaction.
netware/mysqld_safe.c:
  Make error message more accurate/descriptive.
netware/mysqldump.def:
  Add SCREENNAME to allow interaction.
netware/mysqlimport.def:
  Add SCREENNAME to allow interaction.
2004-01-12 21:15:49 -01: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