Commit graph

4215 commits

Author SHA1 Message Date
unknown
0e5f0023b3 Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0
client/mysqltest.c:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/slave.cc:
  Auto merged
2002-06-02 17:05:08 +03:00
unknown
499ebe5459 Fixed bug in wait_for_relay_log_space()
Added checking of sem_init() in configure.


client/mysqltest.c:
  Cleanup
configure.in:
  Added checking of sem_init
sql/hostname.cc:
  Portability fix
sql/slave.cc:
  Fixed bug in wait_for_relay_log_space()
2002-06-02 17:04:16 +03:00
unknown
a532bfb2ea new subselect tests
LIMIT fixed
AVG & STD with subselect fixed
join_free fixed to be depended queries compatible
sort_default removed from SELECT_LEX


mysql-test/r/subselect.result:
  new subselect tests
mysql-test/t/subselect.test:
  new subselect tests
sql/item.cc:
  marking as depended _ALL_ subselects under select from wich depend
sql/item_subselect.cc:
  limit fixed
  TODO added
sql/sql_class.cc:
  AVG & STD function with subselects fixed
sql/sql_lex.h:
  sort_default removed
sql/sql_parse.cc:
  limit fixed
sql/sql_select.cc:
  fixed to be subselect compatible
sql/sql_yacc.yy:
  sort_default removed
2002-06-01 23:35:36 +03:00
unknown
0e06aec874 fix for a multi-table delete bug when optimiser used only indices 2002-06-01 21:37:29 +03:00
unknown
78aa48a809 Fixed some spelling errors. 2002-06-01 11:46:06 +03:00
unknown
32113efe2a Merge nleippe@work.mysql.com:/home/bk/mysql
into nick.leippe.com:/home/nick/mysql/mysql
2002-05-31 16:56:48 -07:00
unknown
169a4d9282 fixed 'load table from master' hang when host is empty
added respective test case


sql/slave.cc:
  fixed load table from master hang when host is empty
2002-05-31 16:56:02 -07:00
unknown
58e4105b62 Added filling of unicode mapping arrays during charset.conf loading
All charset.conf files were extended to supply unicode mapping array
CONVERT() now uses more common order of arguments: CONVERT(expr,charset_from,charset_to)
Dynamic charset can be used as CONVERT() argument


mysys/charset.c:
  Added filling of unicode mapping arrays during charset.conf loading
sql/share/charsets/armscii8.conf:
  Added filling of unicode mapping arrays during charset.conf loading
sql/share/charsets/cp1251.conf:
  Added filling of unicode mapping arrays during charset.conf loading
sql/share/charsets/cp1257.conf:
  Added filling of unicode mapping arrays during charset.conf loading
sql/share/charsets/croat.conf:
  Added filling of unicode mapping arrays during charset.conf loading
sql/share/charsets/danish.conf:
  Added filling of unicode mapping arrays during charset.conf loading
sql/share/charsets/dec8.conf:
  Added filling of unicode mapping arrays during charset.conf loading
sql/share/charsets/dos.conf:
  Added filling of unicode mapping arrays during charset.conf loading
sql/share/charsets/estonia.conf:
  Added filling of unicode mapping arrays during charset.conf loading
sql/share/charsets/german1.conf:
  Added filling of unicode mapping arrays during charset.conf loading
sql/share/charsets/greek.conf:
  Added filling of unicode mapping arrays during charset.conf loading
sql/share/charsets/hebrew.conf:
  Added filling of unicode mapping arrays during charset.conf loading
sql/share/charsets/hp8.conf:
  Added filling of unicode mapping arrays during charset.conf loading
sql/share/charsets/hungarian.conf:
  Added filling of unicode mapping arrays during charset.conf loading
sql/share/charsets/koi8_ru.conf:
  Added filling of unicode mapping arrays during charset.conf loading
sql/share/charsets/koi8_ukr.conf:
  Added filling of unicode mapping arrays during charset.conf loading
sql/share/charsets/latin1.conf:
  Added filling of unicode mapping arrays during charset.conf loading
