Commit graph

5986 commits

Author SHA1 Message Date
unknown
27b7b8abbd A fix for the bug when MyISAM tmp table has to be created in order
to resolve derived table.

Will make a test case for this quite soon.
2002-11-15 19:58:07 +02:00
unknown
6e289b7d06 ha_innodb.cc:
Fix bug intoduced in 4.0.4 in REPLACE and AUTO_INCREMENT: if replace did an update, then auto-inc counter was left 1 too low


sql/ha_innodb.cc:
  Fix bug intoduced in 4.0.4 in REPLACE and AUTO_INCREMENT: if replace did an update, then auto-inc counter was left 1 too low
2002-11-15 18:46:23 +02:00
unknown
183a207fd7 few small bug fixes ...
sql/sql_delete.cc:
  A better fix for safe updates
sql/sql_table.cc:
  A fix for foreign key handling ...
2002-11-15 16:37:44 +02:00
unknown
ecd4ac2a3c test for NULL processing has been added 2002-11-15 17:34:10 +04:00
unknown
87db341dd5 Merge rkalimullin@work.mysql.com:/home/bk/mysql-4.1
into mysql.r18.ru:/usr/home/ram/mysql-4.1.bdb
2002-11-15 16:46:52 +04:00
unknown
a6007a364e fix for NULL processing 2002-11-15 16:45:08 +04:00
unknown
84deca32aa Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2002-11-15 13:51:25 +02:00
unknown
08253aa93d Copy from /sql directory 2002-11-15 13:58:24 +04:00
unknown
5a264eb9a7 move like_range into CHARSET_INFO structure 2002-11-15 11:44:23 +04:00
unknown
ff3fd7e5d2 Merge abarkov@work.mysql.com:/home/bk/mysql-4.1
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1.wrk
2002-11-15 11:01:04 +04:00
unknown
fdabe22c3a - Fixed some minor bugs/typos
scripts/mysqlhotcopy.sh:
   - added missing "--host" option
sql-bench/test-create.sh:
   - fixed typo
support-files/mysql.server.sh:
   - fixed typo
2002-11-15 01:57:56 +01:00
unknown
c717613b8d Merge serg.mysql.com:/usr/home/serg/Abk/mysql
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0


sql/ha_myisam.cc:
  Auto merged
2002-11-14 22:42:19 +01:00
unknown
4ebb96c6b1 better fix for OPTIMIZE bug 2002-11-14 22:39:46 +01:00
unknown
8d70a01f1a Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1


sql/sql_select.cc:
  Auto merged
2002-11-14 22:10:17 +02:00
unknown
59436a6db1 Actually, I do it in order to pull new stuff
sql/sql_delete.cc:
  fix for safe_updates
  Actually, I do it in order to pull new stuff
sql/sql_select.cc:
  fix for LIMIT 0
  Actually, I do it in order to pull new stuff
2002-11-14 22:08:25 +02:00
unknown
f3af93f88e Merge mysql.com:/home/wax/mysql-4n into mysql.com:/home/wax/mysql-4sm 2002-11-15 00:18:37 +05:00
unknown
64dd949c41 Add shared memory protocol and option --protocol
client/client_priv.h:
  Add OPT_MYSQL_PROTOCOL and OPT_SHARED_MEMORY_BASE_NAME
include/config-win.h:
  Add shared memory protocol
include/errmsg.h:
  Add error codes of shared memory protocol
include/my_sys.h:
  Delete TYPELIB, moved to typelib.h
include/mysql.h:
  Add shared memory protocol
include/violite.h:
  Add shared memory protocol
libmysql/errmsg.c:
  Add texts of errors of shared memory protocol
sql/mysqld.cc:
  Add shared memory protocol and option --shared-memory, correct option --named-pipe
sql/set_var.cc:
  Add shared memory protocol variables
vio/vio.c:
  Add shared memory protocol
vio/viosocket.c:
  Add shared memory protocol
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2002-11-15 00:16:30 +05:00
unknown
fd5b16374c wild_case_compate(&String, &String, escape) doesn't exist anymor 2002-11-14 17:25:34 +04:00
unknown
5a8c6a33c2 removed unused function
some bug fixes


