Below is the list of changes that have just been committed into a local
5.2 repository of emurphy. When emurphy does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet
1.2241 06/07/04 15:36:07 elliot@scared.(none) +6 -0
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into mysql.com:/home/emurphy/src/bk-clean/mysql-5.2
sql/share/errmsg.txt
1.92 06/07/04 15:36:01 elliot@scared.(none) +0 -0
Auto merged
sql/sql_yacc.yy
1.468 06/07/04 15:36:00 elliot@scared.(none) +0 -0
Auto merged
mysql-test/t/ctype_ucs.test
1.42 06/07/04 15:36:00 elliot@scared.(none) +0 -0
Auto merged
mysql-test/mysql-test-run.sh
1.314 06/07/04 15:36:00 elliot@scared.(none) +0 -0
Auto merged
mysql-test/mysql-test-run.pl
1.125 06/07/04 15:36:00 elliot@scared.(none) +0 -0
Auto merged
configure.in
1.348 06/07/04 15:36:00 elliot@scared.(none) +0 -0
Auto merged
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: elliot
# Host: scared.(none)
# Root: /home/emurphy/src/bk-clean/mysql-5.2/RESYNC
--- 1.347/configure.in 2006-06-23 09:49:15 -04:00
+++ 1.348/configure.in 2006-07-04 15:36:00 -04:00
@@ -482,6 +482,10 @@
# We need an assembler, too
AM_PROG_AS
+CCASFLAGS="$CCASFLAGS $ASFLAGS"
+
+# Check if we need noexec stack for assembler
+AC_CHECK_NOEXECSTACK
if test "$am_cv_prog_cc_stdc" = "no"
then
--- 1.467/sql/sql_yacc.yy 2006-06-23 09:49:16 -04:00
+++ 1.468/sql/sql_yacc.yy 2006-07-04 15:36:00 -04:00
@@ -38,7 +38,7 @@
#include "sp_pcontext.h"
#include "sp_rcontext.h"
#include "sp.h"
-#include "event.h"
+#include "event_timed.h"
#include <myisam.h>
#include <myisammrg.h>
--- 1.91/sql/share/errmsg.txt 2006-06-23 09:49:17 -04:00
+++ 1.92/sql/share/errmsg.txt 2006-07-04 15:36:01 -04:00
@@ -54,7 +54,7 @@
dan "Kan ikke oprette filen '%-.64s' (Fejlkode: %d)"
nla "Kan file '%-.64s' niet aanmaken (Errcode: %d)"
- eng "Can't create file '%-.64s' (errno: %d)"
+ eng "Can't create file '%-.200s' (errno: %d)"
est "Ei suuda luua faili '%-.64s' (veakood: %d)"
ger "Kann Datei '%-.64s' nicht erzeugen (Fehler: %d)"
@@ -278,7 +278,7 @@
nla "Kan de status niet krijgen van '%-.64s' (Errcode: %d)"
- eng "Can't get status of '%-.64s' (errno: %d)"
+ eng "Can't get status of '%-.200s' (errno: %d)"
est "Ei suuda lugeda '%-.64s' olekut (veakood: %d)"
fre "Ne peut obtenir le status de '%-.64s' (Errcode: %d)"
@@ -353,7 +353,7 @@
nla "Kan de file '%-.64s' niet openen (Errcode: %d)"
- eng "Can't open file: '%-.64s' (errno: %d)"
+ eng "Can't open file: '%-.200s' (errno: %d)"
est "Ei suuda avada faili '%-.64s' (veakood: %d)"
fre "Ne peut ouvrir le fichier: '%-.64s' (Errcode: %d)"
@@ -378,7 +378,7 @@
dan "Kan ikke finde fila: '%-.64s' (Fejlkode: %d)"
nla "Kan de file: '%-.64s' niet vinden (Errcode: %d)"
- eng "Can't find file: '%-.64s' (errno: %d)"
+ eng "Can't find file: '%-.200s' (errno: %d)"
est "Ei suuda leida faili '%-.64s' (veakood: %d)"
fre "Ne peut trouver le fichier: '%-.64s' (Errcode: %d)"
@@ -549,7 +549,7 @@
nla "Fout bij het lezen van file '%-.64s' (Errcode: %d)"
- eng "Error reading file '%-.64s' (errno: %d)"
+ eng "Error reading file '%-.200s' (errno: %d)"
est "Viga faili '%-.64s' lugemisel (veakood: %d)"
fre "Erreur en lecture du fichier '%-.64s' (Errcode: %d)"
@@ -599,7 +599,7 @@
dan "Fejl ved skriving av filen '%-.64s' (Fejlkode: %d)"
nla "Fout bij het wegschrijven van file '%-.64s' (Errcode: %d)"
- eng "Error writing file '%-.64s' (errno: %d)"
+ eng "Error writing file '%-.200s' (errno: %d)"
est "Viga faili '%-.64s' kirjutamisel (veakood: %d)"
@@ -772,7 +772,7 @@
dan "Forkert indhold i: '%-.64s'"
nla "Verkeerde info in file: '%-.64s'"
- eng "Incorrect information in file: '%-.64s'"
+ eng "Incorrect information in file: '%-.200s'"
est "Vigane informatsioon failis '%-.64s'"
@@ -797,7 +797,7 @@
nla "Verkeerde zoeksleutel file voor tabel: '%-.64s'; probeer het te repareren"
- eng "Incorrect key file for table '%-.64s'; try to repair it"
+ eng "Incorrect key file for table '%-.200s'; try to repair it"
@@ -2044,7 +2044,7 @@
nla "Het bestand '%-.64s' dient in de database directory voor the komen of leesbaar voor iedereen te zijn."
- eng "The file '%-.64s' must be in the database directory or be readable by all"
+ eng "The file '%-.128s' must be in the database directory or be readable by all"
@@ -2069,7 +2069,7 @@
dan "Filen '%-.64s' eksisterer allerede"
nla "Het bestand '%-.64s' bestaat reeds"
- eng "File '%-.80s' already exists"
+ eng "File '%-.200s' already exists"
est "Fail '%-.80s' juba eksisteerib"
@@ -2345,7 +2345,7 @@
dan "Kan ikke lave unikt log-filnavn %s.(1-999)\n"
nla "Het is niet mogelijk een unieke naam te maken voor de logfile %s.(1-999)\n"
- eng "Can't generate a unique log-filename %-.64s.(1-999)\n"
+ eng "Can't generate a unique log-filename %-.200s.(1-999)\n"
est "Ei suuda luua unikaalset logifaili nime %-.64s.(1-999)\n"
@@ -5193,7 +5193,7 @@
ER_FPARSER_EOF_IN_COMMENT
- eng "Unexpected end of file while parsing comment '%-.64s'"
+ eng "Unexpected end of file while parsing comment '%-.200s'"
ger "Unerwartetes Dateiende beim Parsen des Kommentars '%-.64s'"
@@ -5362,7 +5362,7 @@
eng "Binary logging and replication forbid changing the global server %s"
ER_NO_FILE_MAPPING
- eng "Can't map file: %-.64s, errno: %d"
+ eng "Can't map file: %-.200s, errno: %d"
ger "Kann Datei nicht abbilden: %-.64s, Fehler: %d"
ER_WRONG_MAGIC
eng "Wrong magic in %-.64s"
--- 1.41/mysql-test/t/ctype_ucs.test 2006-04-26 22:41:21 -04:00
+++ 1.42/mysql-test/t/ctype_ucs.test 2006-07-04 15:36:00 -04:00
@@ -439,6 +439,32 @@
create index t1f1 on t1(f1);
select f1 from t1 where f1 like 'a%';
drop table t1;
+
+#
+# Bug#9442 Set parameter make query fail if column character set is UCS2
+#
+create table t1 (utext varchar(20) character set ucs2);
+insert into t1 values ("lily");
+insert into t1 values ("river");
+prepare stmt from 'select utext from t1 where utext like ?';
+set @param1='%%';
+execute stmt using @param1;
+execute stmt using @param1;
+select utext from t1 where utext like '%%';
+drop table t1;
+deallocate prepare stmt;
+
+#
+# Bug #20076: server crashes for a query with GROUP BY if MIN/MAX aggregation
+# over a 'ucs2' field uses a temporary table
+#
+
+CREATE TABLE t1 (id int, s char(5) CHARACTER SET ucs2 COLLATE ucs2_unicode_ci);
+INSERT INTO t1 VALUES (1, 'ZZZZZ'), (1, 'ZZZ'), (2, 'ZZZ'), (2, 'ZZZZZ');
+
+SELECT id, MIN(s) FROM t1 GROUP BY id;
+
+DROP TABLE t1;
# End of 4.1 tests
#
--- 1.124/mysql-test/mysql-test-run.pl 2006-06-23 09:49:15 -04:00
+++ 1.125/mysql-test/mysql-test-run.pl 2006-07-04 15:36:00 -04:00
@@ -1049,7 +1049,9 @@
# New CMake locations.
"$glob_basedir/client/release",
"$glob_basedir/client/debug");
- $exe_mysqld= mtr_exe_exists ("$path_client_bindir/mysqld-nt",
+ $exe_mysqld= mtr_exe_exists ("$path_client_bindir/mysqld-max-nt",
+ "$path_client_bindir/mysqld-max",
+ "$path_client_bindir/mysqld-nt",
"$path_client_bindir/mysqld",
"$path_client_bindir/mysqld-debug",
"$path_client_bindir/mysqld-max",
| Thread |
|---|
| • bk commit into 5.2 tree (elliot:1.2241) | Elliot Murphy | 4 Jul |