sql/share/charsets/latin2.conf:
  Added filling of unicode mapping arrays during charset.conf loading
sql/share/charsets/latin5.conf:
  Added filling of unicode mapping arrays during charset.conf loading
sql/share/charsets/swe7.conf:
  Added filling of unicode mapping arrays during charset.conf loading
sql/share/charsets/usa7.conf:
  Added filling of unicode mapping arrays during charset.conf loading
sql/share/charsets/win1250.conf:
  Added filling of unicode mapping arrays during charset.conf loading
sql/share/charsets/win1251.conf:
  Added filling of unicode mapping arrays during charset.conf loading
sql/share/charsets/win1251ukr.conf:
  Added filling of unicode mapping arrays during charset.conf loading
sql/sql_yacc.yy:
  Changed the order of arguments to Convert(expr,charset_from,charset_to)
  Dynamic charsets are now resolved too for Convert() arguments
2002-05-31 21:04:47 +05:00
unknown
2e86ba7e9e Fixed a bug in my_getopt.
mysys/my_getopt.c:
  Fixed two bugs in my_getopt:
  - Didn't exit with error if a short option was not recognized. Fixed.
  - If unrecognized short option was not the first one in the list,
    printed "unknown option" error for wrong option. Fixed.
2002-05-31 16:23:36 +03:00
unknown
b379016d88 Fixed a bug in mysql client.
client/mysql.cc:
  Fixed a bug in option -N
2002-05-31 15:43:21 +03:00
unknown
0ceaf6d2c2 Portability fixes for SCO and HPUX
Change TRUNCATE(number) to truncate towards zero for negative numbers
Fix NULL handling for DESCRIBE table_name


Docs/manual.texi:
  Update of TRUNCATE() information
configure.in:
  Fix for HPUX
extra/resolveip.c:
  Fix for SCO
include/my_net.h:
  Fix for HPUX
libmysql/libmysql.c:
  Removed warning on HPUX 10.20
mysql-test/r/func_math.result:
  Test of new TRUNCATE handling
mysql-test/t/func_math.test:
  Test of new TRUNCATE handling
mysys/my_gethostbyname.c:
  Portability fix
sql/item_func.cc:
  Change TRUNCATE(number) to truncate towards zero for negative numbers
sql/sql_show.cc:
  Fix NULL handling for DESCRIBE table_name
2002-05-31 15:22:38 +03:00
unknown
2c058d8478 Fixed a problem with --skip-networking.
This fix should be merged into 4.0 and 4.1
2002-05-31 13:35:20 +03:00
unknown
79efd9dbaa Fixed a bug in mysql client.
client/mysql.cc:
  Fixed a bug that caused segmentation fault in internal 'tee' command.
2002-05-31 12:34:47 +03:00
unknown
95f2b1e6a8 Added more complete master and slave configuration section
support-files/my-huge.cnf.sh:
  added more complete sample master and slave configuration
2002-05-30 17:38:19 -07:00
unknown
0720fe5927 Fixed bug: load table from master w/empty master would hang.
Now it properly returns error.
Added respective test case.


sql/repl_failsafe.cc:
  fixed bug: load table from master w/ empty master would hang.
  Now it properly returns error.
2002-05-30 17:31:25 -07:00
unknown
676c018344 mirrors.texi:
change mirror


Docs/mirrors.texi:
  change mirror
2002-05-30 17:50:10 +03:00
unknown
940ab3e031 A small fix for HP-UX when used --with-debug 2002-05-30 15:49:32 +03:00
unknown
96a1daa6d2 A very nasty bug in multi-table deletes & updates 2002-05-29 21:20:28 +03:00
unknown
324cb57baf Merge sinisa@work.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.0
2002-05-29 15:29:43 +03:00
unknown
b752924929 Fixed a bug.
sql/slave.h:
  Fixed a bug in option handling.
sql/sql_repl.h:
  Fixed a bug in option handling.
