Commit graph

8251 commits

Author SHA1 Message Date
unknown
c36356b6a4 Bug #5447 Select does not find records
Note, there is no need to propagate this change into 4.1.


mysql-test/r/ctype_latin1_de.result:
  Bug #5447 Select does not find records
mysql-test/t/ctype_latin1_de.test:
  Bug #5447 Select does not find records
strings/ctype-latin1_de.c:
  Bug #5447 Select does not find records
2004-09-09 12:23:10 +05:00
unknown
a366a0d1ed Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0
into gw.mysql.r18.ru:/usr/home/ram/work/4.0.b3120
2004-09-09 11:58:11 +05:00
unknown
ca2f6cbda9 Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.0
into brian-akers-computer.local:/Users/brian/mysql/mysql-4.0
2004-09-08 19:00:33 -07:00
unknown
c00c89af7f Updating the headers on a few files to include GPL header.
sql/repl_failsafe.cc:
  Removed reference to old maintainer.
sql/repl_failsafe.h:
  Added license header.
sql/slave.h:
  Added license header.
sql/sql_repl.cc:
  Removed old maintainer.
sql/sql_repl.h:
  Added license header
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2004-09-08 18:26:19 -07:00
unknown
773a256e89 [This patch has already been approved by Serge. I am recommitting and pushing from a new repository because there were other changesets that couldn't be pushed.]
BUG# 5229 --password=foobar does not override the empty 'password' option in the my.cnf
This is a backport of a change made by jani in the 4.1 tree.

mysql.cc:
  Add tty_password=0 in the p case handling in get_one_option


client/mysql.cc:
  Add tty_password=0 in the p case handling in get_one_option
2004-09-08 16:31:01 +02:00
unknown
eed990d667 A fix (bug #3120: 'mysqladmin ping' - return error code). 2004-09-08 16:45:03 +05:00
unknown
419ca7152f Merge rurik.mysql.com:/home/igor/mysql-4.0
into rurik.mysql.com:/home/igor/dev/mysql-4.0-0
2004-09-07 10:08:17 -07:00
unknown
95036003c6 select.test:
Added newline at the end of file.


mysql-test/t/select.test:
  Added newline at the end of file.
2004-09-07 10:03:46 -07:00
unknown
7a02bd9c3d Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
2004-09-07 14:58:40 +02:00
unknown
32db5b4c5e when we update thd->db in replication, it's safer to update thd->db_length too.
This does not fix any known bug, but is still a good idea.


sql/log_event.cc:
  when we update thd->db in replication, it's safer to update thd->db_length too.
sql/slave.cc:
  when we update thd->db in replication, it's safer to update thd->db_length too.
sql/sql_db.cc:
  comment
2004-09-07 14:57:54 +02:00
unknown
bb88f4fbc3 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0
into gw.mysql.r18.ru:/usr/home/ram/work/4.0.b2205
2004-09-07 17:57:46 +05:00
unknown
de027f1026 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0
into gw.mysql.r18.ru:/usr/home/ram/work/4.0.b2205
2004-09-07 17:26:15 +05:00
unknown
3a476a6e91 clean up at end of test (thanks serg)
mysql-test/r/rpl_set_charset.result:
  result update
mysql-test/t/rpl_set_charset.test:
  clean up on slave too.
2004-09-07 14:20:48 +02:00
unknown
6b1444d7ba better fix for bug#5001 2004-09-07 13:48:38 +02:00
unknown
e205392de7 cleanup 2004-09-07 13:36:27 +02:00
unknown
ee511e55e7 A fix (Bug #5432: Is this a leak in mysql console client?) 2004-09-07 14:24:47 +05:00
unknown
999e4ad1c9 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
unknown
e4ff34388a 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
unknown
00080aa7c3 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
unknown
1af2cd3639 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
unknown
2b464cae9b Fixed Bug#3645, "PROCEDURE ANALYSE() recommends illegal
FLOAT columns".
2004-09-07 11:40:27 +03:00
unknown
2fcb02b6be 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
unknown
6f46f997b1 Fix of previous push.
sql/sql_table.cc:
  stupid me. error already exists in the function. Using a local 'int error' resulted in global 'error' not being inited, which probably made next steps (those testing global error) go wrong!
2004-09-06 23:20:33 +02:00
unknown
21642fb5d7 Bug #5413 mysqlcheck segfaults when user has to few permissions 2004-09-06 22:48:42 +02:00
unknown
d00627758b Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0-opt


sql/log.cc:
  Auto merged
2004-09-06 22:47:50 +02:00
unknown
ea971987fc Replacing class Disable_binlog by macros. Patch already approved by Monty.
sql/log.cc:
  removing unneeded class Disable_binlog
sql/sql_class.h:
  removing unneeded class Disable_binlog
sql/sql_table.cc:
  As discussed, class Disable_binlog is removed and replaced by macros.
2004-09-06 22:47:26 +02:00
unknown
3cc5262411 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
unknown
e663f91ad7 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.


sql/Makefile.am:
  sql_yacc.c includes mysql_priv.h, slave.h etc, so sql_yacc.o does depend on these .h files;
  so they need to be listed in the dependencies.
2004-09-06 22:30:16 +02:00
unknown
982a78829a bug#5389 merge.test fails on qnx - uninitalized variable in myrg_open()
myisammrg/myrg_open.c:
  backport from 4.1
mysql-test/r/union.result:
  after merge fix
mysql-test/t/union.test:
  after merge fix
sql/log.cc:
  backward compatibility: inhibit severity labels in error log
2004-09-06 22:20:40 +02:00
unknown
50bde49309 Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0


mysql-test/r/union.result:
  Auto merged
mysql-test/t/union.test:
  Auto merged
2004-09-06 20:18:41 +02:00
unknown
71ba3e55b7 A fix (bug #2205 USE database doesn't work after DROP database + CREATE database)
(Jani's CS 1.1675 04/01/05 21:45:14 was adapted an aplied).


client/mysql.cc:
  A fix (bug #2205 USE database doesn't work after DROP database + CREATE database).
2004-09-06 16:48:11 +05:00
unknown
e9a4045252 union.test: drop table added
BitKeeper/etc/ignore:
  Added support-files/my-innodb-heavy-4G.cnf to the ignore list
mysql-test/r/union.result:
  drop table added
mysql-test/t/union.test:
  drop table added
2004-09-05 11:27:31 +02:00
unknown
0d34c63536 sql_yacc.yy:
Allow FROM or IN in SHOW KEYS, as in other SHOW statements.


sql/sql_yacc.yy:
  Allow FROM or IN in SHOW KEYS, as in other SHOW statements.
2004-09-03 10:56:55 -05:00
unknown
8838c971fa A fix (Bug #4980: union statement with () union () order by produces wrong explain). 2004-09-03 19:59:29 +05:00
unknown
462ee7c417 A fix (bug #2631: mlockall called after dropping root permissions). 2004-09-03 19:26:11 +05:00
unknown
182688f01f Merge rurik.mysql.com:/home/igor/mysql-4.0
into rurik.mysql.com:/home/igor/dev/mysql-4.0-0


sql/sql_select.cc:
  Auto merged
2004-09-02 22:07:07 -07:00
unknown
afac3c3127 select.result, select.test:
Added a test case for bug #5333.
null_key.result, key_primary.result:
  Made covering index usable for const tables.
sql_select.cc:
  Made covering index usable for const tables:
  downported the corresponding code from 4.1.
  Simultaneously fixed bug #5333 reported for 4.1.
  The bug was due to the fact that field index in join
  structures was always set to 0 for const tables.


sql/sql_select.cc:
  Made covering index usable for const tables:
  downported the corresponding code from 4.1.
  Simultaneously fixed bug #5333 reported for 4.1.
  The bug was due to the fact that field index in join
  structures was always set to 0 for const tables.
mysql-test/t/select.test:
  Added a test case for bug #5333.
mysql-test/r/key_primary.result:
  Made covering index usable for const tables.
mysql-test/r/null_key.result:
  Made covering index usable for const tables.
mysql-test/r/select.result:
  Added a test case for bug #5333.
2004-09-02 22:06:30 -07:00
unknown
b871ea386c errmsg.txt:
Add GPL comment


sql/share/czech/errmsg.txt:
  Add GPL comment
sql/share/danish/errmsg.txt:
  Add GPL comment
sql/share/dutch/errmsg.txt:
  Add GPL comment
sql/share/english/errmsg.txt:
  Add GPL comment
sql/share/estonian/errmsg.txt:
  Add GPL comment
sql/share/french/errmsg.txt:
  Add GPL comment
sql/share/german/errmsg.txt:
  Add GPL comment
sql/share/greek/errmsg.txt:
  Add GPL comment
sql/share/hungarian/errmsg.txt:
  Add GPL comment
sql/share/italian/errmsg.txt:
  Add GPL comment
sql/share/japanese/errmsg.txt:
  Add GPL comment
sql/share/korean/errmsg.txt:
  Add GPL comment
sql/share/norwegian-ny/errmsg.txt:
  Add GPL comment
sql/share/norwegian/errmsg.txt:
  Add GPL comment
sql/share/polish/errmsg.txt:
  Add GPL comment
sql/share/portuguese/errmsg.txt:
  Add GPL comment
sql/share/romanian/errmsg.txt:
  Add GPL comment
sql/share/russian/errmsg.txt:
  Add GPL comment
sql/share/slovak/errmsg.txt:
  Add GPL comment
sql/share/spanish/errmsg.txt:
  Add GPL comment
sql/share/swedish/errmsg.txt:
  Add GPL comment
sql/share/ukrainian/errmsg.txt:
  Add GPL comment
2004-09-02 18:12:05 -05:00
unknown
e230217f4d 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
unknown
ac55058d78 Fix for bug #5302 2004-09-02 01:17:28 -03:00
unknown
240812bdef Fix for bug #5302 2004-09-01 14:02:11 -03:00
unknown
4d5fee8e01 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
unknown
2377b96450 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
unknown
d21aae9564 - removed swedish errmsg.OLD
BitKeeper/deleted/.del-errmsg.OLD~de59ad17392012d:
  Delete: sql/share/swedish/errmsg.OLD
2004-09-01 16:04:01 +02:00
unknown
06959e0e66 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


sql/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
unknown
8133ce04f8 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
unknown
23ae3c1707 Correct a typo error: cpp symbol is "BIG_TABLES", not "BIG_FILES"
(backport from 4.1).


configure.in:
  Defining "BIG_TABLES" works around a problem with the Sun Forte
  compiler for Solaris on x86 platforms: improper handling of "long long".
  Error shows up on the "limit_rows_found" variable in test "union".
  Old "BIG_FILES" was a typing error (backport from 4.1).
2004-09-01 12:36:01 +02:00
unknown
8ed495dd32 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
unknown
0d80b507ff 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.


scripts/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
unknown
38105ee845 Do-compile:
Remove --warnings for mysql-test-run. Devs don't use it, and Serg says it's not needed anymore.


Build-tools/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