Commit graph

5612 commits

Author SHA1 Message Date
unknown
60e774790b Merge abarkov@work.mysql.com:/home/bk/mysql-4.1
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1.wrk
2002-10-23 15:41:26 +05:00
unknown
426cb615a6 ctype.c, Makefile.am, Makefile.shared:
binary charset
ctype-bin.c:
  new file


libmysql/Makefile.shared:
  binary charset
strings/Makefile.am:
  binary charset
strings/ctype.c:
  binary charset
2002-10-23 15:40:22 +05:00
unknown
387f11d09a binary charset 2002-10-23 15:39:41 +05:00
unknown
8531d74e3b New cp1256 charset 2002-10-23 13:58:05 +05: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
78d524b37e truncate both MYI and MYD files on DELETE FROM table; to avoid warnings on CHECK TABLE
myisam/mi_delete_all.c:
  truncate both MYI and MYD files to avoid warnings on CHECK TABLE
2002-10-22 15:16:16 +00:00
unknown
fafb58e31e Merge work:/home/bk/mysql-4.1
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.1


BitKeeper/etc/gone:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/deleted/.del-skipkeys~56cb758b36258d1c:
  'Auto converge rename'
2002-10-22 00:30:17 +00:00
unknown
2f5ded0ae4 BK automatic LOD removal.
BitKeeper/etc/skipkeys:
  auto add
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2002-10-22 00:28:08 +00:00
unknown
1930ba12c3 make REPAIR killable 2002-10-22 00:25:36 +00:00
unknown
6f3b5e1286 - added "darwin" to the list of systems that are known to support the
-p option for cp and the -r option for scp (thank to Paul DuBois for
   the patch)
 - fixed a typo
2002-10-21 14:51:57 +02:00
unknown
a336aba95c Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2002-10-21 14:12:10 +03:00
unknown
6449eec150 Small addition to COM_DEBUG
sql/sql_test.cc:
  small addition to COM_DEBUG
2002-10-21 14:08:37 +03:00
unknown
14cbecdc8b Merge abotchkov@work.mysql.com:/home/bk/mysql-4.0
into genie.(none):/home/hf/work/04


BitKeeper/etc/logging_ok:
  auto-union
2002-10-21 09:57:53 +05:00
unknown
911a8e1ba0 Embedded server bugfix
libmysqld/lib_sql.cc:
  Necessary thd->scramble initialization added
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2002-10-21 09:56:30 +05:00
unknown
6d25b5439c BK automatic LOD removal.
BitKeeper/etc/skipkeys:
  auto add
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2002-10-20 21:43:24 +02:00
unknown
54516f06e3 BK automatic LOD removal.
BitKeeper/etc/skipkeys:
  auto add
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2002-10-20 21:23:21 +02:00
unknown
3f86502e34 After bk -r check -ff (to be able to upgrade to bk 3.0) 2002-10-20 21:19:37 +02:00
unknown
768043db81 BK automatic LOD removal.
BitKeeper/etc/skipkeys:
  auto add
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2002-10-20 21:16:05 +02:00
unknown
1937fd448a Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0
Docs/manual.texi:
  Auto merged
2002-10-20 09:06:22 +03:00
unknown
56878e7d2f Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql
mysys/my_init.c:
  Auto merged
2002-10-20 09:05:53 +03:00
unknown
c771f85e6c Fixed usage of putenv() on windows (in not normally used code) 2002-10-20 09:01:15 +03:00
unknown
6258b38e5c Fixed Changelog 2002-10-20 08:58:48 +03:00
unknown
20b7379e79 ftb wasn't able to re-initialize index search (oops! in joins) 2002-10-19 20:39:35 +00:00
unknown
b790301d6e - fixed typo in scripts/mysql_convert_table_format.sh
scripts/mysql_convert_table_format.sh:
   - fixed typo (spotted by Engin Gunduz)
2002-10-18 19:43:06 +02: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
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
unknown
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
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
516256c8cf Added notes about --set-variable being deprecated since MySQL 4.0 2002-10-17 20:03:31 +03:00
unknown
619232cc8b Fixed three bugs in mysqlcheck and changed documentation for mysqld_multi
client/mysqlcheck.c:
  Fixed three bugs in mysqlcheck:
  1. mysqlcheck died with error Got error: 1103: Incorrect table name when
     executing 'REPAIR TABLE'
  2. --auto-repair used together with --all-in-1 (-1) tried to fix next table
     in a row, independent whether the next table was OK or corrupted, in case an
     error was found from a previous table and the previous table remained unfixed.
  3. --auto-repair didn't work at all when -1 option wasn't used; broken tables
     were not noticed at all.
scripts/mysqld_multi.sh:
  Changed documentation
2002-10-17 19:34:02 +03:00
unknown
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
unknown
025375c296 - fixed typo in mysqld.cc: "agaist" -> "against"
sql/mysqld.cc:
   - fixed typo: "agaist" -> "against"
2002-10-17 11:08:04 +02:00
unknown
b863b75a60 Added Change note about the fixed join parsing, allowing (removing) braces. 2002-10-17 10:58:30 +02:00
unknown
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
unknown
2e6dff75ad Added optional NT service and fix the TZ variable bug
mysys/my_init.c:
  Fix the TZ variable bug: 100% CPU usage
sql/mysqld.cc:
  Added optional NT service
sql/nt_servc.cc:
  Added optional NT service
sql/nt_servc.h:
  Added optional NT service
2002-10-16 21:51:03 -02:00
unknown
e157150cf9 Fix the 100% CPU usage with TZ variable 2002-10-16 21:22:56 -02:00
unknown
f64428be11 Fix after merge 2002-10-16 22:48:51 +03:00
unknown
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
unknown
61122db525 Some small accelerations ...
I intend to do some more accelerations in mysql_execute_command and
in SQLCOM_SELECT part for which I need to fix EXPLAIN with derived
tables plus few additional items. If this proves to be much I wil
just make it a new SCRUM task


sql/sql_lex.h:
  Some small accelerations ...
sql/sql_parse.cc:
  Some small accelerations ...
sql/sql_yacc.yy:
  Some small accelerations ...
2002-10-16 21:17:57 +03:00
unknown
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
unknown
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
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
aee5ef8516 Added THD as parameter to filesort. Removed not used 'special' argument.
sql/mysql_priv.h:
  Fix for changed parameters to filesort
sql/sql_delete.cc:
  Fix for changed parameters to filesort
sql/sql_select.cc:
  Fix for changed parameters to filesort
sql/sql_table.cc:
  Fix for changed parameters to filesort
sql/sql_test.cc:
  Removed not used special parameter
sql/sql_update.cc:
  Fix for changed parameters to filesort
2002-10-16 17:21:47 +03:00
unknown
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
unknown
3de4f87503 some fixes for SELECT INTO @vars ..
sql/sql_parse.cc:
  Simplification of code
2002-10-16 16:55:08 +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