2002-05-29 15:29:42 +03:00
unknown
aea0ae808f Some fixes for user resources management 2002-05-29 15:21:06 +03:00
unknown
75d312bc1f Fixed a bug in make test, non-debug version.
sql/slave.cc:
  Released some variables in non-debug version. These are needed
  in mysqld.cc my_getopt struct, which defines some options,
  which are used by mysql_test in a non-debug version.
sql/sql_repl.cc:
  Released some variables in non-debug version. These are needed
  in mysqld.cc my_getopt struct, which defines some options,
  which are used by mysql_test in a non-debug version.
2002-05-29 15:20:36 +03:00
unknown
a90b2f309e Added useful exit error code for programs using my_getopt in case
of an error in option handling. This can sometimes be useful in
scripts.

Changed some exit code names and corresponding numbers.

Fixed a bug in mysqld.cc, in replication related options.

Added a global flag in my_getopt, which can be set by any program
that is using my_getopt, which tells whether the client should
print the error message itself, or whether my_getopt should do it.
The default is that my_getopt will print the error messages.


client/mysql.cc:
  Added useful exit error code for programs using my_getopt in case
  of an error in option handling. This can sometimes be useful in
  scripts.
client/mysqladmin.c:
  Added useful exit error code for programs using my_getopt in case
  of an error in option handling. This can sometimes be useful in
  scripts.
client/mysqlbinlog.cc:
  Added useful exit error code for programs using my_getopt in case
  of an error in option handling. This can sometimes be useful in
  scripts.
client/mysqlcheck.c:
  Added useful exit error code for programs using my_getopt in case
  of an error in option handling. This can sometimes be useful in
  scripts.
client/mysqldump.c:
  Added useful exit error code for programs using my_getopt in case
  of an error in option handling. This can sometimes be useful in
  scripts.
client/mysqlimport.c:
  Added useful exit error code for programs using my_getopt in case
  of an error in option handling. This can sometimes be useful in
  scripts.
client/mysqlmanager-pwgen.c:
  Added useful exit error code for programs using my_getopt in case
  of an error in option handling. This can sometimes be useful in
  scripts.
client/mysqlmanagerc.c:
  Added useful exit error code for programs using my_getopt in case
  of an error in option handling. This can sometimes be useful in
  scripts.
client/mysqlshow.c:
  Added useful exit error code for programs using my_getopt in case
  of an error in option handling. This can sometimes be useful in
  scripts.
client/mysqltest.c:
  Added useful exit error code for programs using my_getopt in case
  of an error in option handling. This can sometimes be useful in
  scripts.
client/thread_test.c:
  Added useful exit error code for programs using my_getopt in case
  of an error in option handling. This can sometimes be useful in
  scripts.
extra/my_print_defaults.c:
  Added useful exit error code for programs using my_getopt in case
  of an error in option handling. This can sometimes be useful in
  scripts.
extra/mysql_install.c:
  Added useful exit error code for programs using my_getopt in case
  of an error in option handling. This can sometimes be useful in
  scripts.
extra/perror.c:
  Added useful exit error code for programs using my_getopt in case
  of an error in option handling. This can sometimes be useful in
  scripts.
extra/resolve_stack_dump.c:
  Added useful exit error code for programs using my_getopt in case
  of an error in option handling. This can sometimes be useful in
  scripts.
extra/resolveip.c:
  Added useful exit error code for programs using my_getopt in case
  of an error in option handling. This can sometimes be useful in
  scripts.
include/my_getopt.h:
  Added global (flag) variable which tells my_getopt whether to
  print errors or just silently exit with proper error code.
include/mysys_err.h:
  Changed exit code names and corresponding numbers.
isam/isamchk.c:
  Added useful exit error code for programs using my_getopt in case
  of an error in option handling. This can sometimes be useful in
  scripts.
isam/pack_isam.c:
  Added useful exit error code for programs using my_getopt in case
  of an error in option handling. This can sometimes be useful in
  scripts.
myisam/ft_dump.c:
  Added useful exit error code for programs using my_getopt in case
  of an error in option handling. This can sometimes be useful in
  scripts.