include/m_ctype.h:
  Macros bug fix
mysys/charset.c:
  wildcmp was not initialized
sql/mysql_priv.h:
  removed unused functions
sql/slave.cc:
  removed unused function
sql/sql_string.cc:
  removed unused functions
2002-11-14 16:47:48 +04:00
unknown
e7bbe3aa0b New wildcmp() function in CHARSET_INFO structure 2002-11-14 16:07:29 +04:00
unknown
7557af6f4d Merge work:/home/bk/mysql-4.1
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.1
2002-11-14 11:55:03 +01:00
unknown
ffd1d3df2a Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0 2002-11-14 12:35:33 +02:00
unknown
3648eb7da8 Portability fix when using -DBIG_TABLES
BitKeeper/etc/config:
  Changed Sasha to sys
client/mysqlbinlog.cc:
  Fixed that --position open works.
sql/item_timefunc.cc:
  Portability fix
sql/log_event.cc:
  Portability fix
sql/set_var.cc:
  Portability fix
2002-11-14 12:21:36 +02:00
unknown
948a867123 fixed bug in cyclic reference refinition
mysql-test/r/subselect.result:
  test of cyclic reference
mysql-test/t/subselect.test:
  test of cyclic reference
sql/sql_parse.cc:
  fixed layout
  fixed bug in cyclic reference refinition
2002-11-14 09:43:24 +02:00
unknown
20243b65d7 results updated
mysql-test/r/myisam.result:
  updated
2002-11-14 00:27:14 +01:00
unknown
9f8277f9a4 merged
BitKeeper/etc/gone:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
sql/ha_myisam.cc:
  Auto merged
