Commit graph

8189 commits

Author SHA1 Message Date
unknown
edde138b30 removing architecture dependent test 2003-04-30 17:39:23 +03:00
unknown
a20b167cae make compilation to work w/o InnoDB as well
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2003-04-30 14:15:24 +02:00
unknown
09b8283864 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0


sql/sql_acl.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
2003-04-30 14:27:51 +03:00
unknown
4a506d6e23 Fixed bug in Item_func_compress::val_str() on MacOS X (bigendian); the length
was not properly stored in the buffer.


sql/item_strfunc.cc:
  Made it work on MacOS X (bigendian) where int4store is a macro that expands
  the arguments several times.
  It's possible this should be done differently, like not side-stepping the
  String methods the way it's done here, or fixing String::c_ptr(), but this
  simple fix was the quickest way.
2003-04-30 13:10:53 +02:00
unknown
679f39b928 Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2003-04-30 12:36:00 +02:00
unknown
7a5b5d51b2 more #ifdef THREAD added 2003-04-30 12:32:43 +02:00
unknown
fff9e2722b - fixed Max RPM package description (removed RAID) 2003-04-30 11:30:45 +02:00
unknown
f84febcde6 - disabled MyISAM RAID (--with-raid) for the 4.0 Max binaries for now
(several users reported crashes, even when not using RAID) (see bug #346)
2003-04-30 11:27:13 +02:00
unknown
6db41f7793 Fix reference to not initialized memory
Changed handing of priv_host to fix bug in FLUSH PRIVILEGES


libmysqld/lib_sql.cc:
  Changed handing of priv_host to fix bug in FLUSH PRIVILEGES
myisam/mi_rkey.c:
  Fix reference to not initialized memory
sql/sql_acl.cc:
  Changed handing of priv_host to fix bug in FLUSH PRIVILEGES
sql/sql_acl.h:
  Changed handing of priv_host to fix bug in FLUSH PRIVILEGES
sql/sql_class.h:
  Changed handing of priv_host to fix bug in FLUSH PRIVILEGES
sql/sql_parse.cc:
  Changed handing of priv_host to fix bug in FLUSH PRIVILEGES
sql/unireg.h:
  Changed handing of priv_host to fix bug in FLUSH PRIVILEGES
2003-04-30 10:15:09 +03:00
unknown
b857129454 Updated warning test
Updated all tests to catchup warnings for all field conversions


mysql-test/t/ctype_many.test:
  Disable the warnings for misc conversion
mysql-test/t/warnings.test:
  More warning tests
2003-04-30 00:07:37 -07:00
unknown
05af39d591 Support of warnings for all DML statements (Insert, Update and Alter)
Fix LOAD DATA INFILE warnings to have a better meanigful messages
Fix to make the mysql command line to automatically show the warnings count for all basic commands
2003-04-30 00:02:28 -07:00
unknown
d4b465e2f3 Merge bk-internal.mysql.com:/home/bk/mysql-3.23
into narttu.mysql.fi:/my/mysql-3.23
2003-04-29 23:00:48 +03:00
unknown
ee9aceeb5c Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2003-04-29 18:41:37 +03:00
unknown
4845193d43 Porting back security fix from 4.0.
All tests plus grant.pl test passed.
2003-04-29 18:24:33 +03:00
unknown
b725fc0b33 Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2003-04-29 15:12:25 +02:00
unknown
7e1b828a38 followup to CURRENT_USER() fix 2003-04-29 15:11:45 +02:00
unknown
6f19b98611 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-3.23
into sinisa.nasamreza.org:/mnt/work/mysql
2003-04-29 15:57:13 +03:00
unknown
eb585f6615 merge fix
mysql-test/r/innodb.result:
  Auto merged
mysql-test/r/join_outer.result:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
2003-04-29 14:35:10 +03:00
unknown
38b70f0608 code cleanup
mysql-test/r/innodb.result:
  fixing result
mysql-test/t/innodb.test:
  fixing test
sql/sql_base.cc:
  committing a fix in order to pull new stuff
2003-04-29 14:13:22 +03:00
unknown
3c9524233b - minor fixups (no more warnings)
- the preferred mailing list is internals@ not dev-public@
   (this is a public document)
 - Rather use the 4.1 tree for new development (4.0 is frozen)


BitKeeper/etc/ignore:
  Added Docs/internals.html Docs/internals.pdf Docs/internals.txt Docs/internals_toc.html to the ignore list
2003-04-29 09:52:14 +02:00
unknown
998dc6468b Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into myvenu.com:/home/venu/work/sql/dev-4.1
2003-04-28 22:58:19 -07:00
unknown
8fd4623489 Update PeterG's internals documentation per comments from
Monty; minor changes only.
2003-04-28 18:52:04 -07:00
unknown
349029c1e9 Updated PeterG's internals documentation per comments from
Monty; clarified differences between the MySQL library 
directories.
2003-04-28 18:21:06 -07:00
unknown
1604f14e34 Updated PeterG's internals documentation per comments
from Monty; minor changes only.
2003-04-28 17:20:26 -07:00
unknown
d4e65cc371 Updated PeterG's internals documentation per comments from
Monty; new description of /man subdirectory
2003-04-28 17:13:48 -07:00
unknown
df280ba4ca Updated PeterG's internals documentation per comments from
Monty; one minor change, plus addition of how HEAP works.
2003-04-28 17:01:19 -07:00
unknown
ce2329b8f7 Merge pgulutzan@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/pgulutzan/mysql-4.0
2003-04-28 16:41:20 -07:00
unknown
66dc5cccea Updated PeterG's internals documentation per comments from
Monty; added additional description of MySQL's three types 
of record formats.


Docs/internals.texi:
  Updated PeterG's internals documentation per comments from 
  Monty; added additional description of MySQL's three types
  of record formats.
2003-04-28 16:40:33 -07:00
unknown
d98d71f56b Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2003-04-29 00:26:16 +02:00
unknown
d098137155 CURRENT_USER() and "access denied" error messages now report hostname exactly as it was specified in the GRANT command (with wildcards, that is)
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2003-04-29 00:15:18 +02:00
unknown
df98925fdd Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mashka.mysql.fi:/home/my/mysql-4.0
2003-04-29 00:14:43 +03:00
unknown
3d12a41d67 Added missing dependency to VC++ project file
Docs/internals.texi:
  Moved code guidelines first
  Fixed texinfo nodes & menus
VC++Files/mysql.dsw:
  Added missing dependency
2003-04-29 00:14:17 +03:00
unknown
7c04ced1e0 Merge bk-internal:/home/bk/mysql-3.23/
into serg.mylan:/usr/home/serg/Abk/mysql


client/mysqldump.c:
  Auto merged
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2003-04-28 20:09:38 +02:00
unknown
4ceb257849 Documentation fixed according bug 185 fixing patch (1.1551 03/04/23 00:
Docs/internals.texi:
  Documentation fixed according bug 185 fixing patch (1.1551 03/04/23 00:01:19)
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2003-04-28 20:40:41 +03:00
unknown
13a24a513d Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.0
into mysql.com:/space/my/mysql-4.0
2003-04-28 18:36:02 +02:00
unknown
288e32a3cb - removed Benchmark results from source distribution (they are not
up-to-date anyway)
2003-04-28 18:35:15 +02:00
unknown
749c0fe97f Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mashka.mysql.fi:/home/my/mysql-4.0
2003-04-28 19:06:57 +03:00
unknown
68faea2eaa Fix to remove compiler warnings
include/my_global.h:
  Fixed wrong #ifdef
include/violite.h:
  Fix to remove compiler warning
libmysqld/libmysqld.c:
  Fix to remove compiler warning
myisam/sort.c:
  Fix to remove compiler warning
myisammrg/myrg_extra.c:
  Fix to remove compiler warning
vio/viossl.c:
  Fix to remove compiler warning
2003-04-28 19:05:57 +03:00
unknown
671e77a1f7 - Removed two EXPLAIN SELECT statements from the InnoDB test suite
(the results are nondeterministic and provide different output on 32bit
  and 64bit architectures)


mysql-test/r/innodb.result:
   - removed two EXPLAIN SELECT results because the output is nondeterministic
     (the result was different on 64bit platforms)
mysql-test/t/innodb.test:
   - removed two EXPLAIN SELECT tests because the results are nondeterministic
     (the result was different on 64bit platforms)
2003-04-28 16:05:27 +02:00
unknown
7318eff7df - Fixed some texi errors in internals.texi (still some more left)
Docs/internals.texi:
   - fixed some structural errors
2003-04-28 15:59:04 +02:00
unknown
8a05f5c7f4 Better test for regular files. 2003-04-28 12:31:19 +03:00
unknown
c9a7f29bc6 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.mysql.r18.ru:/home/hf/work/mysql-4.1.cursor


BitKeeper/etc/ignore:
  auto-union
2003-04-28 14:29:22 +05:00
unknown
c13f555861 SCRUM
Protocol_cursor task
net_field_length definitions trimmed with Monty's suggestions


BitKeeper/etc/ignore:
  Added sql/pack.c to the ignore list
include/my_global.h:
  my_ulonglong definition moved here from mysql.h
include/mysql.h:
  we define my_ulonglong here only if no global.h included
include/mysql_com.h:
  net_field_length_ll definition is here now
sql/mini_client.cc:
  unnecessary cast removed
2003-04-28 14:25:29 +05:00
unknown
546097b95f Use my.cnf file from datadir even if datadir is different from the default one. 2003-04-28 12:00:04 +03:00
unknown
0d58c5bc7a Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mashka.mysql.fi:/home/my/mysql-4.0
2003-04-28 10:34:34 +03:00
unknown
a34fc63465 Fix for openssl on Solaris
Fix for grant bug with SELECT *


include/my_global.h:
  Fix for openssl on Solaris
sql/item_strfunc.cc:
  Fix for openssl on Solaris
sql/sql_acl.cc:
  Indentation cleanup
sql/sql_base.cc:
  Fix for grant bug with SELECT *
sql/sql_parse.cc:
  Added comment
tests/grant.pl:
  New grant test for SELECT *
tests/grant.res:
  new grant results
2003-04-28 10:32:56 +03:00
unknown
bec53039d3 Merge gweir@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/greg/bk/mysql-4.0


sql/mini_client.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/slave.cc:
  Auto merged
2003-04-27 21:16:20 -04:00
unknown
1ab78e0320 Change to NetWare platform mods, per Monty
mysys/my_pthread.c:
  Move #undef directive out of function
2003-04-27 21:15:52 -04:00
unknown
31dc4b3c83 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mashka.mysql.fi:/home/my/mysql-4.0


sql/ha_innodb.cc:
  Auto merged
2003-04-27 22:12:38 +03:00
unknown
f22be77734 Fixed problem when comparing a key for a multi-byte-character set. (bug 152)
Use 0x.... as strings if 'new' mode. (bug 152)
Don't report -max on windows when InnoDB is enabled. (bug 332)
Reset current_linfo;  This could cause a hang when doing PURGE LOGS.
Fix for row numbers in EXPLAIN (bug 322)
 Fix that USE_FRM works for all table types (bug 97)


VC++Files/libmysql/libmysql.dsp:
  Added new source files
myisam/mi_key.c:
  Fixed problem when comparing a key for a multi-byte-character set.
myisam/mi_range.c:
  Fixed problem when comparing a key for a multi-byte-character set.
myisam/mi_rkey.c:
  Fixed problem when comparing a key for a multi-byte-character set.
myisam/mi_search.c:
  Fixed problem when comparing a key for a multi-byte-character set.
myisam/mi_test2.c:
  Fixed printf statements
myisam/myisamdef.h:
  Fixed problem when comparing a key for a multi-byte-character set.
myisam/sort.c:
  Fixed printf statements
mysql-test/r/ctype_latin1_de.result:
  New test results
mysql-test/r/join.result:
  New test results
mysql-test/r/repair.result:
  New test results
mysql-test/r/rpl_alter.result:
  New test results
mysql-test/t/ctype_latin1_de-master.opt:
  --new is needed to get 0x... strings to work properly
mysql-test/t/ctype_latin1_de.test:
  New test for latin1_de
mysql-test/t/repair.test:
  Test of USE_FRM and HEAP tables
sql/field.cc:
  Fixed problem when comparing a key for a multi-byte-character set.
sql/item.cc:
  Use 0x.... as strings if 'new' mode
sql/item.h:
  Use 0x.... as strings if 'new' mode
sql/mysqld.cc:
  Don't report -max on windows when InnoDB is enabled.
sql/sql_analyse.cc:
  Removed unused variable
sql/sql_insert.cc:
  Removed debug message
sql/sql_repl.cc:
  Reset current_linfo;  This could cause a hang when doing PURGE LOGS.
sql/sql_select.cc:
  Fix for row numbers in EXPLAIN
sql/sql_table.cc:
  Fix that USE_FRM works for all table types (without strange errors)
sql/sql_yacc.yy:
  Removed compiler warnings.
2003-04-27 22:12:08 +03:00