1
0
mirror of https://github.com/MariaDB/server.git synced 2025-11-08 00:28:29 +03:00
Commit Graph

2441 Commits

Author SHA1 Message Date
unknown
5fa6df3081 merge with 3.23.49
BitKeeper/etc/logging_ok:
  auto-union
acconfig.h:
  Auto merged
Docs/manual.texi:
  Auto merged
client/client_priv.h:
  Auto merged
include/mysql.h:
  Auto merged
innobase/dict/dict0dict.c:
  Auto merged
innobase/row/row0mysql.c:
  Auto merged
mysql-test/t/comments.test:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/unireg.cc:
  Auto merged
sql/unireg.h:
  Auto merged
2002-02-14 18:58:24 +02:00
unknown
4866455558 Don't give warnings for empty statements with comments 2002-02-14 15:04:14 +02:00
unknown
429abf3560 Added --user=userid to mysqld
Fix for ctypes on windows
Cleanup max_queries_per_hour


mysql-test/t/dirty_close.test:
  Rename: mysql-test/t/dirty-close.test -> mysql-test/t/dirty_close.test
mysql-test/r/dirty_close.result:
  Rename: mysql-test/r/dirty-close.result -> mysql-test/r/dirty_close.result
Docs/manual.texi:
  Added --user=userid
include/m_ctype.h:
  Fix for ctypes on windows
mysql-test/r/join.result:
  Update join results
sql/mysqld.cc:
  Added --user=userid
sql/sql_parse.cc:
  Cleanup max_queries_per_hour
2002-02-13 22:37:19 +02:00
unknown
33d2d76549 Made LOAD DATA LOCAL INFILE more secure
Docs/manual.texi:
  Changelog
sql/sql_yacc.yy:
  optimization
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2002-02-13 21:53:26 +02:00
unknown
e5c3d1c366 Merge paul@work.mysql.com:/home/bk/mysql-4.0
into teton.kitebird.com:/home/paul/mysql-4.0


Docs/manual.texi:
  Auto merged
2002-02-11 19:23:08 -06:00
unknown
e0ccdc17a2 merge with 3.23.48
BUILD/FINISH.sh:
  Auto merged
BUILD/SETUP.sh:
  Auto merged
BUILD/compile-alpha:
  Auto merged
BUILD/compile-pentium-gcov:
  Auto merged
BUILD/compile-pentium-gprof:
  Auto merged
BUILD/compile-pentium:
  Auto merged
BitKeeper/deleted/.del-my_new.cc:
  Delete: mysys/my_new.cc
Build-tools/Do-compile:
  Auto merged
acconfig.h:
  Auto merged
acinclude.m4:
  Auto merged
Docs/manual.texi:
  Auto merged
bdb/dist/configure.in:
  Auto merged
client/Makefile.am:
  Auto merged
innobase/btr/btr0cur.c:
  Auto merged
innobase/buf/buf0lru.c:
  Auto merged
innobase/dict/dict0crea.c:
  Auto merged
innobase/fil/fil0fil.c:
  Auto merged
innobase/include/srv0srv.h:
  Auto merged
innobase/rem/rem0cmp.c:
  Auto merged
innobase/srv/srv0srv.c:
  Auto merged
innobase/srv/srv0start.c:
  Auto merged
innobase/trx/trx0purge.c:
  Auto merged
myisam/myisampack.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/t/join.test:
  Auto merged
mysys/Makefile.am:
  Auto merged
scripts/Makefile.am:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/handler.cc:
  Auto merged
sql/my_lock.c:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
support-files/my-huge.cnf.sh:
  Auto merged
support-files/my-large.cnf.sh:
  Auto merged
support-files/my-medium.cnf.sh:
  Auto merged
support-files/my-small.cnf.sh:
  Auto merged
configure.in:
  merge
innobase/row/row0mysql.c:
  merge
innobase/trx/trx0trx.c:
  merge
