1
0
mirror of https://github.com/MariaDB/server.git synced 2025-05-17 14:41:26 +03:00

6466 Commits

Author SHA1 Message Date
unknown
ac316cfdb3 Fixed bug in CREATE ... DECIMAL(-1,1). Bug #432
mysql-test/mysql-test-run.sh:
  Ensure that tests are sorted
mysql-test/r/type_decimal.result:
  Test for bug with decimal()
mysql-test/t/type_decimal.test:
  Test for bug with decimal()
sql/sql_parse.cc:
  Fixed bug in CREATE ... DECIMAL(-1,1)
2003-05-14 22:12:55 +03:00
unknown
c4bc507fdd Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-top-4.1


mysql-test/r/subselect.result:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2003-05-14 22:01:56 +03:00
unknown
a32b868c3b subselect transformation moved in after-fix_field place
removed "of is null" if it is possible
  (this cset should be SCRUM related, but not approved as scrum task yet)


mysql-test/r/subselect.result:
  new subselect test result (new place of error detecting & and more subselect reducing)
sql/item.cc:
  layout fix
sql/item.h:
  unneed ';'
  fixed print pethod
sql/item_cmpfunc.cc:
  new method to support transformation after fix_fields
sql/item_cmpfunc.h:
  new method to support transformation after fix_fields
  fixed Item printing
sql/item_subselect.cc:
  new transformation
sql/item_subselect.h:
  new transformation
sql/sql_derived.cc:
  'table' & 'table_list' now is not union
sql/sql_lex.cc:
  'table' & 'table_list' now is not union to support reinit only shared tables (but all)
sql/sql_lex.h:
  mark fake st_select_lex
sql/sql_olap.cc:
  fixed table assignment
  TODO added
sql/sql_select.cc:
  'table' & 'table_list' now is not union
  transforming subselect
sql/sql_union.cc:
  prepare make on fix_fields
sql/sql_yacc.yy:
  fixed layout
sql/table.h:
  'table & 'table_list' now is different fields
2003-05-14 21:51:33 +03:00
unknown
13a23a879f Fix for MacOSX and symlinks
Fix for USE_FRM and crashed index file


configure.in:
  Fix for MacOSX and symlinks
myisam/mi_open.c:
  Give better error message in case of of crashed index file
mysql-test/r/repair.result:
  new test case
mysql-test/r/update.result:
  new test case
mysql-test/t/repair.test:
  Added test with crashed MyISAM index header
mysql-test/t/update.test:
  Added test case from bugs system
sql/handler.cc:
  Indentation changes
sql/sql_table.cc:
  Fix for USE_FRM and crashed index file
2003-05-14 01:27:26 +03:00
unknown
40e4b8d0cb Proper replication of CONNECTION_ID() and 4.1 PASSWORD() (bugs 177 and 344),
new test for this.


sql/item_create.cc:
  Proper replication of CONNECTION_ID() (bug 177).
  This is just for replication; mysqlbinlog|mysql still does not work
  with CONNECTION_ID(), it will wait for row-level binlogging.
sql/item_strfunc.cc:
  Proper replication of the new 4.1 PASSWORD() (bug 344)
2003-05-13 22:50:28 +02:00
unknown
6c60313bc7 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0


include/my_global.h:
  Auto merged
2003-05-13 22:35:41 +03:00
unknown
1e99e9fe96 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into hynda.(none):/home/my/bk/mysql-4.0
2003-05-13 22:34:04 +03:00
unknown
32450d159b Fixed a bug in DROP DATABASE when database had a RAID type table.
Bug ID 381.
2003-05-13 22:28:34 +03:00
unknown
21b5aecff1 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0
2003-05-13 22:09:03 +03:00
unknown
517bbaceee Merge pmartin@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/pem/work/mysql-4.0
2003-05-13 20:05:23 +02:00
unknown
7a96b137ef - disabled all "EXPLAIN SELECT" tests from the InnoDB test because of
nodeterministic results on some platforms
2003-05-13 19:30:07 +02:00
unknown
a147307f42 Forgot to correct comment in key.test (after fixing bug 390).
mysql-test/t/key.test:
  Forgot to correct comment (after fixing bug 390).
