diff options
| author | unknown <antony@ltantony.dsl-verizon.net> | 2004-04-28 16:38:29 +0100 |
|---|---|---|
| committer | unknown <antony@ltantony.dsl-verizon.net> | 2004-04-28 16:38:29 +0100 |
| commit | 87026280298716e121b39eb3213522e697378c25 (patch) | |
| tree | fad6008f9a47dceee37b452fbd9446c2ae102897 /mysql-test/r/func_str.result | |
| parent | 4118e3fb97d7fd796f9aa78866f1e0041bf0c274 (diff) | |
| parent | 0d07fe42c3a825e21d74f3db8efe4af1dba32f5b (diff) | |
| download | mariadb-git-87026280298716e121b39eb3213522e697378c25.tar.gz | |
Merge ltantony.dsl-verizon.net:/usr/home/antony/work/mysql-4.0
into ltantony.dsl-verizon.net:/usr/home/antony/work/bug3481
mysql-test/r/func_str.result:
Auto merged
mysql-test/t/func_str.test:
Auto merged
Diffstat (limited to 'mysql-test/r/func_str.result')
| -rw-r--r-- | mysql-test/r/func_str.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/func_str.result b/mysql-test/r/func_str.result index 6be8e34c334..dd20ffa2dbb 100644 --- a/mysql-test/r/func_str.result +++ b/mysql-test/r/func_str.result @@ -247,7 +247,7 @@ CREATE TABLE t1 ( wid int(10) unsigned NOT NULL auto_increment, data_podp date default NULL, status_wnio enum('nowy','podp','real','arch') NOT NULL default 'nowy', -PRIMARY KEY(wid), +PRIMARY KEY(wid) ); INSERT INTO t1 VALUES (8,NULL,'real'); INSERT INTO t1 VALUES (9,NULL,'nowy'); |