mysql-test/r/innodb.result:
  merge
mysql-test/r/join.result:
  merge
sql/ha_innodb.cc:
  merge
sql/slave.cc:
  merge
2002-02-11 13:48:59 +02:00
unknown
501650c5b1 Updated changelog of 3.23.48 with InnoDB changes.
sql/sql_table.cc:
  Fixed comment
2002-02-11 12:56:48 +02:00
unknown
8a99eebe92 Changelog fixups. 2002-02-11 14:27:56 +10:00
unknown
4122b3928b Cleanup
Docs/manual.texi:
  Update information about IS NULL.
myisam/myisamchk.c:
  Portability fix
sql/mysqld.cc:
  Changed log_long_queries -> log_slow_queries
2002-02-11 04:55:52 +02:00
unknown
c1caaf756f Fixed bug in full join with many NULL fields.
Build-tools/Do-compile:
  Fixed 'touch' and 'chmod' of files.
Docs/manual.texi:
  Changelog
2002-02-10 12:47:37 +02:00
unknown
f7c085efe3 Removed compiler warnings
Docs/manual.texi:
  Cleanup
myisam/myisampack.c:
  Removed warning
sql/handler.cc:
  cleanup
sql/slave.cc:
  Removed not used var
2002-02-09 04:00:24 +02:00
unknown
0f9932a162 Fix some bugs introduced with the new my_getopt
Added counting of rollback's and commits
Fixed bug in 'SELECT 0 LIMIT 0'
Fixed bug in 'SELECT SQL_CALC_FOUND_ROWS'


Docs/manual.texi:
  Changelog
configure.in:
  Cleanup
myisam/myisamchk.c:
  Fix some bugs introduced with the new my_getopt
mysql-test/r/limit.result:
  Test for bugfix
mysql-test/r/rpl000001.result:
  fix wrong result
mysql-test/r/select.result:
  Fix things after fixing ignore index()
mysql-test/r/select_found.result:
  Test of bug in SQL_CALC_FOUND_ROWS
mysql-test/t/limit.test:
  Test bug in LIMIT 0
mysql-test/t/rpl000001.test:
  fix wrong result
mysql-test/t/select_found.test:
  Test of bug in SQL_CALC_FOUND_ROWS
sql/handler.cc:
  Added counting of rollback's and commits
sql/mysql_priv.h:
  Added counting of rollback's and commits
sql/mysqld.cc:
  Added counting of rollback's and commits
sql/sql_select.cc:
  Fixed bug in 'SELECT 0 LIMIT 0'
  Fixed bug in 'SELECT SQL_CALC_FOUND_ROWS'
2002-02-08 03:21:34 +02:00
unknown
3942e44524 Update to autoconf 2.52
Fix of InnoDB variables in SHOW VARIABLES
Fix for ALTER TABLE and InnoDB


BUILD/FINISH.sh:
  Update to autoconf 2.52
BUILD/SETUP.sh:
  Update to autoconf 2.52
BUILD/compile-alpha:
  Update to autoconf 2.52
BUILD/compile-pentium-gcov:
  Update to autoconf 2.52
BUILD/compile-pentium-gprof:
  Update to autoconf 2.52
BUILD/compile-pentium:
  Update to autoconf 2.52
Docs/manual.texi:
  Changelog
acconfig.h:
  Update to autoconf 2.52
acinclude.m4:
  Update to autoconf 2.52
bdb/dist/configure.in:
  Update to autoconf 2.52
client/Makefile.am:
  Update to autoconf 2.52
configure.in:
  Update to autoconf 2.52
mysql-test/r/innodb.result:
  Update of InnoDB Cardinality values
mysys/Makefile.am:
  Update to autoconf 2.52
scripts/Makefile.am:
  Update to autoconf 2.52
sql/ha_innobase.cc:
  Fix of InnoDB variables in SHOW VARIABLES