2003-05-13 19:19:57 +02:00
unknown
563c32ccd1 Fix of bug 390: primary key now implies (silently) NOT NULL for key fields. 2003-05-13 19:16:30 +02:00
unknown
d4ae4f0ec0 Fixed 'Unknown error' when using 'UPDATE ... LIMIT'. Bug 373
mysql-test/r/update.result:
  new test
mysql-test/t/update.test:
  Test of UPDATE ... LIMIT
sql/sql_update.cc:
  Fixed 'Unknown error' when using 'UPDATE ... LIMIT'
2003-05-13 20:07:43 +03:00
unknown
496357a180 - Fixed a bug in myisam_max_[extra]_sort_file_size, bug ID 339 and 342
- Fix for QNX: UNIX sockets available since 6.2.1


include/my_global.h:
  Fix for QNX: UNIX sockets available since 6.2.1
mysql-test/r/variables.result:
  Fixed a bug in myisam_max_[extra]_sort_file_size, bug ID 339
mysql-test/t/variables.test:
  Fixed a bug in myisam_max_[extra]_sort_file_size, bug ID 339
sql/mysqld.cc:
  Fixed a bug in myisam_max_[extra]_sort_file_size, bug ID 339
sql/set_var.cc:
  Fixed a bug in myisam_max_[extra]_sort_file_size, bug ID 339
sql/set_var.h:
  Fixed a bug in myisam_max_[extra]_sort_file_size, bug ID 339
