1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-24 19:42:23 +03:00
Commit Graph

13900 Commits

Author SHA1 Message Date
03437238ee Merge mysql.com:/home/pz/mysql/mysql-4.1-root
into mysql.com:/home/pz/mysql/mysql-4.1


sql/sql_yacc.yy:
  Auto merged
2002-10-30 14:47:05 +03:00
5bd7661115 Delete: mysql-test/std_data/master-bin.001 2002-10-29 17:33:03 -07:00
75dc4d5ce5 Merge mysql.com:/home/nick/mysql/repository/mysql-4.1
into mysql.com:/home/nick/mysql/mysql-4.1


sql/log.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
2002-10-29 15:51:41 -07:00
46cd8ff4e4 Changed binlog name padding from binlog.001 to binlog.000001
mysql-test/Makefile.am:
  Changed binlog.001 to be binlog.000001
mysql-test/r/rpl000015.result:
  Changed binlog.001 to be binlog.000001
mysql-test/r/rpl000018.result:
  Changed binlog.001 to be binlog.000001
mysql-test/r/rpl_flush_log_loop.result:
  Changed binlog.001 to be binlog.000001
mysql-test/r/rpl_log.result:
  Changed binlog.001 to be binlog.000001
mysql-test/r/rpl_log_pos.result:
  Changed binlog.001 to be binlog.000001
mysql-test/r/rpl_rotate_logs.result:
  Changed binlog.001 to be binlog.000001
mysql-test/t/rpl000017-slave.sh:
  Changed binlog.001 to be binlog.000001
mysql-test/t/rpl_log.test:
  Changed binlog.001 to be binlog.000001
mysql-test/t/rpl_rotate_logs.test:
  Changed binlog.001 to be binlog.000001
sql/log.cc:
  Changed binlog.001 to be binlog.000001
2002-10-29 15:11:13 -07:00
60d46b9086 merge
include/my_global.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
2002-10-29 23:54:37 +02:00
31ba88c0c1 Added --skip-safemalloc to mysqltest
Added bug fix from 3.23 for AIX 4.3.3 and gcc 3.x
Small change in EXCHANGE output
Propagate open-files-limit from mysqld_safe -> mysqld
Fixed speed bug in GROUP BY
Added quotes around database name in CREATE DATABASE db_name (for binary log)


BitKeeper/etc/ignore:
  added stamp-h1
Docs/manual.texi:
  Added 4.1 manual section
  Updated changelog
client/mysqltest.c:
  Added --skip-safemalloc
include/my_global.h:
  Added bug fix from 3.23 for AIX 4.3.3 and gcc 3.x
mysql-test/mysql-test-run.sh:
  Start mysqltest with --skip-safemalloc (To get it faster)
mysql-test/r/bdb.result:
  Update for new EXPLAIN output
mysql-test/r/compare.result:
  Update for new EXPLAIN output
mysql-test/r/create.result:
  Update for new EXPLAIN output
mysql-test/r/distinct.result:
  Update for new EXPLAIN output
mysql-test/r/explain.result:
  Update for new EXPLAIN output
mysql-test/r/group_by.result:
  Update for new EXPLAIN output
mysql-test/r/heap.result:
  Update for new EXPLAIN output
mysql-test/r/innodb.result:
  Update for new EXPLAIN output
mysql-test/r/join_outer.result:
  Update for new EXPLAIN output
mysql-test/r/key_diff.result:
  Update for new EXPLAIN output
mysql-test/r/merge.result:
  Update for new EXPLAIN output
mysql-test/r/null_key.result:
  Update for new EXPLAIN output
mysql-test/r/order_by.result:
  Update for new EXPLAIN output
mysql-test/r/select.result:
  Update for new EXPLAIN output
mysql-test/r/temp_table.result:
  Fixed speed bug in GROUP BY
mysql-test/r/type_datetime.result:
  Update for new EXPLAIN output
mysql-test/r/user_var.result:
  Update for new EXPLAIN output