sql/ha_innobase.h:
  Fix of InnoDB variables in SHOW VARIABLES
sql/sql_table.cc:
  Fix for ALTER TABLE and InnoDB
support-files/my-huge.cnf.sh:
  Fixed typo
support-files/my-large.cnf.sh:
  Fixed typo
support-files/my-medium.cnf.sh:
  Fixed typo
support-files/my-small.cnf.sh:
  Fixed typo
2002-02-07 21:34:35 +02:00
unknown
0d41ed0a92 Merge paul@work.mysql.com:/home/bk/mysql-4.0
into teton.kitebird.com:/home/paul/mysql-4.0


Docs/manual.texi:
  Auto merged
2002-02-05 15:58:51 -06:00
unknown
043c5af812 manual.texi fix example where %x produced x, not a year
Docs/manual.texi:
  fix example where %x produced x, not a year
2002-02-05 15:57:38 -06:00
unknown
9adfd2e8d9 manual.texi:
Updated general manual about InnoDB locking and CHECK TABLE


Docs/manual.texi:
  Updated general manual about InnoDB locking and CHECK TABLE
2002-02-05 11:37:33 +02:00
unknown
0d4a628348 A few required additions to XML docbook fixup script.
Added url to success story form in manual.


Docs/Support/docbook-fixup.pl:
  A few required additions to script.
Docs/manual.texi:
  Added url to success story form.
2002-02-04 14:28:17 +10:00
unknown
3a2c8b9a1b manual.texi fix bad edit
Docs/manual.texi:
  fix bad edit
2002-02-02 17:26:53 -06:00
unknown
48a25a2477 manual.texi fix typos pointed out by mailing list reader
Docs/manual.texi:
  typos pointed out by mailing list reader
2002-02-02 17:24:11 -06:00
unknown
9bc97643c8 manual.texi fix too short/too long ellipses
Docs/manual.texi:
  fix too short/too long ellipses
2002-02-01 14:38:00 -06:00
unknown
f5a75e7965 manual.texi minor cleanups, typo fixes
Docs/manual.texi:
  minor cleanups
2002-01-30 20:36:59 -06:00
unknown
83c83a0223 Fixes for new getopt
Bug fix when using --no-deaults
Sets ref_length to right value (faster rnd_pos() handling in InnoDB).
Fixed problem with multi-table-delete and InnoDB
Fixed problem with truncate table, which required a COMMIT before.
Fixed multi-table-delete bug with InnoDB.
Remove not used index from EXPLAIN


Docs/manual.texi:
  ChangeLog
include/my_getopt.h:
  Removed compiler warnings
myisam/myisamchk.c:
  Fixes for new getopt
mysql-test/r/explain.result:
  Updated test results
mysql-test/r/innodb.result:
  Updated test results
mysql-test/r/join.result:
  Updated test results
mysql-test/t/innodb.test:
  Updated test results
mysys/default.c:
  Bug fix when using --no-defaults
mysys/my_getopt.c:
  Fixes for new getopt
sql/ha_innodb.cc:
  Sets ref_length to right value (faster rnd_pos() handling).
  Fixed problem with multi-table-delete.
  Fixed problem with truncate table, which required a COMMIT before.
sql/opt_sum.cc:
  Remove not used index from EXPLAIN
sql/sql_cache.cc:
  Fixed core dump bug when not using query cache
sql/sql_select.cc:
  Remove not used index from EXPLAIN
2002-01-31 04:36:58 +02:00
unknown
85278245af Merge from 3.23.48 tree
BitKeeper/etc/logging_ok:
  auto-union
Docs/manual.texi:
  Auto merged
innobase/dict/dict0dict.c:
  Auto merged
innobase/include/srv0srv.h:
  Auto merged
innobase/mem/mem0dbg.c:
  Auto merged
innobase/os/os0file.c:
  Auto merged
innobase/que/que0que.c:
  Auto merged
