1
0
mirror of https://github.com/MariaDB/server.git synced 2025-11-12 10:22:39 +03:00
Commit Graph

1926 Commits

Author SHA1 Message Date
unknown
f5f15255be Merge nleippe@work.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/nick/mysql/repository/mysql-4.0
2002-10-24 18:40:15 -06:00
unknown
d39f52780e fixed prev. commit (was commited in disabled state) 2002-10-24 16:04:38 -06:00
unknown
6f043c359c - replaced all occurences of HPUX with HPUX10 (to be prepared for eventual
differences in HPUX11)


acconfig.h:
   - fixed typo
configure.in:
   - replaced HPUX -> HPUX10
   - added -DHPUX11 (not being used yet) to hpux11 workarounds
include/my_global.h:
   - replaced HPUX -> HPUX10
include/my_net.h:
   - replaced HPUX -> HPUX10
include/my_pthread.h:
   - replaced HPUX -> HPUX10
libmysql/libmysql.c:
   - replaced HPUX -> HPUX10
mysys/my_append.c:
   - replaced HPUX -> HPUX10
mysys/my_copy.c:
   - replaced HPUX -> HPUX10
mysys/my_pthread.c:
   - replaced HPUX -> HPUX10
mysys/my_redel.c:
   - replaced HPUX -> HPUX10
mysys/thr_alarm.c:
   - replaced HPUX -> HPUX10
sql/mini_client.cc:
   - replaced HPUX -> HPUX10
sql/mysqld.cc:
   - replaced HPUX -> HPUX10
strings/do_ctype.c:
   - replaced HPUX -> HPUX10
2002-10-24 14:30:25 +02:00
unknown
47ffb583ca added new syntax:
STOP|START SLAVE
rather than SLAVE STOP|START, which is now deprecated and should be deleted in 4.1
2002-10-24 03:52:51 -06:00
unknown
ebe07fa468 Merge mysql.com:/home/nick/mysql/repository/mysql-4.0
into mysql.com:/home/nick/mysql/mysql-4.0


sql/item_func.cc:
  Auto merged
2002-10-22 15:18:11 -06:00
unknown
d326428c41 Added Rand_log_event 2002-10-22 15:17:17 -06:00
unknown
5513a8a5e3 Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
2002-10-18 14:54:51 +00:00
unknown
5ab1dbf567 some DBUG_ENTER/RETURN macro added
safer GWS_PROB, avoid log(0)


myisam/ft_nlq_search.c:
  some DBUG_ENTER/RETURN macro added
myisam/ft_parser.c:
  some DBUG_ENTER/RETURN macro added
myisam/ftdefs.h:
  safer GWS_PROB, avoid log(0).
sql/item_func.cc:
  some DBUG_ENTER/RETURN macro added
2002-10-18 14:53:46 +00:00
unknown
d2e52820f6 Moved rand initialization from mysqld.cc to sql_class.cc:THD::THD() 2002-10-17 14:57:01 -06:00
unknown
ff71cf2d13 Small code improvement in multi-table updates 2002-10-17 21:25:24 +03:00
unknown
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
unknown
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
unknown
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
unknown
b3e3a09e72 Fixed bug in LEFT JOIN ... WHERE not_null_key_column=NULL;
Docs/manual.texi:
  ChangeLog
sql/field.h:
  New virtual function to set a field to null or signal an error
sql/field_conv.cc:
  New function to set a field to null or signal an error
sql/item.cc:
  When setting a field to null internally (for WHERE testing) don't autoconvert NULL -> now() or last_insert_id()
sql/item.h:
  New virtual function to set a field to null or signal an error
2002-10-16 10:32:45 +03:00
unknown
d3c61fd93e Fixed some bugs in mysql, mysqladmin and mysqld.
client/mysql.cc:
  Fixed a bug in --pager when used with --disable- or --skip- prefixes.
