Commit graph

17475 commits

Author SHA1 Message Date
unknown
abd8200f77 Fix of an incorrect merge 2005-02-24 17:25:06 +01:00
unknown
3087b2f1fd Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into here.mwagner.org:/Users/mwagner/work/bk/mysql-4.1
2005-02-23 23:57:28 -06:00
unknown
6294c68ee4 Bootstrap:
Add new manual.texi include files


Build-tools/Bootstrap:
  Add new manual.texi include files
2005-02-23 23:44:13 -06:00
unknown
7f13845432 Bug#8412: Setting error code to 0 on statements that cannot fail.
sql/log.cc:
  Setting error code to 0 on SQL statements that cannot fail.
2005-02-23 20:59:00 +01:00
unknown
1f2b46fa0f Bug#8412: Merge from 4.0
mysql-test/r/rpl_insert_id.result:
  Auto merged
mysql-test/t/rpl_insert_id.test:
  Auto merged
sql/log.cc:
  Merge from 4.0
2005-02-23 19:58:54 +01:00
unknown
6a0e1def63 Merge mysql.com:/home/bkroot/mysql-4.0
into mysql.com:/home/bk/b8412-mysql-4.0
2005-02-23 19:40:31 +01:00
unknown
cc97be60ba Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-clean
2005-02-23 18:18:22 +01:00
unknown
262dadccf1 Fix for bug #6572: SHOW ERRORS doesn't 2005-02-23 20:18:21 +03:00
unknown
5941f19bbd FIx for BUG#8682 "flush_block_commit test hangs on HPUX":
start_waiting_global_read_lock() should wake up all those who are waiting
for protect_against_global_read_lock to go down to 0: those registered in waiting_for_read_lock
AND those registered in global_read_lock_blocks_commit.


sql/lock.cc:
  start_waiting_global_read_lock() should wake up all those who are waiting
  for protect_against_global_read_lock to go down to 0: those registered in waiting_for_read_lock
  AND those registered in global_read_lock_blocks_commit.
2005-02-23 17:38:51 +01:00
unknown
f443992e66 Fix for bug#6317: string function CHAR, parameter is NULL, wrong result 2005-02-23 18:15:45 +03:00
unknown
2e199a1e8d Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/home/bar/mysql-4.1
2005-02-23 16:29:01 +04:00
unknown
990d937de2 config-win.h:
Activate Unicode collations in Windows version.


include/config-win.h:
  Activate Unicode collations in Windows version.
2005-02-23 16:28:10 +04:00
unknown
e1d76d1663 removed printout "- Repeated 1 times"
make sure transporter connections are close early in shutdown


ndb/src/common/logger/LogHandler.cpp:
  removed printout "- Repeated 1 times"
ndb/src/kernel/main.cpp:
  make sure transporter connections are close early in shutdown
ndb/src/kernel/vm/Emulator.cpp:
  make sure transporter connections are close early in shutdown
ndb/src/kernel/vm/Emulator.hpp:
  make sure transporter connections are close early in shutdown
2005-02-23 10:12:26 +01:00
unknown
8776230074 Merge mysql.com:/home/jimw/my/mysql-4.1-7989
into mysql.com:/home/jimw/my/mysql-4.1-clean


sql/sql_acl.cc:
  Auto merged
2005-02-22 13:15:34 -08:00
unknown
62ff22ee28 Merge bk-internal:/home/bk/mysql-4.1
into mysql.com:/home/jimw/my/mysql-4.1-clean


sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
2005-02-22 13:14:49 -08:00
unknown
100f792602 Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/b6676-4.1 2005-02-22 14:17:17 +01:00
unknown
d6a53e0cfc Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/bkroot/mysql-4.1
2005-02-22 14:12:42 +01:00
unknown
2131efb1f0 Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/b6676-4.1
sql/log_event.cc:
  Auto merged