innobase/rem/rem0rec.c:
  Auto merged
innobase/row/row0sel.c:
  Auto merged
innobase/srv/srv0srv.c:
  Auto merged
innobase/srv/srv0start.c:
  Auto merged
innobase/sync/sync0arr.c:
  Auto merged
innobase/trx/trx0trx.c:
  Auto merged
innobase/trx/trx0undo.c:
  Auto merged
myisam/mi_check.c:
  Auto merged
mysql-test/t/join.test:
  Auto merged
mysys/hash.c:
  Auto merged
scripts/mysql_config.sh:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
2002-01-30 16:37:47 +02:00
unknown
bd454107a8 Fix in SHOW GRANTS: REFERENCE -> REFERENCES
Docs/manual.texi:
  changelog
sql/sql_acl.cc:
  Fix REFERENCE -> REFERENCES
2002-01-30 16:09:19 +02:00
unknown
9369764f22 Take into account that table scans may use indexes
Docs/manual.texi:
  Changelog
2002-01-30 16:07:11 +02:00
unknown
9c5eec61e3 Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0
Docs/manual.texi:
  Auto merged
2002-01-30 15:34:32 +02:00
unknown
22ab243303 Added --sql-mode=NO_UNSIGNED_SUBTRACTION
Docs/manual.texi:
  More information about UNSIGNED BIGINT arithmetic
sql/slave.cc:
  Make binary logs 4G safe
sql/slave.h:
  Make binary logs 4G safe
sql/sql_rename.cc:
  cleanup
2002-01-30 15:32:48 +02:00
unknown
525f1a4a28 New changes for DocBook XML output filter.
Added Docs/Support/make-docbook script, to work without makefile. 


BitKeeper/etc/ignore:
  Added Docs/mysql.xml to the ignore list
Docs/Support/docbook-fixup.pl:
  New changes for DocBook XML output filter.
2002-01-30 17:44:47 +10:00
unknown
82873647ff @menu updates. 2002-01-30 11:45:16 +10:00
unknown
49b7281e82 mirrors.texi:
Remove French mirror


Docs/mirrors.texi:
  Remove French mirror
2002-01-30 02:16:57 +02:00
unknown
0aadbdde75 mirrors.texi:
Fix Yugoslavian mirror name
manual.texi:
  Fix a couple of contributed software links


Docs/manual.texi:
  Fix a couple of contributed software links
Docs/mirrors.texi:
  Fix Yugoslavian mirror name
2002-01-29 20:55:35 +02:00
unknown
5b968bb8ee Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0
sql/share/dutch/errmsg.txt:
  Auto merged
2002-01-29 18:34:05 +02:00
unknown
d6a4362687 New error messages
Test of unsigned BIGINT values
Fixes for queries-per-hour
Cleanup of replication code (comments and portability fixes)
Make most of the binary log code 4G clean
Changed syntax for GRANT ... QUERIES PER HOUR


Docs/manual.texi:
  Fixed Changelog, upgrading to 4.0 and 4.1 TODO sections.
Docs/mysqld_error.txt:
  Added error message.
configure.in:
  Fix for autoconf 2.52
include/my_getopt.h:
  Portability fix.
include/my_global.h:
  Portablity fix.
include/mysqld_error.h:
  New error messages
mysql-test/r/bigint.result:
  Test of unsigned BIGINT values.
mysql-test/r/func_op.result:
  Test of unsigned BIGINT values.
mysql-test/r/varbinary.result:
  Test of unsigned BIGINT values.
mysql-test/t/bigint.test:
  Test of unsigned BIGINT values.
sql/item_func.h:
  Optimized Item_int_func() usage.
sql/lock.cc:
  Cleanup comments
sql/log.cc:
  Cleanup
sql/log_event.cc:
  Cleanup and portability fixes.
sql/log_event.h:
  Cleanup and portability fixes.