myisam/ft_eval.c:
  Added useful exit error code for programs using my_getopt in case
  of an error in option handling. This can sometimes be useful in
  scripts.
myisam/ft_test1.c:
  Added useful exit error code for programs using my_getopt in case
  of an error in option handling. This can sometimes be useful in
  scripts.
myisam/mi_test1.c:
  Added useful exit error code for programs using my_getopt in case
  of an error in option handling. This can sometimes be useful in
  scripts.
myisam/myisamchk.c:
  Added useful exit error code for programs using my_getopt in case
  of an error in option handling. This can sometimes be useful in
  scripts.
myisam/myisampack.c:
  Added useful exit error code for programs using my_getopt in case
  of an error in option handling. This can sometimes be useful in
  scripts.
mysys/my_getopt.c:
  Changed exit code names and corresponding numbers. Added a flag
  for checking whether my_getopt should print the error message,
  or whether it should be printed by the client itself.
sql/gen_lex_hash.cc:
  Added useful exit error code for programs using my_getopt in case
  of an error in option handling. This can sometimes be useful in
  scripts.
sql/mysqld.cc:
  Added useful exit error code for programs using my_getopt in case
  of an error in option handling. This can sometimes be useful in
  scripts.
  
  Fixed a bug when compiling in non-debug mode, some replication
  related options were not enabled while they should be. This made
  'make test' to fail in rpl000010 when --with-debug was not used.
tools/mysqlmanager.c:
  Added useful exit error code for programs using my_getopt in case
  of an error in option handling. This can sometimes be useful in
  scripts.
2002-05-29 15:07:30 +03:00
unknown
d5adf39c85 Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0
Docs/manual.texi:
  Auto merged
2002-05-29 14:30:44 +03:00
unknown
336d94bcec ha_innobase.cc:
Fix an assertion failure in ha_innobase.cc about line 302 when a user has used user level locks and closes a connection; this was reported by Jeremy Zawodny


sql/ha_innobase.cc:
  Fix an assertion failure in ha_innobase.cc about line 302 when a user has used user level locks and closes a connection; this was reported by Jeremy Zawodny
2002-05-29 14:04:19 +03:00
unknown
bb4cf4c24e Style fixup. 2002-05-29 12:31:22 +10:00
unknown
3dcf2214c2 A few style/spelling fixups. 2002-05-29 12:21:36 +10:00
unknown
1b2f82ecd8 Fixed a bug in mysqlmanager-pwgen. 2002-05-29 00:34:25 +03:00
unknown
56f154165c merging
mysql-test/r/derived.result:
  Auto merged
mysql-test/t/derived.test:
  Auto merged
2002-05-28 22:43:10 +03:00
unknown
3d9cd36f47 limit clause fixed 2002-05-28 22:38:17 +03:00
unknown
3cdaf67e9c Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/work-orig-4.1
2002-05-28 20:50:58 +03:00
unknown
0bef1099a2 derived table with * bug fixed
mysql-test/r/derived.result:
  derived table with * bug test suite
mysql-test/t/derived.test:
  derived table with * bug test suite
2002-05-28 20:49:17 +03:00
unknown
c78685e0c2 Removed unnecessary key search in the hp_rb_write_key() function 2002-05-28 20:46:35 +05:00
unknown
9e279bde12 small fix for a bug introduced when someone made a new getopt scheme
in clients ...
2002-05-28 14:47:51 +03:00
unknown
af5f3f5f9f Merge sinisa@work.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.0
2002-05-28 13:40:39 +03:00
unknown
e7daa09516 Fixing a small bug in new code for cond_timedwait fix 2002-05-28 13:36:51 +03:00
unknown
d86be3427a Merge hundin:/my/mysql-4.0 into narttu.mysql.fi:/my/mysql-4.0
Docs/manual.texi:
  Auto merged
2002-05-28 10:42:06 +03:00
unknown
c579f8102d Small documentation change
Docs/manual.texi:
  slave_read_timeout -> slave_net_timeout
sql/mysqld.cc:
  Documented slave_net_timeout
