Commit graph

7,300 commits

Author SHA1 Message Date
unknown
ad144e30fb allow --without-extra-charsets 2003-02-24 11:46:07 +01:00
unknown
b4b2ce0483 - re-added missing reservedwords.texi (disappeared after last merge with
3.23.x) and removed mirrors.texi again
2003-02-24 11:34:41 +01:00
unknown
0463b01dc8 opt_sum.cc:
Correction for min/max optimization of queries with outer joins


sql/opt_sum.cc:
  Correction for min/max optimization of queries with outer joins
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2003-02-23 04:27:03 +02:00
unknown
87ee470db0 tests updated 2003-02-22 18:22:39 +01:00
unknown
feb8dc9ee5 ALTER TABLE closes all open HANDLER's for the table in question
fixed error handling in HANDLER ... READ FIRST


sql/sql_handler.cc:
  fix error handling in HANDLER ... READ FIRST
sql/sql_table.cc:
  ALTER TABLE closes all open HANDLER's for the table in question
2003-02-22 18:00:34 +01:00
unknown
17a76b00c6 merge fix
client/mysql.cc:
  Auto merged
libmysql/libmysql.c:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2003-02-22 17:14:50 +02:00
unknown
72065f34e6 Allowing NULL values in UNION's with first SELECT having only NOT NULL
columns.
2003-02-22 17:02:36 +02:00
unknown
850daeea33 make myisamchk -R to work, if the table contains fulltext indexes 2003-02-22 15:51:21 +01:00
unknown
3e4c276693 do not accept -R (sort by index) for FULLTEXT indexes 2003-02-22 11:44:26 +01:00
unknown
d5d69b9ccf Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
2003-02-22 01:07:47 +01:00
unknown
eec10a01cb do not allow COLUMN and AFTER/FIRST in
ALTER TABLE ... ADD KEY
2003-02-22 01:07:17 +01:00
unknown
8d05f9ef3e Merge work.mysql.com:/home/bk/mysql-4.1
into myvenu.com:/home/venu/work/sql/dev-4.1
2003-02-21 15:01:58 -08:00
unknown
c9a50805a1 Fix for mysql_stmt_close(), so that the PHP layer can map it easily to know whether the 'stmt' is really freed, so that they can free their internal stmts 2003-02-21 15:00:05 -08:00
unknown
4a07a2b1db Test's result update because std_data/words.dat has been lengthened by 500 bytes.
Increased some tests' robustness a bit :
- Added RESET MASTER to all tests who do SHOW BINLOG EVENTS, to make them independent from previous tests.
- Added save_master_pos to these tests to wait for the slave to start before purging its binary logs.


mysql-test/r/rpl_log.result:
  Updated SHOW BINLOG EVENTS's positions as Monty lengthened std_data/words.dat by 500 bytes.
mysql-test/r/rpl_temporary.result:
  Added RESET MASTER to make positions shown by SHOW BINLOG EVENTS independent of any previous test.
mysql-test/r/rpl_user_variables.result:
  Added RESET MASTER to make positions shown by SHOW BINLOG EVENTS independent of any previous test.
mysql-test/t/rpl_log.test:
  Added save_master_pos to wait for the slave to have started before purging its binary logs.
  Otherwise, we could purge before the slave finishes starting, and then the slave could log events implicitly provoked by previous tests.
mysql-test/t/rpl_temporary.test:
  Added RESET MASTER to make positions shown by SHOW BINLOG EVENTS independent of any previous test.
mysql-test/t/rpl_user_variables.test:
  Added RESET MASTER to make positions shown by SHOW BINLOG EVENTS independent of any previous test.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2003-02-21 23:38:56 +01:00
unknown
283a8a16f6 ibuf0ibuf.c:
Add diagnostic prints if insert buffer merge is tried to a page whose type is not an index page, try to recover from the situation by discarding the insert buffer records


innobase/ibuf/ibuf0ibuf.c:
  Add diagnostic prints if insert buffer merge is tried to a page whose type is not an index page, try to recover from the situation by discarding the insert buffer records
2003-02-21 23:11:31 +02:00
unknown
2ff70c9ea6 Merge lgrimmer@work.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
2003-02-21 17:51:37 +01:00
unknown
86efca41ac - removed +DD64 compile option from the HPUX11 default CFLAGS in
configure.in - there are 32bit installations of HPUX11 out there
   and compiling for these by manually adding +DAportable to CFLAGS
   did not work. Better add +DD64 manually, if you need it.