sql/mini_client.cc:
  Cleanup and portability fixes.
sql/mysqld.cc:
  Fix for queries-per-hour
sql/repl_failsafe.cc:
  Prepare for making binary log 2G clean.
sql/share/czech/errmsg.txt:
  New error messages
sql/share/danish/errmsg.txt:
  New error messages
sql/share/dutch/errmsg.txt:
  New error messages
sql/share/english/errmsg.txt:
  New error messages
sql/share/estonian/errmsg.txt:
  New error messages
sql/share/french/errmsg.txt:
  New error messages
sql/share/german/errmsg.txt:
  New error messages
sql/share/greek/errmsg.txt:
  New error messages
sql/share/hungarian/errmsg.txt:
  New error messages
sql/share/italian/errmsg.txt:
  New error messages
sql/share/japanese/errmsg.txt:
  New error messages
sql/share/korean/errmsg.txt:
  New error messages
sql/share/norwegian-ny/errmsg.txt:
  New error messages
sql/share/norwegian/errmsg.txt:
  New error messages
sql/share/polish/errmsg.txt:
  New error messages
sql/share/portuguese/errmsg.txt:
  New error messages
sql/share/romanian/errmsg.txt:
  New error messages
sql/share/russian/errmsg.txt:
  New error messages
sql/share/slovak/errmsg.txt:
  New error messages
sql/share/spanish/errmsg.txt:
  New error messages
sql/share/swedish/errmsg.txt:
  New error messages
sql/share/ukrainian/errmsg.txt:
  New error messages
sql/slave.cc:
  Cleanup
sql/slave.h:
  Cleanup
sql/sql_acl.cc:
  Cleanup and removal of possible reserved words
sql/sql_base.cc:
  More DBUG
sql/sql_cache.cc:
  Cleanup & portability fixes
sql/sql_class.h:
  Make binary log 4G clean
sql/sql_delete.cc:
  More DBUG
sql/sql_handler.cc:
  Cleanup & portability fixes
sql/sql_parse.cc:
  Cleanup of queries-per-hours code
sql/sql_rename.cc:
  Add missing DBUG_RETURN
sql/sql_repl.cc:
  Cleanup & portability fixes
sql/sql_select.cc:
  Cleanup & portability fixes
sql/sql_show.cc:
  Cleanup & portability fixes
sql/sql_update.cc:
  Small cleanup of multi-update-code (need second pass)
sql/sql_yacc.yy:
  Changed syntax for GRANT ... QUERIES PER HOUR
strings/str2int.c:
  Cleanup & portability fixes
2002-01-29 18:32:16 +02:00
unknown
1e1efae1e8 Little fixup for template. 2002-01-29 13:26:11 +10:00
unknown
f3363c6f61 Simple template.texi file for new .texi documents. 2002-01-29 12:49:51 +10:00
unknown
2e0096454b merge 2002-01-26 01:24:38 +02:00
unknown
48ff048f8f Update needed for SuSE 7.3
Update for autoconf 2.52


BitKeeper/deleted/.del-compile-pentium-symbols~b1b0f0b465eb15b8:
  Delete: BUILD/compile-pentium-symbols
BUILD/Makefile.am:
  Remove not used scripts
BUILD/SETUP.sh:
  Update needed for SuSE 7.3
BUILD/compile-alpha:
  Update needed for SuSE 7.3
BUILD/compile-pentium-debug-no-bdb:
  Update needed for SuSE 7.3
BUILD/compile-pentium-gcov:
  Update needed for SuSE 7.3
BUILD/compile-pentium-gprof:
  Update needed for SuSE 7.3
BUILD/compile-pentium-mysqlfs-debug:
  Update needed for SuSE 7.3
BUILD/compile-pentium:
  Update needed for SuSE 7.3
Docs/manual.texi:
  changelog
Docs/mysqld_error.txt:
  New error messages.
acconfig.h:
  Update to autoconf 2.52