2003-05-13 19:34:51 +03:00
unknown
d05cd28c10 Fixed problem with ansi mode and GROUP BY with constants. (Bug #387)
sql/sql_select.cc:
  Fixed problem with ansi mode and GROUP BY with constants
2003-05-13 19:26:07 +03:00
unknown
dc1e55f819 Fix for UNION and LEFT JOIN (Bug #386)
Fixed wrong logging of Access denied error (Bug #398)


include/my_global.h:
  Fix for QNX
mysql-test/r/union.result:
  new test case
mysql-test/t/union.test:
  Test of bug in union and left join
mysys/my_seek.c:
  Safety fix to find out when pos gets a wrong value
sql/field.h:
  Fix for UNION and LEFT JOIN
sql/mysql_priv.h:
  Fix for UNION and LEFT JOIN
sql/sql_base.cc:
  Fix for UNION and LEFT JOIN
sql/sql_insert.cc:
  Fix for UNION and LEFT JOIN
sql/sql_parse.cc:
  Fixed wrong logging of Access denied error
sql/sql_union.cc:
  Fix for UNION and LEFT JOIN
sql/sql_update.cc:
  Fix for UNION and LEFT JOIN
2003-05-13 18:58:26 +03:00
unknown
4ccf66df87 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mashka.mysql.fi:/home/my/mysql-4.0
2003-05-13 12:04:32 +03:00
unknown
179b1b6842 Removed timing of tests from mysql-test-run.
Needed by QNX, and there was no real use for timing.
2003-05-13 11:39:07 +03:00
unknown
9f22d16669 Give warning if MySQL doesn't honor given storage engine
Allow syntax CREATE TABLE t1 (LIKE t2)


BUILD/compile-pentium-debug-max:
  Disable isam
BUILD/compile-pentium-valgrind-max:
  Disable isam
include/mysqld_error.h:
  New error
mysql-test/r/bdb.result:
  new error message
mysql-test/r/innodb.result:
  new error message
mysql-test/r/subselect.result:
  New test
mysql-test/r/variables.result:
  New test
mysql-test/r/warnings.result:
  Test of warning if MySQL creates table with another handler than specified
mysql-test/t/innodb.test:
  Added test case for derivied tables
mysql-test/t/subselect.test:
  New test
mysql-test/t/variables-master.opt:
  Fixed wrong parameter
mysql-test/t/warnings.test:
  Test if creating handler of not existing table type
sql/ha_isam.cc:
  Added option --skip-isam
sql/ha_isam.h:
  Added option --skip-isam
sql/handler.cc:
  Added option --skip-isam
sql/item.cc:
  Deleted probably wrong bug fix
sql/mysqld.cc:
  Added option --skip-isam
sql/share/czech/errmsg.txt:
  Added missing ','
sql/share/danish/errmsg.txt:
  Added missing ','
sql/share/dutch/errmsg.txt:
  Added missing ','
sql/share/english/errmsg.txt:
  Added missing ','
  changed table handler -> storage engine
sql/share/estonian/errmsg.txt:
  Added missing ','
sql/share/french/errmsg.txt:
  Added missing ','
sql/share/german/errmsg.txt:
  Added missing ','
sql/share/greek/errmsg.txt:
  Added missing ','
sql/share/hungarian/errmsg.txt:
  Added missing ','
sql/share/italian/errmsg.txt:
  Added missing ','
sql/share/japanese/errmsg.txt:
  Added missing ','
sql/share/korean/errmsg.txt:
  Added missing ','
sql/share/norwegian-ny/errmsg.txt:
  Added missing ','
sql/share/norwegian/errmsg.txt:
  Added missing ','
sql/share/polish/errmsg.txt:
  Added missing ','
sql/share/portuguese/errmsg.txt:
  Added missing ','
sql/share/romanian/errmsg.txt:
  Added missing ','
sql/share/russian/errmsg.txt:
  Added missing ','
sql/share/serbian/errmsg.txt:
  Added missing ','
sql/share/slovak/errmsg.txt:
  Added missing ','
sql/share/spanish/errmsg.txt:
  Added missing ','
sql/share/swedish/errmsg.txt:
  Added missing ','
sql/share/ukrainian/errmsg.txt:
  Added missing ','
sql/sql_acl.cc:
  Fix bug in access checking of derived tables
sql/sql_base.cc:
  Indentation change
sql/sql_parse.cc:
  Fix bug in access checking of derived tables
sql/sql_select.cc:
  Fixed bug in new sub select optimization
sql/sql_table.cc:
  Give warning if MySQL doesn't honor given storage engine
sql/sql_yacc.yy:
  Allow syntax CREATE TABLE t1 (LIKE t2).
2003-05-13 11:15:11 +03:00
unknown
10c790eff0 Safety fix to enable RAID in max binaries
Better fix for format('nan')
Fix for HAVING COUNT(DISTINCT...)


myisam/mi_check.c:
  Better error message
myisam/mi_dynrec.c:
  Simple code cleanup
myisam/myisamchk.c:
  Better error messages
mysql-test/r/func_misc.result:
  Added back test for format('nan')
mysql-test/r/having.result:
  New test
mysql-test/t/func_misc.test:
  Added back test for format('nan')
mysql-test/t/having.test:
  Added test for count(distinct) in having
mysys/raid.cc:
  Safety fix to enable RAID in max binaries
scripts/mysql_install_db.sh:
  Create data directories even if --in-rpm is used (for MaxOSX)
sql/item_strfunc.cc:
  Better fix for format('nan')
sql/mysqld.cc:
  Give stacktrace on assert()
sql/sql_yacc.yy:
  Fix for HAVING COUNT(DISTINCT...)
tests/big_record.pl:
  Extend test to abuse packed MyISAM tables
tests/table_types.pl:
  Fixed wrong merge
2003-05-13 10:54:07 +03:00
unknown
ab7b332835 Task #627 : user variables' names are now case-insensitive :
@test=@"tEsT"=@`teST` etc. Tests updated.
Note that the patch to sql_class.cc does not use HASH_CASE_INSENSITIVE as did the one which I sent for review. This is because meanwhile HASH_CASE_INSENSITIVE has disappeared (since cset 1.1504.1.6).


mysql-test/r/variables.result:
  updated test
mysql-test/t/variables.test:
  updated test
sql/sql_class.cc:
  Task #627 : user variables' names are now case-insensitive :
  @test=@"tEsT"=@`teST` etc.
2003-05-12 15:36:31 +02:00
unknown
fb5df27adf Expand the mysql.proc table 2003-05-06 21:09:20 +05:00
unknown
429c488fce merge
sql/item.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/unireg.h:
  Auto merged
2003-05-06 01:42:33 +03:00
unknown
b96aaea7e1 Removed compiler warnings
Fixed memory leak in new filesort code
Optimzed sub selects to use keys with outer references.
Increased max tables in join to 62


client/Makefile.am:
  Remve test programs
myisam/mi_check.c:
  Remove compiler warnings
myisam/mi_delete.c:
  Remove 'rnd' variable to make usage repeatable
myisam/mi_open.c:
  Remove 'rnd' variable to make usage repeatable
myisam/mi_write.c:
  Remove 'rnd' variable to make usage repeatable
myisam/myisamdef.h:
  Remove 'rnd' variable to make usage repeatable
myisam/myisamlog.c:
  Remove 'rnd' variable to make usage repeatable
mysql-test/r/subselect.result:
  new test
mysql-test/t/join.test:
  Updated test
mysql-test/t/subselect.test:
  new test
sql/filesort.cc:
  Added function to free buffers allocated by filesort
sql/item.cc:
  Sub select optimization
sql/item_cmpfunc.cc:
  Sub select optimization
sql/item_subselect.cc:
  Sub select optimization
sql/item_sum.cc:
  Removed compiler warnings
sql/item_sum.h:
  Simple code cleanup
sql/log.cc:
  Removed compiler warning
sql/mysql_priv.h:
  Made table_map ulonglong to allow 62 tables in join
sql/records.cc:
  Moved free of filesort buffers to own function
sql/sql_select.cc:
  subselect optimization
  Call filesort_free_buffers() to free memory from filesort
sql/unireg.h:
  Sub select optimization
2003-05-06 01:38:38 +03:00
unknown
3ed1a9a188 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0
2003-05-05 14:58:33 +03:00
unknown
afe9738efb Fixed that reading a DATE string of 000000 is interpreted as 0000-00-00 instead of 2000-00-00
sql/time.cc:
  Removed not used code
  Fixed that reading a DATE string of 000000 is interpreted as 0000-00-00 instead of 2000-00-00
2003-05-05 14:52:39 +03:00
unknown
6b1d89b1c9 result updated 2003-05-04 11:00:45 +02:00
unknown
155b8e0013 "delete from table where const" bug fixed 2003-05-03 18:08:11 +02:00
unknown
ba886f1086 Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2003-05-03 15:22:57 +02:00
unknown
38b188bf9a Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0


mysql-test/r/innodb.result:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
2003-05-03 16:22:56 +03:00
unknown
34c3c02794 Fix problem where key_read was not cleaned up properly, which caused assert in innodb test.
mysql-test/r/innodb.result:
  Changed tests to make them repeatable.
mysql-test/t/innodb.test:
  Changed tests to make them repeatable.
sql/opt_sum.cc:
  Safety fix
sql/sql_base.cc:
  Safety assert
2003-05-03 16:21:43 +03:00
unknown
e2a839ff47 test case added 2003-05-03 15:21:39 +02:00
unknown
b33115ecf9 INSERT ... UPDATE ... VALUES() 2003-05-03 01:16:56 +02:00
unknown
edde138b30 removing architecture dependent test 2003-04-30 17:39:23 +03:00
unknown
b857129454 Updated warning test
Updated all tests to catchup warnings for all field conversions


mysql-test/t/ctype_many.test:
  Disable the warnings for misc conversion
mysql-test/t/warnings.test:
  More warning tests
2003-04-30 00:07:37 -07:00
unknown
eb585f6615 merge fix
mysql-test/r/innodb.result:
  Auto merged
mysql-test/r/join_outer.result:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
2003-04-29 14:35:10 +03:00
unknown
38b70f0608 code cleanup
mysql-test/r/innodb.result:
  fixing result
mysql-test/t/innodb.test:
  fixing test
sql/sql_base.cc:
  committing a fix in order to pull new stuff
2003-04-29 14:13:22 +03:00
unknown
3f25329605 Merged 4.1 to 5.0.
BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
include/mysql_com.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/lex.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/protocol.cc:
  Auto merged
sql/records.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_derived.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2003-04-29 12:06:04 +02:00
unknown
998dc6468b Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into myvenu.com:/home/venu/work/sql/dev-4.1
2003-04-28 22:58:19 -07:00
unknown
671e77a1f7 - Removed two EXPLAIN SELECT statements from the InnoDB test suite
(the results are nondeterministic and provide different output on 32bit
  and 64bit architectures)


mysql-test/r/innodb.result:
   - removed two EXPLAIN SELECT results because the output is nondeterministic
     (the result was different on 64bit platforms)
mysql-test/t/innodb.test:
   - removed two EXPLAIN SELECT tests because the results are nondeterministic
     (the result was different on 64bit platforms)
2003-04-28 16:05:27 +02:00
unknown
f22be77734 Fixed problem when comparing a key for a multi-byte-character set. (bug 152)
Use 0x.... as strings if 'new' mode. (bug 152)
Don't report -max on windows when InnoDB is enabled. (bug 332)
Reset current_linfo;  This could cause a hang when doing PURGE LOGS.
Fix for row numbers in EXPLAIN (bug 322)
 Fix that USE_FRM works for all table types (bug 97)


VC++Files/libmysql/libmysql.dsp:
  Added new source files
myisam/mi_key.c:
  Fixed problem when comparing a key for a multi-byte-character set.
myisam/mi_range.c:
  Fixed problem when comparing a key for a multi-byte-character set.
myisam/mi_rkey.c:
  Fixed problem when comparing a key for a multi-byte-character set.
myisam/mi_search.c:
  Fixed problem when comparing a key for a multi-byte-character set.
myisam/mi_test2.c:
  Fixed printf statements
myisam/myisamdef.h:
  Fixed problem when comparing a key for a multi-byte-character set.
myisam/sort.c:
  Fixed printf statements
mysql-test/r/ctype_latin1_de.result:
  New test results
mysql-test/r/join.result:
  New test results
mysql-test/r/repair.result:
  New test results
mysql-test/r/rpl_alter.result:
  New test results
mysql-test/t/ctype_latin1_de-master.opt:
  --new is needed to get 0x... strings to work properly
mysql-test/t/ctype_latin1_de.test:
  New test for latin1_de
mysql-test/t/repair.test:
  Test of USE_FRM and HEAP tables
sql/field.cc:
  Fixed problem when comparing a key for a multi-byte-character set.
sql/item.cc:
  Use 0x.... as strings if 'new' mode
sql/item.h:
  Use 0x.... as strings if 'new' mode
sql/mysqld.cc:
  Don't report -max on windows when InnoDB is enabled.
sql/sql_analyse.cc:
  Removed unused variable
sql/sql_insert.cc:
  Removed debug message
sql/sql_repl.cc:
  Reset current_linfo;  This could cause a hang when doing PURGE LOGS.
sql/sql_select.cc:
  Fix for row numbers in EXPLAIN
sql/sql_table.cc:
  Fix that USE_FRM works for all table types (without strange errors)
sql/sql_yacc.yy:
  Removed compiler warnings.
2003-04-27 22:12:08 +03:00
unknown
64cad16faa Post-fix of bug #302 fix.
Fixed bug #320.
Some new tests and cosmetic changes.
Another strcasecmp() replaced.


mysql-test/r/sp.result:
  Moved SP tests from subselect and added some more.
mysql-test/r/subselect.result:
  Moved SP tests to sp.test.
mysql-test/t/sp.test:
  Moved SP tests from subselect and added some more.
mysql-test/t/subselect.test:
  Moved SP tests to sp.test.
sql/sp.cc:
  Don't close derived tables.
sql/sp_head.cc:
  Minor layout and comment fix.
sql/sp_head.h:
  Minor comment fix.
sql/sql_derived.cc:
  Don't set org_table_list->derived to 1 when debugging, as this breaks certain
  subselect args to SPs.
sql/sql_parse.cc:
  Post-fix of bugfix (free memory on error), and added comment.
sql/sql_yacc.yy:
  Another strcasecmp() replaced.
2003-04-27 17:35:54 +02:00
unknown
3e90ec6a58 Merge with 3.23:
Set innobase_flush_log_at_trx_commit to 1 by default
Fix problem with timestamp on 64 bit systems
Reserve alarms for up to 10 slave threads


BitKeeper/etc/logging_ok:
  auto-union
mysql-test/t/rpl_alter.test:
  Auto merged
mysys/charset.c:
  Auto merged
sql/log_event.cc:
  Auto merged
mysql-test/r/join.result:
  Merge with 3.23
mysql-test/t/join.test:
  Merge with 3.23
sql/ha_innodb.cc:
  Merge with 3.23;  Set innobase_flush_log_at_trx_commit to 1 by default
sql/log_event.h:
  Merge with 3.23; Fix problem with timestamp on 64 bit systems
sql/mini_client.cc:
  Use local version
sql/mysqld.cc:
  Reserve alarms for up to 10 slave threads
sql/slave.cc:
  Use local version
sql/sql_list.h:
  Use local version
2003-04-26 21:10:13 +03:00
unknown
62af18cb87 Fix for -fbranch-probabilites (bug 268)
Fix for LEFT/RIGHT/MID with multi-byte-character sets (bug 314)
Fix for new bison 1.875
max_insert_delayed_threads and delayed_insert_timeout now works as documented (bug 211)
Don't show port in SHOW PROCESSLIST for system threads
Fix problem with ORDER BY being discarded for some DISTINCT queries (bug 275)
Fixed bug with NATURAL LEFT JOIN, NATURAL RIGHT JOIN and RIGHT JOIN when
using many joined tables (Bug 212)


acinclude.m4:
  Fix for -fbranch-probabilites
configure.in:
  Fix for -fbranch-probabilites
myisam/mi_open.c:
  Give error instead of writing to stderr (Which user can't see)
mysql-test/r/join.result:
  Update results after change to NATURAL/LEFT/RIGHT JOIN
mysql-test/r/join_outer.result:
  Update results after change to NATURAL/LEFT/RIGHT JOIN
mysql-test/r/select.result:
  Update results after change to NATURAL/LEFT/RIGHT JOIN
mysql-test/t/join.test:
  Update results after change to NATURAL/LEFT/RIGHT JOIN
sql/item_strfunc.cc:
  Fix for LEFT/RIGHT/MID with multi-byte-character sets
sql/mysqld.cc:
  Fix for new bison 1.875 (Wrong error text message when one got syntax error)
sql/sql_class.cc:
  Don't show port in SHOW PROCESSLIST for system threads
sql/sql_insert.cc:
  max_insert_delayed_threads now works as documented.
  delayed_insert_timeout now works on Linux
sql/sql_parse.cc:
  Added comment
sql/sql_select.cc:
  Fix problem with ORDER BY being discarded and results returned un-sorted
sql/sql_yacc.yy:
  Fixed bug with NATURAL LEFT JOIN, NATURAL RIGHT JOIN and RIGHT JOIN when
  using many joined tables.
2003-04-26 20:43:28 +03:00
unknown
8ae605d7ee merge fix
mysql-test/r/alter_table.result:
  Auto merged
mysql-test/r/join_outer.result:
  Auto merged
mysql-test/r/multi_update.result:
  Auto merged
mysql-test/t/alter_table.test:
  Auto merged
mysql-test/t/join_outer.test:
  Auto merged
mysql-test/t/multi_update.test:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/share/czech/errmsg.txt:
  Auto merged
sql/share/danish/errmsg.txt:
  Auto merged
sql/share/dutch/errmsg.txt:
  Auto merged
sql/share/estonian/errmsg.txt:
  Auto merged
sql/share/french/errmsg.txt:
  Auto merged
sql/share/german/errmsg.txt:
  Auto merged
sql/share/greek/errmsg.txt:
  Auto merged
sql/share/hungarian/errmsg.txt:
  Auto merged
sql/share/italian/errmsg.txt:
  Auto merged
sql/share/korean/errmsg.txt:
  Auto merged
sql/share/norwegian-ny/errmsg.txt:
  Auto merged
sql/share/norwegian/errmsg.txt:
  Auto merged
sql/share/portuguese/errmsg.txt:
  Auto merged
sql/share/romanian/errmsg.txt:
  Auto merged
sql/share/russian/errmsg.txt:
  Auto merged
sql/share/slovak/errmsg.txt:
  Auto merged
sql/share/spanish/errmsg.txt:
  Auto merged
sql/share/ukrainian/errmsg.txt:
  Auto merged
sql/sql_table.cc:
  Auto merged
2003-04-26 16:44:42 +03:00
unknown
0c94064bbd merge fix
sql/handler.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
2003-04-26 15:26:28 +03:00
unknown
046c66819f filesort.cc, order_by.result:
Fixed bug 263
order_by.test:
  Fixed bug 263


mysql-test/t/order_by.test:
  Fixed bug 263
mysql-test/r/order_by.result:
   Fixed bug 263
sql/filesort.cc:
   Fixed bug 263
2003-04-26 14:54:53 +03:00
unknown
9c7d955bc6 Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.0
into mysql.com:/space/my/mysql-4.0
2003-04-25 14:52:48 +02:00
unknown
a8d6374fef - Updated innodb test results on Heikki's request (InnoDB now supports
ANALYZE TABLE)


BitKeeper/etc/ignore:
  Added support-files/MacOSX/ReadMe.txt to the ignore list
2003-04-25 14:42:01 +02:00