Commit graph

8199 commits

Author SHA1 Message Date
unknown
fb724e532c If the system has 64 bit "long", then "long long" does not add new
functionality. The existing code takes advantage of this when
"typedef"ing 'longlong' in 'my_global.h'. This holds for Alpha CPUs.
If the compiler then has prototypes for C99 functions 'strtoll()' and
'strtoull()' but no implementation, the existing code in 'strtoull.c'
collides with that prototype. These collisions are avoided now.
(backport from 4.1)


include/m_string.h:
  Extend the "fake" approach from 'strtoull()' onto 'strtoll()'
  (backport from 4.1).
strings/strto.c:
  Ensure that calling file has included necessary headers,
  as these are needed at the upper level already
  (backport from 4.1).
strings/strtol.c:
  Cleanup/alignment with the "long long" functions.
strings/strtoll.c:
  When "long" is 64 bit already, system function 'strtol()' can be used.
  Header files 'my_global.h' and 'm_string.h' will manage that,
  if they are included early enough (backport from 4.1).
strings/strtoul.c:
  Cleanup/alignment with the "long long" functions.
strings/strtoull.c:
  When "long" is 64 bit already, system function 'strtoul()' can be used.
  Header files 'my_global.h' and 'm_string.h' will manage that,
  if they are included early enough (backport from 4.1).
2004-08-30 17:41:41 +02:00
unknown
88fe390a72 Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2004-08-30 10:17:51 +02:00
unknown
4e2f80b457 typo fixed 2004-08-30 10:13:13 +02:00
unknown
0c549e366c - removed mysql-test/t/flush_block_commit-master.opt as it collided
with the sleep value we use for the test suite run during the
   release builds


BitKeeper/deleted/.del-flush_block_commit-master.opt~3bcd295d5bf68796:
  Delete: mysql-test/t/flush_block_commit-master.opt
2004-08-30 09:20:52 +02:00
unknown
877503f5af log.cc:
Fixed missing * in comment in setup_windows_event_source


sql/log.cc:
  Fixed missing * in comment in setup_windows_event_source
2004-08-30 00:50:39 +02:00
unknown
d84b42b6e4 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0


sql/log.cc:
  Auto merged
2004-08-29 14:14:32 +02:00
unknown
4014c093e2 Fix for BUG#4500 "set character set replicates incorrectly"
We must not reset the charset in slave after each statement, otherwise the SET CHARACTER SET is cancelled immediately.
Instead, we write a SET CHARACTER SET DEFAULT to the master's binlog when needed (like we already do for SET FOREIGN_KEY_CHECKS);
such writing is not necessary in 4.1 (in 4.1 the bug does not exist, as the SET ONE_SHOT syntax is used).
I have written a test and it works, but I'm not pushing the test as it requires building with all charsets.
I have noticed differences between what is inserted in the master's table in 4.0 and 4.1, and alerted Bar.


sql/log.cc:
  When SET CHARACTER SET has been used, we must reset the charset after the writing the statement, in the binlog.
  In 4.1, this resetting is already achieved by the SET ONE_SHOT syntax.