acinclude.m4:
  Update to autoconf 2.52
bdb/dist/configure.in:
  Update to autoconf 2.52
configure.in:
  Update to autoconf 2.52
myisam/mi_check.c:
  Fix for myisamchk bug when reparing table with many keys.
myisam/mi_key.c:
  Fix problem with NAN in key's
scripts/Makefile.am:
  Fix for autoconf 2.52
scripts/mysql_new_fix_privilege_tables.sh:
  cleanup
2002-01-26 01:19:47 +02:00
unknown
adb110bec2 manual.texi change notes cleanup
Docs/manual.texi:
  change notes cleanup
2002-01-24 09:15:07 -06:00
unknown
a1014a4f3a Merge
client/mysqldump.c:
  Auto merged
2002-01-24 13:47:17 +02:00
unknown
17ed74a9e6 Added SQL dump of our sample database 'world'. 2002-01-24 14:09:21 +10:00
unknown
26d9a40ecb ODBC compliance level updated 2 -> 3.51 2002-01-24 14:04:45 +10:00
unknown
caa2707234 Corrected typo: CALC_FOUND_ROWS should be SQL_CALC_FOUND_ROWS. 2002-01-24 09:28:38 +10:00
unknown
7b72c14bbb Increase max package length to 512M for mysql and mysqldump.
Faster 'read_first_row' (Fixes slow 'preparing' state)
Read constant tables earlier, which provides better optimzations when using tables with <=1 row.
This also fixes a complicated bug involving const tables.


Docs/manual.texi:
  Changelog
client/mysql.cc:
  Increase max package length to 512M
client/mysqldump.c:
  Increase max package length to 512M
dbug/dbug.c:
  Fixed wrong printf() format string.
mysql-test/t/innodb.test:
  Test for multi-table delete
sql/handler.cc:
  Faster 'read_first_row' (Fixes slow 'preparing' state)
sql/handler.h:
  Faster 'read_first_row' (Fixes slow 'preparing' state)
sql/opt_range.cc:
  More debug info.
sql/sql_select.cc:
  Read constant tables earlier, which provides better optimzations when using tables with <=1 row.
  This also fixes a complicated bug involving const tables.
sql/sql_select.h:
  Read const tables earlier
2002-01-23 02:52:26 +02:00
unknown
2778e53e51 manual.texi:
Added a comment for Tfr; Test for Tom


Docs/manual.texi:
  Added a comment for Tfr; Test for Tom
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2002-01-22 10:30:42 -05:00
unknown
15d6fd1df0 manual.texi:
Add nore info to make InnoDB installation easier


Docs/manual.texi:
  Add nore info to make InnoDB installation easier
2002-01-22 17:19:16 +02:00
unknown
29f14f065f mirrors.texi:
Update mirror listing


Docs/mirrors.texi:
  Update mirror listing
2002-01-21 18:44:21 +02:00
unknown
add1f37e4b Merge arjen@work.mysql.com:/home/bk/mysql-4.0
into co3064164-a.bitbike.com:/home/arjen/mysql-4.0


Docs/manual.texi:
  Auto merged
2002-01-18 09:24:25 +10:00
unknown
143b571a08 InnoDB stable version adjustment (from Heikki). 2002-01-18 09:20:49 +10:00
unknown
d38454fab1 Fixed bug when making a range join based on information from a const table.
Docs/manual.texi:
  Changelog
mysql-test/r/join.result:
  Test of join bug
mysql-test/t/join.test:
  Test of join bug
mysys/hash.c:
  Fix for SUNPRO_C
scripts/mysql_config.sh:
  Fix for MacOS X
2002-01-18 00:43:50 +02:00
unknown
c20e45d622 manual.texi fix for colons in TIME being referred to as semicolons
Docs/manual.texi:
  fix for colons in TIME being referred to as semicolons
2002-01-17 16:22:54 -06:00