2005-02-22 14:12:23 +01:00
unknown
2ae6eb094b Fix errors in my last changeset 2005-02-22 15:08:12 +02:00
unknown
361d8fe55f Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/b8297-4.1 2005-02-22 14:03:01 +01:00
unknown
1c172c3bc4 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2005-02-22 14:43:14 +02:00
unknown
29b4d186cb Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/b6676-4.1 2005-02-22 13:39:41 +01:00
unknown
209b24473c Bug#8349 myisamchk: --set-charset does not work
What we need to be able to set in myisamchk is
actually a collation, not a character set. This
fix just changes to display the proper error message. 


include/mysys_err.h:
  New mysys error message "unknown collation".
mysys/charset.c:
  Display more proper error when a collation is not found.
mysys/errors.c:
  New "unknown collation" error.
2005-02-22 16:37:25 +04:00
unknown
fe471dfd0f Merge 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/mysql-4.1
into 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-4.1
2005-02-22 14:34:59 +02:00
unknown
a7b6d0c232 Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/b6676-4.1 2005-02-22 13:29:20 +01:00
unknown
6f6bf32afa Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/b6662-4.1
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
2005-02-22 13:22:34 +01:00
unknown
2fb807d1d0 A user variable are now always have IMPLICIT coercibility,
independently from the expression it is initialized from.
In other words, this change treats a user variable like
a table with one column and one record. Discussed with 
PeterG, Serg and Lars. This change also simplifies replication
allowing not to replicate variables' coercibility.


mysql-test/r/user_var.result:
  Test changes accordintly
mysql-test/t/user_var.test:
  Test changes accordintly
2005-02-22 15:55:40 +04:00
unknown
7d766fdbeb BUG#6662: Changes after Guilhems and Sergs review 2005-02-22 12:40:31 +01:00
unknown
56679769a8 Merge 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/mysql-4.1
into 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-4.1


BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2005-02-22 13:00:00 +02:00
unknown
7e028f994a Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1


sql/field.cc:
  Auto merged