mysql-test/r/variables.result:
  Removed variable safe_show_database
mysql-test/t/temp_table.test:
  Fixed speed bug in GROUP BY
mysql-test/t/variables.test:
  Removed not used variable safe_show_databases
scripts/mysqld_safe.sh:
  Propagate open-files-limit from mysqld_safe -> mysqld
sql/mysqld.cc:
  Removed variable safe_show_database
sql/set_var.cc:
  Removed variable safe_show_database
sql/slave.cc:
  Updated error message
sql/sql_db.cc:
  Added quotes around database name in CREATE DATABASE db_name
sql/sql_select.cc:
  Fixed speed bug in GROUP BY
2002-10-29 22:56:30 +02:00
ea3ffb9b3e Added back old LARGEFILE handling
Fixed reference to freed memory in acl_init()/grant_init()
Fixed possible memory leak. (Could only happen in very strange circumstances)
Fixed bug in ALTER TABLE with BDB tables
Updated mysql-test for valgrind


Docs/manual.texi:
  ChangeLog
acinclude.m4:
  Added back old LARGEFILE handling.
  (Needed to get MySQL to compile on Solaris 2.9 with gcc 3.x)
configure.in:
  Added back old LARGEFILE handling.
  (Needed to get MySQL to compile on Solaris 2.9 with gcc 3.x)
libmysqld/lib_sql.cc:
  Fixed reference to freed memory
mysql-test/mysql-test-run.sh:
  Added option --valgrind
mysys/Makefile.am:
  Removed warning when doing make
sql/mysqld.cc:
  Free regexp memory on shutdown.
  read 'des' key files from data directory
  Fixed reference to freed memory in grant_init()
sql/slave.cc:
  Fixed wrong printf() argument
sql/sql_acl.cc:
  Fixed reference to freed memory
sql/sql_acl.h:
  Fixed reference to freed memory
sql/sql_base.cc:
  Fixed possible memory leak. (Could only happen in very strange circumstances)
sql/sql_parse.cc:
  Updated arguments to grant_reload()
sql/sql_table.cc:
  Fixed bug in ALTER TABLE with BDB tables
sql/sql_yacc.yy:
  memset -> bzero
2002-10-29 21:59:03 +02:00
05512a0145 fixed MyISAM crash on dynamic-row tables with huge number of to-be-packed fields 2002-10-28 22:52:02 +01:00
4c6e578b0e Merge mysql.com:/home/pz/mysql/mysql-4.1-root
into mysql.com:/home/pz/mysql/mysql-4.1
2002-10-28 10:48:51 +03:00
ffb367ac50 Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/work-in-4.1


mysql-test/r/subselect.result:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
2002-10-27 23:27:57 +02:00
0241d64b64 IN subselect
mysql-test/r/subselect.result:
  IN subselect test
mysql-test/t/subselect.test:
  IN subselect test
sql/item.cc:
  Item wrappers for IN subselect
sql/item.h:
  Item wrappers for IN subselect
2002-10-27 23:27:00 +02:00
d2c7f44ff6 fixed union rexecution bug
mysql-test/r/subselect.result:
  test for union rexecution bug
mysql-test/t/subselect.test:
  test for union rexecution bug
2002-10-27 21:29:40 +02:00
68168ee5ff Merge mysql.com:/home/pz/mysql/mysql-4.1-root
into mysql.com:/home/pz/mysql/mysql-4.1


BitKeeper/etc/logging_ok:
  auto-union
include/mysql_com.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2002-10-27 13:13:31 +03:00
7cbe573473 Merge mysql.com:/home/pz/mysql/mysql-4.0-root
into mysql.com:/home/pz/mysql/mysql-4.0
2002-10-26 22:27:22 +04:00
c37bbf06bb code cleanup
fixed subselect error handling bug
fixed subselect UNION ALL bug
fixed thd->lex.select restoring
explain UNION subselect bug


