Commit graph

9564 commits

Author SHA1 Message Date
unknown
6d37179796 - Updated version number to 4.0.16 now that 4.0.15 has been released
- tagged ChangeSet 1.1556 as mysql-4.0.15


configure.in:
   - Bumped up version number: 4.0.15 -> 4.0.16
2003-09-10 16:48:57 +02:00
unknown
565d92210e Merge abarkov@build.mysql.com:/home/bk/mysql-4.1
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
2003-09-10 17:26:09 +05:00
unknown
fef3c15a05 mysql_create_table now accepts field lengths in CREATE form, not in internal form.
This is to simplify fixing indexes to mean number of chars rather than bytes too.
2003-09-10 17:25:26 +05:00
unknown
c33a4508cd Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.2way
2003-09-10 13:00:19 +05:00
unknown
01397f5d19 SCRUM: embedde library
Minor fixes


libmysqld/lib_sql.cc:
  Comment added
libmysqld/libmysqld.c:
  this part of code should be moved under if (mysql)
2003-09-10 12:58:26 +05:00
unknown
8f2c275746 Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
2003-09-10 10:25:29 +03:00
unknown
af1c7280f4 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.2way
2003-09-10 12:10:30 +05:00
unknown
12e063b5e2 SCRUM: embedded library
mysql_fetch_length fixed for embedded library. Now data length is stored
before the data. Pointers in row still points to the data so you have to
get *(uint*)(data_ptr - sizeof(uint)) to get data length


libmysqld/lib_sql.cc:
  bug fixed - user didn't get error description
  Protocol::net_store_data changed to store data length before the data
libmysqld/libmysqld.c:
  emb_fetch_length changed to retrive data length stored before the data
2003-09-10 12:09:24 +05:00
unknown
42eb434993 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-in-4.1


mysql-test/r/subselect.result:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
2003-09-10 09:43:30 +03:00
unknown
c734cca601 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.r18.ru:/usr/home/ram/work/4.1
2003-09-10 11:19:39 +05:00
unknown
b7f06b9439 Fix for the fix for the bug #1209: SELECT DATABASE(). 2003-09-10 11:19:01 +05:00
unknown
479c3766d6 after merge fix 2003-09-09 23:07:39 +03:00
unknown
62a33db03b merge
mysql-test/r/subselect.result:
  Auto merged
sql/item.cc:
  Auto merged
2003-09-09 22:26:19 +03:00
unknown
8272be9412 Cleaned up last bug fixes
Fix bug in SHOW GRANTS when there is a column privilege but no table privilege


include/mysql.h:
  Make server_inited external
libmysqld/libmysqld.c:
  Remove reference to (wrong) external variable
mysql-test/r/grant.result:
  Fixed up grant test to not user 'user1' or 'user2'
  Check for bug in SHOW GRANTS when there is a column privilege but no table privilege
mysql-test/r/mix_innodb_myisam_binlog.result:
  Change to use tables t1 and t2
mysql-test/t/grant.test:
  Fixed up grant test to not user 'user1' or 'user2'
  Check for bug in SHOW GRANTS when there is a column privilege but no table privilege
mysql-test/t/mix_innodb_myisam_binlog.test:
  Change to use tables t1 and t2
sql/sql_acl.cc:
  Fix bug in SHOW GRANTS when there is a column privilege but no table privilege
sql/sql_parse.cc:
  Use HAVE_REPLICATION instead of EMBEDDED_LIBRARY
2003-09-09 20:06:50 +03:00
unknown
4a35c8e238 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-optimized_prepared-4.1


sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/sql_lex.h:
  Auto merged
2003-09-09 17:38:21 +03:00
unknown
b2a6994b22 Fix for a bug #1226.
Happens when braces are used on a single select, which leads
to the uninitialized global parameters structure.
2003-09-09 15:23:38 +03:00
unknown
d17cfa9caa removing additional IN subquery condition
fixed IN optimisation bug


mysql-test/r/subselect.result:
  test of IN optimisation bug
mysql-test/t/subselect.test:
  test of IN optimisation bug
sql/item_subselect.cc:
  fixed IN optimisation bug
sql/mysql_priv.h:
  constant for additional IN subquery condition detecting
sql/mysqld.cc:
  constant for additional IN subquery condition detecting
sql/sql_select.cc:
  removing additional IN subquery condition
2003-09-08 21:58:09 +03:00
unknown
13f0dc32f4 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.0
into deer.(none):/home/hf/work/mysql-4.0
2003-09-08 21:47:41 +05:00
unknown
d8f676f543 Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.0
into eagle.mysql.r18.ru:/home/vva/work/BUG_1184/mysql-4.0
2003-09-08 12:47:40 -04:00
unknown
82afcf7eb0 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0
into eagle.mysql.r18.ru:/home/vva/work/BUG_1184/mysql-4.0
2003-09-08 12:46:16 -04:00
unknown
f03afbf289 Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.0
into eagle.mysql.r18.ru:/home/vva/work/BUG_1056/mysql-4.0
2003-09-08 12:16:17 -04:00
unknown
0c5145ccd9 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0
into eagle.mysql.r18.ru:/home/vva/work/BUG_1056/mysql-4.0


client/mysqldump.c:
  Auto merged