innobase/row/row0sel.c:
  merged (ul - as 3.23's fix was a backport from 4.0)
mysql-test/r/myisam.result:
  merged - ul
2002-11-13 23:38:19 +01:00
unknown
7642da10d4 Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/work-crash-4.1
2002-11-14 00:26:40 +02:00
unknown
81a5afb925 fixed cyclic reference bug
mysql-test/r/subselect.result:
  test of cyclic reference
mysql-test/t/subselect.test:
  test of cyclic reference
sql/share/czech/errmsg.txt:
  new error message
sql/share/danish/errmsg.txt:
  new error message
sql/share/dutch/errmsg.txt:
  new error message
sql/share/english/errmsg.txt:
  new error message
sql/share/estonian/errmsg.txt:
  new error message
sql/share/french/errmsg.txt:
  new error message
sql/share/german/errmsg.txt:
  new error message
sql/share/greek/errmsg.txt:
  new error message
sql/share/hungarian/errmsg.txt:
  new error message
sql/share/italian/errmsg.txt:
  new error message
sql/share/japanese/errmsg.txt:
  new error message
sql/share/korean/errmsg.txt:
  new error message
sql/share/norwegian-ny/errmsg.txt:
  new error message
sql/share/norwegian/errmsg.txt:
  new error message
sql/share/polish/errmsg.txt:
  new error message
sql/share/portuguese/errmsg.txt:
  new error message
sql/share/romanian/errmsg.txt:
  new error message
sql/share/russian/errmsg.txt:
  new error message
sql/share/serbian/errmsg.txt:
  new error message
sql/share/slovak/errmsg.txt:
  new error message
sql/share/spanish/errmsg.txt:
  new error message
sql/share/swedish/errmsg.txt:
  new error message
sql/share/ukrainian/errmsg.txt:
  new error message
2002-11-14 00:26:18 +02:00
unknown
3a58dc5a4e Merge work:/home/bk/mysql into serg.mysql.com:/usr/home/serg/Abk/mysql 2002-11-13 22:56:05 +01:00
unknown
ffb4dee5a5 optimize table corruption fixed, though more clean fix is desired.
Fix for another optimize bug is undone, as the new one handles both cases.
test added


mysql-test/r/myisam.result:
  updated
mysql-test/t/myisam.test:
  optimize table corruption test
sql/ha_myisam.cc:
  optimize table corruption fixed, though more clean fix is desired.
  Fix for another optimize bug is undone, as the new one handles both cases.
2002-11-13 22:55:32 +01:00
unknown
30fb37d53c Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
2002-11-13 15:58:11 +01:00
unknown
ee23bc4d31 removed redundant line 2002-11-13 15:57:29 +01:00
unknown
f8680cf00c row0sel.c:
Backport from 4.0 a bug fix: if unique search from a primary key matched a delete-marked record, InnoDB could return the NEXT record


innobase/row/row0sel.c:
  Backport from 4.0 a bug fix: if unique search from a primary key matched a delete-marked record, InnoDB could return the NEXT record
2002-11-13 16:24:50 +02:00
unknown
7721c7582a Some macros to make life easier 2002-11-13 17:58:07 +04:00
unknown
5907ab4e04 row0sel.c:
Fix bug: if a unique search from a primary key matched to a delete-marked row, it could return the NEXT row


innobase/row/row0sel.c:
  Fix bug: if a unique search from a primary key matched to a delete-marked row, it could return the NEXT row
2002-11-13 15:45:05 +02:00
unknown
81d428bd5a Preparing to embed string to number conversion functions into charset structure 2002-11-13 17:13:29 +04:00
unknown
95ff7f77dd Merge sinisa@work.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2002-11-13 14:48:28 +02:00
unknown
e0ad88a2ff Merge abelkin@work.mysql.com:/home/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/mysql-4.1
2002-11-13 13:10:40 +02:00
unknown
0fb5b32422 fixed possible bug 2002-11-13 13:07:58 +02:00
unknown
a464676f64 my_snprintf() doesn't support things like %04X so use vsprintf() instead 2002-11-13 15:00:25 +04:00
unknown
cc19c18cf7 Merge abarkov@work.mysql.com:/home/bk/mysql-4.1
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1.wrk
2002-11-13 14:37:30 +04:00
unknown
6ed18d1c9f fixed bug of derived table in subselect
fixed bug in error handling


mysql-test/r/subselect.result:
  test of error handling
  test of derived tables inside subselect
mysql-test/t/subselect.test:
  test of error handling
  test of derived tables inside subselect
sql/sql_class.cc:
  fixed error handling error
sql/sql_lex.h:
  fifex layout
sql/sql_parse.cc:
  fixed processing of derived tables
sql/sql_select.cc:
  more quick abort on error
2002-11-13 11:59:03 +02:00
unknown
d0516d75ae dict0load.c:
Fix wrong sprintf argument
row0sel.c:
  Fix uninitialized variable error found by Miguel


innobase/row/row0sel.c:
  Fix uninitialized variable error found by Miguel
innobase/dict/dict0load.c:
  Fix wrong sprintf argument
2002-11-13 06:11:56 +02:00
unknown
62e8b90130 Typo fix (duplicate functions body)
sql/nt_servc.cc:
  Typo fix (duplicate fuctions body)
2002-11-12 22:11:59 -02:00
unknown
0c59356895 Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/work-crash-4.1
2002-11-13 01:14:56 +02:00
unknown
2707f00cdb fixed error handling
fixed subselects in ORDER bug


mysql-test/r/subselect.result:
  test of subselects in ORDER clause
  test of error handling bug
mysql-test/t/subselect.test:
  test of subselects in ORDER clause
  test of error handling bug
sql/item_subselect.cc:
  fixed subselects in ORDER bug
sql/item_subselect.h:
  fixed subselects in ORDER bug
sql/sql_select.cc:
  fixed error handling
2002-11-13 01:14:39 +02:00
unknown
869dc1a1e7 Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0 2002-11-12 23:31:15 +02:00
unknown
e087434c10 Ensure that mysql_home ends in FN_LIBCHAR after realpath() 2002-11-12 23:26:10 +02:00
unknown
eae8e515b4 Merge sinisa@work.mysql.com:/home/bk/mysql
into sinisa.nasamreza.org:/mnt/work/mysql
2002-11-12 17:43:03 +02:00
unknown
751b3be192 small fix
sql/sql_parse.cc:
  fix for a RANME to empty string
2002-11-12 17:41:31 +02:00