2003-02-21 17:42:48 +01:00
unknown
8f89795ec2 make EXPLAIN killable 2003-02-21 17:01:12 +01:00
unknown
fc10df3805 - removed duplicate my_sys.h inclusion from lib_vio.c
- removed obsolete compile options from compile-pentium-debug-openssl


BUILD/compile-pentium-debug-openssl:
   - removed "--without-innodb" (InnoDB is on by default) and "--with-vio"
     (--with-openssl implies --with-vio)
libmysqld/lib_vio.c:
   - removed duplicate my_sys.h inclusion
2003-02-21 16:37:18 +01:00
unknown
0bf753ab74 DATABASE character set is never blank anymore 2003-02-21 18:24:41 +04:00
unknown
f14222f252 Another missed fix for Embedded Library (Windows specific)
libmysqld/libmysqld.c:
  Another missed fix for Embedded Library
2003-02-20 23:42:35 -08:00
unknown
9c91aa956f Minor tweak to fix the Netware portability to libmysqld
libmysqld/libmysqld.c:
  Minor tweak to fix the Netware portability to libmysqld
2003-02-20 15:40:58 -08:00
unknown
0777bd04e4 Fix .dsp files to have all new changes to work with src disribution package script
VC++Files/client/mysqlclient.dsp:
  .
VC++Files/libmysql/libmysql.dsp:
  .
VC++Files/libmysqld/libmysqld.dsp:
  .
VC++Files/myisammrg/myisammrg.dsp:
  .
VC++Files/mysqlmanager/MySqlManager.dsp:
  .
VC++Files/mysys/mysys.dsp:
  .
VC++Files/strings/strings.dsp:
  .
2003-02-20 14:16:57 -08:00
unknown
20e237e5eb Windows portabilty fixups (last commit caused some errors, so recomitting) - SCRUM
strings/strto.c:
  Windows won't compile for a wrong argument passing, expects a charset pointer
sql/filesort.cc:
  Remove unused variable
sql/lex.h:
  Change POINT->POINT_SYM due to redefination error from windef.h
sql/mysqld.cc:
  Fix Embedded Server related code
sql/protocol.cc:
  Remove unused variables from Embedded Server
sql/sql_class.h:
  Remove silly usage
sql/sql_derived.cc:
  Windows won't let you compile for this kind of assignments
sql/sql_help.cc:
  Need a cast to make it compile
sql/sql_parse.cc:
  Remove unused variables from Embedded server
sql/sql_yacc.yy:
  Change POINT->POINT_SYM due to redefination error from windef.h
mysys/mf_keycache.c:
  Add a correct cast and remove the unused variables
libmysqld/lib_sql.cc:
  Remove unused variable
libmysqld/libmysqld.c:
  Port the netware change to remove mysql_once_init to libmysqld
2003-02-20 14:14:37 -08:00
unknown
6963b121da Initial script to create a windows src distribution package 2003-02-20 14:05:58 -08:00
unknown
857e77a160 - temporarily removed netware from AC_OUTPUT to be able to perform the
builds and until I've found a way on how to add this conditionally
2003-02-20 15:13:47 +01:00
unknown
27521fb5dd charset.c:
SHOW CHARACTER SET now displays "1" in mb_maxlen even if a charset is not loaded yet


mysys/charset.c:
  SHOW CHARACTER SET now displays "1" in mb_maxlen even if a charset is not loaded yet
2003-02-20 17:54:25 +04:00
unknown
596dc3857a Bug fix: we should not use info->buff for searching after we found last key in page 2003-02-20 16:44:34 +04:00
unknown
dda92b4b28 - autom4te.cache is a directory - remove it recursively 2003-02-20 10:20:26 +01:00
unknown
1184164aa5 - removed leading slashes (thanks Jim!) 2003-02-19 21:52:38 +01:00
unknown
c2e9867b19 - remove "autom4te.cache" directories, too 2003-02-19 21:41:01 +01:00
unknown
9158140a24 Merge mysql.com:/space/my/mysql-4.0
into mysql.com:/space/my/mysql-4.0-build
2003-02-19 21:22:29 +01:00
unknown
68ee31cf6c - added more files to support-files/MacOSX and added them to the
distribution
 - added Bootstrap, logger.pm and Do-pkg to Build-tools:
   Bootstrap is used to build the source distribution for the binary builds
   logger.pm includes some helper functions
   Do-pkg converts a binary distribution into a Mac OS X PKG (still needs
   some polishing)