client/mysqladmin.c:
  Fixed a bug in --wait, which didn't take an optional argument while it should.
sql/mysqld.cc:
  Fixed a type and a bug in --transaction-isolation option in mysqld.cc
2002-10-15 23:34:55 +03:00
unknown
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
unknown
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
unknown
e1d7b8414f Fixed bug in ORDER BY ... LIMIT
Docs/manual.texi:
  ChangeLog
2002-10-15 16:47:55 +03:00
unknown
fab06ac587 Fix error handling in last patch (BLOB's in temporary tables) if
create_tmp_table fails.
2002-10-15 01:52:41 +03:00
unknown
e11dfa3763 Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql
Docs/manual.texi:
  Auto merged
2002-10-14 17:13:45 +03:00
unknown
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
unknown
228bfb05e3 Two bug fixes
Docs/manual.texi:
  added text for fixes
mysql-test/r/multi_update.result:
  new test case for multi-table deletes
mysql-test/t/multi_update.test:
  new test case for multi-table deletes
sql/sql_delete.cc:
  fix for multi-table deletes
sql/sql_update.cc:
  fix for multi-table updates
2002-10-12 21:36:39 +03:00
unknown
8926c0bc38 Fixed bug where we could reference a freed tmp_table->table_name variable for some
GROUP BY ... ORDER BY queries.


Docs/manual.texi:
  ChangeLog
2002-10-12 12:38:48 +03:00
unknown
9bca9fb751 Task 430: Allowing braces in joins by simply removing them.
This is a simple fix, allowing a join_table_list in the right reduction of a
normal_join sequence, instead of just a join_table. This makes things like
"t1, (t2 left join t3)" work, but it also allows "join" and "cross join" instead
of ",".

This should fix the bug reported as:
  Subject: ODBC SQL syntax issue 
  From: Ivan Vazharov 
  Date: Mon, 30 Sep 2002 12:02:42 +0200 


mysql-test/r/select.result:
  Results from new test cases for removing braces in joins.
mysql-test/t/select.test:
  New test cases for removing braces in joins.
sql/sql_yacc.yy:
  Allow (and remove) braces in all parts of a normal_join list, not just the
  first one.
  Also added three missing ';'.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2002-10-12 11:07:54 +02:00
unknown
c05fc9fa31 ha_innobase.cc:
Fix bug: if skip-innodb was defined SHOW INNODB STATUS crashed


sql/ha_innobase.cc:
  Fix bug: if skip-innodb was defined SHOW INNODB STATUS crashed
2002-10-09 19:52:34 +03:00
unknown
38b547257d Fixed bug in LOCK TABLES on windows.
Docs/manual.texi:
  Changelog
2002-10-09 12:05:22 +03:00
unknown
4dcdf3f318 Merge mysql.com:/my/mysql-4.0
into mysql.com:/space/my/mysql-4.0-automake
2002-10-08 16:22:35 +02:00
unknown
97a120e16b Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql 2002-10-08 16:41:50 +03:00
unknown
9d33a7a2e4 Remove wrong clear of mysql_port when using --skip-show-databases
Docs/manual.texi:
  ChangeLog
2002-10-08 16:40:50 +03:00
unknown
122b6927bf ha_innobase.cc:
test


sql/ha_innobase.cc:
  test
2002-10-08 15:17:41 +03:00
unknown
a1517908c1 touchup to last fix
sql/log.cc:
  moved mutex back to after is_open() test,
  but still protecting name dereference (the real problem)
2002-10-07 16:39:52 -06:00
unknown
2ab04c8cee Merge mysql.com:/home/nick/mysql/repository/mysql-3.23
into mysql.com:/home/nick/mysql/mysql-3.23
2002-10-07 15:44:00 -06:00
unknown
642b759333 fixed race that caused sig11s on simultaneous FLUSH LOGS
(possibly also fixes binlog filename corruption problems--hasn't
been reproduced since)


sql/log.cc:
  Fixed race caused by calling MYSQL_LOG::is_open() outside of critical section.
sql/sql_parse.cc:
  added missing args to calls to MYSQL_LOG::new_file(bool)
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2002-10-07 15:42:10 -06:00
unknown
da4d153124 fixed query cache with system database
FN_NO_CASE_SENCE used instead of __WIN__ in table name handling of quary cache


mysql-test/r/query_cache.result:
  query cache with system database test
mysql-test/t/query_cache.test:
  query cache with system database test
sql/sql_cache.cc:
  fixed query cache with system database
  FN_NO_CASE_SENCE used instead of __WIN__
2002-10-08 00:26:15 +03:00
unknown
25b2d47517 btr0cur.c:
Do not let range estimator to return over 1 / 2 of total rows in table; use longlong in range estimation
btr0cur.h, ha_innobase.cc:
  Use longlong in range estimation, in case there are > 4 billion rows


sql/ha_innobase.cc:
  Use longlong in range estimation, in case there are > 4 billion rows
innobase/include/btr0cur.h:
  Use longlong in range estimation, in case there are > 4 billion rows
innobase/btr/btr0cur.c:
  Do not let range estimator to return over 1 / 2 of total rows in table; use longlong in range estimation
2002-10-05 22:23:51 +03:00
unknown
5a6c52f17c Merge mysql.com:/my/mysql-4.0
into mysql.com:/space/my/mysql-4.0-automake


configure.in:
  Auto merged
2002-10-03 21:12:28 +02:00
unknown
b05f22d997 ha_innobase.cc:
Remove unintentionally pushed assert


sql/ha_innobase.cc:
  Remove unintentionally pushed assert
2002-10-03 19:48:24 +03:00
unknown
3a088a328d ha_innobase.cc, ha_innobase.h:
Backport from 4.0.4 the bug fix of the crash when a temporary table was created inside LOCK TABLES and used


sql/ha_innobase.h:
  Backport from 4.0.4 the bug fix of the crash when a temporary table was created inside LOCK TABLES and used
sql/ha_innobase.cc:
  Backport from 4.0.4 the bug fix of the crash when a temporary table was created inside LOCK TABLES and used
2002-10-03 19:10:49 +03:00
unknown
9ffa49c95d Fix for building shared libraries with a patched glibc
Don't require UPDATE_ACL for REPLACE


Docs/manual.texi:
  Changelog
configure.in:
  Fix for building shared libraries with a patched glibc
sql/sql_parse.cc:
  Don't require UPDATE_ACL for REPLACE
2002-10-02 12:37:32 +03:00
unknown
9311345ecc - Applied required modifications for automake 1.5
- some additional small fixes
 - added "depcomp" for automake 1.5


acinclude.m4:
   - Removed AC_SYS_LARGEFILE (is in autoconf since v2.50)
config.guess:
   - applied diffs from config.guess of automake 1.5
config.sub:
   - applied diffs from config.sub of automake 1.5
configure.in:
   - adapted for automake 1.5
   - added AM_PROG_AS
   - replaced MYSQL_SYS_LARGEFILE with AC_SYS_LARGEFILE (is in
     autoconf since v2.50)
dbug/Makefile.am:
   - removed OMIT_DEPENDENCIES to make automake 1.5 happy
extra/Makefile.am:
   - removed OMIT_DEPENDENCIES to make automake 1.5 happy
heap/Makefile.am:
   - removed OMIT_DEPENDENCIES to make automake 1.5 happy
include/my_global.h:
   - fix for PPC64
install-sh:
   - applied diffs from install-sh of automake 1.5
isam/Makefile.am:
   - removed OMIT_DEPENDENCIES to make automake 1.5 happy
libmysql_r/Makefile.am:
   - removed OMIT_DEPENDENCIES to make automake 1.5 happy
libmysqld/Makefile.am:
   - removed OMIT_DEPENDENCIES to make automake 1.5 happy
ltconfig:
   - small correction for new libtool
ltmain.sh:
   - applied diffs from ltmain.sh of libtool 1.4.2
merge/Makefile.am:
   - removed OMIT_DEPENDENCIES to make automake 1.5 happy
missing:
   - applied diffs from missing of automake 1.5
myisam/Makefile.am:
   - removed OMIT_DEPENDENCIES to make automake 1.5 happy
myisammrg/Makefile.am:
   - removed OMIT_DEPENDENCIES to make automake 1.5 happy
mysys/Makefile.am:
   - removed OMIT_DEPENDENCIES to make automake 1.5 happy
regex/Makefile.am:
   - removed OMIT_DEPENDENCIES to make automake 1.5 happy
sql/Makefile.am:
   - removed OMIT_DEPENDENCIES to make automake 1.5 happy
strings/Makefile.am:
   - removed OMIT_DEPENDENCIES to make automake 1.5 happy
tools/Makefile.am:
   - removed OMIT_DEPENDENCIES to make automake 1.5 happy
vio/Makefile.am:
   - removed OMIT_DEPENDENCIES to make automake 1.5 happy
2002-10-01 21:57:10 +02:00
unknown
d432f39948 Revert change to use ha_rows for number of rows as other code depend of this
Docs/manual.texi:
  Changelog
2002-09-30 14:54:16 +03:00
unknown
08d18a45fd Merge hundin.mysql.fi:/my/mysql-3.23
into hundin.mysql.fi:/my/bk/mysql-4.0


configure.in:
  Auto merged
BitKeeper/deleted/.del-global.h~e80d28157acfdcb5:
  Auto merged
Docs/manual.texi:
  Auto merged
client/mysqlbinlog.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
2002-09-27 12:13:28 +03:00
unknown
9dd4e2b244 Don't reset Delayed_insert_threads on FLUSH STATUS
Docs/manual.texi:
  changelog
2002-09-27 12:01:26 +03:00
unknown
492d53fa50 Fix some ORDER BY ... DESC problems with InnoDB
sql/ha_heap.h:
  Move HA_NOT_READ_PREFIX_LAST to index_flags()
sql/ha_isammrg.h:
  Move HA_NOT_READ_PREFIX_LAST to index_flags()
sql/handler.h:
  Added comment
sql/sql_select.cc:
  Test HA_NOT_READ_PREFIX_LAST from index_flags() instead of table_flags().
  Should fix some ORDER BY ... DESC problems with InnoDB
2002-09-27 08:23:51 +03:00
unknown
f78951aa3c ha_innodb.h:
Put the flag HA_NOT_READ_PREFIX_LAST back to index_flags: seems to fix also the LIKE ... DESC bug


sql/ha_innodb.h:
  Put the flag HA_NOT_READ_PREFIX_LAST back to index_flags: seems to fix also the LIKE ... DESC bug
2002-09-26 21:21:44 +03:00
unknown
a703057a92 COUNT(*) for merge can be longlong even if it's long for MyISAM 2002-09-26 17:52:52 +02:00
unknown
b0bf32fd57 ha_innodb.cc:
Fix an assertion in btr0pcur.c line 203 when an UPDATE is done inside LOCK TABLES


sql/ha_innodb.cc:
  Fix an assertion in btr0pcur.c line 203 when an UPDATE is done inside LOCK TABLES
2002-09-26 14:50:25 +03:00
unknown
54ad43bd6e Do filesort if handler has the HA_NOT_READ_PREFIX_LAST flag set.
mysys/my_symlink.c:
  More debug info
2002-09-26 10:20:49 +03:00
unknown
d416fcd670 Merge nleippe@work.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/nick/mysql/repository/mysql-4.0
2002-09-25 18:07:13 -06:00
unknown
0c8ed9baa6 fix (work-around) rpl_log test on FreeBSD. 2002-09-25 18:04:08 -06:00