mysql-test/r/subselect.result:
  test for:
    subselect UNION ALL bug
    subselect error handling bug
    explain UNION subselect bug
mysql-test/t/subselect.test:
  test for:
    subselect UNION ALL bug
    subselect error handling bug
    explain UNION subselect bug
sql/sql_lex.cc:
  fixed subselect UNION ALL bug
sql/sql_lex.h:
  fixed subselect UNION ALL bug
sql/sql_parse.cc:
  fixed subselect UNION ALL bug
sql/sql_select.cc:
  fixed subselect error handling bug
  fixed explain UNION subselect bug
sql/sql_union.cc:
  fixed thd->lex.select restoring
  code cleanup
  fixed subselect error handling bug
  fixed subselect UNION ALL bug
sql/sql_yacc.yy:
  fixed subselect UNION ALL bug
2002-10-26 20:18:37 +03:00
7962de4cf3 merged
BitKeeper/etc/gone:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/deleted/.del-skipkeys~888e38cf95239a33:
  'Auto converge rename'
Docs/manual.texi:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
myisam/ft_boolean_search.c:
  Auto merged
myisam/ft_nlq_search.c:
  Auto merged
myisam/ft_parser.c:
  Auto merged
myisam/ftdefs.h:
  Auto merged
myisam/mi_create.c:
  Auto merged
mysys/my_init.c:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
2002-10-25 22:07:04 +00:00
f5563ddad4 merged
BitKeeper/etc/gone:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/deleted/.del-skipkeys~53ffbfa7d2fa9fb:
  Delete: BitKeeper/etc/skipkeys
BitKeeper/etc/skipkeys:
  Rename: BitKeeper/deleted/.del-skipkeys~f623848ba4db5c3 -> BitKeeper/etc/skipkeys
Build-tools/Do-compile:
  Auto merged
Docs/manual.texi:
  Auto merged
innobase/pars/lexyy.c:
  Auto merged
innobase/pars/pars0grm.c:
  Auto merged
mysys/my_init.c:
  Auto merged
scripts/mysqlhotcopy.sh:
  Auto merged
sql/nt_servc.cc:
  Auto merged
sql/nt_servc.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
mysql-test/t/bdb-crash.test:
  Auto merged
2002-10-25 21:15:52 +00:00
235068a164 ENUM/SET fields now have charset too 2002-10-25 15:08:47 +05:00
0525cf47cb Merge abarkov@work.mysql.com:/home/bk/mysql-4.1
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1.wrk


sql/item_func.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2002-10-25 13:59:08 +05:00
e823751548 BINARY charset is now used instead of binary_flag 2002-10-25 13:58:32 +05:00
d172cc9aa0 changed syntax from SHOW MASTER LOGS to SHOW BINARY LOGS 2002-10-24 18:32:42 -06:00
458ced9f34 altered syntax from SLAVE START|STOP to START|STOP SLAVE
mysql-test/mysql-test-run.sh:
  Added --rpl option which tests all t/rpl*.test tests.
2002-10-24 17:46:14 -06:00
c813006913 fixed update with subselect (FOR REVIEW)
mysql-test/r/subselect.result:
  update with subselect test
mysql-test/t/subselect.test:
  update with subselect test
sql/mysql_priv.h:
  fixed update with subselect
sql/sql_base.cc:
  fixed update with subselect
sql/sql_lex.cc:
  fixed update with subselect
sql/sql_select.cc:
  fixed update with subselect
sql/sql_update.cc:
  fixed update with subselect
sql/sql_yacc.yy:
  fixed update with subselect
2002-10-24 22:59:29 +03:00
7a8e330f3b Fixed problem with BDB tables and ALTER TABLE
Docs/manual.texi:
  ChangeLog
mysql-test/t/bdb-crash.test:
  Don't run test if BDB is not configured
sql/sql_base.cc:
  Added free on error
2002-10-24 01:29:29 +03:00
4aef286296 fixed DISTINCT in subselect bug
small Item_ref fix


mysql-test/r/subselect.result:
  DISTINCT in subselect test