sql/log_event.cc:
  In slave, we must not simply reset the charset after each statement: if we do this, the charset gets
  immediately after executing the SET CHARACTER SET! (BUG#4500).
2004-08-29 14:13:51 +02:00
unknown
a90c14b6f4 - fixed typo so make dist does not fail 2004-08-28 09:31:15 +02:00
unknown
db15b91915 Code style fixes.
Initialize LOG_error_log before get_options to not use an uninitalized mutex in case of an error from handle_options()


mysql-test/r/lowercase_table.result:
  Changed foo database -> mysqltest
  More test cases
mysql-test/t/lowercase_table.test:
  Changed foo database -> mysqltest
  More test cases
mysys/my_getopt.c:
  Fix new code to use MySQL indentation style
sql/log.cc:
  Change to use MySQL indentation style and naming conventions
  Remove usage of strlen() and strcat()
sql/mysqld.cc:
  Initialize LOG_error_log before get_options to not use an uninitalized mutex in case of an error from handle_options()
sql/sql_base.cc:
  Added comment
sql/table.cc:
  Added #if MYSQL_VERSION_ID < 40100 to ensure code is merged correctly
2004-08-28 00:49:54 +03:00
unknown
434d385ac1 Compile all charset conversion tables if --with-extra-charsets=all
or --with-extra-charsets=complex is given.
2004-08-27 21:17:29 +05:00
unknown
14f96b2f60 table.cc:
Bug #4558 Escape handling error for ENUM values in SJIS encoding


sql/table.cc:
  Bug #4558 Escape handling error for ENUM values in SJIS encoding
2004-08-27 12:09:28 +05:00
unknown
dd714c9a1b win1251.conf:
Wrong UPPER/LOWER translation for Cyrillic letter tse was fixed.
  bug#5110


sql/share/charsets/win1251.conf:
  Wrong UPPER/LOWER translation for Cyrillic letter tse was fixed.
  bug#5110
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2004-08-27 10:54:57 +05:00
unknown
1499bbfbb8 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into build.mysql.com:/users/rburnett/mysql-4.0
2004-08-27 01:14:12 +02:00
unknown
0b10b8cba6 Adding a file that was missed during the first push
This file was part of the patch for 
Bug #4466  	Nothing in .err when mysql service ends because of malformed my.ini options 

message.mc:
  new file
2004-08-27 01:08:57 +02:00
unknown
1176c17553 - fixed brain fart in Bootrap - it never actually caught failures
when pulling BK trees before.


Build-tools/Bootstrap:
   - thinko fix: we need to run the "bk pull" command on its own, if
     we want to get its return value...
2004-08-26 19:57:32 +02:00
unknown
ad3fed2e7b Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2004-08-26 17:49:04 +02:00
unknown
5dbfa9db7b Merge miguel@bk-internal.mysql.com:/home/bk/mysql-4.0
into hegel.txg.br:/home/miguel/bk/mysql-4.0
2004-08-26 11:44:02 -03:00
unknown
e188532610 remove warning 2004-08-26 15:32:57 +02:00
unknown
ad1f3bb17d Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into build.mysql.com:/users/rburnett/mysql-4.0


BitKeeper/etc/logging_ok:
  auto-union
sql/mysql_priv.h:
  Auto merged
2004-08-26 13:43:27 +02:00
unknown
337f02b74e Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.0
into mysql.com:/space/my/mysql-4.0
2004-08-26 12:36:48 +02:00
unknown
0830992f2d - Updated RPM spec file: MySQL-Max now requires MySQL-server instead
of MySQL (BUG#3860)
2004-08-26 12:25:14 +02:00
unknown
fe9b9d57cf Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/my/mysql-4.0
2004-08-26 13:18:10 +03:00
unknown
a0dd3a30a5 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/M40/mysql-4.0
2004-08-26 11:02:53 +02:00
unknown
0572112d43 merge
sql/mysql_priv.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
mysql-test/mysql-test-run.sh:
  merge (use new code)
2004-08-26 00:39:43 +03:00
unknown
8ed5952a86 Remove default argument to mysql_truncate()
Update to new valgrind


mysql-test/mysql-test-run.sh:
  Update for new valgrind
sql/mysql_priv.h:
  Remove default argument to mysql_truncate()
sql/sql_parse.cc:
  Remove default argument to mysql_truncate()
2004-08-26 00:37:25 +03:00
unknown
3b55c6f394 Test case for Bug #4792 lower_case_table_names does not resolve db.tbl.column in SELECT list
lowercase_table.result:
  New results for modified lowercase_table test
lowercase_table.test:
  Added test case for all uppercase database when running under lower_case_table_names.  This really only failed under Windows.  Bug# 4792


mysql-test/t/lowercase_table.test:
  Added test case for all uppercase database when running under lower_case_table_names.  This really only failed under Windows.  Bug# 4792
mysql-test/r/lowercase_table.result:
  New results for modified lowercase_table test
2004-08-25 17:25:38 +02:00
unknown
ca59bf4746 Bug #4792 lower_case_table_names does not resolve db.tbl.column in SELECT list
sql_base.cc:
  Added code to lowercase database name in insert_fields when lower_case_table_names=1. This fixes bug# 4792


sql/sql_base.cc:
  Added code to lowercase database name in insert_fields when lower_case_table_names=1. This fixes bug# 4792
2004-08-25 15:12:31 +02:00
unknown
335a791aba Adding binary version information for debug/release version of libmysqld.dll
This was a customer request for to get the XP Logo Certification.

Note for LenZ:
Adding to the project libmysqld.dsp the file libmysqld.rc at compilation time will be created
the libmysqld.res and this linked. For every release edit the libmysqld.rc
version number.
2004-08-25 02:04:45 -03:00
unknown
b15ee67874 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into build.mysql.com:/users/rburnett/mysql-4.0


BitKeeper/etc/logging_ok:
  auto-union
client/mysql.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
2004-08-25 06:39:19 +02:00
unknown
73fe243d43 buf0rea.c:
Fix bug: if there was little file I/O in InnoDB, but the insert buffer was used, it could happen that 'Pending normal aio reads' was bigger than 0, but the I/O handler thread did not get waken up in 600 seconds. This resulted in a hang, and crashing of InnoDB.


innobase/buf/buf0rea.c:
  Fix bug: if there was little file I/O in InnoDB, but the insert buffer was used, it could happen that 'Pending normal aio reads' was bigger than 0, but the I/O handler thread did not get waken up in 600 seconds. This resulted in a hang, and crashing of InnoDB.
2004-08-24 20:17:23 +03:00
unknown
47d87c639c All 'Makefile's must use '$(AR)' (not just 'ar') because the variable may contain options.
libmysqld/Makefile.am:
  Always use 'make' variable '$(AR)' so that options (AIX 64 bit!) are included.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2004-08-24 19:05:42 +02:00
unknown
9d1a9d72cb Fix warning VC++ and fix applied fisrt to source 4.1
mysys/my_lib.c:
  Same fix for bug #4737 that wrongly I did first on tree 4.1
mysys/my_vsnprintf.c:
  Fix VC++ warning assuming that my_vsnprintf() is external
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2004-08-24 10:40:20 -03:00
unknown
6212c6e7f5 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.0
into gluh.mysql.r18.ru:/home/gluh/MySQL-BUGS/mysql-4.0
2004-08-24 17:40:19 +04:00
unknown
b758a6d142 Fix for bug #4340: find_in_set is case insensitive even on binary operators(2nd version)
mysql-test/r/func_set.result:
  Fix for bug #4340: find_in_set is case insensitive even on binary operators
mysql-test/t/func_set.test:
  Fix for bug #4340: find_in_set is case insensitive even on binary operators
sql/item_func.cc:
  Fix for bug #4340: find_in_set is case insensitive even on binary operators
2004-08-24 17:29:08 +04:00
unknown
8b11e715bb - make sure to recreate all autoconf/automake-related files after
modifying configure.in for the commercial tarballs
 - added my-innodb-heavy-4G.cnf to the distribution


Build-tools/mysql-copyright:
   - make sure to recreate all autoconf/automake-related files after
     modifying configure.in
support-files/Makefile.am:
   - added my-innodb-heavy-4G.cnf to the distribution
2004-08-24 13:51:28 +02:00
unknown
696a303547 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
2004-08-23 17:16:22 +02:00
unknown
1e86cd1ed1 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.0
into gluh.mysql.r18.ru:/home/gluh/MySQL-BUGS/mysql-4.0
2004-08-23 19:16:21 +04:00
unknown
6d9046c6e7 Fix for bug #5134: WHERE x = 'bar' AND x LIKE BINARY 'bar' returns
wrong results
2004-08-23 19:13:47 +04:00
unknown
e9c25d9336 Fix for BUG#5033 "When using temporary tables truncate does NOT reset the auto_increment counter"
(ok'd by CTO to fix it in 4.0).
Fix to make mysql-test-run work with all Valgrind versions.


mysql-test/mysql-test-run.sh:
  fixing mysql-test-run.sh so that it works indifferently with Valgrind 1.x, 2.x
  (versions <= 2.0.0 refuse --tool option; versions >=2.1.2 require it; 2.1.0 accepts it).
  I hope the shell code is portable enough; anyway Valgrind only runs on Linux...
  I tested it with 2.0.0, 2.1.0, 2.1.2.
mysql-test/r/truncate.result:
  result update
mysql-test/t/truncate.test:
  testing if TRUNCATE resets autoinc counter for temp tables (BUG#5033); testing difference with DELETE FROM.
sql/sql_delete.cc:
  in mysql_truncate(), always reset the autoinc counter, as manual says (even if it's a temp table, which was BUG#5033).
2004-08-23 16:15:57 +02:00
unknown
9ecbafb512 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/pem/work/mysql-4.0
2004-08-23 15:30:49 +02:00
unknown
b7e4463dac Fixed: BUG#5135: cannot turn on log_warnings with SET in 4.1 (and 4.0)
mysql-test/r/variables.result:
  Test case for BUG#5135, check that setting log_warnings actually works.
mysql-test/t/variables.test:
  Test case for BUG#5135, check that setting log_warnings actually works.
sql/mysqld.cc:
  Set a max value for log_warnings, so se can set it to something other than 0.
2004-08-23 15:29:55 +02:00
unknown
38b8c98543 unnecessary LINT_INIT removed 2004-08-23 13:43:55 +02:00
unknown
cb6dc5738c after merge fixes 2004-08-22 12:43:26 +02:00
unknown
24c008a5fb ported bugfix for #2408 from 3.23
(cannot call it a "merge" :)
2004-08-22 10:22:59 +02:00
unknown
35d5744e8a bug#2408 - Multiple threads altering MERGE table UNIONs hang/crash.
Abandoned improper use of MyISAM data.
Thanks Ingo!
2004-08-22 09:36:17 +02:00
unknown
c1fd20bb5e null.test, null.result:
Added test case for bug #4256.
join_outer.result:
  Fixed bug #4256.
item_cmpfunc.h:
  Fixed inconsistency of values of used_tables_cache and
  const_item_cache for Item_func_isnull objects.
  This inconsistency caused bug #4256.


sql/item_cmpfunc.h:
  Fixed inconsistency of values of used_tables_cache and
  const_item_cache for Item_func_isnull objects.
  This inconsistency caused bug #4256.
mysql-test/r/join_outer.result:
  Fixed bug #4256.
mysql-test/r/null.result:
  Added test case for bug #4256.
mysql-test/t/null.test:
  Added test case for bug #4256.
2004-08-20 23:48:30 -07:00
unknown
4f0e2da316 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
2004-08-20 17:16:03 +02:00
unknown
cd8054d431 Making FLUSH TABLES WITH READ LOCK block COMMITs of existing transactions,
in a deadlock-free manner. This splits locking the global read lock in two steps.
This fixes a consequence of this bug, known as:
BUG#4953 'mysqldump --master-data may report incorrect binlog position if using InnoDB'
And a test.


sql/handler.cc:
  making COMMIT wait if FLUSH TABLES WITH READ LOCK happened.
sql/lock.cc:
  an additional stage so that FLUSH TABLES WITH READ LOCK blocks COMMIT:
  make_global_read_lock_block_commit():
  taking the global read lock is TWO steps (2nd step is optional; without
  it, COMMIT of existing transactions will be allowed):
  lock_global_read_lock() THEN make_global_read_lock_block_commit().
sql/mysql_priv.h:
  new argument to wait_if_global_read_lock()
sql/sql_class.h:
  THD::global_read_lock now an uint to reflect the 2 steps of global read lock (does not block COMMIT / does)
sql/sql_db.cc:
  update for new prototype
sql/sql_parse.cc:
  implementing the two steps of global read lock so that FLUSH TABLES WITH READ LOCK can block COMMIT without deadlocking with COMMITs.
2004-08-20 16:35:23 +02:00
unknown
7c3e8f62f5 A fix (bug #5115: Erronious Syntax Error when comment placed inside of "create table")
client/mysql.cc:
  in_comment is now outside the add_line().
2004-08-20 13:37:58 +05:00
unknown
d1c5ca31f6 Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2004-08-19 23:11:16 +02:00