2003-09-08 12:15:17 -04:00
unknown
d2008574d6 Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2003-09-08 17:48:00 +02:00
unknown
cccb195baa Merge
innobase/row/row0sel.c:
  SCCS merged
2003-09-08 16:55:30 +02:00
unknown
b036ffec6c fix for #1219
libmysqld/lib_sql.cc:
  we need ER() macrodefinition from errmsg.h
2003-09-08 18:49:23 +05:00
unknown
1d3d64d69b Fix for the bug #1209: SELECT DATABASE(). 2003-09-08 17:30:53 +05:00
unknown
be67ce0b0f fix for #1218
sql/sql_parse.cc:
  This line fails in libmysqld.
  And isn't needed while we don't check privileges in embedded library
2003-09-08 17:00:39 +05:00
unknown
9fd076375b Trimming of embedded library code
sql/sql_parse.cc:
  It's better to check for HAVE_REPLICATION here instead of EMBEDDED_LIBRARY
2003-09-08 15:08:53 +05:00
unknown
8aff7009fd fix for #1211
sql/sql_parse.cc:
  Replication's commands were allowed, but didn't have proper implementations
  for embedded library
2003-09-08 14:46:44 +05:00
unknown
ca2ab3537c Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.r18.ru:/usr/home/ram/work/4.1
2003-09-08 14:43:54 +05:00
unknown
f94972f66d Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.clean
2003-09-08 13:13:17 +05:00
unknown
d0f9e73a43 fix for #1210
include/errmsg.h:
  Error code added
libmysql/errmsg.c:
  Error message added
libmysqld/lib_sql.cc:
  static inited variable changed to global server_inited
libmysqld/libmysqld.c:
  check for mysql_server_init execution added
2003-09-08 13:11:18 +05:00
unknown
2a5b413ab1 Fix for #1210
i fixed this in 4.1 in slightly different way


libmysqld/lib_sql.cc:
  Initialization's flag was made global
libmysqld/libmysqld.c:
  Check for mysql_server_init call added
2003-09-08 13:02:19 +05:00
unknown
2b18554744 #1169: Add --exec command to mysqltest 2003-09-08 10:53:51 +05:00
unknown
7c835f0a52 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-in-4.1
2003-09-07 20:36:21 +03:00
unknown
57c9756b69 fixed row union processing
mysql-test/r/subselect.result:
  row union test
mysql-test/t/subselect.test:
  row union test
2003-09-07 20:35:10 +03:00
unknown
c9d1bdfac3 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mashka.mysql.fi:/home/my/mysql-tmp


sql/item.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
2003-09-07 15:14:32 +03:00
unknown
7b107a966a fixed Bug #1184 (change type of opt_ignore_lines to longlong) 2003-09-06 18:59:04 -04:00
unknown
5193315f9d added space after first '--' in the long '----....' comment line in mysqldump
just to make it compatible with the manual
(fixed bug #1056)


client/mysqldump.c:
  added space after first '--' in the long '----....' comment line
  just to make it compatible with the manual
  (fixed bug #1056)
2003-09-06 15:06:08 -04:00
unknown
08e2747587 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.clean
2003-09-06 18:51:39 +05:00
unknown
1496610d1c Fix for LOAD DATA to work with embedded library
libmysqld/lib_sql.cc:
  There's now one common SCRAMBLE_LENGTH
sql/sql_load.cc:
  mysql_load fixed to work with embedded library
sql/sql_parse.cc:
  LOAD DATA enabled for embedded library
2003-09-06 18:50:30 +05:00
unknown
17c52a90cf Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-string_parameters-4.1
2003-09-06 11:43:52 +03:00
unknown
07cacdcbe7 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mashka.mysql.fi:/home/my/mysql-4.0
2003-09-05 17:06:36 +03:00
unknown
a65f5081ba Add QUICK as mysql-recover option in mysqld --help
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2003-09-05 14:44:21 +02:00
unknown
c7ef970ea5 Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2003-09-05 12:05:05 +02:00
unknown
ad66d486f0 bug#926 fix undone - it caused suboptimal execution plan for "range ON, no WHERE" query
Another fix applied
2003-09-05 11:42:21 +02:00
unknown
04ff15001d after merge fixes 2003-09-05 08:16:13 +03:00
unknown
0af8b9805b Merge with 3.23 2003-09-05 06:56:28 +03:00
unknown
a91b55ce48 Fixed rare bug in MYISAM introduced in 4.0.3 where the index file header was not updated directly after an UPDATE of split dynamic rows.
myisam/mi_locking.c:
  Added DBUG info
myisam/mi_open.c:
  Added DBUG info
myisam/mi_update.c:
  More comments
  Fixed rare bug in MYISAM introduced in 4.0.3 where the index file header
  was not updated directly after an UPDATE of split dynamic rows.
mysql-test/r/myisam.result:
  Added test case for MyISAM UPDATE bug
mysql-test/t/myisam.test:
  Added test case for MyISAM UPDATE bug
2003-09-05 06:42:55 +03:00
unknown
a4caa4cc57 Windows fix to avoid VC++ 6.0 compiler bug, which prevents compilation when function calls are present inside an expanded inline function
innobase/fsp/fsp0fsp.c:
  Added seperate error message to avoid VC++ 6.0 compiler bug
2003-09-04 16:00:05 -04:00