mysql-test/t/subselect.test:
  DISTINCT in subselect test
sql/sql_class.cc:
  fixed DISTINCT in subselect bug
2002-10-23 23:36:11 +03:00
5a84f21cac Merge mysql.com:/home/pz/mysql/mysql-4.1-root
into mysql.com:/home/pz/mysql/mysql-4.1


BitKeeper/etc/logging_ok:
  auto-union
2002-10-22 14:06:53 +04:00
a456cfa135 Merge to update to recent tree version
BitKeeper/etc/logging_ok:
  auto-union
client/mysqladmin.c:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2002-10-20 00:09:11 +04:00
e85943bde3 Merge mysql.com:/home/pz/mysql/mysql-4.0-root
into mysql.com:/home/pz/mysql/mysql-4.0
2002-10-19 22:37:18 +04:00
f1592f89a6 Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2002-10-18 14:12:18 +03:00
4ae5fd0b89 Fixed heap_btree test to make it repeatable
mysql-test/r/heap_btree.result:
  Make test repeatable
mysql-test/t/heap_btree.test:
  Make test repeatable
2002-10-18 09:51:46 +03:00
49185c7769 added a test case.
And I am not able to find a Changelog for 4.1


mysql-test/r/union.result:
  added a test case
mysql-test/t/union.test:
  added a test case
2002-10-17 16:20:14 +03:00
5d2e98ff5f merge
Docs/world.sql:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
2002-10-17 11:39:11 +03:00
620b2e6e8b fix of the small bug in UNION's
mysql-test/r/heap_btree.result:
  I donno why this changed, aint my fault
sql/sql_union.cc:
  fix of the small bug
2002-10-16 22:27:47 +03:00
2cbb3b229f Merge hundin.mysql.fi:/my/mysql-4.0 into hundin.mysql.fi:/my/mysql-4.1
mysql-test/r/null_key.result:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
2002-10-16 19:31:22 +03:00
b3cb7b7f77 merge with 4.0.5
BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
Docs/manual.texi:
  Auto merged
myisam/mi_open.c:
  Auto merged
mysql-test/r/null_key.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
sql/field.h:
  Auto merged
sql/field_conv.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/table.cc:
  Auto merged
2002-10-16 19:30:24 +03:00
320d4912f4 Fixes after last merge.
Ignore changed keyblocks when on does DELETE FROM table_name;


acinclude.m4:
  Don't give warnings when using openssl installed in /usr/include with gcc 3.x
myisam/mi_delete_all.c:
  Ignore changed keyblocks when on does DELETE FROM table_name;
mysql-test/r/null_key.result:
  Fix null test
sql/ha_innodb.cc:
  Fix bug in last merge
sql/sql_parse.cc:
  Fix bug introduced with merge
2002-10-16 19:05:10 +03:00
df16b3182a Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1


sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
2002-10-16 16:57:42 +03:00
6f38e3083f Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0
BitKeeper/etc/logging_ok:
  auto-union
sql/mysqld.cc:
  Auto merged
2002-10-16 16:34:29 +03:00
7013d8ef0a Merge with 3.23.54
BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/deleted/.del-LICENSE~4cfaff8de837acb8:
  Auto merged
BitKeeper/deleted/.del-MySQLEULA.txt:
  Delete: Docs/MySQLEULA.txt
BitKeeper/deleted/.del-global.h~e80d28157acfdcb5:
  Auto merged
Build-tools/mysql-copyright-2:
  Auto merged
Build-tools/mysql-copyright:
  Auto merged
heap/heapdef.h:
  Auto merged
heap/hp_open.c:
  Auto merged
innobase/btr/btr0cur.c:
  Auto merged
innobase/lock/lock0lock.c:
  Auto merged
innobase/os/os0file.c:
  Auto merged
innobase/os/os0thread.c:
  Auto merged
myisam/mi_open.c:
  Auto merged
mysql-test/Makefile.am:
  Auto merged
