Commit graph

8233 commits

Author SHA1 Message Date
serg@serg.mylan
001dfd3d48 cleanup 2004-09-07 13:36:27 +02:00
serg@serg.mylan
8ffde5a232 Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2004-09-07 11:15:54 +02:00
guilhem@mysql.com
491adcb589 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
2004-09-07 11:15:53 +02:00
guilhem@mysql.com
06954e0f6d A new test for the fix for BUG#4500 ("SET CHARACTER SET replicates incorrectly").
As I cannot be 100% sure that there won't be issues with some of our exotic platforms
(who knows if the charset of <obscure old OS> will play fair?), I'll send an email to the build guys.
Well, this holds if bk does not crash on binary chars of this cset.
2004-09-07 11:15:23 +02:00
jani@rhols221.adsl.netsonic.fi
e04e50b6b7 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.0
into rhols221.adsl.netsonic.fi:/home/my/bk/mysql-4.0
2004-09-07 11:40:48 +03:00
jani@rhols221.adsl.netsonic.fi
56b4c31633 Fixed Bug#3645, "PROCEDURE ANALYSE() recommends illegal
FLOAT columns".
2004-09-07 11:40:27 +03:00
ram@gw.mysql.r18.ru
04fd903157 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0
into gw.mysql.r18.ru:/usr/home/ram/work/4.0.b2631
2004-09-07 12:53:12 +05:00
guilhem@mysql.com
de5d1e780e Fix of previous push. 2004-09-06 23:20:33 +02:00
serg@serg.mylan
c0aba1ab98 Bug #5413 mysqlcheck segfaults when user has to few permissions 2004-09-06 22:48:42 +02:00
guilhem@mysql.com
f25d3fca92 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0-opt
2004-09-06 22:47:50 +02:00
guilhem@mysql.com
99444c3311 Replacing class Disable_binlog by macros. Patch already approved by Monty. 2004-09-06 22:47:26 +02:00
guilhem@mysql.com
e2aca8cbea Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
2004-09-06 22:30:58 +02:00
guilhem@mysql.com
01ad1bb569 Dependency fix. We observed that doing any change to class THD in sql_class.h resulted in mysqld going crazy (parsing errors,
query cache errors in query_cache.test). This is because sql_yacc.cc depends on several .h files but those were not listed in
the dependencies of sql_yacc.o. The present patch does fix the issue; but my auto*-expert colleagues may have a better one.
2004-09-06 22:30:16 +02:00
serg@serg.mylan
130d2fd57f bug#5389 merge.test fails on qnx - uninitalized variable in myrg_open() 2004-09-06 22:20:40 +02:00
serg@serg.mylan
02d3cf19ef Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2004-09-06 20:18:41 +02:00
serg@serg.mylan
7ac525fc1b union.test: drop table added 2004-09-05 11:27:31 +02:00
paul@kite-hub.kitebird.com
38f462ae6f sql_yacc.yy:
Allow FROM or IN in SHOW KEYS, as in other SHOW statements.
2004-09-03 10:56:55 -05:00
ram@gw.mysql.r18.ru
f91ca0bd66 A fix (Bug #4980: union statement with () union () order by produces wrong explain). 2004-09-03 19:59:29 +05:00
ram@gw.mysql.r18.ru
3c85a363e5 A fix (bug #2631: mlockall called after dropping root permissions). 2004-09-03 19:26:11 +05:00
paul@kite-hub.kitebird.com
f7bc60e0fc errmsg.txt:
Add GPL comment
2004-09-02 18:12:05 -05:00
ram@gw.mysql.r18.ru
c6b2b2f09d Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0
into gw.mysql.r18.ru:/usr/home/ram/work/4.0.b5232
2004-09-02 16:25:32 +05:00
miguel@hegel.txg.br
fc11887596 Fix for bug #5302 2004-09-02 01:17:28 -03:00
miguel@hegel.txg.br
ca42de54a1 Fix for bug #5302 2004-09-01 14:02:11 -03:00
lenz@mysql.com
7b8b5d8969 Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.0
into mysql.com:/space/my/mysql-4.0
2004-09-01 16:17:49 +02:00
lenz@mysql.com
1483564b49 Merge mysql.com:/space/my/mysql-4.0
into mysql.com:/space/my/mysql-4.0-build
2004-09-01 16:04:51 +02:00
lenz@mysql.com
80879cffe6 - removed swedish errmsg.OLD 2004-09-01 16:04:01 +02:00
heikki@hundin.mysql.fi
40c0fde904 ha_innodb.cc:
If ALTER TABLE ... DROP FOREIGN KEY ... fails because of a wrong constraint name, return a table handler error number 150 instead of 152; the value 152 was misleading, as it referred to '152 = Cannot delete a parent row', whereas '150 = Foreign key constraint is incorrectly formed' is less misleading
2004-09-01 16:41:09 +03:00
joerg@mysql.com
1a44a2110c Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/M40/mysql-4.0
2004-09-01 12:46:56 +02:00
joerg@mysql.com
9e2e71816f Correct a typo error: cpp symbol is "BIG_TABLES", not "BIG_FILES"
(backport from 4.1).
2004-09-01 12:36:01 +02:00
patg@krsna.patg.net
54eac3b8d4 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-4.0
into krsna.patg.net:/home/patg/mysql-4.0
2004-08-31 19:04:07 -07:00
patg@krsna.patg.net
e277145911 mysqld_safe.sh:
bug #5001, added conditional if to test if port set, then only kill the processes
  for this port, not all processes (in the case of this bug where multiple servers 
  are killed.)
  The change to the 'grep' to make sure mysqld_safe isn't killed was per Serg's
  discovery that mysqld_safe would get killed. 
  In my testing, in killing one of the pids for a running server, the "if test ! -f $pid_file"
  was the case that evaluated as true, so in order to test, I had to comment that block
  out.
2004-08-31 18:59:41 -07:00
mwagner@here.mwagner.org
3f0f1a4fb2 Do-compile:
Remove --warnings for mysql-test-run. Devs don't use it, and Serg says it's not needed anymore.
2004-08-31 13:29:28 -05:00
ram@gw.mysql.r18.ru
b93a973b12 Added global my_getopt_error_reporter function pointer which is
used in the handle_options() function (instead of using additional 
handle_option() parameter). The default value of the 
my_getopt_error_reporter is default_reporter(). One can set it to
other functions if case of need.
2004-08-31 21:27:58 +05:00
joerg@mysql.com
86fcffb323 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)
2004-08-30 17:41:41 +02:00
serg@serg.mylan
079678be7b 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
serg@serg.mylan
38d9ce96f9 typo fixed 2004-08-30 10:13:13 +02:00
lenz@mysql.com
9632f7d9c8 - 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
2004-08-30 09:20:52 +02:00
rburnett@build.mysql.com
547b46b7c9 log.cc:
Fixed missing * in comment in setup_windows_event_source
2004-08-30 00:50:39 +02:00
guilhem@mysql.com
0485e5d3f0 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
2004-08-29 14:14:32 +02:00
guilhem@mysql.com
93101561fd 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.
2004-08-29 14:13:51 +02:00
lenz@mysql.com
0f023b3b9b - fixed typo so make dist does not fail 2004-08-28 09:31:15 +02:00
monty@mysql.com
f574cd4e8f Code style fixes.
Initialize LOG_error_log before get_options to not use an uninitalized mutex in case of an error from handle_options()
2004-08-28 00:49:54 +03:00
bar@mysql.com
4d1dedd70d 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
ram@gw.mysql.r18.ru
3acccb988a A fix (Bug #5232: CREATE TABLE ... SELECT can deadlock itself). 2004-08-27 16:43:01 +05:00
bar@mysql.com
5258ea12cf table.cc:
Bug #4558 Escape handling error for ENUM values in SJIS encoding
2004-08-27 12:09:28 +05:00
bar@mysql.com
43b792d5cf win1251.conf:
Wrong UPPER/LOWER translation for Cyrillic letter tse was fixed.
  bug#5110
2004-08-27 10:54:57 +05:00
rburnett@build.mysql.com
bd48150e38 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
rburnett@build.mysql.com
caf1e73be7 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
lenz@mysql.com
2ed54c12e5 - fixed brain fart in Bootrap - it never actually caught failures
when pulling BK trees before.
2004-08-26 19:57:32 +02:00
serg@serg.mylan
0712f34d72 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