2005-02-22 12:51:54 +02:00
unknown
cb8d9c3ad4 Backport my_strntod() from 5.0
Change string->float conversion to delay division as long as possible.
This gives us more exact integer->float conversion for numbers of type '123.45E+02' (Bug #7740)




client/mysql.cc:
  Fix wront usage of charset (found during review of pushed code)
include/m_string.h:
  Backported my_strtod() from 5.0
mysql-test/mysql-test-run.sh:
  Run also mysql_client_test with --debug
mysql-test/r/ps_1general.result:
  Safety fix (if mysql_client_test.test fails)
mysql-test/r/type_float.result:
  More test
mysql-test/t/mysql_client_test.test:
  Comments for what to do if this test fails
mysql-test/t/ps_1general.test:
  Safety fix (if mysql_client_test.test fails)
mysql-test/t/type_float.test:
  More test to better test new strtod() function
  Test also bug #7740 (wrong comparsion between integer and float-in-integer-range)
sql/field.cc:
  Backport my_strntod() from 5.0
sql/item.cc:
  Backport my_strntod() from 5.0
sql/item.h:
  Backport my_strntod() from 5.0
sql/item_func.h:
  Backport my_strntod() from 5.0
sql/item_strfunc.cc:
  Backport my_strntod() from 5.0
sql/item_sum.cc:
  Backport my_strntod() from 5.0
sql/item_sum.h:
  Backport my_strntod() from 5.0
sql/procedure.h:
  Backport my_strntod() from 5.0
strings/ctype-simple.c:
  Backport my_strntod() from 5.0
strings/ctype-ucs2.c:
  Backport my_strntod() from 5.0
strings/strtod.c:
  Backport my_strntod() from 5.0
  Change conversion to delay division as long as possible.
  This gives us more exact integer-> float conversion for numbers of type '123.45E+02'
2005-02-22 12:51:23 +02:00
unknown
14707d71c3 ctype_latin1.result, ctype_latin1.test, charset.c:
Treat unknown characters straight in a query as syntax error, rather skipping it as a space character.


mysys/charset.c:
  Treat unknown characters straight in a query as syntax error, rather skipping it as a space character.
mysql-test/t/ctype_latin1.test:
  Treat unknown characters straight in a query as syntax error, rather skipping it as a space character.
mysql-test/r/ctype_latin1.result:
  Treat unknown characters straight in a query as syntax error, rather skipping it as a space character.
2005-02-22 09:56:07 +04:00
unknown
1329f063c0 field.cc:
optimize test_if_minus() when not UCS2 support is compiled.


sql/field.cc:
  optimize test_if_minus() when not UCS2 support is compiled.
2005-02-22 08:35:15 +04:00
unknown
595b46efd1 Merge. 2005-02-21 17:28:33 -06:00
unknown
edaf33a14e BUG#6662: Importing mysqldumps should not show any warnings of level "notes". 2005-02-21 18:40:28 +01:00
unknown
25b205cec8 BUG#6676: Added comment for the fix 2005-02-21 17:52:15 +01:00
unknown
df1b674a69 BUG#6676: Derivation of user variables should be of derivation "IMPLICIT" 2005-02-21 16:26:04 +01:00
unknown
aef137bc81 sql_parse.cc:
Fix compiler complaint.


sql/sql_parse.cc:
  Fix compiler complaint.
2005-02-21 09:15:43 -06:00
unknown
ae8c3e130a Fix -ansi -pedantic compilation failure. 2005-02-21 17:27:36 +03:00
unknown
65410bd0a1 ctype_utf8.result, ctype_utf8.test, ctype-utf8.c:
Bugs: #8385: utf8_general_ci treats cyrillic letters I and SHORT I as the same


strings/ctype-utf8.c:
  Bugs: #8385: utf8_general_ci treats cyrillic letters I and SHORT I as the same
mysql-test/t/ctype_utf8.test:
  Bugs: #8385: utf8_general_ci treats cyrillic letters I and SHORT I as the same
mysql-test/r/ctype_utf8.result:
  Bugs: #8385: utf8_general_ci treats cyrillic letters I and SHORT I as the same
2005-02-21 17:17:30 +04:00
unknown
e8f888a525 mysql.cc:
bug#7571:
  Server & Client characterset are shown under different decriptions
  Switch them into the correct order.


client/mysql.cc:
  bug#7571:
  Server & Client characterset are shown under different decriptions
  Switch them into the correct order.
2005-02-21 15:43:25 +04:00
unknown
d5e8980443 Merge bk-internal:/home/bk/mysql-4.1
into mysql.com:/home/mysqldev/tulin/mysql-4.1


scripts/make_binary_distribution.sh:
  Auto merged
2005-02-21 10:54:23 +01:00
unknown
afdfb1935f bug #8611, ndb includes in lib dir instead of include dir 2005-02-21 10:52:29 +01:00
unknown
97e6e78006 fix for a bug with my_print_defaults with --defaults-extra-file= option 2005-02-19 19:51:47 +02:00
unknown
881ce362bf Merge mysql.com:/home/jimw/my/mysql-4.1-8475
into mysql.com:/home/jimw/my/mysql-4.1-clean


sql/sql_parse.cc:
  Auto merged
2005-02-18 15:40:17 -08:00
unknown
9b6462216c Merge mysql.com:/home/jimw/my/mysql-4.1-8517
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-02-18 15:39:53 -08:00
unknown
6feefa2f16 Clean up merge for fix for Bug #8350.
sql/sql_parse.cc:
  Clean up merge
2005-02-18 15:23:17 -08:00
unknown
f1cea652d6 Fix merge of fix for Bug #4872.
sql/mysqld.cc:
  Clean up merge
2005-02-18 15:02:54 -08:00
unknown
cfad792e74 Clean up fix for Bug #7989 by avoiding extra memory copy, and adding some
more information to the error message.


sql/sql_acl.cc:
  Change strmov() call to strnmov(), and don't do redundant copy.
  Add to warning message that privilege can't be removed with REVOKE.
2005-02-18 12:47:33 -08:00
unknown
ac57068a7b Merge from 4.0
sql/sql_update.cc:
  Auto merged
sql/sql_yacc.yy:
  Merged from 4.0
2005-02-18 14:19:08 +01:00