support-files/MacOSX/Description.plist.sh:
   - Shortened IFPkgDescriptionDescription a bit
support-files/MacOSX/Makefile.am:
   - Added more files (StartupParameters.plist, postinstall, preinstall) to
     distribution
2003-02-19 21:02:05 +01:00
unknown
f8862eaafa Merge mysql.com:/space/my/mysql-4.0
into mysql.com:/space/my/mysql-4.0-patches
2003-02-19 19:41:57 +01:00
unknown
b56b25c78c nwbootstrap:
Change mode to -rwxrwxr-x


netware/nwbootstrap:
  Change mode to -rwxrwxr-x
2003-02-19 12:49:12 -05:00
unknown
fe673a80b1 row0sel.c:
Print a warning if MySQL uses a partial-field key value prefix in a search; that would not work if the search flag would happen to be HA_READ_PREFIX_LAST


innobase/row/row0sel.c:
  Print a warning if MySQL uses a partial-field key value prefix in a search; that would not work if the search flag would happen to be HA_READ_PREFIX_LAST
2003-02-19 19:38:38 +02:00
unknown
23544ee8bf Merge rkalimullin@work.mysql.com:/home/bk/mysql-4.1
into mysql.r18.ru:/usr/home/ram/work/mysql-4.1
2003-02-19 21:28:47 +04:00
unknown
3b41d79fa0 Code cleanup 2003-02-19 21:28:19 +04:00
unknown
75d1d877b3 Bug fix: we should set have_rtree value in case of table reopen.
Code cleanup.


myisam/mi_open.c:
  Bug fix: we should set have_rtree value in case of table reopen.
myisam/myisamdef.h:
  code cleanup
myisam/rt_index.c:
  code cleanup
2003-02-19 21:14:50 +04:00
unknown
5fae3c25e2 Reverted Sinisa's patch "Fixing the error messages returned on GRANT
commands" again, since this problem had been fixed differently
already (Thanks to Serg for spotting this)


sql/share/english/errmsg.txt:
  Reverted Sinisa's patch again, since this problem had been fixed differently
  already (Thanks to Serg for spotting this)
sql/sql_acl.cc:
  Reverted Sinisa's patch again, since this problem had been fixed differently
  already (Thanks to Serg for spotting this)
2003-02-19 16:16:27 +01:00
unknown
f4d93af14d Applied Sinisa's patch:
"A fix for non-releasing locks for multi table updates and multi
table deletes with InnoDB tables."
2003-02-19 15:08:29 +01:00
unknown
ea3e5a5c0f Applying Sinisa's patch:
"Cleaning the code of the remaining OLAP code.
This code is unnecessary in 4.1/5.0"
2003-02-19 14:58:44 +01:00
unknown
22815476c0 - Applying Sinisa's Patch "Fixing the error messages returned on
GRANT commands"
2003-02-19 14:50:40 +01:00
unknown
bcd22f2a28 add option default-week-format and variable default_week_format
(SCRUM)


mysql-test/r/func_time.result:
  result of test default_week_format
mysql-test/t/func_time.test:
  test of default_week_format
sql/mysqld.cc:
  add option default-week-format
sql/set_var.cc:
  add system variable default_week_format
sql/sql_class.h:
  add default_week_format into structure system_variables
sql/sql_yacc.yy:
  change lex of week() with one parameter
2003-02-19 17:05:35 +05:00
unknown
f96c1f60f6 Fixed typo in mysqltest command name.
client/mysqltest.c:
  Fixed typo in command name.
2003-02-19 11:10:23 +01:00
unknown
35391c733e Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
2003-02-19 10:41:21 +01:00
unknown
19f00e0abe Merge rkalimullin@work.mysql.com:/home/bk/mysql-4.1
into mysql.r18.ru:/usr/home/ram/work/mysql-4.1
2003-02-19 13:31:40 +04:00
unknown
5b15b39c8f Merge work:/home/bk/mysql into serg.mysql.com:/usr/home/serg/Abk/mysql 2003-02-19 10:27:15 +01:00
unknown
0f02d8fc5b Merge sgluhov@work.mysql.com:/home/bk/mysql-4.1
into gluh.mysql.r18.ru:/home/gluh/mysql-4.1.uvar
2003-02-19 13:22:04 +04:00
unknown
18cb991592 Bug fix: rtree should handle nulls itself 2003-02-19 13:21:21 +04:00