2002-05-28 10:39:47 +03:00
unknown
10be37fa63 Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0
Docs/manual.texi:
  Auto merged
2002-05-28 10:22:50 +03:00
unknown
ec04d043aa fixed tests after merge
mysql-test/r/type_enum.result:
  fixed test after merge
mysql-test/r/type_set.result:
  fixed test after merge
mysys/Makefile.am:
  R
2002-05-28 10:21:56 +03:00
unknown
766038f277 merge with 3.23.51
BitKeeper/etc/logging_ok:
  auto-union
BUILD/SETUP.sh:
  Auto merged
Docs/manual.texi:
  Auto merged
extra/resolveip.c:
  Auto merged
include/my_sys.h:
  Auto merged
mysql-test/t/type_enum.test:
  Auto merged
mysys/mf_strip.c:
  Auto merged
mysys/raid.cc:
  Auto merged
include/my_net.h:
  merge
mysql-test/r/type_enum.result:
  merge
mysql-test/t/type_decimal.test:
  merge
mysys/Makefile.am:
  merge
sql/sql_db.cc:
  merge
sql/sql_parse.cc:
  merge
2002-05-27 23:52:21 +03:00
unknown
37db9f71ba Manual update about SET/ENUM
Docs/manual.texi:
  Added information about SET/ENUM
2002-05-27 23:40:26 +03:00
unknown
940a8a4020 Renamed stripp_sp -> strip_sp
Remove end space from ENUM and SET strings


mysql-test/t/type_enum.test:
  Test of end space in enum's
Docs/manual.texi:
  Changelog
include/my_sys.h:
  Renamed stripp_sp -> strip_sp
mysql-test/r/type_enum.result:
  Test of end space in enums
mysys/Makefile.am:
  change stripp_sp -> strip_sp
mysys/mf_strip.c:
  change stripp_sp -> strip_sp
sql/sql_db.cc:
  change stripp_sp -> strip_sp
sql/sql_parse.cc:
  change stripp_sp -> strip_sp
  Remove end space from ENUM and SET strings
2002-05-27 23:21:49 +03:00
unknown
807b50855c Hiding internal pointers of SELECT_LEX structures 2002-05-27 20:52:54 +03:00
unknown
38fad33321 Split raid C function to separate file to make things more portable.
Fixed some portability things in my_gethostbyname_r
Portability fix for type_decimal.test


BUILD/SETUP.sh:
  Fixes for gcc 3.1
extra/resolveip.c:
  Cleanup
include/my_net.h:
  Portability fix for SCO
mysql-test/t/type_decimal.test:
  Portability fix for FreeBSD
mysys/Makefile.am:
  Portability fix for OSF1
mysys/raid.cc:
  Portability fix for OSF1
2002-05-27 10:02:00 +03:00
unknown
e3b5fd8696 Portability fix for OSF1
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2002-05-27 09:29:26 +03:00
unknown
bc63956efe Clarified myisampack 'limitations' (note from Werner). 2002-05-27 09:44:43 +10:00
unknown
e640e2e2c0 merge
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.h:
  Auto merged
sql/item_strfunc.h:
  merge layout fixing
sql/sql_update.cc:
  merge layout fixing
2002-05-26 22:57:08 +03:00
unknown
02d8b9ba56 added depended subselect processing
mysql-test/r/subselect.result:
  depended subselect test
mysql-test/t/subselect.test:
  depended subselect test
sql/item.cc:
  resolving field names in depended queries
sql/item_subselect.cc:
  move optimization just before execution, because we can't optimize inner depended subselect if have not optimized outer subselect
sql/item_subselect.h:
  move optimization just before execution
sql/sql_lex.h:
  some inline methods to hide internal SELECT_LEX structures
sql/sql_select.cc:
  fixed error
2002-05-26 22:50:32 +03:00
unknown
6ec00a6692 Fixed core dump bug in mysqltest
Added DBUG_ code to lib_vio.c


client/mysqltest.c:
  Fixed core dump bug
libmysqld/lib_vio.c:
  Added DBUG_ code
2002-05-26 16:53:57 +03:00