mysql-test/t/null_key.test:
  Auto merged
mysys/safemalloc.c:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
scripts/mysqld_safe.sh:
  Auto merged
scripts/mysqlhotcopy.sh:
  Auto merged
sql/field.h:
  Auto merged
sql/field_conv.cc:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/table.cc:
  Auto merged
tests/grant.res:
  Auto merged
Build-tools/Do-compile:
  merge
Docs/manual.texi:
  merge
configure.in:
  merge
mysql-test/r/distinct.result:
  merge
mysql-test/r/null_key.result:
  merge
sql/ha_innodb.cc:
  merge
sql/item.h:
  merge
sql/log.cc:
  merge
sql/mysqld.cc:
  merge
support-files/mysql.spec.sh:
  merge
2002-10-16 13:11:25 +03:00
103330a3c0 fixed subselect explain bug
mysql-test/r/subselect.result:
  test for subselect explain bug
mysql-test/t/subselect.test:
  test for subselect explain bug
2002-10-16 00:42:59 +03:00
53a0e2992a SCRUM Task 430: Allowing braces in joins by simply removing them.
Fixed the remaining join variations, (left, right, natural, etc).
(Previous fix only solved "," and "[cross] join".)


mysql-test/r/select.result:
  Added more test case results for more braced join fixes.
mysql-test/t/select.test:
  Added more tests for braced join fixes.
sql/sql_yacc.yy:
  Changed the remaining join_table_list cases to handle braces.
  Also added some precedence declaration to silence shift/reduce conflicts
  warnings that turned up after these fixes.
2002-10-15 16:33:06 +02:00
b9ce760069 Merge pmartin@work.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/pem/work/mysql-4.0


BitKeeper/etc/logging_ok:
  auto-union
2002-10-15 16:12:53 +02:00
4ae92cf96b Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/work-distinct-4.1
2002-10-14 17:50:44 +03:00
9e6b04a285 Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1


sql/sql_lex.h:
  Auto merged
2002-10-14 17:50:44 +03:00
a86c172f58 Fixed a bug in key optimizing handling where the expression
WHERE column_name = key_column_name was calculated as true
for NULL values.


Docs/manual.texi:
  Changelog
mysql-test/r/distinct.result:
  Updated results caused by bug fix.
mysql-test/r/null_key.result:
  New tests
mysql-test/t/null_key.test:
  New tests
sql/sql_select.cc:
  Additional change for previous changeset for using BLOB in GROUP BY
2002-10-14 17:04:12 +03:00
65c4fdc007 merged
BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
libmysqld/Makefile.am:
  Auto merged
myisam/Makefile.am:
  Auto merged
myisam/mi_check.c:
  Auto merged
myisam/myisampack.c:
  Auto merged
mysql-test/r/fulltext.result:
  Auto merged
mysys/Makefile.am:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
strings/Makefile.am:
  Auto merged
2002-10-14 11:36:48 +00:00
8290f609a7 fixed cteate temporary field of subselect bug
mysql-test/r/subselect.result:
  test of cteate temporary field of subselect bug
mysql-test/t/subselect.test:
  test of cteate temporary field of subselect bug
2002-10-14 14:33:42 +03:00
ceec5316ba Fix exponent overflow handling for decimal type. Overflow lead to crash
mysql-test/r/type_decimal.result:
  Result set for new tests
mysql-test/t/type_decimal.test:
  Tests for exponent overflow
sql/field.cc:
  Fixes for exponent overflow handling
2002-10-13 21:11:01 +04:00
c69223d9be Merge mysql.com:/home/pz/mysql/mysql-4.1-root
into mysql.com:/home/pz/mysql/mysql-4.1
2002-10-13 18:44:17 +04:00
a299a27021 fixed bug of multi-level EXPLAIN
mysql-test/r/subselect.result:
  test of multi-level EXPLAIN
mysql-test/t/subselect.test:
  test of multi-level EXPLAIN
2002-10-13 14:25:16 +03:00